장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
462c652d 1 parent 0edfb5cf

123 design

Expand all
Inline Side-by-side
Showing 16 changed files with 208 additions and 155 deletions
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 android:roundIcon="@mipmap/ic_launcher_round" 9 android:roundIcon="@mipmap/ic_launcher_round"
10 android:supportsRtl="true" 10 android:supportsRtl="true"
11 android:theme="@style/NoActionBar"> 11 android:theme="@style/NoActionBar">
12 - <activity android:name=".SignUpCompleteActivity"></activity> 12 + <activity android:name=".InputProfilThirdFiveActivity"></activity>
13 + <activity android:name=".SignUpCompleteActivity" />
13 <activity android:name=".ChildAdapter" /> 14 <activity android:name=".ChildAdapter" />
14 <activity android:name=".InputProfilFifthFourActivity" /> 15 <activity android:name=".InputProfilFifthFourActivity" />
15 <activity android:name=".InputProfilFifthThreeActivity" /> 16 <activity android:name=".InputProfilFifthThreeActivity" />
......
...@@ -175,25 +175,16 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -175,25 +175,16 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
175 if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit();editor.putString("third_four","done");editor.commit()} 175 if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit();editor.putString("third_four","done");editor.commit()}
176 if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit();editor.putString("third_four","done");editor.commit()} 176 if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit();editor.putString("third_four","done");editor.commit()}
177 177
178 - if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("third_four","done");editor.commit()}//DB,pref 뻑 주의 178 + var intent = Intent(this, InputProfilThirdFiveActivity::class.java)
179 - if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit();editor.putString("third_four","done");editor.commit()}
180 - if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
181 - if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit();editor.putString("third_four","done");editor.commit()}
182 - if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit();editor.putString("third_four","done");editor.commit()}
183 - if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
184 -
185 - var intent = Intent(this, InputProfilFourthOneActivity::class.java)
186 startActivity(intent) 179 startActivity(intent)
187 } 180 }
188 181
189 yesButton.setOnClickListener { 182 yesButton.setOnClickListener {
190 eightoneLayout.visibility=VISIBLE 183 eightoneLayout.visibility=VISIBLE
191 - eighttwoLayout.visibility= GONE
192 184
193 } 185 }
194 noButton.setOnClickListener { 186 noButton.setOnClickListener {
195 eightoneLayout.visibility= GONE 187 eightoneLayout.visibility= GONE
196 - eighttwoLayout.visibility= VISIBLE
197 } 188 }
198 189
199 190
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="oval">
4 + <stroke
5 + android:width="5dp"
6 + android:color="#29ABE2" />
7 +
8 + <solid
9 + android:color="#29ABE2"/>
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 +
4 + <item android:state_checked="false" android:drawable="@drawable/circle_x" />
5 + <item android:state_checked="true" android:drawable="@drawable/circle_o" />
6 +</selector>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="oval">
4 + <stroke
5 + android:width="5dp"
6 + android:color="#F4F4F4" />
7 +
8 + <solid
9 + android:color="#F4F4F4"/>
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<selector xmlns:android="http://schemas.android.com/apk/res/android"> 2 +<selector xmlns:android="http://schemas.android.com/apk/res/android"></selector>
3 - <shape android:shape="rectangle">
4 - <solid android:color="#29ABE2"/>
5 -
6 - <stroke android:width="0dp"
7 - android:color="#29ABE2"
8 - />
9 - <padding android:left="0dp"
10 - android:top="0dp"
11 - android:right="0dp"
12 - android:bottom="0dp"
13 - />
14 -
15 - <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
16 - android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
17 -
18 - </shape>
19 -</selector>
20 3
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list
3 + xmlns:android="http://schemas.android.com/apk/res/android">
4 + <item>
5 + <shape android:shape="rectangle">
6 + <solid android:color="#29ABE2"/>
7 +
8 + <stroke android:width="0dp"
9 + android:color="#29ABE2"
10 + />
11 + <padding android:left="0dp"
12 + android:top="0dp"
13 + android:right="0dp"
14 + android:bottom="0dp"
15 + />
16 +
17 +
18 + </shape>
19 + </item>
20 +</layer-list>
...@@ -11,13 +11,12 @@ ...@@ -11,13 +11,12 @@
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 -
15 <androidx.appcompat.widget.Toolbar 14 <androidx.appcompat.widget.Toolbar
16 android:id="@+id/toolbar" 15 android:id="@+id/toolbar"
17 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
18 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
19 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
20 - android:background="#FFF" 19 + android:background="#0000001A"
21 android:elevation="5dp" 20 android:elevation="5dp"
22 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
23 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -32,31 +31,35 @@ ...@@ -32,31 +31,35 @@
32 android:layout_width="10dp" 31 android:layout_width="10dp"
33 android:layout_height="match_parent" 32 android:layout_height="match_parent"
34 android:layout_weight="1.5" 33 android:layout_weight="1.5"
35 - android:background="#FFFFFF" 34 + android:background="#00000000"
36 android:text="나가기" 35 android:text="나가기"
37 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
38 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
39 <LinearLayout 39 <LinearLayout
40 android:layout_width="10dp" 40 android:layout_width="10dp"
41 android:layout_height="match_parent" 41 android:layout_height="match_parent"
42 - android:orientation="horizontal" 42 + android:layout_weight="1"
43 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
44 <ImageView 45 <ImageView
45 android:layout_width="77dp" 46 android:layout_width="77dp"
46 android:layout_height="44dp" 47 android:layout_height="44dp"
47 android:layout_gravity="center" 48 android:layout_gravity="center"
48 android:layout_weight="1" 49 android:layout_weight="1"
49 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
50 <LinearLayout 52 <LinearLayout
51 android:layout_width="10dp" 53 android:layout_width="10dp"
52 android:layout_height="match_parent" 54 android:layout_height="match_parent"
53 - android:orientation="horizontal" 55 + android:layout_weight="1"
54 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
55 <LinearLayout 58 <LinearLayout
56 android:layout_width="10dp" 59 android:layout_width="10dp"
57 android:layout_height="match_parent" 60 android:layout_height="match_parent"
58 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
59 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
60 63
61 </LinearLayout> 64 </LinearLayout>
62 65
...@@ -75,9 +78,10 @@ ...@@ -75,9 +78,10 @@
75 android:layout_height="match_parent" 78 android:layout_height="match_parent"
76 android:layout_gravity="center" 79 android:layout_gravity="center"
77 android:layout_weight="1" 80 android:layout_weight="1"
78 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage_filling"
79 android:gravity="center" 82 android:gravity="center"
80 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
81 85
82 <TextView 86 <TextView
83 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -85,9 +89,10 @@ ...@@ -85,9 +89,10 @@
85 android:layout_height="match_parent" 89 android:layout_height="match_parent"
86 android:layout_gravity="center" 90 android:layout_gravity="center"
87 android:layout_weight="1" 91 android:layout_weight="1"
88 - android:background="#1E90FF" 92 + android:background="@drawable/profile_stage"
89 android:gravity="center" 93 android:gravity="center"
90 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
91 96
92 <TextView 97 <TextView
93 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -95,8 +100,10 @@ ...@@ -95,8 +100,10 @@
95 android:layout_height="match_parent" 100 android:layout_height="match_parent"
96 android:layout_gravity="center" 101 android:layout_gravity="center"
97 android:layout_weight="1" 102 android:layout_weight="1"
103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,8 +111,10 @@ ...@@ -104,8 +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"
114 + android:background="#F4F4F4"
107 android:gravity="center" 115 android:gravity="center"
108 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
109 118
110 <TextView 119 <TextView
111 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -113,71 +122,74 @@ ...@@ -113,71 +122,74 @@
113 android:layout_height="match_parent" 122 android:layout_height="match_parent"
114 android:layout_gravity="center" 123 android:layout_gravity="center"
115 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
116 android:gravity="center" 126 android:gravity="center"
117 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
118 129
119 </LinearLayout> 130 </LinearLayout>
120 131
121 - <LinearLayout 132 + <ScrollView
122 android:layout_width="match_parent" 133 android:layout_width="match_parent"
123 - android:layout_height="wrap_content" 134 + android:layout_height="match_parent"
124 - android:layout_weight="1" 135 + android:layout_marginTop="30dp"
125 - android:orientation="vertical"> 136 + android:layout_marginBottom="30dp"
137 + android:layout_weight="1">
126 138
127 - <ScrollView 139 + <LinearLayout
128 android:layout_width="match_parent" 140 android:layout_width="match_parent"
129 - android:layout_height="match_parent" 141 + android:layout_height="wrap_content"
130 - android:layout_weight="1"> 142 + android:orientation="vertical"
143 + android:weightSum="1">
131 144
132 - <LinearLayout 145 + <TextView
146 + android:id="@+id/mainTextView"
133 android:layout_width="match_parent" 147 android:layout_width="match_parent"
134 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
135 - android:orientation="vertical" 149 + android:gravity="center"
136 - android:weightSum="1"> 150 + android:text="6-2. 총 형제/자매 수를 입력해주세요."
151 + android:textSize="20dp" />
137 152
138 - <TextView 153 + <LinearLayout
139 - android:id="@+id/mainTextView" 154 + android:layout_width="match_parent"
140 - android:layout_width="match_parent" 155 + android:layout_height="wrap_content"
141 - android:layout_height="wrap_content" 156 + android:layout_margin="20dp"
142 - android:text="4-2. 총 형제자매 수를 입력해주세요." /> 157 + android:orientation="horizontal">
143 158
144 - <LinearLayout 159 + <EditText
145 - android:layout_width="match_parent" 160 + android:id="@+id/bsNumberEditText"
161 + android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 162 android:layout_height="wrap_content"
147 - android:orientation="horizontal"> 163 + android:layout_weight="1"
148 - 164 + android:ems="10"
149 - <EditText 165 + android:hint="ex) 3"
150 - android:id="@+id/bsNumberEditText" 166 + android:inputType="number|textPersonName"
151 - android:layout_width="wrap_content" 167 + android:theme="@style/EditTheme" />
152 - android:layout_height="wrap_content" 168 +
153 - android:layout_weight="1" 169 + <Button
154 - android:ems="10" 170 + android:id="@+id/bsNumberInputButton"
155 - android:hint="ex) 3" 171 + android:layout_width="wrap_content"
156 - android:inputType="number|textPersonName" />
157 -
158 - <Button
159 - android:id="@+id/bsNumberInputButton"
160 - android:layout_width="wrap_content"
161 - android:layout_height="wrap_content"
162 - android:layout_weight="1"
163 - android:text="입 력" />
164 - </LinearLayout>
165 -
166 - <androidx.recyclerview.widget.RecyclerView
167 - android:id="@+id/bsRecyclerView"
168 - android:layout_width="match_parent"
169 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
170 - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" 173 + android:layout_marginLeft="10dp"
171 - tools:listitem="@layout/item_child" /> 174 + android:layout_weight="1"
172 - 175 + android:background="@drawable/button_o"
176 + android:text="입 력"
177 + android:textColor="#FFFFFF" />
173 </LinearLayout> 178 </LinearLayout>
174 - </ScrollView> 179 +
175 - </LinearLayout> 180 + <androidx.recyclerview.widget.RecyclerView
181 + android:id="@+id/bsRecyclerView"
182 + android:layout_width="match_parent"
183 + android:layout_height="wrap_content"
184 + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
185 + tools:listitem="@layout/item_bs" />
186 +
187 + </LinearLayout>
188 + </ScrollView>
176 189
177 <LinearLayout 190 <LinearLayout
178 android:layout_width="match_parent" 191 android:layout_width="match_parent"
179 android:layout_height="wrap_content" 192 android:layout_height="wrap_content"
180 - android:layout_gravity="bottom"
181 android:orientation="horizontal"> 193 android:orientation="horizontal">
182 194
183 <Button 195 <Button
...@@ -185,14 +197,18 @@ ...@@ -185,14 +197,18 @@
185 android:layout_width="10dp" 197 android:layout_width="10dp"
186 android:layout_height="wrap_content" 198 android:layout_height="wrap_content"
187 android:layout_weight="1" 199 android:layout_weight="1"
188 - android:text="이전 단계로" /> 200 + android:background="#F4F4F4"
201 + android:text="이전 단계로"
202 + android:textColor="#757575" />
189 203
190 <Button 204 <Button
191 android:id="@+id/nextButton" 205 android:id="@+id/nextButton"
192 android:layout_width="10dp" 206 android:layout_width="10dp"
193 android:layout_height="wrap_content" 207 android:layout_height="wrap_content"
194 android:layout_weight="1" 208 android:layout_weight="1"
195 - android:text="다음 단계로" /> 209 + android:background="#29ABE2"
210 + android:text="다음 단계로"
211 + android:textColor="#FFFFFF" />
196 </LinearLayout> 212 </LinearLayout>
197 213
198 </LinearLayout> 214 </LinearLayout>
......
...@@ -11,13 +11,12 @@ ...@@ -11,13 +11,12 @@
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 -
15 <androidx.appcompat.widget.Toolbar 14 <androidx.appcompat.widget.Toolbar
16 android:id="@+id/toolbar" 15 android:id="@+id/toolbar"
17 android:layout_width="fill_parent" 16 android:layout_width="fill_parent"
18 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
19 android:layout_marginBottom="11dp" 18 android:layout_marginBottom="11dp"
20 - android:background="#FFF" 19 + android:background="#0000001A"
21 android:elevation="5dp" 20 android:elevation="5dp"
22 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 21 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
23 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 22 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
...@@ -32,31 +31,35 @@ ...@@ -32,31 +31,35 @@
32 android:layout_width="10dp" 31 android:layout_width="10dp"
33 android:layout_height="match_parent" 32 android:layout_height="match_parent"
34 android:layout_weight="1.5" 33 android:layout_weight="1.5"
35 - android:background="#FFFFFF" 34 + android:background="#00000000"
36 android:text="나가기" 35 android:text="나가기"
37 android:textColor="#29ABE2" 36 android:textColor="#29ABE2"
38 android:textSize="16dp" /> 37 android:textSize="16dp" />
38 +
39 <LinearLayout 39 <LinearLayout
40 android:layout_width="10dp" 40 android:layout_width="10dp"
41 android:layout_height="match_parent" 41 android:layout_height="match_parent"
42 - android:orientation="horizontal" 42 + android:layout_weight="1"
43 - android:layout_weight="1"/> 43 + android:orientation="horizontal" />
44 +
44 <ImageView 45 <ImageView
45 android:layout_width="77dp" 46 android:layout_width="77dp"
46 android:layout_height="44dp" 47 android:layout_height="44dp"
47 android:layout_gravity="center" 48 android:layout_gravity="center"
48 android:layout_weight="1" 49 android:layout_weight="1"
49 android:src="@drawable/toolbar_logo" /> 50 android:src="@drawable/toolbar_logo" />
51 +
50 <LinearLayout 52 <LinearLayout
51 android:layout_width="10dp" 53 android:layout_width="10dp"
52 android:layout_height="match_parent" 54 android:layout_height="match_parent"
53 - android:orientation="horizontal" 55 + android:layout_weight="1"
54 - android:layout_weight="1"/> 56 + android:orientation="horizontal" />
57 +
55 <LinearLayout 58 <LinearLayout
56 android:layout_width="10dp" 59 android:layout_width="10dp"
57 android:layout_height="match_parent" 60 android:layout_height="match_parent"
58 - android:orientation="horizontal" 61 + android:layout_weight="1.5"
59 - android:layout_weight="1.5"/> 62 + android:orientation="horizontal" />
60 63
61 </LinearLayout> 64 </LinearLayout>
62 65
...@@ -75,9 +78,10 @@ ...@@ -75,9 +78,10 @@
75 android:layout_height="match_parent" 78 android:layout_height="match_parent"
76 android:layout_gravity="center" 79 android:layout_gravity="center"
77 android:layout_weight="1" 80 android:layout_weight="1"
78 - android:background="#1E90FF" 81 + android:background="@drawable/profile_stage_filling"
79 android:gravity="center" 82 android:gravity="center"
80 - android:text="1" /> 83 + android:text="1"
84 + android:textColor="#FFFFFF" />
81 85
82 <TextView 86 <TextView
83 android:id="@+id/stageTextView2" 87 android:id="@+id/stageTextView2"
...@@ -85,9 +89,10 @@ ...@@ -85,9 +89,10 @@
85 android:layout_height="match_parent" 89 android:layout_height="match_parent"
86 android:layout_gravity="center" 90 android:layout_gravity="center"
87 android:layout_weight="1" 91 android:layout_weight="1"
88 - android:background="#1E90FF" 92 + android:background="@drawable/profile_stage"
89 android:gravity="center" 93 android:gravity="center"
90 - android:text="2" /> 94 + android:text="2"
95 + android:textColor="#FFFFFF" />
91 96
92 <TextView 97 <TextView
93 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -95,8 +100,10 @@ ...@@ -95,8 +100,10 @@
95 android:layout_height="match_parent" 100 android:layout_height="match_parent"
96 android:layout_gravity="center" 101 android:layout_gravity="center"
97 android:layout_weight="1" 102 android:layout_weight="1"
103 + android:background="#F4F4F4"
98 android:gravity="center" 104 android:gravity="center"
99 - android:text="3" /> 105 + android:text="3"
106 + android:textColor="#DDDDDD" />
100 107
101 <TextView 108 <TextView
102 android:id="@+id/stageTextView4" 109 android:id="@+id/stageTextView4"
...@@ -104,8 +111,10 @@ ...@@ -104,8 +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"
114 + android:background="#F4F4F4"
107 android:gravity="center" 115 android:gravity="center"
108 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
109 118
110 <TextView 119 <TextView
111 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -113,71 +122,74 @@ ...@@ -113,71 +122,74 @@
113 android:layout_height="match_parent" 122 android:layout_height="match_parent"
114 android:layout_gravity="center" 123 android:layout_gravity="center"
115 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
116 android:gravity="center" 126 android:gravity="center"
117 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
118 129
119 </LinearLayout> 130 </LinearLayout>
120 131
121 - <LinearLayout 132 + <ScrollView
122 android:layout_width="match_parent" 133 android:layout_width="match_parent"
123 - android:layout_height="wrap_content" 134 + android:layout_height="match_parent"
124 - android:layout_weight="1" 135 + android:layout_marginTop="30dp"
125 - android:orientation="vertical"> 136 + android:layout_marginBottom="30dp"
137 + android:layout_weight="1">
126 138
127 - <ScrollView 139 + <LinearLayout
128 android:layout_width="match_parent" 140 android:layout_width="match_parent"
129 - android:layout_height="match_parent" 141 + android:layout_height="wrap_content"
130 - android:layout_weight="1"> 142 + android:orientation="vertical"
143 + android:weightSum="1">
131 144
132 - <LinearLayout 145 + <TextView
146 + android:id="@+id/mainTextView"
133 android:layout_width="match_parent" 147 android:layout_width="match_parent"
134 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
135 - android:orientation="vertical" 149 + android:gravity="center"
136 - android:weightSum="1"> 150 + android:text="6-1. 총 자녀 수를 입력해주세요."
151 + android:textSize="20dp" />
137 152
138 - <TextView 153 + <LinearLayout
139 - android:id="@+id/mainTextView" 154 + android:layout_width="match_parent"
140 - android:layout_width="match_parent" 155 + android:layout_height="wrap_content"
141 - android:layout_height="wrap_content" 156 + android:layout_margin="20dp"
142 - android:text="4-1. 가족구성원 '자녀' 선택 시 총 자녀 수를 입력해주세요." /> 157 + android:orientation="horizontal">
143 158
144 - <LinearLayout 159 + <EditText
145 - android:layout_width="match_parent" 160 + android:id="@+id/childNumberEditText"
161 + android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 162 android:layout_height="wrap_content"
147 - android:orientation="horizontal"> 163 + android:layout_weight="1"
148 - 164 + android:ems="10"
149 - <EditText 165 + android:hint="ex) 3"
150 - android:id="@+id/childNumberEditText" 166 + android:inputType="number|textPersonName"
151 - android:layout_width="wrap_content" 167 + android:theme="@style/EditTheme" />
152 - android:layout_height="wrap_content" 168 +
153 - android:layout_weight="1" 169 + <Button
154 - android:ems="10" 170 + android:id="@+id/childNumberInputButton"
155 - android:hint="ex) 3" 171 + android:layout_width="wrap_content"
156 - android:inputType="number|textPersonName" />
157 -
158 - <Button
159 - android:id="@+id/childNumberInputButton"
160 - android:layout_width="wrap_content"
161 - android:layout_height="wrap_content"
162 - android:layout_weight="1"
163 - android:text="입 력" />
164 - </LinearLayout>
165 -
166 - <androidx.recyclerview.widget.RecyclerView
167 - android:id="@+id/childRecyclerView"
168 - android:layout_width="match_parent"
169 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
170 - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" 173 + android:layout_marginLeft="10dp"
171 - tools:listitem="@layout/item_child" /> 174 + android:layout_weight="1"
172 - 175 + android:background="@drawable/button_o"
176 + android:text="입 력"
177 + android:textColor="#FFFFFF" />
173 </LinearLayout> 178 </LinearLayout>
174 - </ScrollView> 179 +
175 - </LinearLayout> 180 + <androidx.recyclerview.widget.RecyclerView
181 + android:id="@+id/childRecyclerView"
182 + android:layout_width="match_parent"
183 + android:layout_height="wrap_content"
184 + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
185 + tools:listitem="@layout/item_child" />
186 +
187 + </LinearLayout>
188 + </ScrollView>
176 189
177 <LinearLayout 190 <LinearLayout
178 android:layout_width="match_parent" 191 android:layout_width="match_parent"
179 android:layout_height="wrap_content" 192 android:layout_height="wrap_content"
180 - android:layout_gravity="bottom"
181 android:orientation="horizontal"> 193 android:orientation="horizontal">
182 194
183 <Button 195 <Button
...@@ -185,14 +197,18 @@ ...@@ -185,14 +197,18 @@
185 android:layout_width="10dp" 197 android:layout_width="10dp"
186 android:layout_height="wrap_content" 198 android:layout_height="wrap_content"
187 android:layout_weight="1" 199 android:layout_weight="1"
188 - android:text="이전 단계로" /> 200 + android:background="#F4F4F4"
201 + android:text="이전 단계로"
202 + android:textColor="#757575" />
189 203
190 <Button 204 <Button
191 android:id="@+id/nextButton" 205 android:id="@+id/nextButton"
192 android:layout_width="10dp" 206 android:layout_width="10dp"
193 android:layout_height="wrap_content" 207 android:layout_height="wrap_content"
194 android:layout_weight="1" 208 android:layout_weight="1"
195 - android:text="다음 단계로" /> 209 + android:background="#29ABE2"
210 + android:text="다음 단계로"
211 + android:textColor="#FFFFFF" />
196 </LinearLayout> 212 </LinearLayout>
197 213
198 </LinearLayout> 214 </LinearLayout>
......
This diff is collapsed. Click to expand it.