장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
52f21f4f 1 parent 6d0d209d

subscribe done

Expand all
Inline Side-by-side
Showing 35 changed files with 426 additions and 209 deletions
...@@ -35,7 +35,8 @@ class InfoActivity : AppCompatActivity() { ...@@ -35,7 +35,8 @@ class InfoActivity : AppCompatActivity() {
35 Toast.LENGTH_SHORT).show() 35 Toast.LENGTH_SHORT).show()
36 36
37 InfoProfilModify.setOnClickListener { 37 InfoProfilModify.setOnClickListener {
38 - var intent = Intent(this, SettingActivity::class.java) 38 +
39 + var intent = Intent(this, InputProfilFirstOneActivity::class.java)
39 startActivity(intent) 40 startActivity(intent)
40 } 41 }
41 42
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import android.widget.Toast 8 import android.widget.Toast
...@@ -13,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_input_profil_first_one.* ...@@ -13,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
13 class InputProfilFirstOneActivity : AppCompatActivity() { 15 class InputProfilFirstOneActivity : AppCompatActivity() {
14 16
15 private val firebaseAuth = FirebaseAuth.getInstance() 17 private val firebaseAuth = FirebaseAuth.getInstance()
16 - val user_db = FirebaseDatabase.getInstance("https://capstone-vip-user.firebaseio.com/").reference 18 + val user_db = FirebaseDatabase.getInstance("https://wello-topic.firebaseio.com/").reference
17 19
18 private fun sendToken(){ 20 private fun sendToken(){
19 FirebaseInstanceId.getInstance().instanceId 21 FirebaseInstanceId.getInstance().instanceId
...@@ -46,13 +48,50 @@ class InputProfilFirstOneActivity : AppCompatActivity() { ...@@ -46,13 +48,50 @@ class InputProfilFirstOneActivity : AppCompatActivity() {
46 super.onCreate(savedInstanceState) 48 super.onCreate(savedInstanceState)
47 setContentView(R.layout.activity_input_profil_first_one) 49 setContentView(R.layout.activity_input_profil_first_one)
48 50
51 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
52 + val editor: SharedPreferences.Editor=prof.edit()
49 53
54 + inputStartButton.setOnClickListener {
50 55
56 + editor.putInt("c1_1",1); editor.commit()
57 + editor.putInt("c2_1",1); editor.commit()
58 + editor.putInt("c3_1",1); editor.commit()
59 + editor.putInt("c4_1",1); editor.commit()
60 + editor.putInt("c5_1",1); editor.commit()
61 + editor.putInt("c6_1",1); editor.commit()
62 + editor.putInt("c7_1",1); editor.commit()
63 + editor.putInt("c8_1",1); editor.commit()
64 + editor.putInt("c9_1",1); editor.commit()
65 + editor.putInt("c10_1",1); editor.commit()
66 + editor.putInt("c11_1",1); editor.commit()
67 + editor.putInt("c12_1",1); editor.commit()
68 + editor.putInt("c13_1",1); editor.commit()
69 + editor.putInt("c14_1",1); editor.commit()
70 + editor.putInt("c15_1",1); editor.commit()
71 + editor.putInt("c16_1",1); editor.commit()
72 +
73 + if(prof.getString("first_two","none")!="done"){var intent = Intent(this, InputProfilFirstTwoActivity::class.java);startActivity(intent)}
74 + else if(prof.getString("first_three","none")!="done"){var intent = Intent(this, InputProfilFirstThreeActivity::class.java);startActivity(intent)}
75 + else if(prof.getString("first_four","none")!="done"){var intent = Intent(this, InputProfilFirstFourActivity::class.java);startActivity(intent)}
76 + else if(prof.getString("first_five","none")!="done"){var intent = Intent(this, InputProfilFirstFiveActivity::class.java);startActivity(intent)}
77 + else if(prof.getString("first_six","none")!="done"){var intent = Intent(this, InputProfilFirstSixActivity::class.java);startActivity(intent)}
78 + else if(prof.getString("second_one","none")!="done"){var intent = Intent(this, InputProfilSecondOneActivity::class.java);startActivity(intent)}
79 + else if(prof.getString("second_two","none")!="done"){var intent = Intent(this, InputProfilSecondTwoActivity::class.java);startActivity(intent)}
80 + else if(prof.getString("second_three","none")!="done"){var intent = Intent(this, InputProfilSecondThreeActivity::class.java);startActivity(intent)}
81 + else if(prof.getString("third_one","none")!="done"){var intent = Intent(this, InputProfilThirdOneActivity::class.java);startActivity(intent)}
82 + else if(prof.getString("third_two","none")!="done"){var intent = Intent(this, InputProfilThirdTwoActivity::class.java);startActivity(intent)}
83 + else if(prof.getString("third_three","none")!="done"){var intent = Intent(this, InputProfilThirdThreeActivity::class.java);startActivity(intent)}
84 + else if(prof.getString("third_four","none")!="done"){var intent = Intent(this, InputProfilThirdFourActivity::class.java);startActivity(intent)}
85 + else if(prof.getString("fourth_one","none")!="done"){var intent = Intent(this, InputProfilFourthOneActivity::class.java);startActivity(intent)}
86 + else if(prof.getString("fourth_two","none")!="done"){var intent = Intent(this, InputProfilFourthTwoActivity::class.java);startActivity(intent)}
87 + else if(prof.getString("fourth_three","none")!="done"){var intent = Intent(this, InputProfilFourthThreeActivity::class.java);startActivity(intent)}
88 + else if(prof.getString("fourth_four","none")!="done"){var intent = Intent(this, InputProfilFourthFourActivity::class.java);startActivity(intent)}
89 + else if(prof.getString("fourth_five","none")!="done"){var intent = Intent(this, InputProfilFourthFiveActivity::class.java);startActivity(intent)}
90 + else if(prof.getString("fifth_one","none")!="done"){var intent = Intent(this, InputProfilFifthOneActivity::class.java);startActivity(intent)}
91 + else if(prof.getString("fifth_two","none")!="done"){var intent = Intent(this, InputProfilFifthTwoActivity::class.java);startActivity(intent)}
92 + else if(prof.getString("fifth_three","none")!="done"){var intent = Intent(this, InputProfilFifthThreeActivity::class.java);startActivity(intent)}
93 + else {var intent = Intent(this, InputProfilFifthFourActivity::class.java);startActivity(intent)}
51 94
52 -
53 - inputStartButton.setOnClickListener {
54 - var intent = Intent(this, InputProfilFirstTwoActivity::class.java)
55 - startActivity(intent)
56 } 95 }
57 96
58 } 97 }
......
...@@ -31,6 +31,8 @@ class MainActivity : AppCompatActivity() { ...@@ -31,6 +31,8 @@ class MainActivity : AppCompatActivity() {
31 super.onCreate(savedInstanceState) 31 super.onCreate(savedInstanceState)
32 setContentView(R.layout.activity_main) 32 setContentView(R.layout.activity_main)
33 33
34 +
35 +
34 emailSigninBtn.setOnClickListener{ 36 emailSigninBtn.setOnClickListener{
35 loginEmail() 37 loginEmail()
36 } 38 }
...@@ -49,8 +51,6 @@ class MainActivity : AppCompatActivity() { ...@@ -49,8 +51,6 @@ class MainActivity : AppCompatActivity() {
49 51
50 } 52 }
51 53
52 -
53 -
54 private fun loginEmail(){ 54 private fun loginEmail(){
55 firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString()) 55 firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString())
56 .addOnCompleteListener(this) { 56 .addOnCompleteListener(this) {
...@@ -59,7 +59,28 @@ class MainActivity : AppCompatActivity() { ...@@ -59,7 +59,28 @@ class MainActivity : AppCompatActivity() {
59 Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show() 59 Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show()
60 val user = firebaseAuth?.currentUser 60 val user = firebaseAuth?.currentUser
61 61
62 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
63 + val editor: SharedPreferences.Editor=prof.edit()
64 +
65 +
62 if (user!=null){ 66 if (user!=null){
67 + editor.putInt("c1_1",1); editor.commit()
68 + editor.putInt("c2_1",1); editor.commit()
69 + editor.putInt("c3_1",1); editor.commit()
70 + editor.putInt("c4_1",1); editor.commit()
71 + editor.putInt("c5_1",1); editor.commit()
72 + editor.putInt("c6_1",1); editor.commit()
73 + editor.putInt("c7_1",1); editor.commit()
74 + editor.putInt("c8_1",1); editor.commit()
75 + editor.putInt("c9_1",1); editor.commit()
76 + editor.putInt("c10_1",1); editor.commit()
77 + editor.putInt("c11_1",1); editor.commit()
78 + editor.putInt("c12_1",1); editor.commit()
79 + editor.putInt("c13_1",1); editor.commit()
80 + editor.putInt("c14_1",1); editor.commit()
81 + editor.putInt("c15_1",1); editor.commit()
82 + editor.putInt("c16_1",1); editor.commit()
83 +
63 var intent = Intent(this, SignInActivity::class.java) 84 var intent = Intent(this, SignInActivity::class.java)
64 startActivity(intent) 85 startActivity(intent)
65 86
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <shape android:shape="rectangle">
4 + <solid android:color="#29ABE2"/>
5 +
6 + <stroke android:width="0dp"
7 + android:color="#29ABE2"
8 + />
9 + <padding android:left="0dp"
10 + android:top="0dp"
11 + android:right="0dp"
12 + android:bottom="0dp"
13 + />
14 +
15 + <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
16 + android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
17 +
18 + </shape>
19 +</selector>
20 +
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <shape android:shape="rectangle">
4 + <solid android:color="#F4F4F4"/>
5 +
6 + <stroke android:width="0dp"
7 + android:color="#F4F4F4"
8 + />
9 + <padding android:left="0dp"
10 + android:top="0dp"
11 + android:right="0dp"
12 + android:bottom="0dp"
13 + />
14 +
15 + <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
16 + android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
17 + </shape>
18 +</selector>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list
3 + xmlns:android="http://schemas.android.com/apk/res/android">
4 +
5 + <item>
6 + <shape android:shape="rectangle">
7 + <solid android:color="#F4F4F4"/>
8 +
9 + <stroke android:width="0dp"
10 + android:color="#F4F4F4"
11 + />
12 + <padding android:left="0dp"
13 + android:top="0dp"
14 + android:right="0dp"
15 + android:bottom="0dp"
16 + />
17 +
18 + <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
19 + android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
20 +
21 + </shape>
22 + </item>
23 +
24 + <item>
25 + <shape android:shape="rectangle">
26 + <solid android:color="#29ABE2"/>
27 +
28 + <stroke android:width="0dp"
29 + android:color="#29ABE2"
30 + />
31 + <padding android:left="0dp"
32 + android:top="0dp"
33 + android:right="0dp"
34 + android:bottom="0dp"
35 + />
36 +
37 + <corners android:bottomRightRadius="25dp" android:bottomLeftRadius="0dp"
38 + android:topLeftRadius="0dp" android:topRightRadius="25dp"/>
39 +
40 + </shape>
41 + </item>
42 +</layer-list>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFourthFiveActivity"> 7 + tools:context=".InputProfilFirstFiveActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
19 - android:background="#FFF" 19 + android:background="#0000001A"
20 android:elevation="5dp" 20 android:elevation="5dp"
21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -31,31 +31,35 @@ ...@@ -31,31 +31,35 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:background="#FFFFFF" 34 + android:background="#00000000"
35 android:text="나가기" 35 android:text="나가기"
36 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
37 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
38 <LinearLayout 39 <LinearLayout
39 android:layout_width="10dp" 40 android:layout_width="10dp"
40 android:layout_height="match_parent" 41 android:layout_height="match_parent"
41 - android:orientation="horizontal" 42 + android:layout_weight="1"
42 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
43 <ImageView 45 <ImageView
44 android:layout_width="77dp" 46 android:layout_width="77dp"
45 android:layout_height="44dp" 47 android:layout_height="44dp"
46 android:layout_gravity="center" 48 android:layout_gravity="center"
47 android:layout_weight="1" 49 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
49 <LinearLayout 52 <LinearLayout
50 android:layout_width="10dp" 53 android:layout_width="10dp"
51 android:layout_height="match_parent" 54 android:layout_height="match_parent"
52 - android:orientation="horizontal" 55 + android:layout_weight="1"
53 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
54 <LinearLayout 58 <LinearLayout
55 android:layout_width="10dp" 59 android:layout_width="10dp"
56 android:layout_height="match_parent" 60 android:layout_height="match_parent"
57 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
58 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
59 63
60 </LinearLayout> 64 </LinearLayout>
61 65
...@@ -74,9 +78,10 @@ ...@@ -74,9 +78,10 @@
74 android:layout_height="match_parent" 78 android:layout_height="match_parent"
75 android:layout_gravity="center" 79 android:layout_gravity="center"
76 android:layout_weight="1" 80 android:layout_weight="1"
77 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage"
78 android:gravity="center" 82 android:gravity="center"
79 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
80 85
81 <TextView 86 <TextView
82 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -84,9 +89,10 @@ ...@@ -84,9 +89,10 @@
84 android:layout_height="match_parent" 89 android:layout_height="match_parent"
85 android:layout_gravity="center" 90 android:layout_gravity="center"
86 android:layout_weight="1" 91 android:layout_weight="1"
87 - android:background="#1E90FF" 92 + android:background="#F4F4F4"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#DDDDDD" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,9 +100,10 @@ ...@@ -94,9 +100,10 @@
94 android:layout_height="match_parent" 100 android:layout_height="match_parent"
95 android:layout_gravity="center" 101 android:layout_gravity="center"
96 android:layout_weight="1" 102 android:layout_weight="1"
97 - android:background="#1E90FF" 103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,9 +111,10 @@ ...@@ -104,9 +111,10 @@
104 android:layout_height="match_parent" 111 android:layout_height="match_parent"
105 android:layout_gravity="center" 112 android:layout_gravity="center"
106 android:layout_weight="1" 113 android:layout_weight="1"
107 - android:background="#1E90FF" 114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,8 +122,10 @@ ...@@ -114,8 +122,10 @@
114 android:layout_height="match_parent" 122 android:layout_height="match_parent"
115 android:layout_gravity="center" 123 android:layout_gravity="center"
116 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
117 android:gravity="center" 126 android:gravity="center"
118 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
119 129
120 </LinearLayout> 130 </LinearLayout>
121 131
...@@ -129,35 +139,32 @@ ...@@ -129,35 +139,32 @@
129 android:layout_width="match_parent" 139 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
131 android:layout_weight="1" 141 android:layout_weight="1"
142 + android:gravity="center"
132 android:orientation="vertical"> 143 android:orientation="vertical">
133 144
134 <LinearLayout 145 <LinearLayout
135 - android:layout_width="match_parent" 146 + android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
137 android:orientation="vertical"> 148 android:orientation="vertical">
138 149
139 - <RelativeLayout 150 + <TextView
140 - android:layout_width="match_parent" 151 + android:id="@+id/textView10"
141 - android:layout_height="match_parent"> 152 + android:layout_width="wrap_content"
153 + android:layout_height="wrap_content"
154 + android:text="(*필수항목)"
155 + android:textColor="#29ABE2"
156 + android:textSize="13dp" />
142 157
143 <TextView 158 <TextView
144 android:id="@+id/explainTextView" 159 android:id="@+id/explainTextView"
145 - android:layout_width="match_parent" 160 + android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
147 android:layout_gravity="center" 162 android:layout_gravity="center"
148 android:gravity="center" 163 android:gravity="center"
149 - android:text="4. 내/외국인 여부를 선택해주세요." /> 164 + android:text="4. 자신의 내/외국민 여부를 \n 선택해주세요."
150 - <Button 165 + android:textColor="#4A4A4A"
151 - android:id="@+id/questionButton" 166 + android:textSize="20dp" />
152 - android:layout_width="30dp" 167 +
153 - android:layout_height="30dp"
154 - android:layout_gravity="center"
155 - android:layout_toRightOf="@id/explainTextView"
156 - android:backgroundTint="#1E90FF"
157 - android:gravity="center"
158 - android:text=" ? "
159 - android:textSize="8sp" />
160 - </RelativeLayout>
161 </LinearLayout> 168 </LinearLayout>
162 169
163 <LinearLayout 170 <LinearLayout
...@@ -174,29 +181,40 @@ ...@@ -174,29 +181,40 @@
174 181
175 <LinearLayout 182 <LinearLayout
176 android:layout_width="match_parent" 183 android:layout_width="match_parent"
177 - android:layout_height="wrap_content" 184 + android:layout_height="match_parent"
185 + android:layout_gravity="center"
186 + android:layout_margin="30dp"
187 + android:gravity="center"
178 android:orientation="vertical"> 188 android:orientation="vertical">
189 +
179 <ToggleButton 190 <ToggleButton
180 android:id="@+id/inmanButton" 191 android:id="@+id/inmanButton"
181 - android:layout_width="match_parent" 192 + android:layout_width="300dp"
182 android:layout_height="wrap_content" 193 android:layout_height="wrap_content"
183 - android:background="@drawable/profil_selector" 194 + android:layout_margin="10dp"
195 + android:layout_weight="1"
196 + android:background="@drawable/button_selector"
184 android:text="내국인" 197 android:text="내국인"
198 + android:textColor="#757575"
185 android:textOff="내국인" 199 android:textOff="내국인"
186 - android:textOn="내국인" /> 200 + android:textOn="내국인"
201 + android:textSize="20dp" />
187 202
188 <ToggleButton 203 <ToggleButton
189 android:id="@+id/outmanButton" 204 android:id="@+id/outmanButton"
190 - android:layout_width="match_parent" 205 + android:layout_width="300dp"
191 android:layout_height="wrap_content" 206 android:layout_height="wrap_content"
192 - android:background="@drawable/profil_selector" 207 + android:layout_margin="10dp"
208 + android:layout_weight="1"
209 + android:background="@drawable/button_selector"
193 android:text="외국인" 210 android:text="외국인"
211 + android:textColor="#757575"
194 android:textOff="외국인" 212 android:textOff="외국인"
195 - android:textOn="외국인" /> 213 + android:textOn="외국인"
196 - 214 + android:textSize="20dp" />
197 - </LinearLayout>
198 215
199 216
217 + </LinearLayout>
200 </ScrollView> 218 </ScrollView>
201 219
202 <LinearLayout 220 <LinearLayout
...@@ -215,14 +233,18 @@ ...@@ -215,14 +233,18 @@
215 android:layout_width="10dp" 233 android:layout_width="10dp"
216 android:layout_height="wrap_content" 234 android:layout_height="wrap_content"
217 android:layout_weight="1" 235 android:layout_weight="1"
218 - android:text="이전 단계로" /> 236 + android:background="#F4F4F4"
237 + android:text="이전 단계로"
238 + android:textColor="#757575" />
219 239
220 <Button 240 <Button
221 android:id="@+id/nextButton" 241 android:id="@+id/nextButton"
222 android:layout_width="10dp" 242 android:layout_width="10dp"
223 android:layout_height="wrap_content" 243 android:layout_height="wrap_content"
224 android:layout_weight="1" 244 android:layout_weight="1"
225 - android:text="다음 단계로" /> 245 + android:background="#29ABE2"
246 + android:text="다음 단계로"
247 + android:textColor="#FFFFFF" />
226 </LinearLayout> 248 </LinearLayout>
227 </LinearLayout> 249 </LinearLayout>
228 </LinearLayout> 250 </LinearLayout>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFourthFiveActivity"> 7 + tools:context=".InputProfilFirstFourActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
19 - android:background="#FFF" 19 + android:background="#0000001A"
20 android:elevation="5dp" 20 android:elevation="5dp"
21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -31,31 +31,35 @@ ...@@ -31,31 +31,35 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:background="#FFFFFF" 34 + android:background="#00000000"
35 android:text="나가기" 35 android:text="나가기"
36 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
37 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
38 <LinearLayout 39 <LinearLayout
39 android:layout_width="10dp" 40 android:layout_width="10dp"
40 android:layout_height="match_parent" 41 android:layout_height="match_parent"
41 - android:orientation="horizontal" 42 + android:layout_weight="1"
42 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
43 <ImageView 45 <ImageView
44 android:layout_width="77dp" 46 android:layout_width="77dp"
45 android:layout_height="44dp" 47 android:layout_height="44dp"
46 android:layout_gravity="center" 48 android:layout_gravity="center"
47 android:layout_weight="1" 49 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
49 <LinearLayout 52 <LinearLayout
50 android:layout_width="10dp" 53 android:layout_width="10dp"
51 android:layout_height="match_parent" 54 android:layout_height="match_parent"
52 - android:orientation="horizontal" 55 + android:layout_weight="1"
53 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
54 <LinearLayout 58 <LinearLayout
55 android:layout_width="10dp" 59 android:layout_width="10dp"
56 android:layout_height="match_parent" 60 android:layout_height="match_parent"
57 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
58 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
59 63
60 </LinearLayout> 64 </LinearLayout>
61 65
...@@ -74,9 +78,10 @@ ...@@ -74,9 +78,10 @@
74 android:layout_height="match_parent" 78 android:layout_height="match_parent"
75 android:layout_gravity="center" 79 android:layout_gravity="center"
76 android:layout_weight="1" 80 android:layout_weight="1"
77 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage"
78 android:gravity="center" 82 android:gravity="center"
79 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
80 85
81 <TextView 86 <TextView
82 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -84,9 +89,10 @@ ...@@ -84,9 +89,10 @@
84 android:layout_height="match_parent" 89 android:layout_height="match_parent"
85 android:layout_gravity="center" 90 android:layout_gravity="center"
86 android:layout_weight="1" 91 android:layout_weight="1"
87 - android:background="#1E90FF" 92 + android:background="#F4F4F4"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#DDDDDD" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,9 +100,10 @@ ...@@ -94,9 +100,10 @@
94 android:layout_height="match_parent" 100 android:layout_height="match_parent"
95 android:layout_gravity="center" 101 android:layout_gravity="center"
96 android:layout_weight="1" 102 android:layout_weight="1"
97 - android:background="#1E90FF" 103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,9 +111,10 @@ ...@@ -104,9 +111,10 @@
104 android:layout_height="match_parent" 111 android:layout_height="match_parent"
105 android:layout_gravity="center" 112 android:layout_gravity="center"
106 android:layout_weight="1" 113 android:layout_weight="1"
107 - android:background="#1E90FF" 114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,8 +122,10 @@ ...@@ -114,8 +122,10 @@
114 android:layout_height="match_parent" 122 android:layout_height="match_parent"
115 android:layout_gravity="center" 123 android:layout_gravity="center"
116 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
117 android:gravity="center" 126 android:gravity="center"
118 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
119 129
120 </LinearLayout> 130 </LinearLayout>
121 131
...@@ -129,37 +139,32 @@ ...@@ -129,37 +139,32 @@
129 android:layout_width="match_parent" 139 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
131 android:layout_weight="1" 141 android:layout_weight="1"
142 + android:gravity="center"
132 android:orientation="vertical"> 143 android:orientation="vertical">
133 144
134 <LinearLayout 145 <LinearLayout
135 - android:layout_width="match_parent" 146 + android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
137 android:orientation="vertical"> 148 android:orientation="vertical">
138 149
139 - <RelativeLayout 150 + <TextView
140 - android:layout_width="match_parent" 151 + android:id="@+id/textView10"
141 - android:layout_height="match_parent"> 152 + android:layout_width="wrap_content"
153 + android:layout_height="wrap_content"
154 + android:text="(*필수항목)"
155 + android:textColor="#29ABE2"
156 + android:textSize="13dp" />
142 157
143 <TextView 158 <TextView
144 android:id="@+id/explainTextView" 159 android:id="@+id/explainTextView"
145 android:layout_width="wrap_content" 160 android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
147 - android:layout_centerInParent="true"
148 android:layout_gravity="center" 162 android:layout_gravity="center"
149 android:gravity="center" 163 android:gravity="center"
150 - android:text="3. 자신의 주민등록상 거주지를 선택해주세요." /> 164 + android:text="3. 자신의 주민등록상의 \n 거주지를 선택해주세요."
165 + android:textColor="#4A4A4A"
166 + android:textSize="20dp" />
151 167
152 - <Button
153 - android:id="@+id/questionButton"
154 - android:layout_width="30dp"
155 - android:layout_height="30dp"
156 - android:layout_gravity="center"
157 - android:layout_toRightOf="@id/explainTextView"
158 - android:backgroundTint="#1E90FF"
159 - android:gravity="center"
160 - android:text=" ? "
161 - android:textSize="8sp" />
162 - </RelativeLayout>
163 </LinearLayout> 168 </LinearLayout>
164 169
165 <LinearLayout 170 <LinearLayout
...@@ -219,14 +224,18 @@ ...@@ -219,14 +224,18 @@
219 android:layout_width="10dp" 224 android:layout_width="10dp"
220 android:layout_height="wrap_content" 225 android:layout_height="wrap_content"
221 android:layout_weight="1" 226 android:layout_weight="1"
222 - android:text="이전 단계로" /> 227 + android:background="#F4F4F4"
228 + android:text="이전 단계로"
229 + android:textColor="#757575" />
223 230
224 <Button 231 <Button
225 android:id="@+id/nextButton" 232 android:id="@+id/nextButton"
226 android:layout_width="10dp" 233 android:layout_width="10dp"
227 android:layout_height="wrap_content" 234 android:layout_height="wrap_content"
228 android:layout_weight="1" 235 android:layout_weight="1"
229 - android:text="다음 단계로" /> 236 + android:background="#29ABE2"
237 + android:text="다음 단계로"
238 + android:textColor="#FFFFFF" />
230 </LinearLayout> 239 </LinearLayout>
231 </LinearLayout> 240 </LinearLayout>
232 </LinearLayout> 241 </LinearLayout>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFourthFiveActivity"> 7 + tools:context=".InputProfilFirstSixActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
19 - android:background="#FFF" 19 + android:background="#0000001A"
20 android:elevation="5dp" 20 android:elevation="5dp"
21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -31,31 +31,35 @@ ...@@ -31,31 +31,35 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:background="#FFFFFF" 34 + android:background="#00000000"
35 android:text="나가기" 35 android:text="나가기"
36 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
37 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
38 <LinearLayout 39 <LinearLayout
39 android:layout_width="10dp" 40 android:layout_width="10dp"
40 android:layout_height="match_parent" 41 android:layout_height="match_parent"
41 - android:orientation="horizontal" 42 + android:layout_weight="1"
42 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
43 <ImageView 45 <ImageView
44 android:layout_width="77dp" 46 android:layout_width="77dp"
45 android:layout_height="44dp" 47 android:layout_height="44dp"
46 android:layout_gravity="center" 48 android:layout_gravity="center"
47 android:layout_weight="1" 49 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
49 <LinearLayout 52 <LinearLayout
50 android:layout_width="10dp" 53 android:layout_width="10dp"
51 android:layout_height="match_parent" 54 android:layout_height="match_parent"
52 - android:orientation="horizontal" 55 + android:layout_weight="1"
53 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
54 <LinearLayout 58 <LinearLayout
55 android:layout_width="10dp" 59 android:layout_width="10dp"
56 android:layout_height="match_parent" 60 android:layout_height="match_parent"
57 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
58 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
59 63
60 </LinearLayout> 64 </LinearLayout>
61 65
...@@ -74,9 +78,10 @@ ...@@ -74,9 +78,10 @@
74 android:layout_height="match_parent" 78 android:layout_height="match_parent"
75 android:layout_gravity="center" 79 android:layout_gravity="center"
76 android:layout_weight="1" 80 android:layout_weight="1"
77 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage"
78 android:gravity="center" 82 android:gravity="center"
79 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
80 85
81 <TextView 86 <TextView
82 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -84,9 +89,10 @@ ...@@ -84,9 +89,10 @@
84 android:layout_height="match_parent" 89 android:layout_height="match_parent"
85 android:layout_gravity="center" 90 android:layout_gravity="center"
86 android:layout_weight="1" 91 android:layout_weight="1"
87 - android:background="#1E90FF" 92 + android:background="#F4F4F4"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#DDDDDD" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,9 +100,10 @@ ...@@ -94,9 +100,10 @@
94 android:layout_height="match_parent" 100 android:layout_height="match_parent"
95 android:layout_gravity="center" 101 android:layout_gravity="center"
96 android:layout_weight="1" 102 android:layout_weight="1"
97 - android:background="#1E90FF" 103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,9 +111,10 @@ ...@@ -104,9 +111,10 @@
104 android:layout_height="match_parent" 111 android:layout_height="match_parent"
105 android:layout_gravity="center" 112 android:layout_gravity="center"
106 android:layout_weight="1" 113 android:layout_weight="1"
107 - android:background="#1E90FF" 114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,8 +122,10 @@ ...@@ -114,8 +122,10 @@
114 android:layout_height="match_parent" 122 android:layout_height="match_parent"
115 android:layout_gravity="center" 123 android:layout_gravity="center"
116 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
117 android:gravity="center" 126 android:gravity="center"
118 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
119 129
120 </LinearLayout> 130 </LinearLayout>
121 131
...@@ -129,35 +139,32 @@ ...@@ -129,35 +139,32 @@
129 android:layout_width="match_parent" 139 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
131 android:layout_weight="1" 141 android:layout_weight="1"
142 + android:gravity="center"
132 android:orientation="vertical"> 143 android:orientation="vertical">
133 144
134 <LinearLayout 145 <LinearLayout
135 - android:layout_width="match_parent" 146 + android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
137 android:orientation="vertical"> 148 android:orientation="vertical">
138 149
139 - <RelativeLayout 150 + <TextView
140 - android:layout_width="match_parent" 151 + android:id="@+id/textView10"
141 - android:layout_height="match_parent"> 152 + android:layout_width="wrap_content"
153 + android:layout_height="wrap_content"
154 + android:text="(*필수항목)"
155 + android:textColor="#29ABE2"
156 + android:textSize="13dp" />
142 157
143 <TextView 158 <TextView
144 android:id="@+id/explainTextView" 159 android:id="@+id/explainTextView"
145 - android:layout_width="match_parent" 160 + android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
147 android:layout_gravity="center" 162 android:layout_gravity="center"
148 android:gravity="center" 163 android:gravity="center"
149 - android:text="5. 가구주 여부를 선택해 주세요" /> 164 + android:text="5. 자신의 가구주 여부를 선택해주세요."
150 - <Button 165 + android:textColor="#4A4A4A"
151 - android:id="@+id/questionButton" 166 + android:textSize="20dp" />
152 - android:layout_width="30dp" 167 +
153 - android:layout_height="30dp"
154 - android:layout_gravity="center"
155 - android:layout_toRightOf="@id/explainTextView"
156 - android:backgroundTint="#1E90FF"
157 - android:gravity="center"
158 - android:text=" ? "
159 - android:textSize="8sp" />
160 - </RelativeLayout>
161 </LinearLayout> 168 </LinearLayout>
162 169
163 <LinearLayout 170 <LinearLayout
...@@ -174,26 +181,38 @@ ...@@ -174,26 +181,38 @@
174 181
175 <LinearLayout 182 <LinearLayout
176 android:layout_width="match_parent" 183 android:layout_width="match_parent"
177 - android:layout_height="wrap_content" 184 + android:layout_height="match_parent"
185 + android:layout_gravity="center"
186 + android:layout_margin="30dp"
187 + android:gravity="center"
178 android:orientation="vertical"> 188 android:orientation="vertical">
179 189
180 <ToggleButton 190 <ToggleButton
181 android:id="@+id/gagoojooButton" 191 android:id="@+id/gagoojooButton"
182 - android:layout_width="match_parent" 192 + android:layout_width="300dp"
183 android:layout_height="wrap_content" 193 android:layout_height="wrap_content"
184 - android:background="@drawable/profil_selector" 194 + android:layout_margin="10dp"
195 + android:layout_weight="1"
196 + android:background="@drawable/button_selector"
185 android:text="가구주" 197 android:text="가구주"
198 + android:textColor="#757575"
186 android:textOff="가구주" 199 android:textOff="가구주"
187 - android:textOn="가구주" /> 200 + android:textOn="가구주"
201 + android:textSize="20dp" />
188 202
189 <ToggleButton 203 <ToggleButton
190 android:id="@+id/gagoowonButton" 204 android:id="@+id/gagoowonButton"
191 - android:layout_width="match_parent" 205 + android:layout_width="300dp"
192 android:layout_height="wrap_content" 206 android:layout_height="wrap_content"
193 - android:background="@drawable/profil_selector" 207 + android:layout_margin="10dp"
208 + android:layout_weight="1"
209 + android:background="@drawable/button_selector"
194 android:text="가구원" 210 android:text="가구원"
211 + android:textColor="#757575"
195 android:textOff="가구원" 212 android:textOff="가구원"
196 - android:textOn="가구원" /> 213 + android:textOn="가구원"
214 + android:textSize="20dp" />
215 +
197 216
198 </LinearLayout> 217 </LinearLayout>
199 </ScrollView> 218 </ScrollView>
...@@ -214,14 +233,18 @@ ...@@ -214,14 +233,18 @@
214 android:layout_width="10dp" 233 android:layout_width="10dp"
215 android:layout_height="wrap_content" 234 android:layout_height="wrap_content"
216 android:layout_weight="1" 235 android:layout_weight="1"
217 - android:text="이전 단계로" /> 236 + android:background="#F4F4F4"
237 + android:text="이전 단계로"
238 + android:textColor="#757575" />
218 239
219 <Button 240 <Button
220 android:id="@+id/nextButton" 241 android:id="@+id/nextButton"
221 android:layout_width="10dp" 242 android:layout_width="10dp"
222 android:layout_height="wrap_content" 243 android:layout_height="wrap_content"
223 android:layout_weight="1" 244 android:layout_weight="1"
224 - android:text="다음 단계로" /> 245 + android:background="#29ABE2"
246 + android:text="다음 단계로"
247 + android:textColor="#FFFFFF" />
225 </LinearLayout> 248 </LinearLayout>
226 </LinearLayout> 249 </LinearLayout>
227 </LinearLayout> 250 </LinearLayout>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFourthFiveActivity"> 7 + tools:context=".InputProfilFirstTwoActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
19 - android:background="#FFF" 19 + android:background="#0000001A"
20 android:elevation="5dp" 20 android:elevation="5dp"
21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -31,31 +31,35 @@ ...@@ -31,31 +31,35 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:background="#FFFFFF" 34 + android:background="#00000000"
35 android:text="나가기" 35 android:text="나가기"
36 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
37 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
38 <LinearLayout 39 <LinearLayout
39 android:layout_width="10dp" 40 android:layout_width="10dp"
40 android:layout_height="match_parent" 41 android:layout_height="match_parent"
41 - android:orientation="horizontal" 42 + android:layout_weight="1"
42 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
43 <ImageView 45 <ImageView
44 android:layout_width="77dp" 46 android:layout_width="77dp"
45 android:layout_height="44dp" 47 android:layout_height="44dp"
46 android:layout_gravity="center" 48 android:layout_gravity="center"
47 android:layout_weight="1" 49 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
49 <LinearLayout 52 <LinearLayout
50 android:layout_width="10dp" 53 android:layout_width="10dp"
51 android:layout_height="match_parent" 54 android:layout_height="match_parent"
52 - android:orientation="horizontal" 55 + android:layout_weight="1"
53 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
54 <LinearLayout 58 <LinearLayout
55 android:layout_width="10dp" 59 android:layout_width="10dp"
56 android:layout_height="match_parent" 60 android:layout_height="match_parent"
57 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
58 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
59 63
60 </LinearLayout> 64 </LinearLayout>
61 65
...@@ -74,9 +78,10 @@ ...@@ -74,9 +78,10 @@
74 android:layout_height="match_parent" 78 android:layout_height="match_parent"
75 android:layout_gravity="center" 79 android:layout_gravity="center"
76 android:layout_weight="1" 80 android:layout_weight="1"
77 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage"
78 android:gravity="center" 82 android:gravity="center"
79 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
80 85
81 <TextView 86 <TextView
82 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -84,9 +89,10 @@ ...@@ -84,9 +89,10 @@
84 android:layout_height="match_parent" 89 android:layout_height="match_parent"
85 android:layout_gravity="center" 90 android:layout_gravity="center"
86 android:layout_weight="1" 91 android:layout_weight="1"
87 - android:background="#1E90FF" 92 + android:background="#F4F4F4"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#DDDDDD" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,9 +100,10 @@ ...@@ -94,9 +100,10 @@
94 android:layout_height="match_parent" 100 android:layout_height="match_parent"
95 android:layout_gravity="center" 101 android:layout_gravity="center"
96 android:layout_weight="1" 102 android:layout_weight="1"
97 - android:background="#1E90FF" 103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,9 +111,10 @@ ...@@ -104,9 +111,10 @@
104 android:layout_height="match_parent" 111 android:layout_height="match_parent"
105 android:layout_gravity="center" 112 android:layout_gravity="center"
106 android:layout_weight="1" 113 android:layout_weight="1"
107 - android:background="#1E90FF" 114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,8 +122,10 @@ ...@@ -114,8 +122,10 @@
114 android:layout_height="match_parent" 122 android:layout_height="match_parent"
115 android:layout_gravity="center" 123 android:layout_gravity="center"
116 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
117 android:gravity="center" 126 android:gravity="center"
118 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
119 129
120 </LinearLayout> 130 </LinearLayout>
121 131
...@@ -129,36 +139,32 @@ ...@@ -129,36 +139,32 @@
129 android:layout_width="match_parent" 139 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
131 android:layout_weight="1" 141 android:layout_weight="1"
142 + android:gravity="center"
132 android:orientation="vertical"> 143 android:orientation="vertical">
133 144
134 <LinearLayout 145 <LinearLayout
135 - android:layout_width="match_parent" 146 + android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
137 android:orientation="vertical"> 148 android:orientation="vertical">
138 149
139 - <RelativeLayout 150 + <TextView
140 - android:layout_width="match_parent" 151 + android:id="@+id/textView10"
141 - android:layout_height="match_parent"> 152 + android:layout_width="wrap_content"
153 + android:layout_height="wrap_content"
154 + android:text="(*필수항목)"
155 + android:textColor="#29ABE2"
156 + android:textSize="13dp" />
142 157
143 <TextView 158 <TextView
144 android:id="@+id/explainTextView" 159 android:id="@+id/explainTextView"
145 - android:layout_width="match_parent" 160 + android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
147 android:layout_gravity="center" 162 android:layout_gravity="center"
148 android:gravity="center" 163 android:gravity="center"
149 - android:text="1. 생년월일을 입력해 주세요." /> 164 + android:text="1. 생년월일을 입력해 주세요."
165 + android:textColor="#4A4A4A"
166 + android:textSize="20dp" />
150 167
151 - <Button
152 - android:id="@+id/questionButton"
153 - android:layout_width="30dp"
154 - android:layout_height="30dp"
155 - android:layout_gravity="center"
156 - android:layout_toRightOf="@id/explainTextView"
157 - android:backgroundTint="#1E90FF"
158 - android:gravity="center"
159 - android:text=" ? "
160 - android:textSize="8sp" />
161 - </RelativeLayout>
162 </LinearLayout> 168 </LinearLayout>
163 169
164 <LinearLayout 170 <LinearLayout
...@@ -176,16 +182,17 @@ ...@@ -176,16 +182,17 @@
176 <LinearLayout 182 <LinearLayout
177 android:layout_width="match_parent" 183 android:layout_width="match_parent"
178 android:layout_height="wrap_content" 184 android:layout_height="wrap_content"
179 - android:orientation="vertical" > 185 + android:orientation="vertical">
180 186
181 <EditText 187 <EditText
182 android:id="@+id/editText" 188 android:id="@+id/editText"
183 - android:layout_width="match_parent" 189 + android:layout_width="wrap_content"
184 android:layout_height="wrap_content" 190 android:layout_height="wrap_content"
185 android:layout_gravity="center" 191 android:layout_gravity="center"
186 android:ems="10" 192 android:ems="10"
187 android:gravity="center" 193 android:gravity="center"
188 - android:inputType="date" /> 194 + android:inputType="date"
195 + android:theme="@style/EditTheme" />
189 196
190 197
191 </LinearLayout> 198 </LinearLayout>
...@@ -207,14 +214,18 @@ ...@@ -207,14 +214,18 @@
207 android:layout_width="10dp" 214 android:layout_width="10dp"
208 android:layout_height="wrap_content" 215 android:layout_height="wrap_content"
209 android:layout_weight="1" 216 android:layout_weight="1"
210 - android:text="이전 단계로" /> 217 + android:background="#F4F4F4"
218 + android:text="이전 단계로"
219 + android:textColor="#757575" />
211 220
212 <Button 221 <Button
213 android:id="@+id/nextButton" 222 android:id="@+id/nextButton"
214 android:layout_width="10dp" 223 android:layout_width="10dp"
215 android:layout_height="wrap_content" 224 android:layout_height="wrap_content"
216 android:layout_weight="1" 225 android:layout_weight="1"
217 - android:text="다음 단계로" /> 226 + android:background="#29ABE2"
227 + android:text="다음 단계로"
228 + android:textColor="#FFFFFF" />
218 </LinearLayout> 229 </LinearLayout>
219 </LinearLayout> 230 </LinearLayout>
220 </LinearLayout> 231 </LinearLayout>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
19 - android:background="#FFF" 19 + android:background="#0000001A"
20 android:elevation="5dp" 20 android:elevation="5dp"
21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -31,31 +31,35 @@ ...@@ -31,31 +31,35 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:background="#FFFFFF" 34 + android:background="#00000000"
35 android:text="나가기" 35 android:text="나가기"
36 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
37 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
38 <LinearLayout 39 <LinearLayout
39 android:layout_width="10dp" 40 android:layout_width="10dp"
40 android:layout_height="match_parent" 41 android:layout_height="match_parent"
41 - android:orientation="horizontal" 42 + android:layout_weight="1"
42 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
43 <ImageView 45 <ImageView
44 android:layout_width="77dp" 46 android:layout_width="77dp"
45 android:layout_height="44dp" 47 android:layout_height="44dp"
46 android:layout_gravity="center" 48 android:layout_gravity="center"
47 android:layout_weight="1" 49 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
49 <LinearLayout 52 <LinearLayout
50 android:layout_width="10dp" 53 android:layout_width="10dp"
51 android:layout_height="match_parent" 54 android:layout_height="match_parent"
52 - android:orientation="horizontal" 55 + android:layout_weight="1"
53 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
54 <LinearLayout 58 <LinearLayout
55 android:layout_width="10dp" 59 android:layout_width="10dp"
56 android:layout_height="match_parent" 60 android:layout_height="match_parent"
57 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
58 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
59 63
60 </LinearLayout> 64 </LinearLayout>
61 65
...@@ -74,9 +78,10 @@ ...@@ -74,9 +78,10 @@
74 android:layout_height="match_parent" 78 android:layout_height="match_parent"
75 android:layout_gravity="center" 79 android:layout_gravity="center"
76 android:layout_weight="1" 80 android:layout_weight="1"
77 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage"
78 android:gravity="center" 82 android:gravity="center"
79 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
80 85
81 <TextView 86 <TextView
82 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -84,9 +89,10 @@ ...@@ -84,9 +89,10 @@
84 android:layout_height="match_parent" 89 android:layout_height="match_parent"
85 android:layout_gravity="center" 90 android:layout_gravity="center"
86 android:layout_weight="1" 91 android:layout_weight="1"
87 - android:background="#1E90FF" 92 + android:background="#F4F4F4"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#DDDDDD" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,8 +100,10 @@ ...@@ -94,8 +100,10 @@
94 android:layout_height="match_parent" 100 android:layout_height="match_parent"
95 android:layout_gravity="center" 101 android:layout_gravity="center"
96 android:layout_weight="1" 102 android:layout_weight="1"
103 + android:background="#F4F4F4"
97 android:gravity="center" 104 android:gravity="center"
98 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
99 107
100 <TextView 108 <TextView
101 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -103,8 +111,10 @@ ...@@ -103,8 +111,10 @@
103 android:layout_height="match_parent" 111 android:layout_height="match_parent"
104 android:layout_gravity="center" 112 android:layout_gravity="center"
105 android:layout_weight="1" 113 android:layout_weight="1"
114 + android:background="#F4F4F4"
106 android:gravity="center" 115 android:gravity="center"
107 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
108 118
109 <TextView 119 <TextView
110 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -112,8 +122,10 @@ ...@@ -112,8 +122,10 @@
112 android:layout_height="match_parent" 122 android:layout_height="match_parent"
113 android:layout_gravity="center" 123 android:layout_gravity="center"
114 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
115 android:gravity="center" 126 android:gravity="center"
116 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
117 129
118 </LinearLayout> 130 </LinearLayout>
119 131
...@@ -127,37 +139,31 @@ ...@@ -127,37 +139,31 @@
127 android:layout_width="match_parent" 139 android:layout_width="match_parent"
128 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
129 android:layout_weight="1" 141 android:layout_weight="1"
142 + android:gravity="center"
130 android:orientation="vertical"> 143 android:orientation="vertical">
131 144
132 <LinearLayout 145 <LinearLayout
133 - android:layout_width="match_parent" 146 + android:layout_width="wrap_content"
134 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
135 - android:orientation="vertical"> 148 + android:orientation="horizontal">
136 -
137 - <RelativeLayout
138 - android:layout_width="match_parent"
139 - android:layout_height="match_parent">
140 149
141 <TextView 150 <TextView
142 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
143 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
144 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
145 - android:layout_centerInParent="true"
146 android:layout_gravity="center" 154 android:layout_gravity="center"
147 android:gravity="center" 155 android:gravity="center"
148 - android:text="1. 가구 구성원을 모두 선택해 주세요." /> 156 + android:text="6. 자신의 가구 구성원을 \n 모두 선택해주세요."
157 + android:textColor="#4A4A4A"
158 + android:textSize="20dp" />
149 159
150 <Button 160 <Button
151 android:id="@+id/questionButton" 161 android:id="@+id/questionButton"
152 - android:layout_width="30dp" 162 + android:layout_width="20dp"
153 - android:layout_height="30dp" 163 + android:layout_height="20dp"
154 - android:layout_gravity="center" 164 + android:layout_gravity="bottom"
155 - android:layout_toRightOf="@id/explainTextView" 165 + android:background="@drawable/question_mark_image" />
156 - android:backgroundTint="#1E90FF" 166 +
157 - android:gravity="center"
158 - android:text=" ? "
159 - android:textSize="8sp" />
160 - </RelativeLayout>
161 </LinearLayout> 167 </LinearLayout>
162 168
163 <LinearLayout 169 <LinearLayout
...@@ -387,14 +393,18 @@ ...@@ -387,14 +393,18 @@
387 android:layout_width="10dp" 393 android:layout_width="10dp"
388 android:layout_height="wrap_content" 394 android:layout_height="wrap_content"
389 android:layout_weight="1" 395 android:layout_weight="1"
390 - android:text="이전 단계로" /> 396 + android:background="#F4F4F4"
397 + android:text="이전 단계로"
398 + android:textColor="#757575" />
391 399
392 <Button 400 <Button
393 android:id="@+id/nextButton" 401 android:id="@+id/nextButton"
394 android:layout_width="10dp" 402 android:layout_width="10dp"
395 android:layout_height="wrap_content" 403 android:layout_height="wrap_content"
396 android:layout_weight="1" 404 android:layout_weight="1"
397 - android:text="다음 단계로" /> 405 + android:background="#29ABE2"
406 + android:text="다음 단계로"
407 + android:textColor="#FFFFFF" />
398 </LinearLayout> 408 </LinearLayout>
399 </LinearLayout> 409 </LinearLayout>
400 </LinearLayout> 410 </LinearLayout>
......
...@@ -22,4 +22,5 @@ ...@@ -22,4 +22,5 @@
22 <item name="android:colorControlNormal">#29ABE2</item> 22 <item name="android:colorControlNormal">#29ABE2</item>
23 </style> 23 </style>
24 24
25 +
25 </resources> 26 </resources>
......