장연우 / WELLO

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

12345 slicing design

Inline Side-by-side
Showing 11 changed files with 95 additions and 54 deletions
...@@ -6,6 +6,8 @@ import android.content.SharedPreferences ...@@ -6,6 +6,8 @@ import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 7 import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 +import android.view.View.GONE
10 +import android.view.View.VISIBLE
9 import android.widget.TextView 11 import android.widget.TextView
10 import android.widget.Toast 12 import android.widget.Toast
11 import androidx.appcompat.app.AlertDialog 13 import androidx.appcompat.app.AlertDialog
...@@ -146,6 +148,45 @@ class InputProfilFifthTwoActivity : AppCompatActivity() { ...@@ -146,6 +148,45 @@ class InputProfilFifthTwoActivity : AppCompatActivity() {
146 .show() 148 .show()
147 } 149 }
148 150
151 + jikjaangButton.setOnClickListener {
152 + subLinearLayout.visibility=VISIBLE
153 + jiyeokButton.isChecked=false
154 + pibooyaangjiyeokButton.isChecked=false
155 + pibooyaangjikjaangButton.isChecked=false
156 + uieryoButton.isChecked=false
157 + }
158 + jiyeokButton.setOnClickListener {
159 + subLinearLayout.visibility=VISIBLE
160 + jikjaangButton.isChecked=false
161 + pibooyaangjiyeokButton.isChecked=false
162 + pibooyaangjikjaangButton.isChecked=false
163 + uieryoButton.isChecked=false
164 + }
165 + pibooyaangjikjaangButton.setOnClickListener {
166 + subLinearLayout.visibility= GONE
167 + jikjaangButton.isChecked=false
168 + jiyeokButton.isChecked=false
169 + pibooyaangjiyeokButton.isChecked=false
170 + uieryoButton.isChecked=false
171 +
172 + }
173 + pibooyaangjiyeokButton.setOnClickListener {
174 + jikjaangButton.isChecked=false
175 + jiyeokButton.isChecked=false
176 + pibooyaangjiyeokButton.isChecked=false
177 + uieryoButton.isChecked=false
178 +
179 + subLinearLayout.visibility= GONE
180 + }
181 + uieryoButton.setOnClickListener {
182 + jikjaangButton.isChecked=false
183 + jiyeokButton.isChecked=false
184 + pibooyaangjiyeokButton.isChecked=false
185 + pibooyaangjikjaangButton.isChecked=false
186 + subLinearLayout.visibility= GONE
187 + }
188 +
189 +
149 previousButton.setOnClickListener { 190 previousButton.setOnClickListener {
150 var intent = Intent(this, InputProfilFifthOneActivity::class.java) 191 var intent = Intent(this, InputProfilFifthOneActivity::class.java)
151 startActivity(intent) 192 startActivity(intent)
......
...@@ -124,29 +124,6 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { ...@@ -124,29 +124,6 @@ class InputProfilFourthThreeActivity : 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 -
150 previousButton.setOnClickListener { 127 previousButton.setOnClickListener {
151 var intent = Intent(this, InputProfilFourthTwoActivity::class.java) 128 var intent = Intent(this, InputProfilFourthTwoActivity::class.java)
152 startActivity(intent) 129 startActivity(intent)
......
...@@ -169,11 +169,11 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { ...@@ -169,11 +169,11 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
169 } 169 }
170 170
171 yesButton.setOnClickListener { 171 yesButton.setOnClickListener {
172 - subLayout.visibility=GONE 172 + subLinearLayout.visibility=GONE
173 noButton.isChecked=false 173 noButton.isChecked=false
174 } 174 }
175 noButton.setOnClickListener { 175 noButton.setOnClickListener {
176 - subLayout.visibility=VISIBLE 176 + subLinearLayout.visibility=VISIBLE
177 yesButton.isChecked=false 177 yesButton.isChecked=false
178 } 178 }
179 179
......
...@@ -143,6 +143,12 @@ ...@@ -143,6 +143,12 @@
143 <LinearLayout 143 <LinearLayout
144 android:layout_width="match_parent" 144 android:layout_width="match_parent"
145 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
146 + android:layout_weight="1"
147 + android:orientation="horizontal"></LinearLayout>
148 +
149 + <LinearLayout
150 + android:layout_width="match_parent"
151 + android:layout_height="wrap_content"
146 android:gravity="center" 152 android:gravity="center"
147 android:orientation="horizontal"> 153 android:orientation="horizontal">
148 154
......
...@@ -143,6 +143,12 @@ ...@@ -143,6 +143,12 @@
143 <LinearLayout 143 <LinearLayout
144 android:layout_width="match_parent" 144 android:layout_width="match_parent"
145 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
146 + android:layout_weight="1"
147 + android:orientation="horizontal"></LinearLayout>
148 +
149 + <LinearLayout
150 + android:layout_width="match_parent"
151 + android:layout_height="wrap_content"
146 android:gravity="center" 152 android:gravity="center"
147 android:orientation="horizontal"> 153 android:orientation="horizontal">
148 154
......
...@@ -143,6 +143,12 @@ ...@@ -143,6 +143,12 @@
143 <LinearLayout 143 <LinearLayout
144 android:layout_width="match_parent" 144 android:layout_width="match_parent"
145 android:layout_height="wrap_content" 145 android:layout_height="wrap_content"
146 + android:layout_weight="1"
147 + android:orientation="horizontal"></LinearLayout>
148 +
149 + <LinearLayout
150 + android:layout_width="match_parent"
151 + android:layout_height="wrap_content"
146 android:gravity="center" 152 android:gravity="center"
147 android:orientation="horizontal"> 153 android:orientation="horizontal">
148 154
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
131 131
132 <LinearLayout 132 <LinearLayout
133 android:layout_width="match_parent" 133 android:layout_width="match_parent"
134 - android:layout_height="10dp" 134 + android:layout_height="30dp"
135 android:orientation="horizontal"></LinearLayout> 135 android:orientation="horizontal"></LinearLayout>
136 136
137 <LinearLayout 137 <LinearLayout
...@@ -158,14 +158,6 @@ ...@@ -158,14 +158,6 @@
158 158
159 </LinearLayout> 159 </LinearLayout>
160 160
161 - <LinearLayout
162 - android:layout_width="match_parent"
163 - android:layout_height="50dp"
164 - android:layout_weight="1"
165 - android:orientation="vertical">
166 -
167 - </LinearLayout>
168 -
169 <ScrollView 161 <ScrollView
170 android:layout_width="match_parent" 162 android:layout_width="match_parent"
171 android:layout_height="wrap_content"> 163 android:layout_height="wrap_content">
...@@ -290,8 +282,9 @@ ...@@ -290,8 +282,9 @@
290 <LinearLayout 282 <LinearLayout
291 android:id="@+id/subLinearLayout" 283 android:id="@+id/subLinearLayout"
292 android:layout_width="match_parent" 284 android:layout_width="match_parent"
293 - android:layout_height="match_parent" 285 + android:layout_height="wrap_content"
294 - android:orientation="vertical"> 286 + android:orientation="vertical"
287 + android:visibility="gone">
295 288
296 <LinearLayout 289 <LinearLayout
297 android:layout_width="match_parent" 290 android:layout_width="match_parent"
...@@ -342,17 +335,17 @@ ...@@ -342,17 +335,17 @@
342 335
343 </LinearLayout> 336 </LinearLayout>
344 337
338 + <LinearLayout
339 + android:layout_width="match_parent"
340 + android:layout_height="50dp"
341 + android:layout_weight="1"
342 + android:orientation="vertical"></LinearLayout>
343 +
345 </LinearLayout> 344 </LinearLayout>
346 345
347 </LinearLayout> 346 </LinearLayout>
348 </ScrollView> 347 </ScrollView>
349 348
350 - <LinearLayout
351 - android:layout_width="match_parent"
352 - android:layout_height="100dp"
353 - android:layout_weight="1"
354 - android:orientation="vertical"></LinearLayout>
355 -
356 </LinearLayout> 349 </LinearLayout>
357 350
358 <LinearLayout 351 <LinearLayout
......
...@@ -186,25 +186,33 @@ ...@@ -186,25 +186,33 @@
186 186
187 <TextView 187 <TextView
188 android:id="@+id/doTextView" 188 android:id="@+id/doTextView"
189 - android:layout_width="match_parent" 189 + android:layout_width="300dp"
190 android:layout_height="wrap_content" 190 android:layout_height="wrap_content"
191 + android:layout_gravity="center"
192 + android:layout_margin="10dp"
191 android:text="시/도" /> 193 android:text="시/도" />
192 194
193 <Spinner 195 <Spinner
194 android:id="@+id/doSpinner" 196 android:id="@+id/doSpinner"
195 - android:layout_width="fill_parent" 197 + android:layout_width="300dp"
196 - android:layout_height="wrap_content" /> 198 + android:layout_height="wrap_content"
199 + android:layout_gravity="center"
200 + android:layout_margin="10dp" />
197 201
198 <TextView 202 <TextView
199 android:id="@+id/cityTextView" 203 android:id="@+id/cityTextView"
200 - android:layout_width="match_parent" 204 + android:layout_width="300dp"
201 android:layout_height="wrap_content" 205 android:layout_height="wrap_content"
206 + android:layout_gravity="center"
207 + android:layout_margin="10dp"
202 android:text="시/군/구" /> 208 android:text="시/군/구" />
203 209
204 <Spinner 210 <Spinner
205 android:id="@+id/gooSpinner" 211 android:id="@+id/gooSpinner"
206 - android:layout_width="fill_parent" 212 + android:layout_width="300dp"
207 - android:layout_height="wrap_content" /> 213 + android:layout_height="wrap_content"
214 + android:layout_gravity="center"
215 + android:layout_margin="10dp" />
208 </LinearLayout> 216 </LinearLayout>
209 </ScrollView> 217 </ScrollView>
210 218
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
29 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:layout_gravity="center" 31 android:layout_gravity="center"
32 - tools:srcCompat="@tools:sample/avatars" /> 32 + tools:srcCompat="@tools:sample/avatars"
33 + android:background="@drawable/inputlogo"/>
33 </LinearLayout> 34 </LinearLayout>
34 35
35 <LinearLayout 36 <LinearLayout
...@@ -45,11 +46,14 @@ ...@@ -45,11 +46,14 @@
45 46
46 <Button 47 <Button
47 android:id="@+id/inputStartButton" 48 android:id="@+id/inputStartButton"
48 - android:layout_width="wrap_content" 49 + android:layout_width="300dp"
49 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
50 android:layout_gravity="center" 51 android:layout_gravity="center"
52 + android:background="@drawable/button_o"
51 android:gravity="center" 53 android:gravity="center"
52 - android:text="프로필 정보 입력하기" /> 54 + android:text="프로필 정보 입력하기"
55 + android:textColor="#FFFFFF"
56 + android:textSize="20dp" />
53 </LinearLayout> 57 </LinearLayout>
54 58
55 <LinearLayout 59 <LinearLayout
......
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
237 android:layout_height="wrap_content" 237 android:layout_height="wrap_content"
238 android:layout_weight="1" 238 android:layout_weight="1"
239 android:orientation="vertical" 239 android:orientation="vertical"
240 - android:visibility="visible"> 240 + android:visibility="gone">
241 241
242 <LinearLayout 242 <LinearLayout
243 android:layout_width="match_parent" 243 android:layout_width="match_parent"
...@@ -304,10 +304,10 @@ ...@@ -304,10 +304,10 @@
304 android:layout_weight="1" 304 android:layout_weight="1"
305 android:background="@drawable/circle_selector" 305 android:background="@drawable/circle_selector"
306 android:text="월세" 306 android:text="월세"
307 + android:textColor="#757575"
307 android:textOff="월세" 308 android:textOff="월세"
308 android:textOn="월세" 309 android:textOn="월세"
309 - android:textSize="16dp" 310 + android:textSize="16dp" />
310 - android:textColor="#757575" />
311 311
312 </LinearLayout> 312 </LinearLayout>
313 313
......