장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
13c2a9c8 1 parent 462c652d

12345 design

Inline Side-by-side
Showing 14 changed files with 1009 additions and 756 deletions
...@@ -125,28 +125,6 @@ class InputProfilThirdFiveActivity : AppCompatActivity() { ...@@ -125,28 +125,6 @@ class InputProfilThirdFiveActivity : AppCompatActivity() {
125 startActivity(intent) 125 startActivity(intent)
126 } 126 }
127 127
128 - questionButton.setOnClickListener {
129 - val builder = AlertDialog.Builder(this)
130 - val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
131 - //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
132 - //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
133 - dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
134 - dialogView.findViewById<TextView>(R.id.dialogContent).text="주민등록상 같은 거주지에 사는 사람"
135 -
136 - builder.setView(dialogView)
137 - .setPositiveButton("확인") { dialogInterface, i ->
138 - //mainTv.text = dialogText.text.toString()
139 - //mainRb.rating = dialogRatingBar.rating
140 - /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
141 -
142 - }
143 - /*
144 - .setNegativeButton("취소") { dialogInterface, i ->
145 - /* 취소일 때 아무 액션이 없으므로 빈칸 */
146 - }
147 - */
148 - .show()
149 - }
150 128
151 previousButton.setOnClickListener { 129 previousButton.setOnClickListener {
152 var intent = Intent(this, InputProfilThirdFourActivity::class.java) 130 var intent = Intent(this, InputProfilThirdFourActivity::class.java)
......
...@@ -126,28 +126,6 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -126,28 +126,6 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
126 startActivity(intent) 126 startActivity(intent)
127 } 127 }
128 128
129 - questionButton.setOnClickListener {
130 - val builder = AlertDialog.Builder(this)
131 - val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
132 - //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
133 - //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
134 - dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
135 - dialogView.findViewById<TextView>(R.id.dialogContent).text="주민등록상 같은 거주지에 사는 사람"
136 -
137 - builder.setView(dialogView)
138 - .setPositiveButton("확인") { dialogInterface, i ->
139 - //mainTv.text = dialogText.text.toString()
140 - //mainRb.rating = dialogRatingBar.rating
141 - /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
142 -
143 - }
144 - /*
145 - .setNegativeButton("취소") { dialogInterface, i ->
146 - /* 취소일 때 아무 액션이 없으므로 빈칸 */
147 - }
148 - */
149 - .show()
150 - }
151 129
152 previousButton.setOnClickListener { 130 previousButton.setOnClickListener {
153 var intent = Intent(this, InputProfilThirdThreeActivity::class.java) 131 var intent = Intent(this, InputProfilThirdThreeActivity::class.java)
......
...@@ -124,28 +124,6 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -124,28 +124,6 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
124 startActivity(intent) 124 startActivity(intent)
125 } 125 }
126 126
127 - questionButton.setOnClickListener {
128 - val builder = AlertDialog.Builder(this)
129 - val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
130 - //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
131 - //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
132 - dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
133 - dialogView.findViewById<TextView>(R.id.dialogContent).text="주민등록상 같은 거주지에 사는 사람"
134 -
135 - builder.setView(dialogView)
136 - .setPositiveButton("확인") { dialogInterface, i ->
137 - //mainTv.text = dialogText.text.toString()
138 - //mainRb.rating = dialogRatingBar.rating
139 - /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
140 -
141 - }
142 - /*
143 - .setNegativeButton("취소") { dialogInterface, i ->
144 - /* 취소일 때 아무 액션이 없으므로 빈칸 */
145 - }
146 - */
147 - .show()
148 - }
149 127
150 128
151 elementaryButton.setOnClickListener { 129 elementaryButton.setOnClickListener {
......
...@@ -123,30 +123,6 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { ...@@ -123,30 +123,6 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
123 startActivity(intent) 123 startActivity(intent)
124 } 124 }
125 125
126 - questionButton.setOnClickListener {
127 - val builder = AlertDialog.Builder(this)
128 - val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
129 - //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
130 - //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
131 - dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
132 - dialogView.findViewById<TextView>(R.id.dialogContent).text="주민등록상 같은 거주지에 사는 사람"
133 -
134 - builder.setView(dialogView)
135 - .setPositiveButton("확인") { dialogInterface, i ->
136 - //mainTv.text = dialogText.text.toString()
137 - //mainRb.rating = dialogRatingBar.rating
138 - /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
139 -
140 - }
141 - /*
142 - .setNegativeButton("취소") { dialogInterface, i ->
143 - /* 취소일 때 아무 액션이 없으므로 빈칸 */
144 - }
145 - */
146 - .show()
147 - }
148 -
149 -
150 previousButton.setOnClickListener { 126 previousButton.setOnClickListener {
151 var intent = Intent(this, InputProfilThirdTwoActivity::class.java) 127 var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
152 startActivity(intent) 128 startActivity(intent)
......
...@@ -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=".InputProfilFifthFourActivity"> 7 + tools:context=".InputProfilFifthThreeActivity">
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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,53 +122,47 @@ ...@@ -114,53 +122,47 @@
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"
117 - android:background="#1E90FF" 125 + android:background="@drawable/profile_stage"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#FFFFFF" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 android:layout_height="10dp" 134 android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical"></LinearLayout>
128 136
129 <LinearLayout 137 <LinearLayout
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
132 android:layout_weight="1" 140 android:layout_weight="1"
133 android:orientation="vertical"> 141 android:orientation="vertical">
134 142
135 <LinearLayout 143 <LinearLayout
136 android:layout_width="match_parent" 144 android:layout_width="match_parent"
137 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
138 - android:orientation="vertical"> 146 + android:gravity="center"
139 - 147 + android:orientation="horizontal">
140 - <RelativeLayout
141 - android:layout_width="match_parent"
142 - android:layout_height="match_parent">
143 148
144 <TextView 149 <TextView
145 android:id="@+id/explainTextView" 150 android:id="@+id/explainTextView"
146 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
147 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
148 - android:layout_centerInParent="true"
149 android:layout_gravity="center" 153 android:layout_gravity="center"
150 android:gravity="center" 154 android:gravity="center"
151 - android:text="18. 금융기관 대출금, 공증된 사채 등으로 차용한 금액 중 미상환액, 부채금액을 적어주세요." /> 155 + android:text="20. 부채금액을 적어주세요."
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
152 158
153 <Button 159 <Button
154 android:id="@+id/questionButton" 160 android:id="@+id/questionButton"
155 - android:layout_width="30dp" 161 + android:layout_width="20dp"
156 - android:layout_height="30dp" 162 + android:layout_height="20dp"
157 - android:layout_gravity="center" 163 + android:layout_gravity="bottom"
158 - android:layout_toRightOf="@id/explainTextView" 164 + android:background="@drawable/question_mark_image" />
159 - android:backgroundTint="#1E90FF" 165 +
160 - android:gravity="center"
161 - android:text=" ? "
162 - android:textSize="8sp" />
163 - </RelativeLayout>
164 </LinearLayout> 166 </LinearLayout>
165 167
166 <LinearLayout 168 <LinearLayout
...@@ -176,25 +178,37 @@ ...@@ -176,25 +178,37 @@
176 android:layout_height="wrap_content"> 178 android:layout_height="wrap_content">
177 179
178 <LinearLayout 180 <LinearLayout
179 - android:layout_width="300dp" 181 + android:layout_width="match_parent"
180 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
183 + android:orientation="vertical">
184 +
185 + <LinearLayout
186 + android:layout_width="match_parent"
187 + android:layout_height="match_parent"
181 android:layout_gravity="center" 188 android:layout_gravity="center"
182 android:orientation="vertical"> 189 android:orientation="vertical">
183 190
184 <TextView 191 <TextView
185 android:id="@+id/textView1" 192 android:id="@+id/textView1"
186 - android:layout_width="match_parent" 193 + android:layout_width="300dp"
187 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
188 - android:text="부채 금액" /> 195 + android:layout_gravity="center"
196 + android:layout_margin="5dp"
197 + android:text="부채 금액"
198 + android:textColor="#29ABE2" />
189 199
190 <EditText 200 <EditText
191 android:id="@+id/editText1" 201 android:id="@+id/editText1"
192 - android:layout_width="match_parent" 202 + android:layout_width="300dp"
193 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
204 + android:layout_gravity="center"
205 + android:layout_margin="5dp"
194 android:ems="10" 206 android:ems="10"
195 - android:hint="ex)1000000" /> 207 + android:hint="ex)1000000"
208 + android:theme="@style/EditTheme" />
196 209
197 </LinearLayout> 210 </LinearLayout>
211 + </LinearLayout>
198 </ScrollView> 212 </ScrollView>
199 213
200 <LinearLayout 214 <LinearLayout
...@@ -203,6 +217,13 @@ ...@@ -203,6 +217,13 @@
203 android:layout_weight="1" 217 android:layout_weight="1"
204 android:orientation="vertical"></LinearLayout> 218 android:orientation="vertical"></LinearLayout>
205 219
220 + </LinearLayout>
221 +
222 + <LinearLayout
223 + android:layout_width="match_parent"
224 + android:layout_height="15dp"
225 + android:orientation="horizontal"></LinearLayout>
226 +
206 <LinearLayout 227 <LinearLayout
207 android:layout_width="match_parent" 228 android:layout_width="match_parent"
208 android:layout_height="wrap_content" 229 android:layout_height="wrap_content"
...@@ -213,15 +234,19 @@ ...@@ -213,15 +234,19 @@
213 android:layout_width="10dp" 234 android:layout_width="10dp"
214 android:layout_height="wrap_content" 235 android:layout_height="wrap_content"
215 android:layout_weight="1" 236 android:layout_weight="1"
216 - android:text="이전 단계로" /> 237 + android:background="#F4F4F4"
238 + android:text="이전 단계로"
239 + android:textColor="#757575" />
217 240
218 <Button 241 <Button
219 android:id="@+id/nextButton" 242 android:id="@+id/nextButton"
220 android:layout_width="10dp" 243 android:layout_width="10dp"
221 android:layout_height="wrap_content" 244 android:layout_height="wrap_content"
222 android:layout_weight="1" 245 android:layout_weight="1"
223 - android:text="다음 단계로" /> 246 + android:background="#29ABE2"
224 - </LinearLayout> 247 + android:text="완 료"
248 + android:textColor="#FFFFFF" />
225 </LinearLayout> 249 </LinearLayout>
250 +
226 </LinearLayout> 251 </LinearLayout>
227 </androidx.constraintlayout.widget.ConstraintLayout> 252 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,53 +122,47 @@ ...@@ -114,53 +122,47 @@
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"
117 - android:background="#1E90FF" 125 + android:background="@drawable/profile_stage"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#FFFFFF" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 android:layout_height="10dp" 134 android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical"></LinearLayout>
128 136
129 <LinearLayout 137 <LinearLayout
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
132 android:layout_weight="1" 140 android:layout_weight="1"
133 android:orientation="vertical"> 141 android:orientation="vertical">
134 142
135 <LinearLayout 143 <LinearLayout
136 android:layout_width="match_parent" 144 android:layout_width="match_parent"
137 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
138 - android:orientation="vertical"> 146 + android:gravity="center"
139 - 147 + android:orientation="horizontal">
140 - <RelativeLayout
141 - android:layout_width="match_parent"
142 - android:layout_height="match_parent">
143 148
144 <TextView 149 <TextView
145 android:id="@+id/explainTextView" 150 android:id="@+id/explainTextView"
146 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
147 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
148 - android:layout_centerInParent="true"
149 android:layout_gravity="center" 153 android:layout_gravity="center"
150 android:gravity="center" 154 android:gravity="center"
151 - android:text="15. 월평균소득을 적어주세요. (기준 : 매월소득)" /> 155 + android:text="17. 월평균소득을 적어주세요.\n(* 기준 : 매월소득)"
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
152 158
153 <Button 159 <Button
154 android:id="@+id/questionButton" 160 android:id="@+id/questionButton"
155 - android:layout_width="30dp" 161 + android:layout_width="20dp"
156 - android:layout_height="30dp" 162 + android:layout_height="20dp"
157 - android:layout_gravity="center" 163 + android:layout_gravity="bottom"
158 - android:layout_toRightOf="@id/explainTextView" 164 + android:background="@drawable/question_mark_image" />
159 - android:backgroundTint="#1E90FF" 165 +
160 - android:gravity="center"
161 - android:text=" ? "
162 - android:textSize="8sp" />
163 - </RelativeLayout>
164 </LinearLayout> 166 </LinearLayout>
165 167
166 <LinearLayout 168 <LinearLayout
...@@ -176,38 +178,54 @@ ...@@ -176,38 +178,54 @@
176 android:layout_height="wrap_content"> 178 android:layout_height="wrap_content">
177 179
178 <LinearLayout 180 <LinearLayout
179 - android:layout_width="300dp" 181 + android:layout_width="match_parent"
180 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
183 + android:orientation="vertical">
184 +
185 + <LinearLayout
186 + android:layout_width="match_parent"
187 + android:layout_height="match_parent"
181 android:layout_gravity="center" 188 android:layout_gravity="center"
182 android:orientation="vertical"> 189 android:orientation="vertical">
183 190
184 <TextView 191 <TextView
185 android:id="@+id/textView1" 192 android:id="@+id/textView1"
186 - android:layout_width="match_parent" 193 + android:layout_width="300dp"
187 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
188 - android:text="근로/사업소득" /> 195 + android:layout_gravity="center"
196 + android:text="근로/사업소득"
197 + android:textColor="#29ABE2"
198 + android:textSize="13dp" />
189 199
190 <EditText 200 <EditText
191 android:id="@+id/editText1" 201 android:id="@+id/editText1"
192 - android:layout_width="match_parent" 202 + android:layout_width="300dp"
193 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
204 + android:layout_gravity="center"
194 android:ems="10" 205 android:ems="10"
195 android:hint="ex)1000000" 206 android:hint="ex)1000000"
196 - android:inputType="textPersonName" /> 207 + android:inputType="textPersonName"
208 + android:theme="@style/EditTheme" />
197 209
198 <TextView 210 <TextView
199 android:id="@+id/textView2" 211 android:id="@+id/textView2"
200 - android:layout_width="match_parent" 212 + android:layout_width="300dp"
201 android:layout_height="wrap_content" 213 android:layout_height="wrap_content"
202 - android:text="그 외 소득(재산소득, 공직이전소득 등)" /> 214 + android:layout_gravity="center"
215 + android:text="그 외 소득(재산소득, 공직이전소득 등)"
216 + android:textColor="#29ABE2"
217 + android:textSize="13dp" />
203 218
204 <EditText 219 <EditText
205 android:id="@+id/editText2" 220 android:id="@+id/editText2"
206 - android:layout_width="match_parent" 221 + android:layout_width="300dp"
207 android:layout_height="wrap_content" 222 android:layout_height="wrap_content"
223 + android:layout_gravity="center"
208 android:ems="10" 224 android:ems="10"
209 android:hint="ex)1000000" 225 android:hint="ex)1000000"
210 - android:inputType="textPersonName" /> 226 + android:inputType="textPersonName"
227 + android:theme="@style/EditTheme" />
228 + </LinearLayout>
211 </LinearLayout> 229 </LinearLayout>
212 </ScrollView> 230 </ScrollView>
213 231
...@@ -217,6 +235,13 @@ ...@@ -217,6 +235,13 @@
217 android:layout_weight="1" 235 android:layout_weight="1"
218 android:orientation="vertical"></LinearLayout> 236 android:orientation="vertical"></LinearLayout>
219 237
238 + </LinearLayout>
239 +
240 + <LinearLayout
241 + android:layout_width="match_parent"
242 + android:layout_height="15dp"
243 + android:orientation="horizontal"></LinearLayout>
244 +
220 <LinearLayout 245 <LinearLayout
221 android:layout_width="match_parent" 246 android:layout_width="match_parent"
222 android:layout_height="wrap_content" 247 android:layout_height="wrap_content"
...@@ -227,15 +252,19 @@ ...@@ -227,15 +252,19 @@
227 android:layout_width="10dp" 252 android:layout_width="10dp"
228 android:layout_height="wrap_content" 253 android:layout_height="wrap_content"
229 android:layout_weight="1" 254 android:layout_weight="1"
230 - android:text="이전 단계로" /> 255 + android:background="#F4F4F4"
256 + android:text="이전 단계로"
257 + android:textColor="#757575" />
231 258
232 <Button 259 <Button
233 android:id="@+id/nextButton" 260 android:id="@+id/nextButton"
234 android:layout_width="10dp" 261 android:layout_width="10dp"
235 android:layout_height="wrap_content" 262 android:layout_height="wrap_content"
236 android:layout_weight="1" 263 android:layout_weight="1"
237 - android:text="다음 단계로" /> 264 + android:background="#29ABE2"
238 - </LinearLayout> 265 + android:text="다음 단계로"
266 + android:textColor="#FFFFFF" />
239 </LinearLayout> 267 </LinearLayout>
268 +
240 </LinearLayout> 269 </LinearLayout>
241 </androidx.constraintlayout.widget.ConstraintLayout> 270 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,53 +122,47 @@ ...@@ -114,53 +122,47 @@
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"
117 - android:background="#1E90FF" 125 + android:background="@drawable/profile_stage"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#FFFFFF" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 android:layout_height="10dp" 134 android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical"></LinearLayout>
128 136
129 <LinearLayout 137 <LinearLayout
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
132 android:layout_weight="1" 140 android:layout_weight="1"
133 android:orientation="vertical"> 141 android:orientation="vertical">
134 142
135 <LinearLayout 143 <LinearLayout
136 android:layout_width="match_parent" 144 android:layout_width="match_parent"
137 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
138 - android:orientation="vertical"> 146 + android:gravity="center"
139 - 147 + android:orientation="horizontal">
140 - <RelativeLayout
141 - android:layout_width="match_parent"
142 - android:layout_height="match_parent">
143 148
144 <TextView 149 <TextView
145 android:id="@+id/explainTextView" 150 android:id="@+id/explainTextView"
146 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
147 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
148 - android:layout_centerInParent="true"
149 android:layout_gravity="center" 153 android:layout_gravity="center"
150 android:gravity="center" 154 android:gravity="center"
151 - android:text="17. 재산을 적어주세요." /> 155 + android:text="19. 재산을 적어주세요."
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
152 158
153 <Button 159 <Button
154 android:id="@+id/questionButton" 160 android:id="@+id/questionButton"
155 - android:layout_width="30dp" 161 + android:layout_width="20dp"
156 - android:layout_height="30dp" 162 + android:layout_height="20dp"
157 - android:layout_gravity="center" 163 + android:layout_gravity="bottom"
158 - android:layout_toRightOf="@id/explainTextView" 164 + android:background="@drawable/question_mark_image" />
159 - android:backgroundTint="#1E90FF" 165 +
160 - android:gravity="center"
161 - android:text=" ? "
162 - android:textSize="8sp" />
163 - </RelativeLayout>
164 </LinearLayout> 166 </LinearLayout>
165 167
166 <LinearLayout 168 <LinearLayout
...@@ -176,51 +178,75 @@ ...@@ -176,51 +178,75 @@
176 android:layout_height="wrap_content"> 178 android:layout_height="wrap_content">
177 179
178 <LinearLayout 180 <LinearLayout
179 - android:layout_width="300dp" 181 + android:layout_width="match_parent"
180 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
183 + android:orientation="vertical">
184 +
185 + <LinearLayout
186 + android:layout_width="match_parent"
187 + android:layout_height="match_parent"
181 android:layout_gravity="center" 188 android:layout_gravity="center"
182 android:orientation="vertical"> 189 android:orientation="vertical">
183 190
184 <TextView 191 <TextView
185 android:id="@+id/textView1" 192 android:id="@+id/textView1"
186 - android:layout_width="match_parent" 193 + android:layout_width="300dp"
187 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
188 - android:text="주거용 재산" /> 195 + android:layout_gravity="center"
196 + android:layout_margin="5dp"
197 + android:text="주거용 재산"
198 + android:textColor="#29ABE2" />
189 199
190 <EditText 200 <EditText
191 android:id="@+id/editText1" 201 android:id="@+id/editText1"
192 - android:layout_width="match_parent" 202 + android:layout_width="300dp"
193 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
204 + android:layout_gravity="center"
205 + android:layout_margin="5dp"
194 android:ems="10" 206 android:ems="10"
195 - android:hint="ex)1000000" /> 207 + android:hint="ex)1000000"
208 + android:theme="@style/EditTheme" />
196 209
197 <TextView 210 <TextView
198 android:id="@+id/textView2" 211 android:id="@+id/textView2"
199 - android:layout_width="match_parent" 212 + android:layout_width="300dp"
200 android:layout_height="wrap_content" 213 android:layout_height="wrap_content"
201 - android:text="주거 외 재산" /> 214 + android:layout_gravity="center"
215 + android:layout_margin="5dp"
216 + android:text="주거 외 재산"
217 + android:textColor="#29ABE2" />
202 218
203 <EditText 219 <EditText
204 android:id="@+id/editText2" 220 android:id="@+id/editText2"
205 - android:layout_width="match_parent" 221 + android:layout_width="300dp"
206 android:layout_height="wrap_content" 222 android:layout_height="wrap_content"
223 + android:layout_gravity="center"
224 + android:layout_margin="5dp"
207 android:ems="10" 225 android:ems="10"
208 - android:hint="ex)1000000" /> 226 + android:hint="ex)1000000"
227 + android:theme="@style/EditTheme" />
209 228
210 <TextView 229 <TextView
211 android:id="@+id/textView3" 230 android:id="@+id/textView3"
212 - android:layout_width="match_parent" 231 + android:layout_width="300dp"
213 android:layout_height="wrap_content" 232 android:layout_height="wrap_content"
214 - android:text="금융재산" /> 233 + android:layout_gravity="center"
234 + android:layout_margin="5dp"
235 + android:text="금융재산"
236 + android:textColor="#29ABE2" />
215 237
216 <EditText 238 <EditText
217 android:id="@+id/editText3" 239 android:id="@+id/editText3"
218 - android:layout_width="match_parent" 240 + android:layout_width="300dp"
219 android:layout_height="wrap_content" 241 android:layout_height="wrap_content"
242 + android:layout_gravity="center"
220 android:ems="10" 243 android:ems="10"
221 - android:hint="ex)1000000" /> 244 + android:hint="ex)1000000"
245 + android:theme="@style/EditTheme"
246 + android:layout_margin="5dp" />
222 247
223 </LinearLayout> 248 </LinearLayout>
249 + </LinearLayout>
224 </ScrollView> 250 </ScrollView>
225 251
226 <LinearLayout 252 <LinearLayout
...@@ -229,6 +255,13 @@ ...@@ -229,6 +255,13 @@
229 android:layout_weight="1" 255 android:layout_weight="1"
230 android:orientation="vertical"></LinearLayout> 256 android:orientation="vertical"></LinearLayout>
231 257
258 + </LinearLayout>
259 +
260 + <LinearLayout
261 + android:layout_width="match_parent"
262 + android:layout_height="15dp"
263 + android:orientation="horizontal"></LinearLayout>
264 +
232 <LinearLayout 265 <LinearLayout
233 android:layout_width="match_parent" 266 android:layout_width="match_parent"
234 android:layout_height="wrap_content" 267 android:layout_height="wrap_content"
...@@ -239,15 +272,19 @@ ...@@ -239,15 +272,19 @@
239 android:layout_width="10dp" 272 android:layout_width="10dp"
240 android:layout_height="wrap_content" 273 android:layout_height="wrap_content"
241 android:layout_weight="1" 274 android:layout_weight="1"
242 - android:text="이전 단계로" /> 275 + android:background="#F4F4F4"
276 + android:text="이전 단계로"
277 + android:textColor="#757575" />
243 278
244 <Button 279 <Button
245 android:id="@+id/nextButton" 280 android:id="@+id/nextButton"
246 android:layout_width="10dp" 281 android:layout_width="10dp"
247 android:layout_height="wrap_content" 282 android:layout_height="wrap_content"
248 android:layout_weight="1" 283 android:layout_weight="1"
249 - android:text="다음 단계로" /> 284 + android:background="#29ABE2"
250 - </LinearLayout> 285 + android:text="다음 단계로"
286 + android:textColor="#FFFFFF" />
251 </LinearLayout> 287 </LinearLayout>
288 +
252 </LinearLayout> 289 </LinearLayout>
253 </androidx.constraintlayout.widget.ConstraintLayout> 290 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,53 +122,48 @@ ...@@ -114,53 +122,48 @@
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"
117 - android:background="#1E90FF" 125 + android:background="@drawable/profile_stage"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#FFFFFF" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 android:layout_height="10dp" 134 android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical"></LinearLayout>
128 136
129 <LinearLayout 137 <LinearLayout
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
132 android:layout_weight="1" 140 android:layout_weight="1"
133 android:orientation="vertical"> 141 android:orientation="vertical">
134 142
135 <LinearLayout 143 <LinearLayout
136 android:layout_width="match_parent" 144 android:layout_width="match_parent"
137 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
138 - android:orientation="vertical"> 146 + android:gravity="center"
139 - 147 + android:orientation="horizontal">
140 - <RelativeLayout
141 - android:layout_width="match_parent"
142 - android:layout_height="match_parent">
143 148
144 <TextView 149 <TextView
145 - android:id="@+id/explainTextView" 150 + android:id="@+id/explainTextView0"
146 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
147 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
148 - android:layout_centerInParent="true"
149 android:layout_gravity="center" 153 android:layout_gravity="center"
150 android:gravity="center" 154 android:gravity="center"
151 - android:text="16. 자신의 건강보험 가입형태를 선택해주세요." /> 155 + android:text="18. 건강보험 가입형태를 선택해주세요."
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
158 +
159 + </LinearLayout>
160 +
161 + <LinearLayout
162 + android:layout_width="match_parent"
163 + android:layout_height="50dp"
164 + android:layout_weight="1"
165 + android:orientation="vertical">
152 166
153 - <Button
154 - android:id="@+id/questionButton"
155 - android:layout_width="30dp"
156 - android:layout_height="30dp"
157 - android:layout_gravity="center"
158 - android:layout_toRightOf="@id/explainTextView"
159 - android:backgroundTint="#1E90FF"
160 - android:gravity="center"
161 - android:text=" ? "
162 - android:textSize="8sp" />
163 - </RelativeLayout>
164 </LinearLayout> 167 </LinearLayout>
165 168
166 <ScrollView 169 <ScrollView
...@@ -173,8 +176,8 @@ ...@@ -173,8 +176,8 @@
173 android:orientation="vertical"> 176 android:orientation="vertical">
174 177
175 <LinearLayout 178 <LinearLayout
176 - android:layout_width="wrap_content" 179 + android:layout_width="match_parent"
177 - android:layout_height="wrap_content" 180 + android:layout_height="match_parent"
178 android:layout_gravity="center" 181 android:layout_gravity="center"
179 android:gravity="center" 182 android:gravity="center"
180 android:orientation="vertical"> 183 android:orientation="vertical">
...@@ -182,54 +185,68 @@ ...@@ -182,54 +185,68 @@
182 <LinearLayout 185 <LinearLayout
183 android:layout_width="match_parent" 186 android:layout_width="match_parent"
184 android:layout_height="match_parent" 187 android:layout_height="match_parent"
188 + android:gravity="center"
185 android:orientation="horizontal"> 189 android:orientation="horizontal">
186 190
187 <ToggleButton 191 <ToggleButton
188 android:id="@+id/jikjaangButton" 192 android:id="@+id/jikjaangButton"
189 - android:layout_width="wrap_content" 193 + android:layout_width="100dp"
190 - android:layout_height="wrap_content" 194 + android:layout_height="100dp"
191 - android:layout_weight="1" 195 + android:layout_margin="10dp"
192 - android:background="@drawable/profil_selector" 196 + android:background="@drawable/circle_selector"
197 + android:gravity="center"
193 android:text="직장가입자" 198 android:text="직장가입자"
199 + android:textColor="#757575"
194 android:textOff="직장가입자" 200 android:textOff="직장가입자"
195 - android:textOn="직장가입자" /> 201 + android:textOn="직장가입자"
202 + android:textSize="16dp" />
196 203
197 <ToggleButton 204 <ToggleButton
198 android:id="@+id/jiyeokButton" 205 android:id="@+id/jiyeokButton"
199 - android:layout_width="wrap_content" 206 + android:layout_width="100dp"
200 - android:layout_height="wrap_content" 207 + android:layout_height="100dp"
201 - android:layout_weight="1" 208 + android:layout_margin="10dp"
202 - android:background="@drawable/profil_selector" 209 + android:background="@drawable/circle_selector"
210 + android:gravity="center"
203 android:text="지역가입자" 211 android:text="지역가입자"
212 + android:textColor="#757575"
204 android:textOff="지역가입자" 213 android:textOff="지역가입자"
205 - android:textOn="지역가입자" /> 214 + android:textOn="지역가입자"
215 + android:textSize="16dp" />
206 216
207 </LinearLayout> 217 </LinearLayout>
208 218
209 <LinearLayout 219 <LinearLayout
210 android:layout_width="match_parent" 220 android:layout_width="match_parent"
211 android:layout_height="match_parent" 221 android:layout_height="match_parent"
222 + android:gravity="center"
212 android:orientation="horizontal"> 223 android:orientation="horizontal">
213 224
214 <ToggleButton 225 <ToggleButton
215 android:id="@+id/pibooyaangjikjaangButton" 226 android:id="@+id/pibooyaangjikjaangButton"
216 - android:layout_width="wrap_content" 227 + android:layout_width="100dp"
217 - android:layout_height="wrap_content" 228 + android:layout_height="100dp"
218 - android:layout_weight="1" 229 + android:layout_margin="10dp"
219 - android:background="@drawable/profil_selector" 230 + android:background="@drawable/circle_selector"
231 + android:gravity="center"
220 android:text="피부양자(직장)" 232 android:text="피부양자(직장)"
233 + android:textColor="#757575"
221 android:textOff="피부양자(직장)" 234 android:textOff="피부양자(직장)"
222 - android:textOn="피부양자(직장)" /> 235 + android:textOn="피부양자(직장)"
236 + android:textSize="16dp" />
223 237
224 <ToggleButton 238 <ToggleButton
225 android:id="@+id/pibooyaangjiyeokButton" 239 android:id="@+id/pibooyaangjiyeokButton"
226 - android:layout_width="wrap_content" 240 + android:layout_width="100dp"
227 - android:layout_height="wrap_content" 241 + android:layout_height="100dp"
228 - android:layout_weight="1" 242 + android:layout_margin="10dp"
229 - android:background="@drawable/profil_selector" 243 + android:background="@drawable/circle_selector"
244 + android:gravity="center"
230 android:text="피부양자(지역)" 245 android:text="피부양자(지역)"
246 + android:textColor="#757575"
231 android:textOff="피부양자(지역)" 247 android:textOff="피부양자(지역)"
232 - android:textOn="피부양자(지역)" /> 248 + android:textOn="피부양자(지역)"
249 + android:textSize="16dp" />
233 250
234 </LinearLayout> 251 </LinearLayout>
235 252
...@@ -237,61 +254,69 @@ ...@@ -237,61 +254,69 @@
237 <LinearLayout 254 <LinearLayout
238 android:layout_width="match_parent" 255 android:layout_width="match_parent"
239 android:layout_height="match_parent" 256 android:layout_height="match_parent"
257 + android:gravity="center"
240 android:orientation="horizontal"> 258 android:orientation="horizontal">
241 259
242 <ToggleButton 260 <ToggleButton
243 android:id="@+id/uieryoButton" 261 android:id="@+id/uieryoButton"
244 - android:layout_width="wrap_content" 262 + android:layout_width="100dp"
245 - android:layout_height="wrap_content" 263 + android:layout_height="100dp"
246 - android:layout_weight="1" 264 + android:layout_margin="10dp"
247 - android:background="@drawable/profil_selector" 265 + android:background="@drawable/circle_selector"
266 + android:gravity="center"
248 android:text="의료급여수급건자" 267 android:text="의료급여수급건자"
268 + android:textColor="#757575"
249 android:textOff="의료급여수급건자" 269 android:textOff="의료급여수급건자"
250 - android:textOn="의료급여수급건자" /> 270 + android:textOn="의료급여수급건자"
271 + android:textSize="16dp" />
272 +
273 + <ToggleButton
274 + android:id="@+id/emptyButton"
275 + android:layout_width="100dp"
276 + android:layout_height="100dp"
277 + android:layout_margin="10dp"
278 + android:background="#00000000"
279 + android:gravity="center"
280 + android:textColor="#757575"
281 + android:textOff=" "
282 + android:textOn=" "
283 + android:textSize="16dp"
284 + android:visibility="invisible" />
251 </LinearLayout> 285 </LinearLayout>
252 286
253 287
254 </LinearLayout> 288 </LinearLayout>
255 - </LinearLayout>
256 - </ScrollView>
257 -
258 - <LinearLayout
259 - android:layout_width="match_parent"
260 - android:layout_height="100dp"
261 - android:layout_weight="1"
262 - android:gravity="center"
263 - android:orientation="vertical">
264 289
265 <LinearLayout 290 <LinearLayout
266 android:id="@+id/subLinearLayout" 291 android:id="@+id/subLinearLayout"
267 android:layout_width="match_parent" 292 android:layout_width="match_parent"
268 - android:layout_height="wrap_content" 293 + android:layout_height="match_parent"
269 android:orientation="vertical"> 294 android:orientation="vertical">
270 295
271 - <RelativeLayout 296 + <LinearLayout
272 android:layout_width="match_parent" 297 android:layout_width="match_parent"
273 - android:layout_height="wrap_content"> 298 + android:layout_height="match_parent"
299 + android:gravity="center"
300 + android:orientation="horizontal">
274 301
275 <TextView 302 <TextView
276 - android:id="@+id/explainSubTextView" 303 + android:id="@+id/explainTextView1"
277 android:layout_width="wrap_content" 304 android:layout_width="wrap_content"
278 android:layout_height="wrap_content" 305 android:layout_height="wrap_content"
279 - android:layout_centerInParent="true"
280 android:layout_gravity="center" 306 android:layout_gravity="center"
281 android:gravity="center" 307 android:gravity="center"
282 - android:text="16-1. 매월 납부하는 건강보험료를 입력해주세요." /> 308 + android:text="18-1. 매월 납부하는\n건강보험료를 적어주세요."
309 + android:textColor="#4A4A4A"
310 + android:textSize="20dp" />
283 311
284 <Button 312 <Button
285 - android:id="@+id/questionSubButton" 313 + android:id="@+id/questionButton"
286 - android:layout_width="30dp" 314 + android:layout_width="20dp"
287 - android:layout_height="30dp" 315 + android:layout_height="20dp"
288 - android:layout_gravity="center" 316 + android:layout_gravity="bottom"
289 - android:layout_toRightOf="@id/explainSubTextView" 317 + android:background="@drawable/question_mark_image" />
290 - android:backgroundTint="#1E90FF" 318 +
291 - android:gravity="center" 319 + </LinearLayout>
292 - android:text=" ? "
293 - android:textSize="8sp" />
294 - </RelativeLayout>
295 320
296 <LinearLayout 321 <LinearLayout
297 android:layout_width="wrap_content" 322 android:layout_width="wrap_content"
...@@ -303,7 +328,8 @@ ...@@ -303,7 +328,8 @@
303 android:id="@+id/textView1" 328 android:id="@+id/textView1"
304 android:layout_width="match_parent" 329 android:layout_width="match_parent"
305 android:layout_height="wrap_content" 330 android:layout_height="wrap_content"
306 - android:text="건강보험 총 납부액" /> 331 + android:text="건강보험 총 납부액"
332 + android:textColor="#29ABE2" />
307 333
308 <EditText 334 <EditText
309 android:id="@+id/editText1" 335 android:id="@+id/editText1"
...@@ -311,15 +337,31 @@ ...@@ -311,15 +337,31 @@
311 android:layout_height="wrap_content" 337 android:layout_height="wrap_content"
312 android:ems="10" 338 android:ems="10"
313 android:hint="ex)1000000" 339 android:hint="ex)1000000"
314 - android:inputType="textPersonName" /> 340 + android:inputType="textPersonName"
341 + android:theme="@style/EditTheme" />
342 +
343 + </LinearLayout>
315 344
316 </LinearLayout> 345 </LinearLayout>
317 346
318 </LinearLayout> 347 </LinearLayout>
348 + </ScrollView>
349 +
350 + <LinearLayout
351 + android:layout_width="match_parent"
352 + android:layout_height="100dp"
353 + android:layout_weight="1"
354 + android:orientation="vertical"></LinearLayout>
355 +
319 </LinearLayout> 356 </LinearLayout>
320 357
321 <LinearLayout 358 <LinearLayout
322 android:layout_width="match_parent" 359 android:layout_width="match_parent"
360 + android:layout_height="15dp"
361 + android:orientation="horizontal"></LinearLayout>
362 +
363 + <LinearLayout
364 + android:layout_width="match_parent"
323 android:layout_height="wrap_content" 365 android:layout_height="wrap_content"
324 android:orientation="horizontal"> 366 android:orientation="horizontal">
325 367
...@@ -328,15 +370,19 @@ ...@@ -328,15 +370,19 @@
328 android:layout_width="10dp" 370 android:layout_width="10dp"
329 android:layout_height="wrap_content" 371 android:layout_height="wrap_content"
330 android:layout_weight="1" 372 android:layout_weight="1"
331 - android:text="이전 단계로" /> 373 + android:background="#F4F4F4"
374 + android:text="이전 단계로"
375 + android:textColor="#757575" />
332 376
333 <Button 377 <Button
334 android:id="@+id/nextButton" 378 android:id="@+id/nextButton"
335 android:layout_width="10dp" 379 android:layout_width="10dp"
336 android:layout_height="wrap_content" 380 android:layout_height="wrap_content"
337 android:layout_weight="1" 381 android:layout_weight="1"
338 - android:text="다음 단계로" /> 382 + android:background="#29ABE2"
339 - </LinearLayout> 383 + android:text="다음 단계로"
384 + android:textColor="#FFFFFF" />
340 </LinearLayout> 385 </LinearLayout>
386 +
341 </LinearLayout> 387 </LinearLayout>
342 </androidx.constraintlayout.widget.ConstraintLayout> 388 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,52 +122,47 @@ ...@@ -114,52 +122,47 @@
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
122 <LinearLayout 132 <LinearLayout
123 android:layout_width="match_parent" 133 android:layout_width="match_parent"
124 android:layout_height="10dp" 134 android:layout_height="10dp"
125 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
126 - android:orientation="vertical"></LinearLayout>
127 136
128 <LinearLayout 137 <LinearLayout
129 android:layout_width="match_parent" 138 android:layout_width="match_parent"
130 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
131 android:layout_weight="1" 140 android:layout_weight="1"
132 android:orientation="vertical"> 141 android:orientation="vertical">
133 142
134 <LinearLayout 143 <LinearLayout
135 android:layout_width="match_parent" 144 android:layout_width="match_parent"
136 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
137 - android:orientation="vertical"> 146 + android:gravity="center"
138 - 147 + android:orientation="horizontal">
139 - <RelativeLayout
140 - android:layout_width="match_parent"
141 - android:layout_height="match_parent">
142 148
143 <TextView 149 <TextView
144 - android:id="@+id/explainTextView" 150 + android:id="@+id/explainTextView4"
145 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
147 - android:layout_centerInParent="true"
148 android:layout_gravity="center" 153 android:layout_gravity="center"
149 android:gravity="center" 154 android:gravity="center"
150 - android:text="14. 자신을 포함한 가구구성원의 [피해 상황]을 모두 선택해주세요." /> 155 + android:text='16. 자신을 포함한 가구구성원의\n"피해상황"을 모두 선택해주세요.'
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
151 158
152 <Button 159 <Button
153 android:id="@+id/questionButton" 160 android:id="@+id/questionButton"
154 - android:layout_width="30dp" 161 + android:layout_width="20dp"
155 - android:layout_height="30dp" 162 + android:layout_height="20dp"
156 - android:layout_gravity="center" 163 + android:layout_gravity="bottom"
157 - android:layout_toRightOf="@id/explainTextView" 164 + android:background="@drawable/question_mark_image" />
158 - android:backgroundTint="#1E90FF" 165 +
159 - android:gravity="center"
160 - android:text=" ? "
161 - android:textSize="8sp" />
162 - </RelativeLayout>
163 </LinearLayout> 166 </LinearLayout>
164 167
165 <LinearLayout 168 <LinearLayout
...@@ -180,8 +183,8 @@ ...@@ -180,8 +183,8 @@
180 android:orientation="vertical"> 183 android:orientation="vertical">
181 184
182 <LinearLayout 185 <LinearLayout
183 - android:layout_width="wrap_content" 186 + android:layout_width="match_parent"
184 - android:layout_height="wrap_content" 187 + android:layout_height="match_parent"
185 android:layout_gravity="center" 188 android:layout_gravity="center"
186 android:gravity="center" 189 android:gravity="center"
187 android:orientation="vertical"> 190 android:orientation="vertical">
...@@ -189,54 +192,68 @@ ...@@ -189,54 +192,68 @@
189 <LinearLayout 192 <LinearLayout
190 android:layout_width="match_parent" 193 android:layout_width="match_parent"
191 android:layout_height="match_parent" 194 android:layout_height="match_parent"
195 + android:gravity="center"
192 android:orientation="horizontal"> 196 android:orientation="horizontal">
193 197
194 <ToggleButton 198 <ToggleButton
195 android:id="@+id/nothingButton" 199 android:id="@+id/nothingButton"
196 - android:layout_width="wrap_content" 200 + android:layout_width="100dp"
197 - android:layout_height="wrap_content" 201 + android:layout_height="100dp"
198 - android:layout_weight="1" 202 + android:layout_gravity="center"
199 - android:background="@drawable/profil_selector" 203 + android:layout_margin="10dp"
204 + android:background="@drawable/circle_selector"
200 android:text="해당없음" 205 android:text="해당없음"
206 + android:textColor="#757575"
201 android:textOff="해당없음" 207 android:textOff="해당없음"
202 - android:textOn="해당없음" /> 208 + android:textOn="해당없음"
209 + android:textSize="16dp" />
203 210
204 <ToggleButton 211 <ToggleButton
205 android:id="@+id/iljaeButton" 212 android:id="@+id/iljaeButton"
206 - android:layout_width="wrap_content" 213 + android:layout_width="100dp"
207 - android:layout_height="wrap_content" 214 + android:layout_height="100dp"
208 - android:layout_weight="1" 215 + android:layout_gravity="center"
209 - android:background="@drawable/profil_selector" 216 + android:layout_margin="10dp"
217 + android:background="@drawable/circle_selector"
210 android:text="일제강점기피해자" 218 android:text="일제강점기피해자"
219 + android:textColor="#757575"
211 android:textOff="일제강점기피해자" 220 android:textOff="일제강점기피해자"
212 - android:textOn="일제강점기피해자" /> 221 + android:textOn="일제강점기피해자"
222 + android:textSize="16dp" />
213 223
214 </LinearLayout> 224 </LinearLayout>
215 225
216 <LinearLayout 226 <LinearLayout
217 android:layout_width="match_parent" 227 android:layout_width="match_parent"
218 android:layout_height="match_parent" 228 android:layout_height="match_parent"
229 + android:gravity="center"
219 android:orientation="horizontal"> 230 android:orientation="horizontal">
220 231
221 <ToggleButton 232 <ToggleButton
222 android:id="@+id/specialpihaeButton" 233 android:id="@+id/specialpihaeButton"
223 - android:layout_width="wrap_content" 234 + android:layout_width="100dp"
224 - android:layout_height="wrap_content" 235 + android:layout_height="100dp"
225 - android:layout_weight="1" 236 + android:layout_gravity="center"
226 - android:background="@drawable/profil_selector" 237 + android:layout_margin="10dp"
238 + android:background="@drawable/circle_selector"
227 android:text="특수상황피해자" 239 android:text="특수상황피해자"
240 + android:textColor="#757575"
228 android:textOff="특수상황피해자" 241 android:textOff="특수상황피해자"
229 - android:textOn="특수상황피해자" /> 242 + android:textOn="특수상황피해자"
243 + android:textSize="16dp" />
230 244
231 <ToggleButton 245 <ToggleButton
232 android:id="@+id/sanuppihaeButton" 246 android:id="@+id/sanuppihaeButton"
233 - android:layout_width="wrap_content" 247 + android:layout_width="100dp"
234 - android:layout_height="wrap_content" 248 + android:layout_height="100dp"
235 - android:layout_weight="1" 249 + android:layout_gravity="center"
236 - android:background="@drawable/profil_selector" 250 + android:layout_margin="10dp"
251 + android:background="@drawable/circle_selector"
237 android:text="산업재해피해자/가족" 252 android:text="산업재해피해자/가족"
253 + android:textColor="#757575"
238 android:textOff="산업재해피해자/가족" 254 android:textOff="산업재해피해자/가족"
239 - android:textOn="산업재해피해자/가족" /> 255 + android:textOn="산업재해피해자/가족"
256 + android:textSize="16dp" />
240 257
241 </LinearLayout> 258 </LinearLayout>
242 259
...@@ -244,17 +261,33 @@ ...@@ -244,17 +261,33 @@
244 <LinearLayout 261 <LinearLayout
245 android:layout_width="match_parent" 262 android:layout_width="match_parent"
246 android:layout_height="match_parent" 263 android:layout_height="match_parent"
264 + android:gravity="center"
247 android:orientation="horizontal"> 265 android:orientation="horizontal">
248 266
249 <ToggleButton 267 <ToggleButton
250 android:id="@+id/guitarButton" 268 android:id="@+id/guitarButton"
251 - android:layout_width="wrap_content" 269 + android:layout_width="100dp"
252 - android:layout_height="wrap_content" 270 + android:layout_height="100dp"
253 - android:layout_weight="1" 271 + android:layout_gravity="center"
254 - android:background="@drawable/profil_selector" 272 + android:background="@drawable/circle_selector"
255 android:text="기타피해상황" 273 android:text="기타피해상황"
274 + android:textColor="#757575"
256 android:textOff="기타피해상황" 275 android:textOff="기타피해상황"
257 - android:textOn="기타피해상황" /> 276 + android:textOn="기타피해상황"
277 + android:textSize="16dp"
278 + android:layout_margin="10dp" />
279 +
280 + <ToggleButton
281 + android:id="@+id/emptyButton"
282 + android:layout_width="100dp"
283 + android:layout_height="100dp"
284 + android:layout_gravity="center"
285 + android:layout_margin="10dp"
286 + android:background="#00000000"
287 + android:textColor="#757575"
288 + android:textOff=" "
289 + android:textSize="16dp" />
290 +
258 </LinearLayout> 291 </LinearLayout>
259 292
260 293
...@@ -268,6 +301,13 @@ ...@@ -268,6 +301,13 @@
268 android:layout_weight="1" 301 android:layout_weight="1"
269 android:orientation="vertical"></LinearLayout> 302 android:orientation="vertical"></LinearLayout>
270 303
304 + </LinearLayout>
305 +
306 + <LinearLayout
307 + android:layout_width="match_parent"
308 + android:layout_height="15dp"
309 + android:orientation="horizontal"></LinearLayout>
310 +
271 <LinearLayout 311 <LinearLayout
272 android:layout_width="match_parent" 312 android:layout_width="match_parent"
273 android:layout_height="wrap_content" 313 android:layout_height="wrap_content"
...@@ -278,15 +318,19 @@ ...@@ -278,15 +318,19 @@
278 android:layout_width="10dp" 318 android:layout_width="10dp"
279 android:layout_height="wrap_content" 319 android:layout_height="wrap_content"
280 android:layout_weight="1" 320 android:layout_weight="1"
281 - android:text="이전 단계로" /> 321 + android:background="#F4F4F4"
322 + android:text="이전 단계로"
323 + android:textColor="#757575" />
282 324
283 <Button 325 <Button
284 android:id="@+id/nextButton" 326 android:id="@+id/nextButton"
285 android:layout_width="10dp" 327 android:layout_width="10dp"
286 android:layout_height="wrap_content" 328 android:layout_height="wrap_content"
287 android:layout_weight="1" 329 android:layout_weight="1"
288 - android:text="다음 단계로" /> 330 + android:background="#29ABE2"
289 - </LinearLayout> 331 + android:text="다음 단계로"
332 + android:textColor="#FFFFFF" />
290 </LinearLayout> 333 </LinearLayout>
334 +
291 </LinearLayout> 335 </LinearLayout>
292 </androidx.constraintlayout.widget.ConstraintLayout> 336 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,52 +122,47 @@ ...@@ -114,52 +122,47 @@
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
122 <LinearLayout 132 <LinearLayout
123 android:layout_width="match_parent" 133 android:layout_width="match_parent"
124 android:layout_height="10dp" 134 android:layout_height="10dp"
125 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
126 - android:orientation="vertical"></LinearLayout>
127 136
128 <LinearLayout 137 <LinearLayout
129 android:layout_width="match_parent" 138 android:layout_width="match_parent"
130 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
131 android:layout_weight="1" 140 android:layout_weight="1"
132 android:orientation="vertical"> 141 android:orientation="vertical">
133 142
134 <LinearLayout 143 <LinearLayout
135 android:layout_width="match_parent" 144 android:layout_width="match_parent"
136 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
137 - android:orientation="vertical"> 146 + android:gravity="center"
138 - 147 + android:orientation="horizontal">
139 - <RelativeLayout
140 - android:layout_width="match_parent"
141 - android:layout_height="match_parent">
142 148
143 <TextView 149 <TextView
144 - android:id="@+id/explainTextView" 150 + android:id="@+id/explainTextView4"
145 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
147 - android:layout_centerInParent="true"
148 android:layout_gravity="center" 153 android:layout_gravity="center"
149 android:gravity="center" 154 android:gravity="center"
150 - android:text="13. 자신을 포함한 가구구성원의 [위기 상황]을 모두 선택해주세요." /> 155 + android:text='15. 자신을 포함한 가구구성원의\n"위기상황"을 모두 선택해주세요.'
156 + android:textColor="#4A4A4A"
157 + android:textSize="20dp" />
151 158
152 <Button 159 <Button
153 android:id="@+id/questionButton" 160 android:id="@+id/questionButton"
154 - android:layout_width="30dp" 161 + android:layout_width="20dp"
155 - android:layout_height="30dp" 162 + android:layout_height="20dp"
156 - android:layout_gravity="center" 163 + android:layout_gravity="bottom"
157 - android:layout_toRightOf="@id/explainTextView" 164 + android:background="@drawable/question_mark_image" />
158 - android:backgroundTint="#1E90FF" 165 +
159 - android:gravity="center"
160 - android:text=" ? "
161 - android:textSize="8sp" />
162 - </RelativeLayout>
163 </LinearLayout> 166 </LinearLayout>
164 167
165 <LinearLayout 168 <LinearLayout
...@@ -180,8 +183,8 @@ ...@@ -180,8 +183,8 @@
180 android:orientation="vertical"> 183 android:orientation="vertical">
181 184
182 <LinearLayout 185 <LinearLayout
183 - android:layout_width="wrap_content" 186 + android:layout_width="match_parent"
184 - android:layout_height="wrap_content" 187 + android:layout_height="match_parent"
185 android:layout_gravity="center" 188 android:layout_gravity="center"
186 android:gravity="center" 189 android:gravity="center"
187 android:orientation="vertical"> 190 android:orientation="vertical">
...@@ -189,131 +192,166 @@ ...@@ -189,131 +192,166 @@
189 <LinearLayout 192 <LinearLayout
190 android:layout_width="match_parent" 193 android:layout_width="match_parent"
191 android:layout_height="match_parent" 194 android:layout_height="match_parent"
195 + android:gravity="center"
192 android:orientation="horizontal"> 196 android:orientation="horizontal">
193 197
194 <ToggleButton 198 <ToggleButton
195 android:id="@+id/nothingButton" 199 android:id="@+id/nothingButton"
196 - android:layout_width="wrap_content" 200 + android:layout_width="100dp"
197 - android:layout_height="wrap_content" 201 + android:layout_height="100dp"
198 - android:layout_weight="1" 202 + android:layout_gravity="center"
199 - android:background="@drawable/profil_selector" 203 + android:layout_margin="10dp"
204 + android:background="@drawable/circle_selector"
200 android:text="해당없음" 205 android:text="해당없음"
206 + android:textColor="#757575"
201 android:textOff="해당없음" 207 android:textOff="해당없음"
202 - android:textOn="해당없음" /> 208 + android:textOn="해당없음"
209 + android:textSize="16dp" />
203 210
204 <ToggleButton 211 <ToggleButton
205 android:id="@+id/pokryukButton" 212 android:id="@+id/pokryukButton"
206 - android:layout_width="wrap_content" 213 + android:layout_width="100dp"
207 - android:layout_height="wrap_content" 214 + android:layout_height="100dp"
208 - android:layout_weight="1" 215 + android:layout_gravity="center"
209 - android:background="@drawable/profil_selector" 216 + android:layout_margin="10dp"
217 + android:background="@drawable/circle_selector"
210 android:text="폭력" 218 android:text="폭력"
219 + android:textColor="#757575"
211 android:textOff="폭력" 220 android:textOff="폭력"
212 - android:textOn="폭력" /> 221 + android:textOn="폭력"
222 + android:textSize="16dp" />
213 223
214 <ToggleButton 224 <ToggleButton
215 android:id="@+id/pihaeButton" 225 android:id="@+id/pihaeButton"
216 - android:layout_width="wrap_content" 226 + android:layout_width="100dp"
217 - android:layout_height="wrap_content" 227 + android:layout_height="100dp"
218 - android:layout_weight="1" 228 + android:layout_gravity="center"
219 - android:background="@drawable/profil_selector" 229 + android:layout_margin="10dp"
230 + android:background="@drawable/circle_selector"
220 android:text="피해/학대" 231 android:text="피해/학대"
232 + android:textColor="#757575"
221 android:textOff="피해/학대" 233 android:textOff="피해/학대"
222 - android:textOn="피해/학대" /> 234 + android:textOn="피해/학대"
235 + android:textSize="16dp" />
223 236
224 </LinearLayout> 237 </LinearLayout>
225 238
226 <LinearLayout 239 <LinearLayout
227 android:layout_width="match_parent" 240 android:layout_width="match_parent"
228 android:layout_height="match_parent" 241 android:layout_height="match_parent"
242 + android:gravity="center"
229 android:orientation="horizontal"> 243 android:orientation="horizontal">
230 244
231 <ToggleButton 245 <ToggleButton
232 android:id="@+id/kachoolButton" 246 android:id="@+id/kachoolButton"
233 - android:layout_width="wrap_content" 247 + android:layout_width="100dp"
234 - android:layout_height="wrap_content" 248 + android:layout_height="100dp"
235 - android:layout_weight="1" 249 + android:layout_gravity="center"
236 - android:background="@drawable/profil_selector" 250 + android:layout_margin="10dp"
251 + android:background="@drawable/circle_selector"
237 android:text="가출/실종/사망" 252 android:text="가출/실종/사망"
253 + android:textColor="#757575"
238 android:textOff="가출/실종/사망" 254 android:textOff="가출/실종/사망"
239 - android:textOn="가출/실종/사망" /> 255 + android:textOn="가출/실종/사망"
256 + android:textSize="16dp" />
240 257
241 <ToggleButton 258 <ToggleButton
242 android:id="@+id/sagoButton" 259 android:id="@+id/sagoButton"
243 - android:layout_width="wrap_content" 260 + android:layout_width="100dp"
244 - android:layout_height="wrap_content" 261 + android:layout_height="100dp"
245 - android:layout_weight="1" 262 + android:layout_gravity="center"
246 - android:background="@drawable/profil_selector" 263 + android:layout_margin="10dp"
264 + android:background="@drawable/circle_selector"
247 android:text="사고" 265 android:text="사고"
266 + android:textColor="#757575"
248 android:textOff="사고" 267 android:textOff="사고"
249 - android:textOn="사고" /> 268 + android:textOn="사고"
269 + android:textSize="16dp" />
250 270
251 <ToggleButton 271 <ToggleButton
252 android:id="@+id/ihonButton" 272 android:id="@+id/ihonButton"
253 - android:layout_width="wrap_content" 273 + android:layout_width="100dp"
254 - android:layout_height="wrap_content" 274 + android:layout_height="100dp"
255 - android:layout_weight="1" 275 + android:layout_gravity="center"
256 - android:background="@drawable/profil_selector" 276 + android:layout_margin="10dp"
277 + android:background="@drawable/circle_selector"
257 android:text="이혼(예정)" 278 android:text="이혼(예정)"
279 + android:textColor="#757575"
258 android:textOff="이혼(예정)" 280 android:textOff="이혼(예정)"
259 - android:textOn="이혼(예정)" /> 281 + android:textOn="이혼(예정)"
282 + android:textSize="16dp" />
260 </LinearLayout> 283 </LinearLayout>
261 284
262 285
263 <LinearLayout 286 <LinearLayout
264 android:layout_width="match_parent" 287 android:layout_width="match_parent"
265 android:layout_height="match_parent" 288 android:layout_height="match_parent"
289 + android:gravity="center"
266 android:orientation="horizontal"> 290 android:orientation="horizontal">
267 291
268 <ToggleButton 292 <ToggleButton
269 android:id="@+id/jaehaeButton" 293 android:id="@+id/jaehaeButton"
270 - android:layout_width="wrap_content" 294 + android:layout_width="100dp"
271 - android:layout_height="wrap_content" 295 + android:layout_height="100dp"
272 - android:layout_weight="1" 296 + android:layout_gravity="center"
273 - android:background="@drawable/profil_selector" 297 + android:layout_margin="10dp"
298 + android:background="@drawable/circle_selector"
274 android:text="재해" 299 android:text="재해"
300 + android:textColor="#757575"
275 android:textOff="재해" 301 android:textOff="재해"
276 - android:textOn="재해" /> 302 + android:textOn="재해"
303 + android:textSize="16dp" />
277 304
278 <ToggleButton 305 <ToggleButton
279 android:id="@+id/hakkyobaakButton" 306 android:id="@+id/hakkyobaakButton"
280 - android:layout_width="wrap_content" 307 + android:layout_width="100dp"
281 - android:layout_height="wrap_content" 308 + android:layout_height="100dp"
282 - android:layout_weight="1" 309 + android:layout_gravity="center"
283 - android:background="@drawable/profil_selector" 310 + android:layout_margin="10dp"
311 + android:background="@drawable/circle_selector"
284 android:text="학교밖청소년" 312 android:text="학교밖청소년"
313 + android:textColor="#757575"
285 android:textOff="학교밖청소년" 314 android:textOff="학교밖청소년"
286 - android:textOn="학교밖청소년" /> 315 + android:textOn="학교밖청소년"
316 + android:textSize="16dp" />
287 317
288 <ToggleButton 318 <ToggleButton
289 android:id="@+id/siljikButton" 319 android:id="@+id/siljikButton"
290 - android:layout_width="wrap_content" 320 + android:layout_width="100dp"
291 - android:layout_height="wrap_content" 321 + android:layout_height="100dp"
292 - android:layout_weight="1" 322 + android:layout_gravity="center"
293 - android:background="@drawable/profil_selector" 323 + android:layout_margin="10dp"
324 + android:background="@drawable/circle_selector"
294 android:text="실직" 325 android:text="실직"
326 + android:textColor="#757575"
295 android:textOff="실직" 327 android:textOff="실직"
296 - android:textOn="실직" /> 328 + android:textOn="실직"
329 + android:textSize="16dp" />
297 </LinearLayout> 330 </LinearLayout>
298 331
299 <LinearLayout 332 <LinearLayout
300 android:layout_width="match_parent" 333 android:layout_width="match_parent"
301 android:layout_height="match_parent" 334 android:layout_height="match_parent"
335 + android:gravity="center"
302 android:orientation="horizontal"> 336 android:orientation="horizontal">
303 337
304 <ToggleButton 338 <ToggleButton
305 android:id="@+id/guitarButton" 339 android:id="@+id/guitarButton"
306 - android:layout_width="wrap_content" 340 + android:layout_width="100dp"
307 - android:layout_height="wrap_content" 341 + android:layout_height="100dp"
308 - android:layout_weight="1" 342 + android:layout_gravity="center"
309 - android:background="@drawable/profil_selector" 343 + android:background="@drawable/circle_selector"
310 android:text="기타" 344 android:text="기타"
345 + android:textColor="#757575"
311 android:textOff="기타" 346 android:textOff="기타"
312 - android:textOn="기타" /> 347 + android:textOn="기타"
348 + android:textSize="16dp"
349 + android:layout_margin="10dp" />
313 </LinearLayout> 350 </LinearLayout>
314 351
315 352
316 </LinearLayout> 353 </LinearLayout>
354 +
317 </LinearLayout> 355 </LinearLayout>
318 </ScrollView> 356 </ScrollView>
319 357
...@@ -323,6 +361,13 @@ ...@@ -323,6 +361,13 @@
323 android:layout_weight="1" 361 android:layout_weight="1"
324 android:orientation="vertical"></LinearLayout> 362 android:orientation="vertical"></LinearLayout>
325 363
364 + </LinearLayout>
365 +
366 + <LinearLayout
367 + android:layout_width="match_parent"
368 + android:layout_height="15dp"
369 + android:orientation="horizontal"></LinearLayout>
370 +
326 <LinearLayout 371 <LinearLayout
327 android:layout_width="match_parent" 372 android:layout_width="match_parent"
328 android:layout_height="wrap_content" 373 android:layout_height="wrap_content"
...@@ -333,15 +378,19 @@ ...@@ -333,15 +378,19 @@
333 android:layout_width="10dp" 378 android:layout_width="10dp"
334 android:layout_height="wrap_content" 379 android:layout_height="wrap_content"
335 android:layout_weight="1" 380 android:layout_weight="1"
336 - android:text="이전 단계로" /> 381 + android:background="#F4F4F4"
382 + android:text="이전 단계로"
383 + android:textColor="#757575" />
337 384
338 <Button 385 <Button
339 android:id="@+id/nextButton" 386 android:id="@+id/nextButton"
340 android:layout_width="10dp" 387 android:layout_width="10dp"
341 android:layout_height="wrap_content" 388 android:layout_height="wrap_content"
342 android:layout_weight="1" 389 android:layout_weight="1"
343 - android:text="다음 단계로" /> 390 + android:background="#29ABE2"
344 - </LinearLayout> 391 + android:text="다음 단계로"
392 + android:textColor="#FFFFFF" />
345 </LinearLayout> 393 </LinearLayout>
394 +
346 </LinearLayout> 395 </LinearLayout>
347 </androidx.constraintlayout.widget.ConstraintLayout> 396 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,10 +100,10 @@ ...@@ -94,10 +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 - 103 + android:background="@drawable/profile_stage_filling"
98 - android:background="#1E90FF"
99 android:gravity="center" 104 android:gravity="center"
100 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
101 107
102 <TextView 108 <TextView
103 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -105,9 +111,10 @@ ...@@ -105,9 +111,10 @@
105 android:layout_height="match_parent" 111 android:layout_height="match_parent"
106 android:layout_gravity="center" 112 android:layout_gravity="center"
107 android:layout_weight="1" 113 android:layout_weight="1"
108 - android:background="#1E90FF" 114 + android:background="@drawable/profile_stage"
109 android:gravity="center" 115 android:gravity="center"
110 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
111 118
112 <TextView 119 <TextView
113 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -115,20 +122,21 @@ ...@@ -115,20 +122,21 @@
115 android:layout_height="match_parent" 122 android:layout_height="match_parent"
116 android:layout_gravity="center" 123 android:layout_gravity="center"
117 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 - android:layout_height="wrap_content" 134 + android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical">
128 136
129 <ScrollView 137 <ScrollView
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="match_parent" 139 + android:layout_height="wrap_content"
132 android:layout_weight="1"> 140 android:layout_weight="1">
133 141
134 <LinearLayout 142 <LinearLayout
...@@ -141,30 +149,31 @@ ...@@ -141,30 +149,31 @@
141 android:layout_height="wrap_content" 149 android:layout_height="wrap_content"
142 android:orientation="vertical"> 150 android:orientation="vertical">
143 151
144 - <RelativeLayout 152 + <LinearLayout
145 android:layout_width="match_parent" 153 android:layout_width="match_parent"
146 - android:layout_height="match_parent"> 154 + android:layout_height="match_parent"
155 + android:gravity="center"
156 + android:orientation="horizontal">
147 157
148 <TextView 158 <TextView
149 - android:id="@+id/explainTextView" 159 + android:id="@+id/explainTextView0"
150 android:layout_width="wrap_content" 160 android:layout_width="wrap_content"
151 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
152 - android:layout_centerInParent="true"
153 android:layout_gravity="center" 162 android:layout_gravity="center"
154 android:gravity="center" 163 android:gravity="center"
155 - android:text="10. 자신의 주택보유 상태를 선택해주세요." /> 164 + android:text="12. 자신의 주택보유 상태를\n선택해주세요."
165 + android:textColor="#4A4A4A"
166 + android:textSize="20dp" />
156 167
157 <Button 168 <Button
158 android:id="@+id/questionButton" 169 android:id="@+id/questionButton"
159 - android:layout_width="30dp" 170 + android:layout_width="20dp"
160 - android:layout_height="30dp" 171 + android:layout_height="20dp"
161 - android:layout_gravity="center" 172 + android:layout_gravity="bottom"
162 - android:layout_toRightOf="@id/explainTextView" 173 + android:background="@drawable/question_mark_image" />
163 - android:backgroundTint="#1E90FF" 174 +
164 - android:gravity="center" 175 + </LinearLayout>
165 - android:text=" ? " 176 +
166 - android:textSize="8sp" />
167 - </RelativeLayout>
168 </LinearLayout> 177 </LinearLayout>
169 178
170 <LinearLayout 179 <LinearLayout
...@@ -188,11 +197,14 @@ ...@@ -188,11 +197,14 @@
188 android:id="@+id/yesButton" 197 android:id="@+id/yesButton"
189 android:layout_width="300dp" 198 android:layout_width="300dp"
190 android:layout_height="wrap_content" 199 android:layout_height="wrap_content"
200 + android:layout_margin="5dp"
191 android:layout_weight="1" 201 android:layout_weight="1"
192 - android:background="@drawable/profil_selector" 202 + android:background="@drawable/button_selector"
193 android:text="보유" 203 android:text="보유"
204 + android:textColor="#757575"
194 android:textOff="보유" 205 android:textOff="보유"
195 - android:textOn="보유" /> 206 + android:textOn="보유"
207 + android:textSize="16dp" />
196 208
197 </LinearLayout> 209 </LinearLayout>
198 210
...@@ -207,10 +219,13 @@ ...@@ -207,10 +219,13 @@
207 android:layout_width="300dp" 219 android:layout_width="300dp"
208 android:layout_height="wrap_content" 220 android:layout_height="wrap_content"
209 android:layout_weight="1" 221 android:layout_weight="1"
210 - android:background="@drawable/profil_selector" 222 + android:background="@drawable/button_selector"
211 android:text="미보유" 223 android:text="미보유"
224 + android:textColor="#757575"
212 android:textOff="미보유" 225 android:textOff="미보유"
213 - android:textOn="미보유" /> 226 + android:textOn="미보유"
227 + android:textSize="16dp"
228 + android:layout_margin="5dp" />
214 </LinearLayout> 229 </LinearLayout>
215 230
216 </LinearLayout> 231 </LinearLayout>
...@@ -222,37 +237,31 @@ ...@@ -222,37 +237,31 @@
222 android:layout_height="wrap_content" 237 android:layout_height="wrap_content"
223 android:layout_weight="1" 238 android:layout_weight="1"
224 android:orientation="vertical" 239 android:orientation="vertical"
225 - android:visibility="gone"> 240 + android:visibility="visible">
226 241
227 <LinearLayout 242 <LinearLayout
228 android:layout_width="match_parent" 243 android:layout_width="match_parent"
229 android:layout_height="wrap_content" 244 android:layout_height="wrap_content"
230 android:orientation="vertical"> 245 android:orientation="vertical">
231 246
232 - <RelativeLayout 247 + <LinearLayout
233 android:layout_width="match_parent" 248 android:layout_width="match_parent"
234 - android:layout_height="match_parent"> 249 + android:layout_height="match_parent"
250 + android:gravity="center"
251 + android:orientation="horizontal">
235 252
236 <TextView 253 <TextView
237 - android:id="@+id/explainSub1TextView" 254 + android:id="@+id/explainTextView1"
238 android:layout_width="wrap_content" 255 android:layout_width="wrap_content"
239 android:layout_height="wrap_content" 256 android:layout_height="wrap_content"
240 - android:layout_centerInParent="true"
241 android:layout_gravity="center" 257 android:layout_gravity="center"
242 android:gravity="center" 258 android:gravity="center"
243 - android:text="10-1. 주거유형(본인)을 선택해주세요." /> 259 + android:text="12-1. 자신의 주거유형을 모두 선택해주세요."
260 + android:textColor="#4A4A4A"
261 + android:textSize="20dp" />
262 +
263 + </LinearLayout>
244 264
245 - <Button
246 - android:id="@+id/questionSub1Button"
247 - android:layout_width="30dp"
248 - android:layout_height="30dp"
249 - android:layout_gravity="center"
250 - android:layout_toRightOf="@id/explainSub1TextView"
251 - android:backgroundTint="#1E90FF"
252 - android:gravity="center"
253 - android:text=" ? "
254 - android:textSize="8sp" />
255 - </RelativeLayout>
256 </LinearLayout> 265 </LinearLayout>
257 266
258 <LinearLayout 267 <LinearLayout
...@@ -274,23 +283,29 @@ ...@@ -274,23 +283,29 @@
274 283
275 <ToggleButton 284 <ToggleButton
276 android:id="@+id/jeonsaeButton" 285 android:id="@+id/jeonsaeButton"
277 - android:layout_width="300dp" 286 + android:layout_width="100dp"
278 - android:layout_height="wrap_content" 287 + android:layout_height="100dp"
288 + android:layout_margin="10dp"
279 android:layout_weight="1" 289 android:layout_weight="1"
280 - android:background="@drawable/profil_selector" 290 + android:background="@drawable/circle_selector"
281 android:text="전세" 291 android:text="전세"
292 + android:textColor="#757575"
282 android:textOff="전세" 293 android:textOff="전세"
283 - android:textOn="전세" /> 294 + android:textOn="전세"
295 + android:textSize="16dp" />
284 296
285 <ToggleButton 297 <ToggleButton
286 android:id="@+id/wolseButton" 298 android:id="@+id/wolseButton"
287 - android:layout_width="300dp" 299 + android:layout_width="100dp"
288 - android:layout_height="wrap_content" 300 + android:layout_height="100dp"
301 + android:layout_margin="10dp"
289 android:layout_weight="1" 302 android:layout_weight="1"
290 - android:background="@drawable/profil_selector" 303 + android:background="@drawable/circle_selector"
291 android:text="월세" 304 android:text="월세"
292 android:textOff="월세" 305 android:textOff="월세"
293 - android:textOn="월세" /> 306 + android:textOn="월세"
307 + android:textSize="16dp"
308 + android:textColor="#757575" />
294 309
295 </LinearLayout> 310 </LinearLayout>
296 311
...@@ -301,23 +316,29 @@ ...@@ -301,23 +316,29 @@
301 316
302 <ToggleButton 317 <ToggleButton
303 android:id="@+id/kongkongButton" 318 android:id="@+id/kongkongButton"
304 - android:layout_width="300dp" 319 + android:layout_width="100dp"
305 - android:layout_height="wrap_content" 320 + android:layout_height="100dp"
321 + android:layout_margin="10dp"
306 android:layout_weight="1" 322 android:layout_weight="1"
307 - android:background="@drawable/profil_selector" 323 + android:background="@drawable/circle_selector"
308 android:text="공공(임대)주택" 324 android:text="공공(임대)주택"
325 + android:textColor="#757575"
309 android:textOff="공공(임대)주택" 326 android:textOff="공공(임대)주택"
310 - android:textOn="공공(임대)주택" /> 327 + android:textOn="공공(임대)주택"
328 + android:textSize="16dp" />
311 329
312 <ToggleButton 330 <ToggleButton
313 android:id="@+id/moosangButton" 331 android:id="@+id/moosangButton"
314 - android:layout_width="300dp" 332 + android:layout_width="100dp"
315 - android:layout_height="wrap_content" 333 + android:layout_height="100dp"
334 + android:layout_margin="10dp"
316 android:layout_weight="1" 335 android:layout_weight="1"
317 - android:background="@drawable/profil_selector" 336 + android:background="@drawable/circle_selector"
318 android:text="무상임대" 337 android:text="무상임대"
338 + android:textColor="#757575"
319 android:textOff="무상임대" 339 android:textOff="무상임대"
320 - android:textOn="무상임대" /> 340 + android:textOn="무상임대"
341 + android:textSize="16dp" />
321 </LinearLayout> 342 </LinearLayout>
322 343
323 <LinearLayout 344 <LinearLayout
...@@ -327,23 +348,29 @@ ...@@ -327,23 +348,29 @@
327 348
328 <ToggleButton 349 <ToggleButton
329 android:id="@+id/bojangButton" 350 android:id="@+id/bojangButton"
330 - android:layout_width="300dp" 351 + android:layout_width="100dp"
331 - android:layout_height="wrap_content" 352 + android:layout_height="100dp"
353 + android:layout_margin="10dp"
332 android:layout_weight="1" 354 android:layout_weight="1"
333 - android:background="@drawable/profil_selector" 355 + android:background="@drawable/circle_selector"
334 android:text="보장기관제공주거" 356 android:text="보장기관제공주거"
357 + android:textColor="#757575"
335 android:textOff="보장기관제공주거" 358 android:textOff="보장기관제공주거"
336 - android:textOn="보장기관제공주거" /> 359 + android:textOn="보장기관제공주거"
360 + android:textSize="16dp" />
337 361
338 <ToggleButton 362 <ToggleButton
339 android:id="@+id/guitarButton" 363 android:id="@+id/guitarButton"
340 - android:layout_width="300dp" 364 + android:layout_width="100dp"
341 - android:layout_height="wrap_content" 365 + android:layout_height="100dp"
366 + android:layout_margin="10dp"
342 android:layout_weight="1" 367 android:layout_weight="1"
343 - android:background="@drawable/profil_selector" 368 + android:background="@drawable/circle_selector"
344 android:text="기타" 369 android:text="기타"
370 + android:textColor="#757575"
345 android:textOff="기타" 371 android:textOff="기타"
346 - android:textOn="기타" /> 372 + android:textOn="기타"
373 + android:textSize="16dp" />
347 </LinearLayout> 374 </LinearLayout>
348 375
349 376
...@@ -357,6 +384,11 @@ ...@@ -357,6 +384,11 @@
357 384
358 <LinearLayout 385 <LinearLayout
359 android:layout_width="match_parent" 386 android:layout_width="match_parent"
387 + android:layout_height="15dp"
388 + android:orientation="horizontal"></LinearLayout>
389 +
390 + <LinearLayout
391 + android:layout_width="match_parent"
360 android:layout_height="wrap_content" 392 android:layout_height="wrap_content"
361 android:orientation="horizontal"> 393 android:orientation="horizontal">
362 394
...@@ -365,16 +397,19 @@ ...@@ -365,16 +397,19 @@
365 android:layout_width="10dp" 397 android:layout_width="10dp"
366 android:layout_height="wrap_content" 398 android:layout_height="wrap_content"
367 android:layout_weight="1" 399 android:layout_weight="1"
368 - android:text="이전 단계로" /> 400 + android:background="#F4F4F4"
401 + android:text="이전 단계로"
402 + android:textColor="#757575" />
369 403
370 <Button 404 <Button
371 android:id="@+id/nextButton" 405 android:id="@+id/nextButton"
372 android:layout_width="10dp" 406 android:layout_width="10dp"
373 android:layout_height="wrap_content" 407 android:layout_height="wrap_content"
374 android:layout_weight="1" 408 android:layout_weight="1"
375 - android:text="다음 단계로" /> 409 + android:background="#29ABE2"
410 + android:text="다음 단계로"
411 + android:textColor="#FFFFFF" />
376 </LinearLayout> 412 </LinearLayout>
377 413
378 </LinearLayout> 414 </LinearLayout>
379 - </LinearLayout>
380 </androidx.constraintlayout.widget.ConstraintLayout> 415 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage_filling"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
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="@drawable/profile_stage"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,20 +122,21 @@ ...@@ -114,20 +122,21 @@
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
122 <LinearLayout 132 <LinearLayout
123 android:layout_width="match_parent" 133 android:layout_width="match_parent"
124 android:layout_height="10dp" 134 android:layout_height="10dp"
125 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
126 - android:orientation="vertical"></LinearLayout>
127 136
128 <LinearLayout 137 <LinearLayout
129 android:layout_width="match_parent" 138 android:layout_width="match_parent"
130 - android:layout_height="wrap_content" 139 + android:layout_height="match_parent"
131 android:layout_weight="1" 140 android:layout_weight="1"
132 android:orientation="vertical"> 141 android:orientation="vertical">
133 142
...@@ -136,30 +145,16 @@ ...@@ -136,30 +145,16 @@
136 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
137 android:orientation="vertical"> 146 android:orientation="vertical">
138 147
139 - <RelativeLayout
140 - android:layout_width="match_parent"
141 - android:layout_height="match_parent">
142 -
143 <TextView 148 <TextView
144 - android:id="@+id/explainTextView" 149 + android:id="@+id/explainTextView4"
145 - android:layout_width="wrap_content" 150 + android:layout_width="match_parent"
146 android:layout_height="wrap_content" 151 android:layout_height="wrap_content"
147 - android:layout_centerInParent="true"
148 android:layout_gravity="center" 152 android:layout_gravity="center"
149 android:gravity="center" 153 android:gravity="center"
150 - android:text="12. 자신을 포함한 가구구성원의 [상황]을 모두 선택해주세요." /> 154 + android:text='14. 자신을 포함한 가구구성원의\n"상황"을 모두 선택해주세요.'
155 + android:textColor="#4A4A4A"
156 + android:textSize="20dp" />
151 157
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> 158 </LinearLayout>
164 159
165 <LinearLayout 160 <LinearLayout
...@@ -193,33 +188,42 @@ ...@@ -193,33 +188,42 @@
193 188
194 <ToggleButton 189 <ToggleButton
195 android:id="@+id/nothingButton" 190 android:id="@+id/nothingButton"
196 - android:layout_width="wrap_content" 191 + android:layout_width="100dp"
197 - android:layout_height="wrap_content" 192 + android:layout_height="100dp"
193 + android:layout_margin="10dp"
198 android:layout_weight="1" 194 android:layout_weight="1"
199 - android:background="@drawable/profil_selector" 195 + android:background="@drawable/circle_selector"
200 android:text="해당없음" 196 android:text="해당없음"
197 + android:textColor="#757575"
201 android:textOff="해당없음" 198 android:textOff="해당없음"
202 - android:textOn="해당없음" /> 199 + android:textOn="해당없음"
200 + android:textSize="16dp" />
203 201
204 <ToggleButton 202 <ToggleButton
205 android:id="@+id/jeosodeukButton" 203 android:id="@+id/jeosodeukButton"
206 - android:layout_width="wrap_content" 204 + android:layout_width="100dp"
207 - android:layout_height="wrap_content" 205 + android:layout_height="100dp"
206 + android:layout_margin="10dp"
208 android:layout_weight="1" 207 android:layout_weight="1"
209 - android:background="@drawable/profil_selector" 208 + android:background="@drawable/circle_selector"
210 android:text="저소득" 209 android:text="저소득"
210 + android:textColor="#757575"
211 android:textOff="저소득" 211 android:textOff="저소득"
212 - android:textOn="저소득" /> 212 + android:textOn="저소득"
213 + android:textSize="16dp" />
213 214
214 <ToggleButton 215 <ToggleButton
215 android:id="@+id/hanboomoButton" 216 android:id="@+id/hanboomoButton"
216 - android:layout_width="wrap_content" 217 + android:layout_width="100dp"
217 - android:layout_height="wrap_content" 218 + android:layout_height="100dp"
219 + android:layout_margin="10dp"
218 android:layout_weight="1" 220 android:layout_weight="1"
219 - android:background="@drawable/profil_selector" 221 + android:background="@drawable/circle_selector"
220 android:text="한부모" 222 android:text="한부모"
223 + android:textColor="#757575"
221 android:textOff="한부모" 224 android:textOff="한부모"
222 - android:textOn="한부모" /> 225 + android:textOn="한부모"
226 + android:textSize="16dp" />
223 227
224 </LinearLayout> 228 </LinearLayout>
225 229
...@@ -230,33 +234,42 @@ ...@@ -230,33 +234,42 @@
230 234
231 <ToggleButton 235 <ToggleButton
232 android:id="@+id/oegookinButton" 236 android:id="@+id/oegookinButton"
233 - android:layout_width="wrap_content" 237 + android:layout_width="100dp"
234 - android:layout_height="wrap_content" 238 + android:layout_height="100dp"
239 + android:layout_margin="10dp"
235 android:layout_weight="1" 240 android:layout_weight="1"
236 - android:background="@drawable/profil_selector" 241 + android:background="@drawable/circle_selector"
237 android:text="외국인" 242 android:text="외국인"
243 + android:textColor="#757575"
238 android:textOff="외국인" 244 android:textOff="외국인"
239 - android:textOn="외국인" /> 245 + android:textOn="외국인"
246 + android:textSize="16dp" />
240 247
241 <ToggleButton 248 <ToggleButton
242 android:id="@+id/damoonhwaButton" 249 android:id="@+id/damoonhwaButton"
243 - android:layout_width="wrap_content" 250 + android:layout_width="100dp"
244 - android:layout_height="wrap_content" 251 + android:layout_height="100dp"
252 + android:layout_margin="10dp"
245 android:layout_weight="1" 253 android:layout_weight="1"
246 - android:background="@drawable/profil_selector" 254 + android:background="@drawable/circle_selector"
247 android:text="다문화" 255 android:text="다문화"
256 + android:textColor="#757575"
248 android:textOff="다문화" 257 android:textOff="다문화"
249 - android:textOn="다문화" /> 258 + android:textOn="다문화"
259 + android:textSize="16dp" />
250 260
251 <ToggleButton 261 <ToggleButton
252 android:id="@+id/jaangaeButton" 262 android:id="@+id/jaangaeButton"
253 - android:layout_width="wrap_content" 263 + android:layout_width="100dp"
254 - android:layout_height="wrap_content" 264 + android:layout_height="100dp"
265 + android:layout_margin="10dp"
255 android:layout_weight="1" 266 android:layout_weight="1"
256 - android:background="@drawable/profil_selector" 267 + android:background="@drawable/circle_selector"
257 android:text="장애" 268 android:text="장애"
269 + android:textColor="#757575"
258 android:textOff="장애" 270 android:textOff="장애"
259 - android:textOn="장애" /> 271 + android:textOn="장애"
272 + android:textSize="16dp" />
260 </LinearLayout> 273 </LinearLayout>
261 274
262 275
...@@ -267,33 +280,42 @@ ...@@ -267,33 +280,42 @@
267 280
268 <ToggleButton 281 <ToggleButton
269 android:id="@+id/imshinchoolsanButton" 282 android:id="@+id/imshinchoolsanButton"
270 - android:layout_width="wrap_content" 283 + android:layout_width="100dp"
271 - android:layout_height="wrap_content" 284 + android:layout_height="100dp"
285 + android:layout_margin="10dp"
272 android:layout_weight="1" 286 android:layout_weight="1"
273 - android:background="@drawable/profil_selector" 287 + android:background="@drawable/circle_selector"
274 android:text="임신출산" 288 android:text="임신출산"
289 + android:textColor="#757575"
275 android:textOff="임신출산" 290 android:textOff="임신출산"
276 - android:textOn="임신출산" /> 291 + android:textOn="임신출산"
292 + android:textSize="16dp" />
277 293
278 <ToggleButton 294 <ToggleButton
279 android:id="@+id/ipyaangButton" 295 android:id="@+id/ipyaangButton"
280 - android:layout_width="wrap_content" 296 + android:layout_width="100dp"
281 - android:layout_height="wrap_content" 297 + android:layout_height="100dp"
298 + android:layout_margin="10dp"
282 android:layout_weight="1" 299 android:layout_weight="1"
283 - android:background="@drawable/profil_selector" 300 + android:background="@drawable/circle_selector"
284 android:text="입양" 301 android:text="입양"
302 + android:textColor="#757575"
285 android:textOff="입양" 303 android:textOff="입양"
286 - android:textOn="입양" /> 304 + android:textOn="입양"
305 + android:textSize="16dp" />
287 306
288 <ToggleButton 307 <ToggleButton
289 android:id="@+id/gaajungButton" 308 android:id="@+id/gaajungButton"
290 - android:layout_width="wrap_content" 309 + android:layout_width="100dp"
291 - android:layout_height="wrap_content" 310 + android:layout_height="100dp"
311 + android:layout_margin="10dp"
292 android:layout_weight="1" 312 android:layout_weight="1"
293 - android:background="@drawable/profil_selector" 313 + android:background="@drawable/circle_selector"
294 android:text="가정위탁" 314 android:text="가정위탁"
315 + android:textColor="#757575"
295 android:textOff="가정위탁" 316 android:textOff="가정위탁"
296 - android:textOn="가정위탁" /> 317 + android:textOn="가정위탁"
318 + android:textSize="16dp" />
297 </LinearLayout> 319 </LinearLayout>
298 320
299 <LinearLayout 321 <LinearLayout
...@@ -303,33 +325,42 @@ ...@@ -303,33 +325,42 @@
303 325
304 <ToggleButton 326 <ToggleButton
305 android:id="@+id/bookhanButton" 327 android:id="@+id/bookhanButton"
306 - android:layout_width="wrap_content" 328 + android:layout_width="100dp"
307 - android:layout_height="wrap_content" 329 + android:layout_height="100dp"
330 + android:layout_margin="10dp"
308 android:layout_weight="1" 331 android:layout_weight="1"
309 - android:background="@drawable/profil_selector" 332 + android:background="@drawable/circle_selector"
310 android:text="북한이탈주민" 333 android:text="북한이탈주민"
334 + android:textColor="#757575"
311 android:textOff="북한이탈주민" 335 android:textOff="북한이탈주민"
312 - android:textOn="북한이탈주민" /> 336 + android:textOn="북한이탈주민"
337 + android:textSize="16dp" />
313 338
314 <ToggleButton 339 <ToggleButton
315 android:id="@+id/gookgayoogongButton" 340 android:id="@+id/gookgayoogongButton"
316 - android:layout_width="wrap_content" 341 + android:layout_width="100dp"
317 - android:layout_height="wrap_content" 342 + android:layout_height="100dp"
343 + android:layout_margin="10dp"
318 android:layout_weight="1" 344 android:layout_weight="1"
319 - android:background="@drawable/profil_selector" 345 + android:background="@drawable/circle_selector"
320 android:text="국가유공" 346 android:text="국가유공"
347 + android:textColor="#757575"
321 android:textOff="국가유공" 348 android:textOff="국가유공"
322 - android:textOn="국가유공" /> 349 + android:textOn="국가유공"
350 + android:textSize="16dp" />
323 351
324 <ToggleButton 352 <ToggleButton
325 android:id="@+id/guitarButton" 353 android:id="@+id/guitarButton"
326 - android:layout_width="wrap_content" 354 + android:layout_width="100dp"
327 - android:layout_height="wrap_content" 355 + android:layout_height="100dp"
356 + android:layout_margin="10dp"
328 android:layout_weight="1" 357 android:layout_weight="1"
329 - android:background="@drawable/profil_selector" 358 + android:background="@drawable/circle_selector"
330 android:text="기타" 359 android:text="기타"
360 + android:textColor="#757575"
331 android:textOff="기타" 361 android:textOff="기타"
332 - android:textOn="기타" /> 362 + android:textOn="기타"
363 + android:textSize="16dp" />
333 </LinearLayout> 364 </LinearLayout>
334 365
335 366
...@@ -343,6 +374,13 @@ ...@@ -343,6 +374,13 @@
343 android:layout_weight="1" 374 android:layout_weight="1"
344 android:orientation="vertical"></LinearLayout> 375 android:orientation="vertical"></LinearLayout>
345 376
377 + </LinearLayout>
378 +
379 + <LinearLayout
380 + android:layout_width="match_parent"
381 + android:layout_height="15dp"
382 + android:orientation="horizontal"></LinearLayout>
383 +
346 <LinearLayout 384 <LinearLayout
347 android:layout_width="match_parent" 385 android:layout_width="match_parent"
348 android:layout_height="wrap_content" 386 android:layout_height="wrap_content"
...@@ -353,15 +391,19 @@ ...@@ -353,15 +391,19 @@
353 android:layout_width="10dp" 391 android:layout_width="10dp"
354 android:layout_height="wrap_content" 392 android:layout_height="wrap_content"
355 android:layout_weight="1" 393 android:layout_weight="1"
356 - android:text="이전 단계로" /> 394 + android:background="#F4F4F4"
395 + android:text="이전 단계로"
396 + android:textColor="#757575" />
357 397
358 <Button 398 <Button
359 android:id="@+id/nextButton" 399 android:id="@+id/nextButton"
360 android:layout_width="10dp" 400 android:layout_width="10dp"
361 android:layout_height="wrap_content" 401 android:layout_height="wrap_content"
362 android:layout_weight="1" 402 android:layout_weight="1"
363 - android:text="다음 단계로" /> 403 + android:background="#29ABE2"
364 - </LinearLayout> 404 + android:text="다음 단계로"
405 + android:textColor="#FFFFFF" />
365 </LinearLayout> 406 </LinearLayout>
407 +
366 </LinearLayout> 408 </LinearLayout>
367 </androidx.constraintlayout.widget.ConstraintLayout> 409 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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_filling"
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="@drawable/profile_stage_filling"
88 android:gravity="center" 93 android:gravity="center"
89 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
90 96
91 <TextView 97 <TextView
92 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -94,10 +100,10 @@ ...@@ -94,10 +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 - 103 + android:background="@drawable/profile_stage_filling"
98 - android:background="#1E90FF"
99 android:gravity="center" 104 android:gravity="center"
100 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#FFFFFF" />
101 107
102 <TextView 108 <TextView
103 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -105,9 +111,10 @@ ...@@ -105,9 +111,10 @@
105 android:layout_height="match_parent" 111 android:layout_height="match_parent"
106 android:layout_gravity="center" 112 android:layout_gravity="center"
107 android:layout_weight="1" 113 android:layout_weight="1"
108 - android:background="#1E90FF" 114 + android:background="@drawable/profile_stage"
109 android:gravity="center" 115 android:gravity="center"
110 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#FFFFFF" />
111 118
112 <TextView 119 <TextView
113 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -115,26 +122,26 @@ ...@@ -115,26 +122,26 @@
115 android:layout_height="match_parent" 122 android:layout_height="match_parent"
116 android:layout_gravity="center" 123 android:layout_gravity="center"
117 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
118 android:gravity="center" 126 android:gravity="center"
119 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
120 129
121 </LinearLayout> 130 </LinearLayout>
122 131
123 <LinearLayout 132 <LinearLayout
124 android:layout_width="match_parent" 133 android:layout_width="match_parent"
125 - android:layout_height="wrap_content" 134 + android:layout_height="10dp"
126 - android:layout_weight="1" 135 + android:orientation="horizontal"></LinearLayout>
127 - android:orientation="vertical">
128 136
129 <ScrollView 137 <ScrollView
130 android:layout_width="match_parent" 138 android:layout_width="match_parent"
131 - android:layout_height="match_parent" 139 + android:layout_height="wrap_content"
132 android:layout_weight="1"> 140 android:layout_weight="1">
133 141
134 <LinearLayout 142 <LinearLayout
135 android:layout_width="match_parent" 143 android:layout_width="match_parent"
136 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
137 - android:layout_gravity="center"
138 android:orientation="vertical"> 145 android:orientation="vertical">
139 146
140 <LinearLayout 147 <LinearLayout
...@@ -142,30 +149,31 @@ ...@@ -142,30 +149,31 @@
142 android:layout_height="wrap_content" 149 android:layout_height="wrap_content"
143 android:orientation="vertical"> 150 android:orientation="vertical">
144 151
145 - <RelativeLayout 152 + <LinearLayout
146 android:layout_width="match_parent" 153 android:layout_width="match_parent"
147 - android:layout_height="match_parent"> 154 + android:layout_height="match_parent"
155 + android:gravity="center"
156 + android:orientation="horizontal">
148 157
149 <TextView 158 <TextView
150 - android:id="@+id/explainTextView" 159 + android:id="@+id/explainTextView0"
151 android:layout_width="wrap_content" 160 android:layout_width="wrap_content"
152 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
153 - android:layout_centerInParent="true"
154 android:layout_gravity="center" 162 android:layout_gravity="center"
155 android:gravity="center" 163 android:gravity="center"
156 - android:text="11. 보호자의 주택보유 상태를 선택해주세요." /> 164 + android:text="13. 자신이 속한 가구의\n주택보유상태를 선택해주세요."
165 + android:textColor="#4A4A4A"
166 + android:textSize="20dp" />
157 167
158 <Button 168 <Button
159 android:id="@+id/questionButton" 169 android:id="@+id/questionButton"
160 - android:layout_width="30dp" 170 + android:layout_width="20dp"
161 - android:layout_height="30dp" 171 + android:layout_height="20dp"
162 - android:layout_gravity="center" 172 + android:layout_gravity="bottom"
163 - android:layout_toRightOf="@id/explainTextView" 173 + android:background="@drawable/question_mark_image" />
164 - android:backgroundTint="#1E90FF" 174 +
165 - android:gravity="center" 175 + </LinearLayout>
166 - android:text=" ? " 176 +
167 - android:textSize="8sp" />
168 - </RelativeLayout>
169 </LinearLayout> 177 </LinearLayout>
170 178
171 <LinearLayout 179 <LinearLayout
...@@ -189,11 +197,14 @@ ...@@ -189,11 +197,14 @@
189 android:id="@+id/yesButton" 197 android:id="@+id/yesButton"
190 android:layout_width="300dp" 198 android:layout_width="300dp"
191 android:layout_height="wrap_content" 199 android:layout_height="wrap_content"
200 + android:layout_margin="5dp"
192 android:layout_weight="1" 201 android:layout_weight="1"
193 - android:background="@drawable/profil_selector" 202 + android:background="@drawable/button_selector"
194 android:text="보유" 203 android:text="보유"
204 + android:textColor="#757575"
195 android:textOff="보유" 205 android:textOff="보유"
196 - android:textOn="보유" /> 206 + android:textOn="보유"
207 + android:textSize="16dp" />
197 208
198 </LinearLayout> 209 </LinearLayout>
199 210
...@@ -208,52 +219,51 @@ ...@@ -208,52 +219,51 @@
208 android:layout_width="300dp" 219 android:layout_width="300dp"
209 android:layout_height="wrap_content" 220 android:layout_height="wrap_content"
210 android:layout_weight="1" 221 android:layout_weight="1"
211 - android:background="@drawable/profil_selector" 222 + android:background="@drawable/button_selector"
212 android:text="미보유" 223 android:text="미보유"
224 + android:textColor="#757575"
213 android:textOff="미보유" 225 android:textOff="미보유"
214 - android:textOn="미보유" /> 226 + android:textOn="미보유"
227 + android:textSize="16dp"
228 + android:layout_margin="5dp" />
215 </LinearLayout> 229 </LinearLayout>
216 230
217 </LinearLayout> 231 </LinearLayout>
218 </LinearLayout> 232 </LinearLayout>
219 233
220 <LinearLayout 234 <LinearLayout
221 - android:id="@+id/subLayout" 235 + android:id="@+id/subLinearLayout"
222 android:layout_width="match_parent" 236 android:layout_width="match_parent"
223 android:layout_height="wrap_content" 237 android:layout_height="wrap_content"
224 android:layout_weight="1" 238 android:layout_weight="1"
225 android:orientation="vertical" 239 android:orientation="vertical"
226 - android:visibility="gone"> 240 + android:visibility="visible">
227 241
228 <LinearLayout 242 <LinearLayout
229 android:layout_width="match_parent" 243 android:layout_width="match_parent"
230 android:layout_height="wrap_content" 244 android:layout_height="wrap_content"
231 android:orientation="vertical"> 245 android:orientation="vertical">
232 246
233 - <RelativeLayout 247 + <LinearLayout
234 android:layout_width="match_parent" 248 android:layout_width="match_parent"
235 - android:layout_height="match_parent"> 249 + android:layout_height="match_parent"
250 + android:gravity="center"
251 + android:orientation="horizontal">
236 252
237 <TextView 253 <TextView
238 - android:id="@+id/explainSub1TextView" 254 + android:id="@+id/explainTextView1"
239 android:layout_width="wrap_content" 255 android:layout_width="wrap_content"
240 android:layout_height="wrap_content" 256 android:layout_height="wrap_content"
241 - android:layout_centerInParent="true" 257 + android:layout_centerHorizontal="true"
258 + android:layout_centerVertical="true"
242 android:layout_gravity="center" 259 android:layout_gravity="center"
243 android:gravity="center" 260 android:gravity="center"
244 - android:text="11-1. 주거유형(보호자)를 선택해주세요." /> 261 + android:text="13-1. 자신이 속한 가구의\n 주거유형을 모두 선택해주세요."
262 + android:textColor="#4A4A4A"
263 + android:textSize="20dp" />
264 +
265 + </LinearLayout>
245 266
246 - <Button
247 - android:id="@+id/questionSub1Button"
248 - android:layout_width="30dp"
249 - android:layout_height="30dp"
250 - android:layout_gravity="center"
251 - android:layout_toRightOf="@id/explainSub1TextView"
252 - android:backgroundTint="#1E90FF"
253 - android:gravity="center"
254 - android:text=" ? "
255 - android:textSize="8sp" />
256 - </RelativeLayout>
257 </LinearLayout> 267 </LinearLayout>
258 268
259 <LinearLayout 269 <LinearLayout
...@@ -275,23 +285,29 @@ ...@@ -275,23 +285,29 @@
275 285
276 <ToggleButton 286 <ToggleButton
277 android:id="@+id/jeonsaeButton" 287 android:id="@+id/jeonsaeButton"
278 - android:layout_width="300dp" 288 + android:layout_width="100dp"
279 - android:layout_height="wrap_content" 289 + android:layout_height="100dp"
290 + android:layout_margin="10dp"
280 android:layout_weight="1" 291 android:layout_weight="1"
281 - android:background="@drawable/profil_selector" 292 + android:background="@drawable/circle_selector"
282 android:text="전세" 293 android:text="전세"
294 + android:textColor="#757575"
283 android:textOff="전세" 295 android:textOff="전세"
284 - android:textOn="전세" /> 296 + android:textOn="전세"
297 + android:textSize="16dp" />
285 298
286 <ToggleButton 299 <ToggleButton
287 android:id="@+id/wolseButton" 300 android:id="@+id/wolseButton"
288 - android:layout_width="300dp" 301 + android:layout_width="100dp"
289 - android:layout_height="wrap_content" 302 + android:layout_height="100dp"
303 + android:layout_margin="10dp"
290 android:layout_weight="1" 304 android:layout_weight="1"
291 - android:background="@drawable/profil_selector" 305 + android:background="@drawable/circle_selector"
292 android:text="월세" 306 android:text="월세"
293 android:textOff="월세" 307 android:textOff="월세"
294 - android:textOn="월세" /> 308 + android:textOn="월세"
309 + android:textSize="16dp"
310 + android:textColor="#757575" />
295 311
296 </LinearLayout> 312 </LinearLayout>
297 313
...@@ -302,23 +318,29 @@ ...@@ -302,23 +318,29 @@
302 318
303 <ToggleButton 319 <ToggleButton
304 android:id="@+id/kongkongButton" 320 android:id="@+id/kongkongButton"
305 - android:layout_width="300dp" 321 + android:layout_width="100dp"
306 - android:layout_height="wrap_content" 322 + android:layout_height="100dp"
323 + android:layout_margin="10dp"
307 android:layout_weight="1" 324 android:layout_weight="1"
308 - android:background="@drawable/profil_selector" 325 + android:background="@drawable/circle_selector"
309 android:text="공공(임대)주택" 326 android:text="공공(임대)주택"
327 + android:textColor="#757575"
310 android:textOff="공공(임대)주택" 328 android:textOff="공공(임대)주택"
311 - android:textOn="공공(임대)주택" /> 329 + android:textOn="공공(임대)주택"
330 + android:textSize="16dp" />
312 331
313 <ToggleButton 332 <ToggleButton
314 android:id="@+id/moosangButton" 333 android:id="@+id/moosangButton"
315 - android:layout_width="300dp" 334 + android:layout_width="100dp"
316 - android:layout_height="wrap_content" 335 + android:layout_height="100dp"
336 + android:layout_margin="10dp"
317 android:layout_weight="1" 337 android:layout_weight="1"
318 - android:background="@drawable/profil_selector" 338 + android:background="@drawable/circle_selector"
319 android:text="무상임대" 339 android:text="무상임대"
340 + android:textColor="#757575"
320 android:textOff="무상임대" 341 android:textOff="무상임대"
321 - android:textOn="무상임대" /> 342 + android:textOn="무상임대"
343 + android:textSize="16dp" />
322 </LinearLayout> 344 </LinearLayout>
323 345
324 <LinearLayout 346 <LinearLayout
...@@ -328,23 +350,29 @@ ...@@ -328,23 +350,29 @@
328 350
329 <ToggleButton 351 <ToggleButton
330 android:id="@+id/bojangButton" 352 android:id="@+id/bojangButton"
331 - android:layout_width="300dp" 353 + android:layout_width="100dp"
332 - android:layout_height="wrap_content" 354 + android:layout_height="100dp"
355 + android:layout_margin="10dp"
333 android:layout_weight="1" 356 android:layout_weight="1"
334 - android:background="@drawable/profil_selector" 357 + android:background="@drawable/circle_selector"
335 android:text="보장기관제공주거" 358 android:text="보장기관제공주거"
359 + android:textColor="#757575"
336 android:textOff="보장기관제공주거" 360 android:textOff="보장기관제공주거"
337 - android:textOn="보장기관제공주거" /> 361 + android:textOn="보장기관제공주거"
362 + android:textSize="16dp" />
338 363
339 <ToggleButton 364 <ToggleButton
340 android:id="@+id/guitarButton" 365 android:id="@+id/guitarButton"
341 - android:layout_width="300dp" 366 + android:layout_width="100dp"
342 - android:layout_height="wrap_content" 367 + android:layout_height="100dp"
368 + android:layout_margin="10dp"
343 android:layout_weight="1" 369 android:layout_weight="1"
344 - android:background="@drawable/profil_selector" 370 + android:background="@drawable/circle_selector"
345 android:text="기타" 371 android:text="기타"
372 + android:textColor="#757575"
346 android:textOff="기타" 373 android:textOff="기타"
347 - android:textOn="기타" /> 374 + android:textOn="기타"
375 + android:textSize="16dp" />
348 </LinearLayout> 376 </LinearLayout>
349 377
350 378
...@@ -358,6 +386,11 @@ ...@@ -358,6 +386,11 @@
358 386
359 <LinearLayout 387 <LinearLayout
360 android:layout_width="match_parent" 388 android:layout_width="match_parent"
389 + android:layout_height="15dp"
390 + android:orientation="horizontal"></LinearLayout>
391 +
392 + <LinearLayout
393 + android:layout_width="match_parent"
361 android:layout_height="wrap_content" 394 android:layout_height="wrap_content"
362 android:orientation="horizontal"> 395 android:orientation="horizontal">
363 396
...@@ -366,16 +399,19 @@ ...@@ -366,16 +399,19 @@
366 android:layout_width="10dp" 399 android:layout_width="10dp"
367 android:layout_height="wrap_content" 400 android:layout_height="wrap_content"
368 android:layout_weight="1" 401 android:layout_weight="1"
369 - android:text="이전 단계로" /> 402 + android:background="#F4F4F4"
403 + android:text="이전 단계로"
404 + android:textColor="#757575" />
370 405
371 <Button 406 <Button
372 android:id="@+id/nextButton" 407 android:id="@+id/nextButton"
373 android:layout_width="10dp" 408 android:layout_width="10dp"
374 android:layout_height="wrap_content" 409 android:layout_height="wrap_content"
375 android:layout_weight="1" 410 android:layout_weight="1"
376 - android:text="다음 단계로" /> 411 + android:background="#29ABE2"
412 + android:text="다음 단계로"
413 + android:textColor="#FFFFFF" />
377 </LinearLayout> 414 </LinearLayout>
378 415
379 </LinearLayout> 416 </LinearLayout>
380 - </LinearLayout>
381 </androidx.constraintlayout.widget.ConstraintLayout> 417 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -163,12 +163,12 @@ ...@@ -163,12 +163,12 @@
163 android:layout_height="wrap_content" 163 android:layout_height="wrap_content"
164 android:layout_gravity="center" 164 android:layout_gravity="center"
165 android:gravity="center" 165 android:gravity="center"
166 - android:text="10. 자신의 장애 유무를 선택해주세요." 166 + android:text="11. 자신의 건강상태를 선택해주세요."
167 android:textColor="#4A4A4A" 167 android:textColor="#4A4A4A"
168 android:textSize="20dp" /> 168 android:textSize="20dp" />
169 169
170 <Button 170 <Button
171 - android:id="@+id/questionButton2" 171 + android:id="@+id/questionButton"
172 android:layout_width="20dp" 172 android:layout_width="20dp"
173 android:layout_height="20dp" 173 android:layout_height="20dp"
174 android:layout_gravity="bottom" 174 android:layout_gravity="bottom"
......