장연우 / WELLO

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

123 design

Inline Side-by-side
Showing 16 changed files with 1307 additions and 644 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" />
......
1 +package com.example.vip
2 +
3 +import android.content.Context
4 +import android.content.Intent
5 +import android.content.SharedPreferences
6 +import androidx.appcompat.app.AppCompatActivity
7 +import android.os.Bundle
8 +import android.util.Log
9 +import android.widget.TextView
10 +import android.widget.Toast
11 +import androidx.appcompat.app.AlertDialog
12 +import com.google.android.gms.tasks.OnCompleteListener
13 +import com.google.firebase.auth.FirebaseAuth
14 +import com.google.firebase.database.FirebaseDatabase
15 +import com.google.firebase.iid.FirebaseInstanceId
16 +import com.google.firebase.messaging.FirebaseMessaging
17 +import kotlinx.android.synthetic.main.activity_input_profil_third_five.*
18 +import kotlinx.android.synthetic.main.activity_input_profil_third_four.*
19 +import kotlinx.android.synthetic.main.activity_input_profil_third_four.nextButton
20 +import kotlinx.android.synthetic.main.activity_input_profil_third_four.previousButton
21 +import kotlinx.android.synthetic.main.activity_input_profil_third_four.skipButton
22 +import kotlinx.android.synthetic.main.activity_input_profil_third_four.toolbar
23 +
24 +class InputProfilThirdFiveActivity : AppCompatActivity() {
25 +
26 + private val firebaseAuth = FirebaseAuth.getInstance()
27 + val user_db = FirebaseDatabase.getInstance("https://wello-topic.firebaseio.com/").reference
28 + private fun sendToken(){
29 + FirebaseInstanceId.getInstance().instanceId
30 + .addOnCompleteListener(OnCompleteListener { task ->
31 + if (!task.isSuccessful) {
32 + //Log.w(TAG, "getInstanceId failed", task.exception)
33 + return@OnCompleteListener
34 + }
35 +
36 + // Get new Instance ID token
37 + tkn = task.result!!.token
38 +
39 + // Log and toast
40 + val msg = getString(R.string.msg_token_fmt, tkn)
41 + //Log.d(TAG, msg)
42 + Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
43 + })
44 + }
45 +
46 + private fun writeNewUser(Topic : String) {
47 + user_db.child(Topic).setValue(1)/// .setValue(user)
48 + }
49 +
50 + override fun onCreate(savedInstanceState: Bundle?) {
51 + super.onCreate(savedInstanceState)
52 + setContentView(R.layout.activity_input_profil_third_five)
53 +
54 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 + val editor: SharedPreferences.Editor=prof.edit()
56 +
57 + // 1. 툴바 사용 설정
58 + setSupportActionBar(toolbar)
59 +
60 + //pushing code start
61 + intent.extras?.let {
62 + for (key in it.keySet()) {
63 + val value = intent.extras?.get(key)
64 + //Log.d(TAG, "Key: $key Value: $value")
65 + }
66 + }
67 + //pushing code end
68 +
69 +
70 + skipButton.setOnClickListener {
71 + sendToken()
72 + val user=firebaseAuth?.currentUser!!.uid
73 + Log.d("test:", user.toString())
74 +
75 + val cat_1=listOf("c1_1","c1_2","c1_3")
76 + val cat_2=listOf("c2_1","c2_2","c2_3","c2_4","c2_5","c2_6","c2_7")
77 + val cat_3=listOf("c3_1","c3_2","c3_3")
78 + val cat_4=listOf("c4_1","c4_2","c4_3","c4_4","c4_5","c4_6","c4_7","c4_8","c4_9","c4_10","c4_11")
79 + val cat_5=listOf("c5_1","c5_2","c5_3","c5_4","c5_5","c5_6","c5_7","c5_8","c5_9")
80 + val cat_6=listOf("c6_1","c6_2","c6_3","c6_4","c6_5","c6_6","c6_7")
81 + val cat_7=listOf("c7_1","c7_2","c7_3")
82 + val cat_8=listOf("c8_1","c8_2","c8_3","c8_4","c8_5","c8_6","c8_7","c8_8","c8_9","c8_10","c8_11","c8_12","c8_13","c8_14","c8_15","c8_16","c8_17")
83 + val cat_9=listOf("c9_1","c9_2","c9_3","c9_4","c9_5","c9_6","c9_7","c9_8","c9_9","c9_10","c9_11","c9_12","c9_13","c9_14","c9_15","c9_16","c9_17","c9_18","c9_19")
84 + val cat_10=listOf("c10_1","c10_2","c10_3","c10_4","c10_5","c10_6","c10_7","c10_8","c10_9","c10_10","c10_11","c10_12","c10_13","c10_14","c10_15","c10_16","c10_17","c10_18")
85 + val cat_11=listOf("c11_1","c11_2","c11_3","c11_4","c11_5","c11_6","c11_7","c11_8","c11_9","c11_10","c11_11","c11_12","c11_13","c11_14","c11_15","c11_16","c11_17","c11_18")
86 + val cat_12=listOf("c12_1","c12_100","c12_101","c12_102","c12_103","c12_104","c12_105","c12_106","c12_107","c12_108","c12_109","c12_110","c12_111","c12_112","c12_113","c12_114","c12_115","c12_116","c12_117","c12_118","c12_119","c12_120","c12_121","c12_122","c12_123","c12_124","c12_125","c12_126","c12_127","c12_128","c12_129","c12_130","c12_131","c12_132","c12_133","c12_134","c12_135","c12_136","c12_137","c12_138","c12_139","c12_140","c12_141","c12_142","c12_143","c12_144","c12_145","c12_146","c12_147","c12_148","c12_149","c12_150","c12_151","c12_152","c12_153","c12_154","c12_155","c12_156","c12_157","c12_158","c12_159","c12_160","c12_161","c12_162","c12_163","c12_164","c12_165","c12_166","c12_167","c12_168","c12_169","c12_170","c12_171","c12_172","c12_173","c12_174","c12_175","c12_176","c12_177","c12_178","c12_179","c12_180","c12_181","c12_182","c12_183","c12_184","c12_185","c12_186","c12_187","c12_188","c12_189","c12_190","c12_191","c12_192","c12_193","c12_194","c12_195","c12_196","c12_197","c12_198","c12_199","c12_200","c12_201","c12_202","c12_203","c12_204","c12_205","c12_206","c12_207","c12_208","c12_209","c12_210","c12_211","c12_212","c12_213","c12_214","c12_215","c12_216","c12_217","c12_218","c12_219","c12_220","c12_221","c12_222","c12_223","c12_224","c12_225","c12_226","c12_227","c12_228","c12_229","c12_230","c12_231","c12_232","c12_233","c12_234","c12_235","c12_236","c12_237","c12_238","c12_239","c12_240","c12_241","c12_242","c12_243","c12_244","c12_245","c12_246","c12_247","c12_248","c12_249","c12_250","c12_251","c12_252","c12_253","c12_254","c12_255","c12_256","c12_257","c12_258","c12_259","c12_260","c12_261","c12_262","c12_263","c12_264","c12_265","c12_266","c12_267","c12_268","c12_269","c12_270","c12_271","c12_272","c12_273","c12_274","c12_275","c12_276","c12_277","c12_278","c12_279","c12_280","c12_281","c12_282","c12_283","c12_284","c12_285","c12_286","c12_287","c12_288","c12_289","c12_290","c12_291","c12_292","c12_293","c12_294","c12_295","c12_296","c12_297","c12_298","c12_299","c12_300","c12_301","c12_302","c12_303","c12_304","c12_305","c12_306","c12_307","c12_308","c12_309","c12_310","c12_311","c12_312","c12_313","c12_314","c12_315","c12_316","c12_317","c12_318","c12_319","c12_320","c12_321","c12_322","c12_323","c12_324","c12_325","c12_326","c12_327","c12_328","c12_329","c12_330","c12_331","c12_332","c12_333","c12_334","c12_335","c12_336","c12_337","c12_338","c12_339","c12_340","c12_341","c12_342","c12_343","c12_344","c12_345","c12_346","c12_347","c12_348","c12_349","c12_350")
87 + val cat_13=listOf("c13_1","c13_2","c13_3")
88 + val cat_14=listOf("c14_1","c14_2","c14_3")
89 + val cat_15=listOf("c15_1","c15_2","c15_3")
90 + val cat_16=listOf("c16_1","c16_2","c16_3","c16_4","c16_5","c16_6","c16_7")
91 +
92 + val cat_list=mutableListOf<String>()
93 + cat_list.addAll(cat_1)
94 + cat_list.addAll(cat_2)
95 + cat_list.addAll(cat_3)
96 + cat_list.addAll(cat_4)
97 + cat_list.addAll(cat_5)
98 + cat_list.addAll(cat_6)
99 + cat_list.addAll(cat_7)
100 + cat_list.addAll(cat_8)
101 + cat_list.addAll(cat_9)
102 + cat_list.addAll(cat_10)
103 + cat_list.addAll(cat_11)
104 + cat_list.addAll(cat_12)
105 + cat_list.addAll(cat_13)
106 + cat_list.addAll(cat_14)
107 + cat_list.addAll(cat_15)
108 + cat_list.addAll(cat_16)
109 +
110 + var user_topic=""
111 + for(item in cat_list){if(prof.getInt(item,3)==1){user_topic=user_topic+item}}
112 +
113 + if(prof.getString("existing_topic","none")!=user_topic){
114 + FirebaseMessaging.getInstance().unsubscribeFromTopic(prof.getString("existing_topic","none").toString())
115 + FirebaseMessaging.getInstance().subscribeToTopic(user_topic).addOnCompleteListener { task ->
116 + if (!task.isSuccessful) { } // 성공
117 + }
118 + writeNewUser(user_topic) // db에 쓰기
119 + editor.putString("existing_topic",user_topic)
120 + editor.commit()
121 + }else{
122 +
123 + }
124 + var intent = Intent(this, SignInActivity::class.java)
125 + startActivity(intent)
126 + }
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 +
151 + previousButton.setOnClickListener {
152 + var intent = Intent(this, InputProfilThirdFourActivity::class.java)
153 + startActivity(intent)
154 + }
155 +
156 + nextButton.setOnClickListener {
157 +
158 + if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("third_four","done");editor.commit()}//DB,pref 뻑 주의
159 + if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit();editor.putString("third_four","done");editor.commit()}
160 + if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
161 + if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit();editor.putString("third_four","done");editor.commit()}
162 + if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit();editor.putString("third_four","done");editor.commit()}
163 + if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
164 +
165 + var intent = Intent(this, InputProfilFourthOneActivity::class.java)
166 + startActivity(intent)
167 + }
168 + }
169 +}
...@@ -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>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 android:layout_height="match_parent" 78 android:layout_height="match_parent"
79 android:layout_gravity="center" 79 android:layout_gravity="center"
80 android:layout_weight="1" 80 android:layout_weight="1"
81 - android:background="@drawable/profile_stage" 81 + android:background="@drawable/profile_stage_filling"
82 android:gravity="center" 82 android:gravity="center"
83 android:text="1" 83 android:text="1"
84 android:textColor="#FFFFFF" /> 84 android:textColor="#FFFFFF" />
...@@ -89,10 +89,10 @@ ...@@ -89,10 +89,10 @@
89 android:layout_height="match_parent" 89 android:layout_height="match_parent"
90 android:layout_gravity="center" 90 android:layout_gravity="center"
91 android:layout_weight="1" 91 android:layout_weight="1"
92 - android:background="#F4F4F4" 92 + android:background="@drawable/profile_stage"
93 android:gravity="center" 93 android:gravity="center"
94 android:text="2" 94 android:text="2"
95 - android:textColor="#DDDDDD" /> 95 + android:textColor="#FFFFFF" />
96 96
97 <TextView 97 <TextView
98 android:id="@+id/stageTextView3" 98 android:id="@+id/stageTextView3"
...@@ -129,9 +129,18 @@ ...@@ -129,9 +129,18 @@
129 129
130 </LinearLayout> 130 </LinearLayout>
131 131
132 + <ScrollView
133 + android:layout_width="match_parent"
134 + android:layout_height="wrap_content">
135 +
132 <LinearLayout 136 <LinearLayout
133 android:layout_width="match_parent" 137 android:layout_width="match_parent"
134 - android:layout_height="10dp" 138 + android:layout_height="wrap_content"
139 + android:orientation="vertical">
140 +
141 + <LinearLayout
142 + android:layout_width="match_parent"
143 + android:layout_height="50dp"
135 android:layout_weight="1" 144 android:layout_weight="1"
136 android:orientation="vertical"></LinearLayout> 145 android:orientation="vertical"></LinearLayout>
137 146
...@@ -174,14 +183,7 @@ ...@@ -174,14 +183,7 @@
174 183
175 </LinearLayout> 184 </LinearLayout>
176 185
177 - <ScrollView 186 + </LinearLayout>
178 - android:layout_width="match_parent"
179 - android:layout_height="wrap_content">
180 -
181 - <LinearLayout
182 - android:layout_width="match_parent"
183 - android:layout_height="wrap_content"
184 - android:orientation="vertical">
185 187
186 <LinearLayout 188 <LinearLayout
187 android:layout_width="wrap_content" 189 android:layout_width="wrap_content"
...@@ -197,31 +199,40 @@ ...@@ -197,31 +199,40 @@
197 199
198 <ToggleButton 200 <ToggleButton
199 android:id="@+id/baewoojaButton" 201 android:id="@+id/baewoojaButton"
200 - android:layout_width="wrap_content" 202 + android:layout_width="100dp"
201 - android:layout_height="wrap_content" 203 + android:layout_height="100dp"
204 + android:layout_gravity="center"
205 + android:layout_margin="10dp"
202 android:layout_weight="1" 206 android:layout_weight="1"
203 - android:background="@drawable/profil_selector" 207 + android:background="@drawable/circle_selector"
204 android:text="배우자" 208 android:text="배우자"
209 + android:textColor="#757575"
205 android:textOff="배우자" 210 android:textOff="배우자"
206 android:textOn="배우자" /> 211 android:textOn="배우자" />
207 212
208 <ToggleButton 213 <ToggleButton
209 android:id="@+id/baewoojaboomoButton" 214 android:id="@+id/baewoojaboomoButton"
210 - android:layout_width="wrap_content" 215 + android:layout_width="100dp"
211 - android:layout_height="wrap_content" 216 + android:layout_height="100dp"
217 + android:layout_gravity="center"
218 + android:layout_margin="10dp"
212 android:layout_weight="1" 219 android:layout_weight="1"
213 - android:background="@drawable/profil_selector" 220 + android:background="@drawable/circle_selector"
214 android:text="배우자부모" 221 android:text="배우자부모"
222 + android:textColor="#757575"
215 android:textOff="배우자부모" 223 android:textOff="배우자부모"
216 android:textOn="배우자부모" /> 224 android:textOn="배우자부모" />
217 225
218 <ToggleButton 226 <ToggleButton
219 android:id="@+id/baewoojajoboomoButton" 227 android:id="@+id/baewoojajoboomoButton"
220 - android:layout_width="wrap_content" 228 + android:layout_width="100dp"
221 - android:layout_height="wrap_content" 229 + android:layout_height="100dp"
230 + android:layout_gravity="center"
231 + android:layout_margin="10dp"
222 android:layout_weight="1" 232 android:layout_weight="1"
223 - android:background="@drawable/profil_selector" 233 + android:background="@drawable/circle_selector"
224 android:text="배우자의조부모" 234 android:text="배우자의조부모"
235 + android:textColor="#757575"
225 android:textOff="배우자의조부모" 236 android:textOff="배우자의조부모"
226 android:textOn="배우자의조부모" /> 237 android:textOn="배우자의조부모" />
227 238
...@@ -234,31 +245,40 @@ ...@@ -234,31 +245,40 @@
234 245
235 <ToggleButton 246 <ToggleButton
236 android:id="@+id/brotherButton" 247 android:id="@+id/brotherButton"
237 - android:layout_width="wrap_content" 248 + android:layout_width="100dp"
238 - android:layout_height="wrap_content" 249 + android:layout_height="100dp"
250 + android:layout_gravity="center"
251 + android:layout_margin="10dp"
239 android:layout_weight="1" 252 android:layout_weight="1"
240 - android:background="@drawable/profil_selector" 253 + android:background="@drawable/circle_selector"
241 android:text="형제/자매" 254 android:text="형제/자매"
255 + android:textColor="#757575"
242 android:textOff="형제/자매" 256 android:textOff="형제/자매"
243 android:textOn="형제/자매" /> 257 android:textOn="형제/자매" />
244 258
245 <ToggleButton 259 <ToggleButton
246 android:id="@+id/baewoojabrotherButton" 260 android:id="@+id/baewoojabrotherButton"
247 - android:layout_width="wrap_content" 261 + android:layout_width="100dp"
248 - android:layout_height="wrap_content" 262 + android:layout_height="100dp"
263 + android:layout_gravity="center"
264 + android:layout_margin="10dp"
249 android:layout_weight="1" 265 android:layout_weight="1"
250 - android:background="@drawable/profil_selector" 266 + android:background="@drawable/circle_selector"
251 - android:text="배우자의형제/자매" 267 + android:text="배우자의\n형제/자매"
252 - android:textOff="배우자의형제/자매" 268 + android:textColor="#757575"
253 - android:textOn="배우자의형제/자매" /> 269 + android:textOff="배우자의\n형제/자매"
270 + android:textOn="배우자의\n형제/자매" />
254 271
255 <ToggleButton 272 <ToggleButton
256 android:id="@+id/donggeoButton" 273 android:id="@+id/donggeoButton"
257 - android:layout_width="wrap_content" 274 + android:layout_width="100dp"
258 - android:layout_height="wrap_content" 275 + android:layout_height="100dp"
276 + android:layout_gravity="center"
277 + android:layout_margin="10dp"
259 android:layout_weight="1" 278 android:layout_weight="1"
260 - android:background="@drawable/profil_selector" 279 + android:background="@drawable/circle_selector"
261 android:text="동거인" 280 android:text="동거인"
281 + android:textColor="#757575"
262 android:textOff="동거인" 282 android:textOff="동거인"
263 android:textOn="동거인" /> 283 android:textOn="동거인" />
264 </LinearLayout> 284 </LinearLayout>
...@@ -271,32 +291,41 @@ ...@@ -271,32 +291,41 @@
271 291
272 <ToggleButton 292 <ToggleButton
273 android:id="@+id/fatherButton" 293 android:id="@+id/fatherButton"
274 - android:layout_width="wrap_content" 294 + android:layout_width="100dp"
275 - android:layout_height="wrap_content" 295 + android:layout_height="100dp"
296 + android:layout_gravity="center"
297 + android:layout_margin="10dp"
276 android:layout_weight="1" 298 android:layout_weight="1"
277 - android:background="@drawable/profil_selector" 299 + android:background="@drawable/circle_selector"
278 android:text="아버지" 300 android:text="아버지"
301 + android:textColor="#757575"
279 android:textOff="아버지" 302 android:textOff="아버지"
280 android:textOn="아버지" /> 303 android:textOn="아버지" />
281 304
282 <ToggleButton 305 <ToggleButton
283 android:id="@+id/motherButton" 306 android:id="@+id/motherButton"
284 - android:layout_width="wrap_content" 307 + android:layout_width="100dp"
285 - android:layout_height="wrap_content" 308 + android:layout_height="100dp"
309 + android:layout_gravity="center"
310 + android:layout_margin="10dp"
286 android:layout_weight="1" 311 android:layout_weight="1"
287 - android:background="@drawable/profil_selector" 312 + android:background="@drawable/circle_selector"
288 android:text="어머니" 313 android:text="어머니"
314 + android:textColor="#757575"
289 android:textOff="어머니" 315 android:textOff="어머니"
290 android:textOn="어머니" /> 316 android:textOn="어머니" />
291 317
292 <ToggleButton 318 <ToggleButton
293 android:id="@+id/grandsonbaewoojaButton" 319 android:id="@+id/grandsonbaewoojaButton"
294 - android:layout_width="wrap_content" 320 + android:layout_width="100dp"
295 - android:layout_height="wrap_content" 321 + android:layout_height="100dp"
322 + android:layout_gravity="center"
323 + android:layout_margin="10dp"
296 android:layout_weight="1" 324 android:layout_weight="1"
297 - android:background="@drawable/profil_selector" 325 + android:background="@drawable/circle_selector"
298 - android:text="손자녀의배우자" 326 + android:text="손자녀의\n배우자"
299 - android:textOff="손자녀의배우자" 327 + android:textColor="#757575"
328 + android:textOff="손자녀의\n배우자"
300 android:textOn="손자녀의배우자" /> 329 android:textOn="손자녀의배우자" />
301 </LinearLayout> 330 </LinearLayout>
302 331
...@@ -307,31 +336,40 @@ ...@@ -307,31 +336,40 @@
307 336
308 <ToggleButton 337 <ToggleButton
309 android:id="@+id/grandfatherButton" 338 android:id="@+id/grandfatherButton"
310 - android:layout_width="wrap_content" 339 + android:layout_width="100dp"
311 - android:layout_height="wrap_content" 340 + android:layout_height="100dp"
341 + android:layout_gravity="center"
342 + android:layout_margin="10dp"
312 android:layout_weight="1" 343 android:layout_weight="1"
313 - android:background="@drawable/profil_selector" 344 + android:background="@drawable/circle_selector"
314 android:text="할아버지" 345 android:text="할아버지"
346 + android:textColor="#757575"
315 android:textOff="할아버지" 347 android:textOff="할아버지"
316 android:textOn="할아버지" /> 348 android:textOn="할아버지" />
317 349
318 <ToggleButton 350 <ToggleButton
319 android:id="@+id/grandmotherButton" 351 android:id="@+id/grandmotherButton"
320 - android:layout_width="wrap_content" 352 + android:layout_width="100dp"
321 - android:layout_height="wrap_content" 353 + android:layout_height="100dp"
354 + android:layout_gravity="center"
355 + android:layout_margin="10dp"
322 android:layout_weight="1" 356 android:layout_weight="1"
323 - android:background="@drawable/profil_selector" 357 + android:background="@drawable/circle_selector"
324 android:text="할머니" 358 android:text="할머니"
359 + android:textColor="#757575"
325 android:textOff="할머니" 360 android:textOff="할머니"
326 android:textOn="할머니" /> 361 android:textOn="할머니" />
327 362
328 <ToggleButton 363 <ToggleButton
329 android:id="@+id/grandsonButton" 364 android:id="@+id/grandsonButton"
330 - android:layout_width="wrap_content" 365 + android:layout_width="100dp"
331 - android:layout_height="wrap_content" 366 + android:layout_height="100dp"
367 + android:layout_gravity="center"
368 + android:layout_margin="10dp"
332 android:layout_weight="1" 369 android:layout_weight="1"
333 - android:background="@drawable/profil_selector" 370 + android:background="@drawable/circle_selector"
334 android:text="손자녀" 371 android:text="손자녀"
372 + android:textColor="#757575"
335 android:textOff="손자녀" 373 android:textOff="손자녀"
336 android:textOn="손자녀" /> 374 android:textOn="손자녀" />
337 </LinearLayout> 375 </LinearLayout>
...@@ -344,44 +382,51 @@ ...@@ -344,44 +382,51 @@
344 382
345 <ToggleButton 383 <ToggleButton
346 android:id="@+id/janyeoButton" 384 android:id="@+id/janyeoButton"
347 - android:layout_width="wrap_content" 385 + android:layout_width="100dp"
348 - android:layout_height="wrap_content" 386 + android:layout_height="100dp"
387 + android:layout_gravity="center"
388 + android:layout_margin="10dp"
349 android:layout_weight="1" 389 android:layout_weight="1"
350 - android:background="@drawable/profil_selector" 390 + android:background="@drawable/circle_selector"
351 android:text="자녀" 391 android:text="자녀"
392 + android:textColor="#757575"
352 android:textOff="자녀" 393 android:textOff="자녀"
353 android:textOn="자녀" /> 394 android:textOn="자녀" />
354 395
355 <ToggleButton 396 <ToggleButton
356 android:id="@+id/janyeobaewoojaButton" 397 android:id="@+id/janyeobaewoojaButton"
357 - android:layout_width="wrap_content" 398 + android:layout_width="100dp"
358 - android:layout_height="wrap_content" 399 + android:layout_height="100dp"
400 + android:layout_gravity="center"
401 + android:layout_margin="10dp"
359 android:layout_weight="1" 402 android:layout_weight="1"
360 - android:background="@drawable/profil_selector" 403 + android:background="@drawable/circle_selector"
361 - android:text="자녀의배우자" 404 + android:text="자녀의\n배우자"
362 - android:textOff="자녀의배우자" 405 + android:textColor="#757575"
406 + android:textOff="자녀의\n배우자"
363 android:textOn="자녀의배우자" /> 407 android:textOn="자녀의배우자" />
364 408
365 <ToggleButton 409 <ToggleButton
366 android:id="@+id/nothingButton" 410 android:id="@+id/nothingButton"
367 - android:layout_width="wrap_content" 411 + android:layout_width="100dp"
368 - android:layout_height="wrap_content" 412 + android:layout_height="100dp"
413 + android:layout_gravity="center"
414 + android:layout_margin="10dp"
369 android:layout_weight="1" 415 android:layout_weight="1"
370 - android:background="@drawable/profil_selector" 416 + android:background="@drawable/circle_selector"
371 android:text="해당없음" 417 android:text="해당없음"
418 + android:textColor="#757575"
372 android:textOff="해당없음" 419 android:textOff="해당없음"
373 android:textOn="해당없음" /> 420 android:textOn="해당없음" />
374 </LinearLayout> 421 </LinearLayout>
375 422
376 </LinearLayout> 423 </LinearLayout>
377 - </LinearLayout>
378 - </ScrollView>
379 424
380 <LinearLayout 425 <LinearLayout
381 android:layout_width="match_parent" 426 android:layout_width="match_parent"
382 - android:layout_height="100dp" 427 + android:layout_height="15dp"
383 android:layout_weight="1" 428 android:layout_weight="1"
384 - android:orientation="vertical"></LinearLayout> 429 + android:orientation="horizontal"></LinearLayout>
385 430
386 <LinearLayout 431 <LinearLayout
387 android:layout_width="match_parent" 432 android:layout_width="match_parent"
...@@ -406,6 +451,9 @@ ...@@ -406,6 +451,9 @@
406 android:text="다음 단계로" 451 android:text="다음 단계로"
407 android:textColor="#FFFFFF" /> 452 android:textColor="#FFFFFF" />
408 </LinearLayout> 453 </LinearLayout>
454 +
409 </LinearLayout> 455 </LinearLayout>
456 + </ScrollView>
457 +
410 </LinearLayout> 458 </LinearLayout>
411 </androidx.constraintlayout.widget.ConstraintLayout> 459 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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,20 +122,18 @@ ...@@ -113,20 +122,18 @@
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
122 - android:layout_width="match_parent"
123 - android:layout_height="wrap_content"
124 - android:layout_weight="1"
125 - android:orientation="vertical">
126 -
127 <ScrollView 132 <ScrollView
128 android:layout_width="match_parent" 133 android:layout_width="match_parent"
129 android:layout_height="match_parent" 134 android:layout_height="match_parent"
135 + android:layout_marginTop="30dp"
136 + android:layout_marginBottom="30dp"
130 android:layout_weight="1"> 137 android:layout_weight="1">
131 138
132 <LinearLayout 139 <LinearLayout
...@@ -139,11 +146,14 @@ ...@@ -139,11 +146,14 @@
139 android:id="@+id/mainTextView" 146 android:id="@+id/mainTextView"
140 android:layout_width="match_parent" 147 android:layout_width="match_parent"
141 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
142 - android:text="4-2. 총 형제자매 수를 입력해주세요." /> 149 + android:gravity="center"
150 + android:text="6-2. 총 형제/자매 수를 입력해주세요."
151 + android:textSize="20dp" />
143 152
144 <LinearLayout 153 <LinearLayout
145 android:layout_width="match_parent" 154 android:layout_width="match_parent"
146 android:layout_height="wrap_content" 155 android:layout_height="wrap_content"
156 + android:layout_margin="20dp"
147 android:orientation="horizontal"> 157 android:orientation="horizontal">
148 158
149 <EditText 159 <EditText
...@@ -153,14 +163,18 @@ ...@@ -153,14 +163,18 @@
153 android:layout_weight="1" 163 android:layout_weight="1"
154 android:ems="10" 164 android:ems="10"
155 android:hint="ex) 3" 165 android:hint="ex) 3"
156 - android:inputType="number|textPersonName" /> 166 + android:inputType="number|textPersonName"
167 + android:theme="@style/EditTheme" />
157 168
158 <Button 169 <Button
159 android:id="@+id/bsNumberInputButton" 170 android:id="@+id/bsNumberInputButton"
160 android:layout_width="wrap_content" 171 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
173 + android:layout_marginLeft="10dp"
162 android:layout_weight="1" 174 android:layout_weight="1"
163 - android:text="입 력" /> 175 + android:background="@drawable/button_o"
176 + android:text="입 력"
177 + android:textColor="#FFFFFF" />
164 </LinearLayout> 178 </LinearLayout>
165 179
166 <androidx.recyclerview.widget.RecyclerView 180 <androidx.recyclerview.widget.RecyclerView
...@@ -168,16 +182,14 @@ ...@@ -168,16 +182,14 @@
168 android:layout_width="match_parent" 182 android:layout_width="match_parent"
169 android:layout_height="wrap_content" 183 android:layout_height="wrap_content"
170 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" 184 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
171 - tools:listitem="@layout/item_child" /> 185 + tools:listitem="@layout/item_bs" />
172 186
173 </LinearLayout> 187 </LinearLayout>
174 </ScrollView> 188 </ScrollView>
175 - </LinearLayout>
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,20 +122,18 @@ ...@@ -113,20 +122,18 @@
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
122 - android:layout_width="match_parent"
123 - android:layout_height="wrap_content"
124 - android:layout_weight="1"
125 - android:orientation="vertical">
126 -
127 <ScrollView 132 <ScrollView
128 android:layout_width="match_parent" 133 android:layout_width="match_parent"
129 android:layout_height="match_parent" 134 android:layout_height="match_parent"
135 + android:layout_marginTop="30dp"
136 + android:layout_marginBottom="30dp"
130 android:layout_weight="1"> 137 android:layout_weight="1">
131 138
132 <LinearLayout 139 <LinearLayout
...@@ -139,11 +146,14 @@ ...@@ -139,11 +146,14 @@
139 android:id="@+id/mainTextView" 146 android:id="@+id/mainTextView"
140 android:layout_width="match_parent" 147 android:layout_width="match_parent"
141 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
142 - android:text="4-1. 가족구성원 '자녀' 선택 시 총 자녀 수를 입력해주세요." /> 149 + android:gravity="center"
150 + android:text="6-1. 총 자녀 수를 입력해주세요."
151 + android:textSize="20dp" />
143 152
144 <LinearLayout 153 <LinearLayout
145 android:layout_width="match_parent" 154 android:layout_width="match_parent"
146 android:layout_height="wrap_content" 155 android:layout_height="wrap_content"
156 + android:layout_margin="20dp"
147 android:orientation="horizontal"> 157 android:orientation="horizontal">
148 158
149 <EditText 159 <EditText
...@@ -153,14 +163,18 @@ ...@@ -153,14 +163,18 @@
153 android:layout_weight="1" 163 android:layout_weight="1"
154 android:ems="10" 164 android:ems="10"
155 android:hint="ex) 3" 165 android:hint="ex) 3"
156 - android:inputType="number|textPersonName" /> 166 + android:inputType="number|textPersonName"
167 + android:theme="@style/EditTheme" />
157 168
158 <Button 169 <Button
159 android:id="@+id/childNumberInputButton" 170 android:id="@+id/childNumberInputButton"
160 android:layout_width="wrap_content" 171 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
173 + android:layout_marginLeft="10dp"
162 android:layout_weight="1" 174 android:layout_weight="1"
163 - android:text="입 력" /> 175 + android:background="@drawable/button_o"
176 + android:text="입 력"
177 + android:textColor="#FFFFFF" />
164 </LinearLayout> 178 </LinearLayout>
165 179
166 <androidx.recyclerview.widget.RecyclerView 180 <androidx.recyclerview.widget.RecyclerView
...@@ -172,12 +186,10 @@ ...@@ -172,12 +186,10 @@
172 186
173 </LinearLayout> 187 </LinearLayout>
174 </ScrollView> 188 </ScrollView>
175 - </LinearLayout>
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>
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + tools:context=".InputProfilThirdFiveActivity">
8 +
9 + <LinearLayout
10 + android:layout_width="match_parent"
11 + android:layout_height="match_parent"
12 + android:orientation="vertical">
13 +
14 + <androidx.appcompat.widget.Toolbar
15 + android:id="@+id/toolbar"
16 + android:layout_width="fill_parent"
17 + android:layout_height="wrap_content"
18 + android:layout_marginBottom="11dp"
19 + android:background="#0000001A"
20 + android:elevation="5dp"
21 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
23 +
24 + <LinearLayout
25 + android:layout_width="match_parent"
26 + android:layout_height="match_parent"
27 + android:orientation="horizontal">
28 +
29 + <Button
30 + android:id="@+id/skipButton"
31 + android:layout_width="10dp"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1.5"
34 + android:background="#00000000"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
38 +
39 + <LinearLayout
40 + android:layout_width="10dp"
41 + android:layout_height="match_parent"
42 + android:layout_weight="1"
43 + android:orientation="horizontal" />
44 +
45 + <ImageView
46 + android:layout_width="77dp"
47 + android:layout_height="44dp"
48 + android:layout_gravity="center"
49 + android:layout_weight="1"
50 + android:src="@drawable/toolbar_logo" />
51 +
52 + <LinearLayout
53 + android:layout_width="10dp"
54 + android:layout_height="match_parent"
55 + android:layout_weight="1"
56 + android:orientation="horizontal" />
57 +
58 + <LinearLayout
59 + android:layout_width="10dp"
60 + android:layout_height="match_parent"
61 + android:layout_weight="1.5"
62 + android:orientation="horizontal" />
63 +
64 + </LinearLayout>
65 +
66 +
67 + </androidx.appcompat.widget.Toolbar>
68 +
69 + <LinearLayout
70 + android:layout_width="match_parent"
71 + android:layout_height="50dp"
72 + android:layout_weight="0"
73 + android:orientation="horizontal">
74 +
75 + <TextView
76 + android:id="@+id/stageTextView1"
77 + android:layout_width="wrap_content"
78 + android:layout_height="match_parent"
79 + android:layout_gravity="center"
80 + android:layout_weight="1"
81 + android:background="@drawable/profile_stage_filling"
82 + android:gravity="center"
83 + android:text="1"
84 + android:textColor="#FFFFFF" />
85 +
86 + <TextView
87 + android:id="@+id/stageTextView2"
88 + android:layout_width="wrap_content"
89 + android:layout_height="match_parent"
90 + android:layout_gravity="center"
91 + android:layout_weight="1"
92 + android:background="@drawable/profile_stage_filling"
93 + android:gravity="center"
94 + android:text="2"
95 + android:textColor="#FFFFFF" />
96 +
97 + <TextView
98 + android:id="@+id/stageTextView3"
99 + android:layout_width="wrap_content"
100 + android:layout_height="match_parent"
101 + android:layout_gravity="center"
102 + android:layout_weight="1"
103 + android:background="@drawable/profile_stage"
104 + android:gravity="center"
105 + android:text="3"
106 + android:textColor="#FFFFFF" />
107 +
108 + <TextView
109 + android:id="@+id/stageTextView4"
110 + android:layout_width="wrap_content"
111 + android:layout_height="match_parent"
112 + android:layout_gravity="center"
113 + android:layout_weight="1"
114 + android:background="#F4F4F4"
115 + android:gravity="center"
116 + android:text="4"
117 + android:textColor="#DDDDDD" />
118 +
119 + <TextView
120 + android:id="@+id/stageTextView5"
121 + android:layout_width="wrap_content"
122 + android:layout_height="match_parent"
123 + android:layout_gravity="center"
124 + android:layout_weight="1"
125 + android:background="#F4F4F4"
126 + android:gravity="center"
127 + android:text="5"
128 + android:textColor="#DDDDDD" />
129 +
130 + </LinearLayout>
131 +
132 + <LinearLayout
133 + android:layout_width="match_parent"
134 + android:layout_height="10dp"
135 + android:layout_weight="1"
136 + android:orientation="horizontal"></LinearLayout>
137 +
138 + <ScrollView
139 + android:layout_width="match_parent"
140 + android:layout_height="wrap_content">
141 +
142 + <LinearLayout
143 + android:layout_width="match_parent"
144 + android:layout_height="wrap_content"
145 + android:orientation="vertical">
146 +
147 + <LinearLayout
148 + android:layout_width="match_parent"
149 + android:layout_height="match_parent"
150 + android:layout_weight="1"
151 + android:orientation="vertical"
152 + android:visibility="visible">
153 +
154 + <LinearLayout
155 + android:layout_width="match_parent"
156 + android:layout_height="wrap_content"
157 + android:gravity="center"
158 + android:orientation="horizontal">
159 +
160 + <TextView
161 + android:id="@+id/explainTextView3"
162 + android:layout_width="wrap_content"
163 + android:layout_height="wrap_content"
164 + android:layout_gravity="center"
165 + android:gravity="center"
166 + android:text="10. 자신의 장애 유무를 선택해주세요."
167 + android:textColor="#4A4A4A"
168 + android:textSize="20dp" />
169 +
170 + <Button
171 + android:id="@+id/questionButton2"
172 + android:layout_width="20dp"
173 + android:layout_height="20dp"
174 + android:layout_gravity="bottom"
175 + android:background="@drawable/question_mark_image" />
176 +
177 + </LinearLayout>
178 +
179 + <LinearLayout
180 + android:layout_width="match_parent"
181 + android:layout_height="wrap_content"
182 + android:orientation="vertical">
183 +
184 + <LinearLayout
185 + android:layout_width="wrap_content"
186 + android:layout_height="wrap_content"
187 + android:layout_gravity="center"
188 + android:gravity="center"
189 + android:orientation="vertical">
190 +
191 + <LinearLayout
192 + android:layout_width="match_parent"
193 + android:layout_height="match_parent"
194 + android:orientation="horizontal">
195 +
196 + <ToggleButton
197 + android:id="@+id/nothingButton"
198 + android:layout_width="100dp"
199 + android:layout_height="100dp"
200 + android:layout_margin="10dp"
201 + android:layout_weight="1"
202 + android:background="@drawable/circle_selector"
203 + android:text="해당없음"
204 + android:textColor="#757575"
205 + android:textOff="해당없음"
206 + android:textOn="해당없음"
207 + android:textSize="16dp" />
208 +
209 + <ToggleButton
210 + android:id="@+id/imshinButton"
211 + android:layout_width="100dp"
212 + android:layout_height="100dp"
213 + android:layout_margin="10dp"
214 + android:layout_weight="1"
215 + android:background="@drawable/circle_selector"
216 + android:text="임신및출산(예정)"
217 + android:textColor="#757575"
218 + android:textOff="임신및출산(예정)"
219 + android:textOn="임신및출산(예정)"
220 + android:textSize="16dp" />
221 +
222 + </LinearLayout>
223 +
224 + <LinearLayout
225 + android:layout_width="match_parent"
226 + android:layout_height="match_parent"
227 + android:orientation="horizontal">
228 +
229 + <ToggleButton
230 + android:id="@+id/nanchiButton"
231 + android:layout_width="100dp"
232 + android:layout_height="100dp"
233 + android:layout_margin="10dp"
234 + android:layout_weight="1"
235 + android:background="@drawable/circle_selector"
236 + android:text="희귀난치성및중증질환"
237 + android:textColor="#757575"
238 + android:textOff="희귀난치성및중증질환"
239 + android:textOn="희귀난치성및중증질환"
240 + android:textSize="16dp" />
241 +
242 + <ToggleButton
243 + android:id="@+id/oeButton"
244 + android:layout_width="100dp"
245 + android:layout_height="100dp"
246 + android:layout_margin="10dp"
247 + android:layout_weight="1"
248 + android:background="@drawable/circle_selector"
249 + android:text="중증질환외질병"
250 + android:textColor="#757575"
251 + android:textOff="중증질환외질병"
252 + android:textOn="중증질환외질병"
253 + android:textSize="16dp" />
254 + </LinearLayout>
255 +
256 + <LinearLayout
257 + android:layout_width="match_parent"
258 + android:layout_height="match_parent"
259 + android:orientation="horizontal">
260 +
261 + <ToggleButton
262 + android:id="@+id/yoyaangButton"
263 + android:layout_width="100dp"
264 + android:layout_height="100dp"
265 + android:layout_margin="10dp"
266 + android:layout_weight="1"
267 + android:background="@drawable/circle_selector"
268 + android:text="(장기)요양환자"
269 + android:textColor="#757575"
270 + android:textOff="(장기)요양환자"
271 + android:textOn="(장기)요양환자"
272 + android:textSize="16dp" />
273 +
274 + <ToggleButton
275 + android:id="@+id/guitarButton"
276 + android:layout_width="100dp"
277 + android:layout_height="100dp"
278 + android:layout_margin="10dp"
279 + android:layout_weight="1"
280 + android:background="@drawable/circle_selector"
281 + android:text="기타"
282 + android:textColor="#757575"
283 + android:textOff="기타"
284 + android:textOn="기타"
285 + android:textSize="16dp" />
286 + </LinearLayout>
287 +
288 +
289 + </LinearLayout>
290 + </LinearLayout>
291 +
292 + </LinearLayout>
293 +
294 + <LinearLayout
295 + android:layout_width="match_parent"
296 + android:layout_height="20dp"
297 + android:layout_weight="1"
298 + android:orientation="vertical"></LinearLayout>
299 +
300 + </LinearLayout>
301 + </ScrollView>
302 +
303 + <LinearLayout
304 + android:layout_width="match_parent"
305 + android:layout_height="15dp"
306 + android:layout_weight="1"
307 + android:orientation="horizontal"></LinearLayout>
308 +
309 + <LinearLayout
310 + android:layout_width="match_parent"
311 + android:layout_height="wrap_content"
312 + android:orientation="horizontal">
313 +
314 + <Button
315 + android:id="@+id/previousButton"
316 + android:layout_width="10dp"
317 + android:layout_height="wrap_content"
318 + android:layout_weight="1"
319 + android:background="#F4F4F4"
320 + android:text="이전 단계로"
321 + android:textColor="#757575" />
322 +
323 + <Button
324 + android:id="@+id/nextButton"
325 + android:layout_width="10dp"
326 + android:layout_height="wrap_content"
327 + android:layout_weight="1"
328 + android:background="#29ABE2"
329 + android:text="다음 단계로"
330 + android:textColor="#FFFFFF" />
331 + </LinearLayout>
332 +
333 + </LinearLayout>
334 +</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"
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,8 +111,10 @@ ...@@ -105,8 +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"
114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,56 +122,53 @@ ...@@ -114,56 +122,53 @@
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
123 - android:layout_width="match_parent"
124 - android:layout_height="wrap_content"
125 - android:layout_weight="1"
126 - android:orientation="vertical">
127 -
128 <ScrollView 132 <ScrollView
129 android:layout_width="match_parent" 133 android:layout_width="match_parent"
130 - android:layout_height="match_parent" 134 + android:layout_height="wrap_content"
131 android:layout_weight="1"> 135 android:layout_weight="1">
132 136
133 <LinearLayout 137 <LinearLayout
134 android:layout_width="match_parent" 138 android:layout_width="match_parent"
135 android:layout_height="wrap_content" 139 android:layout_height="wrap_content"
140 + android:gravity="center"
136 android:orientation="vertical"> 141 android:orientation="vertical">
137 142
138 <LinearLayout 143 <LinearLayout
139 android:layout_width="match_parent" 144 android:layout_width="match_parent"
145 + android:layout_height="20dp"
146 + android:layout_weight="1"
147 + android:orientation="horizontal"></LinearLayout>
148 +
149 + <LinearLayout
150 + android:layout_width="match_parent"
140 android:layout_height="wrap_content" 151 android:layout_height="wrap_content"
141 android:orientation="vertical"> 152 android:orientation="vertical">
142 153
143 - <RelativeLayout 154 + <LinearLayout
144 android:layout_width="match_parent" 155 android:layout_width="match_parent"
145 - android:layout_height="match_parent"> 156 + android:layout_height="match_parent"
157 + android:gravity="center"
158 + android:orientation="horizontal">
146 159
147 <TextView 160 <TextView
148 - android:id="@+id/explainTextView" 161 + android:id="@+id/explainTextView0"
149 android:layout_width="wrap_content" 162 android:layout_width="wrap_content"
150 android:layout_height="wrap_content" 163 android:layout_height="wrap_content"
151 - android:layout_centerInParent="true"
152 android:layout_gravity="center" 164 android:layout_gravity="center"
153 android:gravity="center" 165 android:gravity="center"
154 - android:text="8. 자신의 장애 유무를 선택해 주세요." /> 166 + android:text="10. 자신의 장애 유무를 선택해주세요."
167 + android:textColor="#4A4A4A"
168 + android:textSize="20dp" />
169 +
170 + </LinearLayout>
155 171
156 - <Button
157 - android:id="@+id/questionButton"
158 - android:layout_width="30dp"
159 - android:layout_height="30dp"
160 - android:layout_gravity="center"
161 - android:layout_toRightOf="@id/explainTextView"
162 - android:backgroundTint="#1E90FF"
163 - android:gravity="center"
164 - android:text=" ? "
165 - android:textSize="8sp" />
166 - </RelativeLayout>
167 </LinearLayout> 172 </LinearLayout>
168 173
169 <LinearLayout 174 <LinearLayout
...@@ -187,9 +192,11 @@ ...@@ -187,9 +192,11 @@
187 android:id="@+id/yesButton" 192 android:id="@+id/yesButton"
188 android:layout_width="300dp" 193 android:layout_width="300dp"
189 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
195 + android:layout_margin="5dp"
190 android:layout_weight="1" 196 android:layout_weight="1"
191 - android:background="@drawable/profil_selector" 197 + android:background="@drawable/button_selector"
192 android:text="있음" 198 android:text="있음"
199 + android:textColor="#757575"
193 android:textOff="있음" 200 android:textOff="있음"
194 android:textOn="있음" /> 201 android:textOn="있음" />
195 202
...@@ -205,9 +212,11 @@ ...@@ -205,9 +212,11 @@
205 android:id="@+id/noButton" 212 android:id="@+id/noButton"
206 android:layout_width="300dp" 213 android:layout_width="300dp"
207 android:layout_height="wrap_content" 214 android:layout_height="wrap_content"
215 + android:layout_margin="5dp"
208 android:layout_weight="1" 216 android:layout_weight="1"
209 - android:background="@drawable/profil_selector" 217 + android:background="@drawable/button_selector"
210 android:text="없음" 218 android:text="없음"
219 + android:textColor="#757575"
211 android:textOff="없음" 220 android:textOff="없음"
212 android:textOn="없음" /> 221 android:textOn="없음" />
213 </LinearLayout> 222 </LinearLayout>
...@@ -216,6 +225,12 @@ ...@@ -216,6 +225,12 @@
216 </LinearLayout> 225 </LinearLayout>
217 226
218 <LinearLayout 227 <LinearLayout
228 + android:layout_width="match_parent"
229 + android:layout_height="20dp"
230 + android:layout_weight="1"
231 + android:orientation="horizontal"></LinearLayout>
232 +
233 + <LinearLayout
219 android:id="@+id/eightoneLayout" 234 android:id="@+id/eightoneLayout"
220 android:layout_width="match_parent" 235 android:layout_width="match_parent"
221 android:layout_height="wrap_content" 236 android:layout_height="wrap_content"
...@@ -228,30 +243,24 @@ ...@@ -228,30 +243,24 @@
228 android:layout_height="wrap_content" 243 android:layout_height="wrap_content"
229 android:orientation="vertical"> 244 android:orientation="vertical">
230 245
231 - <RelativeLayout 246 + <LinearLayout
232 android:layout_width="match_parent" 247 android:layout_width="match_parent"
233 - android:layout_height="match_parent"> 248 + android:layout_height="match_parent"
249 + android:gravity="center"
250 + android:orientation="horizontal">
234 251
235 <TextView 252 <TextView
236 - android:id="@+id/explainSub1TextView" 253 + android:id="@+id/explainTextView1"
237 android:layout_width="wrap_content" 254 android:layout_width="wrap_content"
238 android:layout_height="wrap_content" 255 android:layout_height="wrap_content"
239 - android:layout_centerInParent="true"
240 android:layout_gravity="center" 256 android:layout_gravity="center"
241 android:gravity="center" 257 android:gravity="center"
242 - android:text="8-1. 장애 유형을 모두 선택해주세요." /> 258 + android:text="10-1. 장애유형을 모두 선택해주세요."
259 + android:textColor="#4A4A4A"
260 + android:textSize="20dp" />
261 +
262 + </LinearLayout>
243 263
244 - <Button
245 - android:id="@+id/questionSub1Button"
246 - android:layout_width="30dp"
247 - android:layout_height="30dp"
248 - android:layout_gravity="center"
249 - android:layout_toRightOf="@id/explainSub1TextView"
250 - android:backgroundTint="#1E90FF"
251 - android:gravity="center"
252 - android:text=" ? "
253 - android:textSize="8sp" />
254 - </RelativeLayout>
255 </LinearLayout> 264 </LinearLayout>
256 265
257 <LinearLayout 266 <LinearLayout
...@@ -273,33 +282,48 @@ ...@@ -273,33 +282,48 @@
273 282
274 <ToggleButton 283 <ToggleButton
275 android:id="@+id/jichaeButton" 284 android:id="@+id/jichaeButton"
276 - android:layout_width="300dp" 285 + android:layout_width="100dp"
277 - android:layout_height="wrap_content" 286 + android:layout_height="100dp"
287 + android:layout_gravity="center"
288 + android:layout_margin="10dp"
278 android:layout_weight="1" 289 android:layout_weight="1"
279 - android:background="@drawable/profil_selector" 290 + android:background="@drawable/circle_selector"
291 + android:gravity="center"
280 android:text="지체장애" 292 android:text="지체장애"
293 + android:textColor="#757575"
281 android:textOff="지체장애" 294 android:textOff="지체장애"
282 - android:textOn="지체장애" /> 295 + android:textOn="지체장애"
296 + android:textSize="16dp" />
283 297
284 <ToggleButton 298 <ToggleButton
285 android:id="@+id/noebyungbyunButton" 299 android:id="@+id/noebyungbyunButton"
286 - android:layout_width="300dp" 300 + android:layout_width="100dp"
287 - android:layout_height="wrap_content" 301 + android:layout_height="100dp"
302 + android:layout_gravity="center"
303 + android:layout_margin="10dp"
288 android:layout_weight="1" 304 android:layout_weight="1"
289 - android:background="@drawable/profil_selector" 305 + android:background="@drawable/circle_selector"
306 + android:gravity="center"
290 android:text="뇌병변장애" 307 android:text="뇌병변장애"
308 + android:textColor="#757575"
291 android:textOff="뇌병변장애" 309 android:textOff="뇌병변장애"
292 - android:textOn="뇌병변장애" /> 310 + android:textOn="뇌병변장애"
311 + android:textSize="16dp" />
293 312
294 <ToggleButton 313 <ToggleButton
295 android:id="@+id/sigaakButton" 314 android:id="@+id/sigaakButton"
296 - android:layout_width="300dp" 315 + android:layout_width="100dp"
297 - android:layout_height="wrap_content" 316 + android:layout_height="100dp"
317 + android:layout_gravity="center"
318 + android:layout_margin="10dp"
298 android:layout_weight="1" 319 android:layout_weight="1"
299 - android:background="@drawable/profil_selector" 320 + android:background="@drawable/circle_selector"
321 + android:gravity="center"
300 android:text="시각장애" 322 android:text="시각장애"
323 + android:textColor="#757575"
301 android:textOff="시각장애" 324 android:textOff="시각장애"
302 - android:textOn="시각장애" /> 325 + android:textOn="시각장애"
326 + android:textSize="16dp" />
303 327
304 </LinearLayout> 328 </LinearLayout>
305 329
...@@ -310,33 +334,48 @@ ...@@ -310,33 +334,48 @@
310 334
311 <ToggleButton 335 <ToggleButton
312 android:id="@+id/chungkaakButton" 336 android:id="@+id/chungkaakButton"
313 - android:layout_width="300dp" 337 + android:layout_width="100dp"
314 - android:layout_height="wrap_content" 338 + android:layout_height="100dp"
339 + android:layout_gravity="center"
340 + android:layout_margin="10dp"
315 android:layout_weight="1" 341 android:layout_weight="1"
316 - android:background="@drawable/profil_selector" 342 + android:background="@drawable/circle_selector"
343 + android:gravity="center"
317 android:text="청각장애" 344 android:text="청각장애"
345 + android:textColor="#757575"
318 android:textOff="청각장애" 346 android:textOff="청각장애"
319 - android:textOn="청각장애" /> 347 + android:textOn="청각장애"
348 + android:textSize="16dp" />
320 349
321 <ToggleButton 350 <ToggleButton
322 android:id="@+id/unuhButton" 351 android:id="@+id/unuhButton"
323 - android:layout_width="300dp" 352 + android:layout_width="100dp"
324 - android:layout_height="wrap_content" 353 + android:layout_height="100dp"
354 + android:layout_gravity="center"
355 + android:layout_margin="10dp"
325 android:layout_weight="1" 356 android:layout_weight="1"
326 - android:background="@drawable/profil_selector" 357 + android:background="@drawable/circle_selector"
358 + android:gravity="center"
327 android:text="언어장애" 359 android:text="언어장애"
360 + android:textColor="#757575"
328 android:textOff="언어장애" 361 android:textOff="언어장애"
329 - android:textOn="언어장애" /> 362 + android:textOn="언어장애"
363 + android:textSize="16dp" />
330 364
331 <ToggleButton 365 <ToggleButton
332 android:id="@+id/ahnmyunButton" 366 android:id="@+id/ahnmyunButton"
333 - android:layout_width="300dp" 367 + android:layout_width="100dp"
334 - android:layout_height="wrap_content" 368 + android:layout_height="100dp"
369 + android:layout_gravity="center"
370 + android:layout_margin="10dp"
335 android:layout_weight="1" 371 android:layout_weight="1"
336 - android:background="@drawable/profil_selector" 372 + android:background="@drawable/circle_selector"
373 + android:gravity="center"
337 android:text="안면장애" 374 android:text="안면장애"
375 + android:textColor="#757575"
338 android:textOff="안면장애" 376 android:textOff="안면장애"
339 - android:textOn="안면장애" /> 377 + android:textOn="안면장애"
378 + android:textSize="16dp" />
340 379
341 </LinearLayout> 380 </LinearLayout>
342 381
...@@ -347,33 +386,48 @@ ...@@ -347,33 +386,48 @@
347 386
348 <ToggleButton 387 <ToggleButton
349 android:id="@+id/sinjaangButton" 388 android:id="@+id/sinjaangButton"
350 - android:layout_width="300dp" 389 + android:layout_width="100dp"
351 - android:layout_height="wrap_content" 390 + android:layout_height="100dp"
391 + android:layout_gravity="center"
392 + android:layout_margin="10dp"
352 android:layout_weight="1" 393 android:layout_weight="1"
353 - android:background="@drawable/profil_selector" 394 + android:background="@drawable/circle_selector"
395 + android:gravity="center"
354 android:text="신장장애" 396 android:text="신장장애"
397 + android:textColor="#757575"
355 android:textOff="신장장애" 398 android:textOff="신장장애"
356 - android:textOn="신장장애" /> 399 + android:textOn="신장장애"
400 + android:textSize="16dp" />
357 401
358 <ToggleButton 402 <ToggleButton
359 android:id="@+id/simjaangButton" 403 android:id="@+id/simjaangButton"
360 - android:layout_width="300dp" 404 + android:layout_width="100dp"
361 - android:layout_height="wrap_content" 405 + android:layout_height="100dp"
406 + android:layout_gravity="center"
407 + android:layout_margin="10dp"
362 android:layout_weight="1" 408 android:layout_weight="1"
363 - android:background="@drawable/profil_selector" 409 + android:background="@drawable/circle_selector"
410 + android:gravity="center"
364 android:text="심장장애" 411 android:text="심장장애"
412 + android:textColor="#757575"
365 android:textOff="심장장애" 413 android:textOff="심장장애"
366 - android:textOn="심장장애" /> 414 + android:textOn="심장장애"
415 + android:textSize="16dp" />
367 416
368 <ToggleButton 417 <ToggleButton
369 android:id="@+id/gaanjaangButton" 418 android:id="@+id/gaanjaangButton"
370 - android:layout_width="300dp" 419 + android:layout_width="100dp"
371 - android:layout_height="wrap_content" 420 + android:layout_height="100dp"
421 + android:layout_gravity="center"
422 + android:layout_margin="10dp"
372 android:layout_weight="1" 423 android:layout_weight="1"
373 - android:background="@drawable/profil_selector" 424 + android:background="@drawable/circle_selector"
425 + android:gravity="center"
374 android:text="간장애" 426 android:text="간장애"
427 + android:textColor="#757575"
375 android:textOff="간장애" 428 android:textOff="간장애"
376 - android:textOn="간장애" /> 429 + android:textOn="간장애"
430 + android:textSize="16dp" />
377 431
378 </LinearLayout> 432 </LinearLayout>
379 433
...@@ -384,33 +438,48 @@ ...@@ -384,33 +438,48 @@
384 438
385 <ToggleButton 439 <ToggleButton
386 android:id="@+id/jaangrooButton" 440 android:id="@+id/jaangrooButton"
387 - android:layout_width="300dp" 441 + android:layout_width="100dp"
388 - android:layout_height="wrap_content" 442 + android:layout_height="100dp"
443 + android:layout_gravity="center"
444 + android:layout_margin="10dp"
389 android:layout_weight="1" 445 android:layout_weight="1"
390 - android:background="@drawable/profil_selector" 446 + android:background="@drawable/circle_selector"
447 + android:gravity="center"
391 android:text="장루/요루장애" 448 android:text="장루/요루장애"
449 + android:textColor="#757575"
392 android:textOff="장루/요루장애" 450 android:textOff="장루/요루장애"
393 - android:textOn="장루/요루장애" /> 451 + android:textOn="장루/요루장애"
452 + android:textSize="16dp" />
394 453
395 <ToggleButton 454 <ToggleButton
396 android:id="@+id/noejungjeungButton" 455 android:id="@+id/noejungjeungButton"
397 - android:layout_width="300dp" 456 + android:layout_width="100dp"
398 - android:layout_height="wrap_content" 457 + android:layout_height="100dp"
458 + android:layout_gravity="center"
459 + android:layout_margin="10dp"
399 android:layout_weight="1" 460 android:layout_weight="1"
400 - android:background="@drawable/profil_selector" 461 + android:background="@drawable/circle_selector"
462 + android:gravity="center"
401 android:text="뇌전증" 463 android:text="뇌전증"
464 + android:textColor="#757575"
402 android:textOff="뇌전증" 465 android:textOff="뇌전증"
403 - android:textOn="뇌전증" /> 466 + android:textOn="뇌전증"
467 + android:textSize="16dp" />
404 468
405 <ToggleButton 469 <ToggleButton
406 android:id="@+id/hoheupkiButton" 470 android:id="@+id/hoheupkiButton"
407 - android:layout_width="300dp" 471 + android:layout_width="100dp"
408 - android:layout_height="wrap_content" 472 + android:layout_height="100dp"
473 + android:layout_gravity="center"
474 + android:layout_margin="10dp"
409 android:layout_weight="1" 475 android:layout_weight="1"
410 - android:background="@drawable/profil_selector" 476 + android:background="@drawable/circle_selector"
477 + android:gravity="center"
411 android:text="호흡기" 478 android:text="호흡기"
479 + android:textColor="#757575"
412 android:textOff="호흡기" 480 android:textOff="호흡기"
413 - android:textOn="호흡기" /> 481 + android:textOn="호흡기"
482 + android:textSize="16dp" />
414 483
415 </LinearLayout> 484 </LinearLayout>
416 485
...@@ -422,175 +491,60 @@ ...@@ -422,175 +491,60 @@
422 491
423 <ToggleButton 492 <ToggleButton
424 android:id="@+id/jijukButton" 493 android:id="@+id/jijukButton"
425 - android:layout_width="300dp" 494 + android:layout_width="100dp"
426 - android:layout_height="wrap_content" 495 + android:layout_height="100dp"
496 + android:layout_gravity="center"
497 + android:layout_margin="10dp"
427 android:layout_weight="1" 498 android:layout_weight="1"
428 - android:background="@drawable/profil_selector" 499 + android:background="@drawable/circle_selector"
500 + android:gravity="center"
429 android:text="지적장애" 501 android:text="지적장애"
502 + android:textColor="#757575"
430 android:textOff="지적장애" 503 android:textOff="지적장애"
431 - android:textOn="지적장애" /> 504 + android:textOn="지적장애"
505 + android:textSize="16dp" />
432 506
433 <ToggleButton 507 <ToggleButton
434 android:id="@+id/japyeahButton" 508 android:id="@+id/japyeahButton"
435 - android:layout_width="300dp" 509 + android:layout_width="100dp"
436 - android:layout_height="wrap_content" 510 + android:layout_height="100dp"
511 + android:layout_gravity="center"
512 + android:layout_margin="10dp"
437 android:layout_weight="1" 513 android:layout_weight="1"
438 - android:background="@drawable/profil_selector" 514 + android:background="@drawable/circle_selector"
515 + android:gravity="center"
439 android:text="자폐성장애" 516 android:text="자폐성장애"
517 + android:textColor="#757575"
440 android:textOff="자폐성장애" 518 android:textOff="자폐성장애"
441 - android:textOn="자폐성장애" /> 519 + android:textOn="자폐성장애"
520 + android:textSize="16dp" />
442 521
443 <ToggleButton 522 <ToggleButton
444 android:id="@+id/jeongshinButton" 523 android:id="@+id/jeongshinButton"
445 - android:layout_width="300dp" 524 + android:layout_width="100dp"
446 - android:layout_height="wrap_content" 525 + android:layout_height="100dp"
526 + android:layout_gravity="center"
527 + android:layout_margin="10dp"
447 android:layout_weight="1" 528 android:layout_weight="1"
448 - android:background="@drawable/profil_selector" 529 + android:background="@drawable/circle_selector"
530 + android:gravity="center"
449 android:text="정신장애" 531 android:text="정신장애"
532 + android:textColor="#757575"
450 android:textOff="정신장애" 533 android:textOff="정신장애"
451 - android:textOn="정신장애" /> 534 + android:textOn="정신장애"
452 - </LinearLayout> 535 + android:textSize="16dp" />
453 -
454 - </LinearLayout>
455 - </LinearLayout>
456 -
457 </LinearLayout> 536 </LinearLayout>
458 537
459 - <LinearLayout
460 - android:id="@+id/eighttwoLayout"
461 - android:layout_width="match_parent"
462 - android:layout_height="wrap_content"
463 - android:layout_weight="1"
464 - android:orientation="vertical"
465 - android:visibility="gone">
466 -
467 - <LinearLayout
468 - android:layout_width="match_parent"
469 - android:layout_height="wrap_content"
470 - android:orientation="vertical">
471 -
472 - <RelativeLayout
473 - android:layout_width="match_parent"
474 - android:layout_height="match_parent">
475 -
476 - <TextView
477 - android:id="@+id/explainSub2TextView"
478 - android:layout_width="wrap_content"
479 - android:layout_height="wrap_content"
480 - android:layout_centerInParent="true"
481 - android:layout_gravity="center"
482 - android:gravity="center"
483 - android:text="9. 자신의 건강 상태를 선택해 주세요." />
484 -
485 - <Button
486 - android:id="@+id/questionSub2Button"
487 - android:layout_width="30dp"
488 - android:layout_height="30dp"
489 - android:layout_gravity="center"
490 - android:layout_toRightOf="@id/explainSub2TextView"
491 - android:backgroundTint="#1E90FF"
492 - android:gravity="center"
493 - android:text=" ? "
494 - android:textSize="8sp" />
495 - </RelativeLayout>
496 </LinearLayout> 538 </LinearLayout>
497 -
498 - <LinearLayout
499 - android:layout_width="match_parent"
500 - android:layout_height="wrap_content"
501 - android:orientation="vertical">
502 -
503 - <LinearLayout
504 - android:layout_width="wrap_content"
505 - android:layout_height="wrap_content"
506 - android:layout_gravity="center"
507 - android:gravity="center"
508 - android:orientation="vertical">
509 -
510 - <LinearLayout
511 - android:layout_width="match_parent"
512 - android:layout_height="match_parent"
513 - android:orientation="horizontal">
514 -
515 - <ToggleButton
516 - android:id="@+id/nothingButton"
517 - android:layout_width="300dp"
518 - android:layout_height="wrap_content"
519 - android:layout_weight="1"
520 - android:background="@drawable/profil_selector"
521 - android:text="해당없음"
522 - android:textOff="해당없음"
523 - android:textOn="해당없음" />
524 -
525 - <ToggleButton
526 - android:id="@+id/imshinButton"
527 - android:layout_width="300dp"
528 - android:layout_height="wrap_content"
529 - android:layout_weight="1"
530 - android:background="@drawable/profil_selector"
531 - android:text="임신및출산(예정)"
532 - android:textOff="임신및출산(예정)"
533 - android:textOn="임신및출산(예정)" />
534 -
535 </LinearLayout> 539 </LinearLayout>
536 540
537 - <LinearLayout
538 - android:layout_width="match_parent"
539 - android:layout_height="match_parent"
540 - android:orientation="horizontal">
541 -
542 - <ToggleButton
543 - android:id="@+id/nanchiButton"
544 - android:layout_width="300dp"
545 - android:layout_height="wrap_content"
546 - android:layout_weight="1"
547 - android:background="@drawable/profil_selector"
548 - android:text="희귀난치성및중증질환"
549 - android:textOff="희귀난치성및중증질환"
550 - android:textOn="희귀난치성및중증질환" />
551 -
552 - <ToggleButton
553 - android:id="@+id/oeButton"
554 - android:layout_width="300dp"
555 - android:layout_height="wrap_content"
556 - android:layout_weight="1"
557 - android:background="@drawable/profil_selector"
558 - android:text="중증질환외질병"
559 - android:textOff="중증질환외질병"
560 - android:textOn="중증질환외질병" />
561 </LinearLayout> 541 </LinearLayout>
562 542
563 <LinearLayout 543 <LinearLayout
564 android:layout_width="match_parent" 544 android:layout_width="match_parent"
565 - android:layout_height="match_parent" 545 + android:layout_height="50dp"
566 - android:orientation="horizontal">
567 -
568 - <ToggleButton
569 - android:id="@+id/yoyaangButton"
570 - android:layout_width="300dp"
571 - android:layout_height="wrap_content"
572 - android:layout_weight="1"
573 - android:background="@drawable/profil_selector"
574 - android:text="(장기)요양환자"
575 - android:textOff="(장기)요양환자"
576 - android:textOn="(장기)요양환자" />
577 -
578 - <ToggleButton
579 - android:id="@+id/guitarButton"
580 - android:layout_width="300dp"
581 - android:layout_height="wrap_content"
582 android:layout_weight="1" 546 android:layout_weight="1"
583 - android:background="@drawable/profil_selector" 547 + android:orientation="horizontal"></LinearLayout>
584 - android:text="기타"
585 - android:textOff="기타"
586 - android:textOn="기타" />
587 - </LinearLayout>
588 -
589 -
590 - </LinearLayout>
591 - </LinearLayout>
592 -
593 - </LinearLayout>
594 548
595 </LinearLayout> 549 </LinearLayout>
596 </ScrollView> 550 </ScrollView>
...@@ -605,16 +559,19 @@ ...@@ -605,16 +559,19 @@
605 android:layout_width="10dp" 559 android:layout_width="10dp"
606 android:layout_height="wrap_content" 560 android:layout_height="wrap_content"
607 android:layout_weight="1" 561 android:layout_weight="1"
608 - android:text="이전 단계로" /> 562 + android:background="#F4F4F4"
563 + android:text="이전 단계로"
564 + android:textColor="#757575" />
609 565
610 <Button 566 <Button
611 android:id="@+id/nextButton" 567 android:id="@+id/nextButton"
612 android:layout_width="10dp" 568 android:layout_width="10dp"
613 android:layout_height="wrap_content" 569 android:layout_height="wrap_content"
614 android:layout_weight="1" 570 android:layout_weight="1"
615 - android:text="다음 단계로" /> 571 + android:background="#29ABE2"
572 + android:text="다음 단계로"
573 + android:textColor="#FFFFFF" />
616 </LinearLayout> 574 </LinearLayout>
617 575
618 </LinearLayout> 576 </LinearLayout>
619 - </LinearLayout>
620 </androidx.constraintlayout.widget.ConstraintLayout> 577 </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"
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,8 +111,10 @@ ...@@ -105,8 +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"
114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,8 +122,10 @@ ...@@ -114,8 +122,10 @@
114 android:layout_height="match_parent" 122 android:layout_height="match_parent"
115 android:layout_gravity="center" 123 android:layout_gravity="center"
116 android:layout_weight="1" 124 android:layout_weight="1"
125 + android:background="#F4F4F4"
117 android:gravity="center" 126 android:gravity="center"
118 - android:text="5" /> 127 + android:text="5"
128 + android:textColor="#DDDDDD" />
119 129
120 </LinearLayout> 130 </LinearLayout>
121 131
...@@ -123,53 +133,57 @@ ...@@ -123,53 +133,57 @@
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:layout_weight="1"
126 - android:orientation="vertical"></LinearLayout> 136 + android:orientation="horizontal"></LinearLayout>
137 +
138 + <ScrollView
139 + android:layout_width="match_parent"
140 + android:layout_height="wrap_content">
127 141
128 <LinearLayout 142 <LinearLayout
129 android:layout_width="match_parent" 143 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
131 - android:layout_weight="1"
132 android:orientation="vertical"> 145 android:orientation="vertical">
133 146
134 <LinearLayout 147 <LinearLayout
135 android:layout_width="match_parent" 148 android:layout_width="match_parent"
149 + android:layout_height="20dp"
150 + android:layout_weight="1"
151 + android:orientation="vertical"></LinearLayout>
152 +
153 + <LinearLayout
154 + android:layout_width="match_parent"
136 android:layout_height="wrap_content" 155 android:layout_height="wrap_content"
156 + android:layout_weight="1"
157 + android:gravity="center"
137 android:orientation="vertical"> 158 android:orientation="vertical">
138 159
139 - <RelativeLayout 160 + <LinearLayout
140 - android:layout_width="match_parent" 161 + android:layout_width="wrap_content"
141 - android:layout_height="match_parent"> 162 + android:layout_height="wrap_content"
163 + android:orientation="horizontal">
142 164
143 <TextView 165 <TextView
144 android:id="@+id/explainTextView" 166 android:id="@+id/explainTextView"
145 android:layout_width="wrap_content" 167 android:layout_width="wrap_content"
146 android:layout_height="wrap_content" 168 android:layout_height="wrap_content"
147 - android:layout_centerInParent="true"
148 android:layout_gravity="center" 169 android:layout_gravity="center"
149 android:gravity="center" 170 android:gravity="center"
150 - android:text="5. 현재 재학상태를 선택해 주세요." /> 171 + android:text="7. 현재 자신의 재학상태를 선택해 주세요."
172 + android:textColor="#4A4A4A"
173 + android:textSize="20dp" />
151 174
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> 175 </LinearLayout>
164 176
165 <LinearLayout 177 <LinearLayout
166 android:layout_width="match_parent" 178 android:layout_width="match_parent"
167 - android:layout_height="50dp" 179 + android:layout_height="20dp"
168 android:layout_weight="1" 180 android:layout_weight="1"
169 android:orientation="vertical"> 181 android:orientation="vertical">
170 182
171 </LinearLayout> 183 </LinearLayout>
172 184
185 + </LinearLayout>
186 +
173 <ScrollView 187 <ScrollView
174 android:layout_width="match_parent" 188 android:layout_width="match_parent"
175 android:layout_height="wrap_content"> 189 android:layout_height="wrap_content">
...@@ -193,33 +207,42 @@ ...@@ -193,33 +207,42 @@
193 207
194 <ToggleButton 208 <ToggleButton
195 android:id="@+id/elementaryButton" 209 android:id="@+id/elementaryButton"
196 - android:layout_width="wrap_content" 210 + android:layout_width="100dp"
197 - android:layout_height="wrap_content" 211 + android:layout_height="100dp"
212 + android:layout_margin="10dp"
198 android:layout_weight="1" 213 android:layout_weight="1"
199 - android:background="@drawable/profil_selector" 214 + android:background="@drawable/circle_selector"
200 android:text="초등학교" 215 android:text="초등학교"
216 + android:textColor="#757575"
201 android:textOff="초등학교" 217 android:textOff="초등학교"
202 - android:textOn="초등학교" /> 218 + android:textOn="초등학교"
219 + android:textSize="16dp" />
203 220
204 <ToggleButton 221 <ToggleButton
205 android:id="@+id/middleButton" 222 android:id="@+id/middleButton"
206 - android:layout_width="wrap_content" 223 + android:layout_width="100dp"
207 - android:layout_height="wrap_content" 224 + android:layout_height="100dp"
225 + android:layout_margin="10dp"
208 android:layout_weight="1" 226 android:layout_weight="1"
209 - android:background="@drawable/profil_selector" 227 + android:background="@drawable/circle_selector"
210 android:text="중학교" 228 android:text="중학교"
229 + android:textColor="#757575"
211 android:textOff="중학교" 230 android:textOff="중학교"
212 - android:textOn="중학교"/> 231 + android:textOn="중학교"
232 + android:textSize="16dp" />
213 233
214 <ToggleButton 234 <ToggleButton
215 android:id="@+id/highButton" 235 android:id="@+id/highButton"
216 - android:layout_width="wrap_content" 236 + android:layout_width="100dp"
217 - android:layout_height="wrap_content" 237 + android:layout_height="100dp"
238 + android:layout_margin="10dp"
218 android:layout_weight="1" 239 android:layout_weight="1"
219 - android:background="@drawable/profil_selector" 240 + android:background="@drawable/circle_selector"
220 android:text="고등학교" 241 android:text="고등학교"
242 + android:textColor="#757575"
221 android:textOff="고등학교" 243 android:textOff="고등학교"
222 - android:textOn="고등학교" /> 244 + android:textOn="고등학교"
245 + android:textSize="16dp" />
223 246
224 </LinearLayout> 247 </LinearLayout>
225 248
...@@ -230,61 +253,79 @@ ...@@ -230,61 +253,79 @@
230 253
231 <ToggleButton 254 <ToggleButton
232 android:id="@+id/specialButton" 255 android:id="@+id/specialButton"
233 - android:layout_width="wrap_content" 256 + android:layout_width="100dp"
234 - android:layout_height="wrap_content" 257 + android:layout_height="100dp"
258 + android:layout_margin="10dp"
235 android:layout_weight="1" 259 android:layout_weight="1"
236 - android:background="@drawable/profil_selector" 260 + android:background="@drawable/circle_selector"
237 android:text="특수학교" 261 android:text="특수학교"
262 + android:textColor="#757575"
238 android:textOff="특수학교" 263 android:textOff="특수학교"
239 - android:textOn="특수학교" /> 264 + android:textOn="특수학교"
265 + android:textSize="16dp" />
240 266
241 <ToggleButton 267 <ToggleButton
242 android:id="@+id/universityButton" 268 android:id="@+id/universityButton"
243 - android:layout_width="wrap_content" 269 + android:layout_width="100dp"
244 - android:layout_height="wrap_content" 270 + android:layout_height="100dp"
271 + android:layout_margin="10dp"
245 android:layout_weight="1" 272 android:layout_weight="1"
246 - android:background="@drawable/profil_selector" 273 + android:background="@drawable/circle_selector"
247 android:text="대학교" 274 android:text="대학교"
275 + android:textColor="#757575"
248 android:textOff="대학교" 276 android:textOff="대학교"
249 - android:textOn="대학교" /> 277 + android:textOn="대학교"
278 + android:textSize="16dp" />
250 279
251 <ToggleButton 280 <ToggleButton
252 android:id="@+id/graduateButton" 281 android:id="@+id/graduateButton"
253 - android:layout_width="wrap_content" 282 + android:layout_width="100dp"
254 - android:layout_height="wrap_content" 283 + android:layout_height="100dp"
284 + android:layout_margin="10dp"
255 android:layout_weight="1" 285 android:layout_weight="1"
256 - android:background="@drawable/profil_selector" 286 + android:background="@drawable/circle_selector"
257 android:text="대학원" 287 android:text="대학원"
288 + android:textColor="#757575"
258 android:textOff="대학원" 289 android:textOff="대학원"
259 - android:textOn="대학원" /> 290 + android:textOn="대학원"
291 + android:textSize="16dp" />
260 </LinearLayout> 292 </LinearLayout>
261 293
262 294
263 <LinearLayout 295 <LinearLayout
264 android:layout_width="match_parent" 296 android:layout_width="match_parent"
265 android:layout_height="match_parent" 297 android:layout_height="match_parent"
298 + android:layout_gravity="center"
299 + android:gravity="center"
266 android:orientation="horizontal"> 300 android:orientation="horizontal">
267 301
268 <ToggleButton 302 <ToggleButton
269 android:id="@+id/nothingButton" 303 android:id="@+id/nothingButton"
270 - android:layout_width="wrap_content" 304 + android:layout_width="100dp"
271 - android:layout_height="wrap_content" 305 + android:layout_height="100dp"
272 - android:layout_weight="1" 306 + android:layout_gravity="center"
273 - android:background="@drawable/profil_selector" 307 + android:layout_margin="10dp"
308 + android:background="@drawable/circle_selector"
274 android:text="해당없음" 309 android:text="해당없음"
310 + android:textColor="#757575"
275 android:textOff="해당없음" 311 android:textOff="해당없음"
276 - android:textOn="해당없음" /> 312 + android:textOn="해당없음"
313 + android:textSize="16dp" />
314 +
277 </LinearLayout> 315 </LinearLayout>
278 316
279 </LinearLayout> 317 </LinearLayout>
280 </LinearLayout> 318 </LinearLayout>
281 </ScrollView> 319 </ScrollView>
282 320
321 + </LinearLayout>
322 + </ScrollView>
323 +
283 <LinearLayout 324 <LinearLayout
284 android:layout_width="match_parent" 325 android:layout_width="match_parent"
285 - android:layout_height="100dp" 326 + android:layout_height="15dp"
286 android:layout_weight="1" 327 android:layout_weight="1"
287 - android:orientation="vertical"></LinearLayout> 328 + android:orientation="horizontal"></LinearLayout>
288 329
289 <LinearLayout 330 <LinearLayout
290 android:layout_width="match_parent" 331 android:layout_width="match_parent"
...@@ -296,15 +337,19 @@ ...@@ -296,15 +337,19 @@
296 android:layout_width="10dp" 337 android:layout_width="10dp"
297 android:layout_height="wrap_content" 338 android:layout_height="wrap_content"
298 android:layout_weight="1" 339 android:layout_weight="1"
299 - android:text="이전 단계로" /> 340 + android:background="#F4F4F4"
341 + android:text="이전 단계로"
342 + android:textColor="#757575" />
300 343
301 <Button 344 <Button
302 android:id="@+id/nextButton" 345 android:id="@+id/nextButton"
303 android:layout_width="10dp" 346 android:layout_width="10dp"
304 android:layout_height="wrap_content" 347 android:layout_height="wrap_content"
305 android:layout_weight="1" 348 android:layout_weight="1"
306 - android:text="다음 단계로" /> 349 + android:background="#29ABE2"
307 - </LinearLayout> 350 + android:text="다음 단계로"
351 + android:textColor="#FFFFFF" />
308 </LinearLayout> 352 </LinearLayout>
353 +
309 </LinearLayout> 354 </LinearLayout>
310 </androidx.constraintlayout.widget.ConstraintLayout> 355 </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"
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,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,14 +122,25 @@ ...@@ -113,14 +122,25 @@
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
132 + <ScrollView
133 + android:layout_width="match_parent"
134 + android:layout_height="wrap_content">
135 +
136 + <LinearLayout
137 + android:layout_width="match_parent"
138 + android:layout_height="wrap_content"
139 + android:orientation="vertical">
140 +
121 <LinearLayout 141 <LinearLayout
122 android:layout_width="match_parent" 142 android:layout_width="match_parent"
123 - android:layout_height="10dp" 143 + android:layout_height="50dp"
124 android:layout_weight="1" 144 android:layout_weight="1"
125 android:orientation="vertical"></LinearLayout> 145 android:orientation="vertical"></LinearLayout>
126 146
...@@ -128,37 +148,24 @@ ...@@ -128,37 +148,24 @@
128 android:layout_width="match_parent" 148 android:layout_width="match_parent"
129 android:layout_height="wrap_content" 149 android:layout_height="wrap_content"
130 android:layout_weight="1" 150 android:layout_weight="1"
151 + android:gravity="center"
131 android:orientation="vertical"> 152 android:orientation="vertical">
132 153
133 <LinearLayout 154 <LinearLayout
134 - android:layout_width="match_parent" 155 + android:layout_width="wrap_content"
135 android:layout_height="wrap_content" 156 android:layout_height="wrap_content"
136 - android:orientation="vertical"> 157 + android:orientation="horizontal">
137 -
138 - <RelativeLayout
139 - android:layout_width="match_parent"
140 - android:layout_height="match_parent">
141 158
142 <TextView 159 <TextView
143 android:id="@+id/explainTextView" 160 android:id="@+id/explainTextView"
144 android:layout_width="wrap_content" 161 android:layout_width="wrap_content"
145 android:layout_height="wrap_content" 162 android:layout_height="wrap_content"
146 - android:layout_centerInParent="true"
147 android:layout_gravity="center" 163 android:layout_gravity="center"
148 android:gravity="center" 164 android:gravity="center"
149 - android:text="7. 병역 구분을 선택해 주세요." /> 165 + android:text="9. 자신의 병역 구분을 선택해 주세요."
166 + android:textColor="#4A4A4A"
167 + android:textSize="20dp" />
150 168
151 - <Button
152 - android:id="@+id/questionButton"
153 - android:layout_width="30dp"
154 - android:layout_height="30dp"
155 - android:layout_gravity="center"
156 - android:layout_toRightOf="@id/explainTextView"
157 - android:backgroundTint="#1E90FF"
158 - android:gravity="center"
159 - android:text=" ? "
160 - android:textSize="8sp" />
161 - </RelativeLayout>
162 </LinearLayout> 169 </LinearLayout>
163 170
164 <LinearLayout 171 <LinearLayout
...@@ -169,15 +176,6 @@ ...@@ -169,15 +176,6 @@
169 176
170 </LinearLayout> 177 </LinearLayout>
171 178
172 - <ScrollView
173 - android:layout_width="match_parent"
174 - android:layout_height="wrap_content">
175 -
176 - <LinearLayout
177 - android:layout_width="match_parent"
178 - android:layout_height="wrap_content"
179 - android:orientation="vertical">
180 -
181 <LinearLayout 179 <LinearLayout
182 android:layout_width="wrap_content" 180 android:layout_width="wrap_content"
183 android:layout_height="wrap_content" 181 android:layout_height="wrap_content"
...@@ -192,31 +190,37 @@ ...@@ -192,31 +190,37 @@
192 190
193 <ToggleButton 191 <ToggleButton
194 android:id="@+id/nothingButton" 192 android:id="@+id/nothingButton"
195 - android:layout_width="wrap_content" 193 + android:layout_width="100dp"
196 - android:layout_height="wrap_content" 194 + android:layout_height="100dp"
197 - android:layout_weight="1" 195 + android:layout_gravity="center"
198 - android:background="@drawable/profil_selector" 196 + android:layout_margin="10dp"
197 + android:background="@drawable/circle_selector"
199 android:text="해당없음" 198 android:text="해당없음"
199 + android:textColor="#757575"
200 android:textOff="해당없음" 200 android:textOff="해당없음"
201 android:textOn="해당없음" /> 201 android:textOn="해당없음" />
202 202
203 <ToggleButton 203 <ToggleButton
204 android:id="@+id/mipilButton" 204 android:id="@+id/mipilButton"
205 - android:layout_width="wrap_content" 205 + android:layout_width="100dp"
206 - android:layout_height="wrap_content" 206 + android:layout_height="100dp"
207 - android:layout_weight="1" 207 + android:layout_gravity="center"
208 - android:background="@drawable/profil_selector" 208 + android:layout_margin="10dp"
209 + android:background="@drawable/circle_selector"
209 android:text="군미필" 210 android:text="군미필"
211 + android:textColor="#757575"
210 android:textOff="군미필" 212 android:textOff="군미필"
211 android:textOn="군미필" /> 213 android:textOn="군미필" />
212 214
213 <ToggleButton 215 <ToggleButton
214 android:id="@+id/myunjaeButton" 216 android:id="@+id/myunjaeButton"
215 - android:layout_width="wrap_content" 217 + android:layout_width="100dp"
216 - android:layout_height="wrap_content" 218 + android:layout_height="100dp"
217 - android:layout_weight="1" 219 + android:layout_gravity="center"
218 - android:background="@drawable/profil_selector" 220 + android:layout_margin="10dp"
221 + android:background="@drawable/circle_selector"
219 android:text="면제" 222 android:text="면제"
223 + android:textColor="#757575"
220 android:textOff="면제" 224 android:textOff="면제"
221 android:textOn="면제" /> 225 android:textOn="면제" />
222 226
...@@ -229,31 +233,37 @@ ...@@ -229,31 +233,37 @@
229 233
230 <ToggleButton 234 <ToggleButton
231 android:id="@+id/jobsoldierButton" 235 android:id="@+id/jobsoldierButton"
232 - android:layout_width="wrap_content" 236 + android:layout_width="100dp"
233 - android:layout_height="wrap_content" 237 + android:layout_height="100dp"
234 - android:layout_weight="1" 238 + android:layout_gravity="center"
235 - android:background="@drawable/profil_selector" 239 + android:layout_margin="10dp"
240 + android:background="@drawable/circle_selector"
236 android:text="직업군인" 241 android:text="직업군인"
242 + android:textColor="#757575"
237 android:textOff="직업군인" 243 android:textOff="직업군인"
238 android:textOn="직업군인" /> 244 android:textOn="직업군인" />
239 245
240 <ToggleButton 246 <ToggleButton
241 android:id="@+id/bokmoojoongButton" 247 android:id="@+id/bokmoojoongButton"
242 - android:layout_width="wrap_content" 248 + android:layout_width="100dp"
243 - android:layout_height="wrap_content" 249 + android:layout_height="100dp"
244 - android:layout_weight="1" 250 + android:layout_gravity="center"
245 - android:background="@drawable/profil_selector" 251 + android:layout_margin="10dp"
252 + android:background="@drawable/circle_selector"
246 android:text="복무중(현역병)" 253 android:text="복무중(현역병)"
254 + android:textColor="#757575"
247 android:textOff="복무중(현역병)" 255 android:textOff="복무중(현역병)"
248 android:textOn="복무중(현역병)" /> 256 android:textOn="복무중(현역병)" />
249 257
250 <ToggleButton 258 <ToggleButton
251 android:id="@+id/mangijedaeButton" 259 android:id="@+id/mangijedaeButton"
252 - android:layout_width="wrap_content" 260 + android:layout_width="100dp"
253 - android:layout_height="wrap_content" 261 + android:layout_height="100dp"
254 - android:layout_weight="1" 262 + android:layout_gravity="center"
255 - android:background="@drawable/profil_selector" 263 + android:layout_margin="10dp"
264 + android:background="@drawable/circle_selector"
256 android:text="만기제대" 265 android:text="만기제대"
266 + android:textColor="#757575"
257 android:textOff="만기제대" 267 android:textOff="만기제대"
258 android:textOn="만기제대" /> 268 android:textOn="만기제대" />
259 </LinearLayout> 269 </LinearLayout>
...@@ -266,31 +276,37 @@ ...@@ -266,31 +276,37 @@
266 276
267 <ToggleButton 277 <ToggleButton
268 android:id="@+id/specialmanryoButton" 278 android:id="@+id/specialmanryoButton"
269 - android:layout_width="wrap_content" 279 + android:layout_width="100dp"
270 - android:layout_height="wrap_content" 280 + android:layout_height="100dp"
271 - android:layout_weight="1" 281 + android:layout_gravity="center"
272 - android:background="@drawable/profil_selector" 282 + android:layout_margin="10dp"
283 + android:background="@drawable/circle_selector"
273 android:text="병역특례(복무만료)" 284 android:text="병역특례(복무만료)"
285 + android:textColor="#757575"
274 android:textOff="병역특례(복무만료)" 286 android:textOff="병역특례(복무만료)"
275 android:textOn="병역특례(복무만료)" /> 287 android:textOn="병역특례(복무만료)" />
276 288
277 <ToggleButton 289 <ToggleButton
278 android:id="@+id/specialbokmoosanupButton" 290 android:id="@+id/specialbokmoosanupButton"
279 - android:layout_width="wrap_content" 291 + android:layout_width="100dp"
280 - android:layout_height="wrap_content" 292 + android:layout_height="100dp"
281 - android:layout_weight="1" 293 + android:layout_gravity="center"
282 - android:background="@drawable/profil_selector" 294 + android:layout_margin="10dp"
295 + android:background="@drawable/circle_selector"
283 android:text="병역특례(산업복무중)" 296 android:text="병역특례(산업복무중)"
297 + android:textColor="#757575"
284 android:textOff="병역특례(산업복무중)" 298 android:textOff="병역특례(산업복무중)"
285 android:textOn="병역특례(산업복무중)" /> 299 android:textOn="병역특례(산업복무중)" />
286 300
287 <ToggleButton 301 <ToggleButton
288 android:id="@+id/specialbokmoojeonmoonButton" 302 android:id="@+id/specialbokmoojeonmoonButton"
289 - android:layout_width="wrap_content" 303 + android:layout_width="100dp"
290 - android:layout_height="wrap_content" 304 + android:layout_height="100dp"
291 - android:layout_weight="1" 305 + android:layout_gravity="center"
292 - android:background="@drawable/profil_selector" 306 + android:layout_margin="10dp"
307 + android:background="@drawable/circle_selector"
293 android:text="병역특례(전문복무중)" 308 android:text="병역특례(전문복무중)"
309 + android:textColor="#757575"
294 android:textOff="병역특례(전문복무중)" 310 android:textOff="병역특례(전문복무중)"
295 android:textOn="병역특례(전문복무중)" /> 311 android:textOn="병역특례(전문복무중)" />
296 </LinearLayout> 312 </LinearLayout>
...@@ -298,29 +314,32 @@ ...@@ -298,29 +314,32 @@
298 <LinearLayout 314 <LinearLayout
299 android:layout_width="match_parent" 315 android:layout_width="match_parent"
300 android:layout_height="match_parent" 316 android:layout_height="match_parent"
317 + android:gravity="center"
301 android:orientation="horizontal"> 318 android:orientation="horizontal">
302 319
303 <ToggleButton 320 <ToggleButton
304 android:id="@+id/jedaeguitarButton" 321 android:id="@+id/jedaeguitarButton"
305 - android:layout_width="wrap_content" 322 + android:layout_width="100dp"
306 - android:layout_height="wrap_content" 323 + android:layout_height="100dp"
307 - android:layout_weight="1" 324 + android:layout_gravity="center"
308 - android:background="@drawable/profil_selector" 325 + android:layout_margin="10dp"
326 + android:background="@drawable/circle_selector"
309 android:text="제대기타" 327 android:text="제대기타"
328 + android:textColor="#757575"
310 android:textOff="제대기타" 329 android:textOff="제대기타"
311 android:textOn="제대기타" /> 330 android:textOn="제대기타" />
312 </LinearLayout> 331 </LinearLayout>
313 332
314 333
315 </LinearLayout> 334 </LinearLayout>
335 +
316 </LinearLayout> 336 </LinearLayout>
317 - </ScrollView>
318 337
319 <LinearLayout 338 <LinearLayout
320 android:layout_width="match_parent" 339 android:layout_width="match_parent"
321 - android:layout_height="100dp" 340 + android:layout_height="15dp"
322 android:layout_weight="1" 341 android:layout_weight="1"
323 - android:orientation="vertical"></LinearLayout> 342 + android:orientation="horizontal"></LinearLayout>
324 343
325 <LinearLayout 344 <LinearLayout
326 android:layout_width="match_parent" 345 android:layout_width="match_parent"
...@@ -332,15 +351,22 @@ ...@@ -332,15 +351,22 @@
332 android:layout_width="10dp" 351 android:layout_width="10dp"
333 android:layout_height="wrap_content" 352 android:layout_height="wrap_content"
334 android:layout_weight="1" 353 android:layout_weight="1"
335 - android:text="이전 단계로" /> 354 + android:background="#F4F4F4"
355 + android:text="이전 단계로"
356 + android:textColor="#757575" />
336 357
337 <Button 358 <Button
338 android:id="@+id/nextButton" 359 android:id="@+id/nextButton"
339 android:layout_width="10dp" 360 android:layout_width="10dp"
340 android:layout_height="wrap_content" 361 android:layout_height="wrap_content"
341 android:layout_weight="1" 362 android:layout_weight="1"
342 - android:text="다음 단계로" /> 363 + android:background="#29ABE2"
364 + android:text="다음 단계로"
365 + android:textColor="#FFFFFF" />
343 </LinearLayout> 366 </LinearLayout>
367 +
344 </LinearLayout> 368 </LinearLayout>
369 + </ScrollView>
370 +
345 </LinearLayout> 371 </LinearLayout>
346 </androidx.constraintlayout.widget.ConstraintLayout> 372 </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"
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,8 +111,10 @@ ...@@ -105,8 +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"
114 + android:background="#F4F4F4"
108 android:gravity="center" 115 android:gravity="center"
109 - android:text="4" /> 116 + android:text="4"
117 + android:textColor="#DDDDDD" />
110 118
111 <TextView 119 <TextView
112 android:id="@+id/stageTextView5" 120 android:id="@+id/stageTextView5"
...@@ -114,13 +122,25 @@ ...@@ -114,13 +122,25 @@
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"
134 + android:layout_height="10dp"
135 + android:layout_weight="1"
136 + android:orientation="horizontal"></LinearLayout>
137 +
138 + <ScrollView
139 + android:layout_width="match_parent"
140 + android:layout_height="wrap_content">
141 +
142 + <LinearLayout
143 + android:layout_width="match_parent"
124 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
125 android:layout_weight="1" 145 android:layout_weight="1"
126 android:gravity="center" 146 android:gravity="center"
...@@ -131,30 +151,23 @@ ...@@ -131,30 +151,23 @@
131 android:layout_height="wrap_content" 151 android:layout_height="wrap_content"
132 android:orientation="vertical"> 152 android:orientation="vertical">
133 153
134 - <RelativeLayout 154 + <LinearLayout
135 android:layout_width="match_parent" 155 android:layout_width="match_parent"
136 - android:layout_height="wrap_content"> 156 + android:layout_height="match_parent"
157 + android:gravity="center"
158 + android:orientation="horizontal">
137 159
138 <TextView 160 <TextView
139 - android:id="@+id/explainTextView" 161 + android:id="@+id/explainTextView0"
140 android:layout_width="wrap_content" 162 android:layout_width="wrap_content"
141 android:layout_height="wrap_content" 163 android:layout_height="wrap_content"
142 - android:layout_centerInParent="true"
143 android:layout_gravity="center" 164 android:layout_gravity="center"
144 android:gravity="center" 165 android:gravity="center"
145 - android:text="6. 직업유무를 선택해 주세요." /> 166 + android:text="8. 자신의 직업 유무를 선택해 주세요."
167 + android:textColor="#4A4A4A"
168 + android:textSize="20dp" />
146 169
147 - <Button 170 + </LinearLayout>
148 - android:id="@+id/questionButton"
149 - android:layout_width="30dp"
150 - android:layout_height="30dp"
151 - android:layout_gravity="center"
152 - android:layout_toRightOf="@id/explainTextView"
153 - android:backgroundTint="#1E90FF"
154 - android:gravity="center"
155 - android:text=" ? "
156 - android:textSize="8sp" />
157 - </RelativeLayout>
158 171
159 <LinearLayout 172 <LinearLayout
160 android:layout_width="match_parent" 173 android:layout_width="match_parent"
...@@ -177,9 +190,11 @@ ...@@ -177,9 +190,11 @@
177 android:id="@+id/jobButton" 190 android:id="@+id/jobButton"
178 android:layout_width="300dp" 191 android:layout_width="300dp"
179 android:layout_height="wrap_content" 192 android:layout_height="wrap_content"
193 + android:layout_margin="5dp"
180 android:layout_weight="1" 194 android:layout_weight="1"
181 - android:background="@drawable/profil_selector" 195 + android:background="@drawable/button_selector"
182 android:text="있음" 196 android:text="있음"
197 + android:textColor="#757575"
183 android:textOff="있음" 198 android:textOff="있음"
184 android:textOn="있음" /> 199 android:textOn="있음" />
185 200
...@@ -195,9 +210,11 @@ ...@@ -195,9 +210,11 @@
195 android:id="@+id/nojobButton" 210 android:id="@+id/nojobButton"
196 android:layout_width="300dp" 211 android:layout_width="300dp"
197 android:layout_height="wrap_content" 212 android:layout_height="wrap_content"
213 + android:layout_margin="5dp"
198 android:layout_weight="1" 214 android:layout_weight="1"
199 - android:background="@drawable/profil_selector" 215 + android:background="@drawable/button_selector"
200 android:text="없음" 216 android:text="없음"
217 + android:textColor="#757575"
201 android:textOff="없음" 218 android:textOff="없음"
202 android:textOn="없음" /> 219 android:textOn="없음" />
203 </LinearLayout> 220 </LinearLayout>
...@@ -210,7 +227,7 @@ ...@@ -210,7 +227,7 @@
210 <LinearLayout 227 <LinearLayout
211 android:id="@+id/sixoneLayout" 228 android:id="@+id/sixoneLayout"
212 android:layout_width="match_parent" 229 android:layout_width="match_parent"
213 - android:layout_height="50dp" 230 + android:layout_height="wrap_content"
214 android:layout_weight="1" 231 android:layout_weight="1"
215 android:orientation="vertical" 232 android:orientation="vertical"
216 android:visibility="gone"> 233 android:visibility="gone">
...@@ -220,30 +237,23 @@ ...@@ -220,30 +237,23 @@
220 android:layout_height="wrap_content" 237 android:layout_height="wrap_content"
221 android:orientation="vertical"> 238 android:orientation="vertical">
222 239
223 - <RelativeLayout 240 + <LinearLayout
224 android:layout_width="match_parent" 241 android:layout_width="match_parent"
225 - android:layout_height="match_parent"> 242 + android:layout_height="match_parent"
243 + android:gravity="center"
244 + android:orientation="horizontal">
226 245
227 <TextView 246 <TextView
228 - android:id="@+id/explainSub1TextView" 247 + android:id="@+id/explainTextView1"
229 android:layout_width="wrap_content" 248 android:layout_width="wrap_content"
230 android:layout_height="wrap_content" 249 android:layout_height="wrap_content"
231 - android:layout_centerInParent="true"
232 android:layout_gravity="center" 250 android:layout_gravity="center"
233 android:gravity="center" 251 android:gravity="center"
234 - android:text="6-1. 근로 형태를 선택해 주세요." /> 252 + android:text="8-1. 근로형태를 선택해주세요."
253 + android:textColor="#4A4A4A"
254 + android:textSize="20dp" />
235 255
236 - <Button 256 + </LinearLayout>
237 - android:id="@+id/questionSub1Button"
238 - android:layout_width="30dp"
239 - android:layout_height="30dp"
240 - android:layout_gravity="center"
241 - android:layout_toRightOf="@id/explainSub1TextView"
242 - android:backgroundTint="#1E90FF"
243 - android:gravity="center"
244 - android:text=" ? "
245 - android:textSize="8sp" />
246 - </RelativeLayout>
247 </LinearLayout> 257 </LinearLayout>
248 258
249 <LinearLayout 259 <LinearLayout
...@@ -267,9 +277,11 @@ ...@@ -267,9 +277,11 @@
267 android:id="@+id/companyButton" 277 android:id="@+id/companyButton"
268 android:layout_width="300dp" 278 android:layout_width="300dp"
269 android:layout_height="wrap_content" 279 android:layout_height="wrap_content"
280 + android:layout_margin="5dp"
270 android:layout_weight="1" 281 android:layout_weight="1"
271 - android:background="@drawable/profil_selector" 282 + android:background="@drawable/button_selector"
272 android:text="사업자" 283 android:text="사업자"
284 + android:textColor="#757575"
273 android:textOff="사업자" 285 android:textOff="사업자"
274 android:textOn="사업자" /> 286 android:textOn="사업자" />
275 287
...@@ -285,9 +297,11 @@ ...@@ -285,9 +297,11 @@
285 android:id="@+id/workerButton" 297 android:id="@+id/workerButton"
286 android:layout_width="300dp" 298 android:layout_width="300dp"
287 android:layout_height="wrap_content" 299 android:layout_height="wrap_content"
300 + android:layout_margin="5dp"
288 android:layout_weight="1" 301 android:layout_weight="1"
289 - android:background="@drawable/profil_selector" 302 + android:background="@drawable/button_selector"
290 android:text="근로자" 303 android:text="근로자"
304 + android:textColor="#757575"
291 android:textOff="근로자" 305 android:textOff="근로자"
292 android:textOn="근로자" /> 306 android:textOn="근로자" />
293 </LinearLayout> 307 </LinearLayout>
...@@ -300,7 +314,7 @@ ...@@ -300,7 +314,7 @@
300 <LinearLayout 314 <LinearLayout
301 android:id="@+id/sixtwoLayout" 315 android:id="@+id/sixtwoLayout"
302 android:layout_width="match_parent" 316 android:layout_width="match_parent"
303 - android:layout_height="100dp" 317 + android:layout_height="wrap_content"
304 android:layout_weight="1" 318 android:layout_weight="1"
305 android:orientation="vertical" 319 android:orientation="vertical"
306 android:visibility="gone"> 320 android:visibility="gone">
...@@ -310,30 +324,30 @@ ...@@ -310,30 +324,30 @@
310 android:layout_height="wrap_content" 324 android:layout_height="wrap_content"
311 android:orientation="vertical"> 325 android:orientation="vertical">
312 326
313 - <RelativeLayout 327 + <LinearLayout
314 android:layout_width="match_parent" 328 android:layout_width="match_parent"
315 - android:layout_height="match_parent"> 329 + android:layout_height="match_parent"
330 + android:gravity="center"
331 + android:orientation="horizontal">
316 332
317 <TextView 333 <TextView
318 - android:id="@+id/explainSub2TextView" 334 + android:id="@+id/explainTextView2"
319 android:layout_width="wrap_content" 335 android:layout_width="wrap_content"
320 android:layout_height="wrap_content" 336 android:layout_height="wrap_content"
321 - android:layout_centerInParent="true"
322 android:layout_gravity="center" 337 android:layout_gravity="center"
323 android:gravity="center" 338 android:gravity="center"
324 - android:text="6-2. 현재 상태를 선택해 주세요." /> 339 + android:text="8-2. 현재상태를 선택해주세요."
340 + android:textColor="#4A4A4A"
341 + android:textSize="20dp" />
325 342
326 <Button 343 <Button
327 - android:id="@+id/questionSub2Button" 344 + android:id="@+id/questionButton"
328 - android:layout_width="30dp" 345 + android:layout_width="20dp"
329 - android:layout_height="30dp" 346 + android:layout_height="20dp"
330 - android:layout_gravity="center" 347 + android:layout_gravity="bottom"
331 - android:layout_toRightOf="@id/explainSub2TextView" 348 + android:background="@drawable/question_mark_image" />
332 - android:backgroundTint="#1E90FF" 349 +
333 - android:gravity="center" 350 + </LinearLayout>
334 - android:text=" ? "
335 - android:textSize="8sp" />
336 - </RelativeLayout>
337 </LinearLayout> 351 </LinearLayout>
338 352
339 <LinearLayout 353 <LinearLayout
...@@ -357,9 +371,11 @@ ...@@ -357,9 +371,11 @@
357 android:id="@+id/entireButton" 371 android:id="@+id/entireButton"
358 android:layout_width="300dp" 372 android:layout_width="300dp"
359 android:layout_height="wrap_content" 373 android:layout_height="wrap_content"
374 + android:layout_margin="5dp"
360 android:layout_weight="1" 375 android:layout_weight="1"
361 - android:background="@drawable/profil_selector" 376 + android:background="@drawable/button_selector"
362 android:text="퇴직자" 377 android:text="퇴직자"
378 + android:textColor="#757575"
363 android:textOff="퇴직자" 379 android:textOff="퇴직자"
364 android:textOn="퇴직자" /> 380 android:textOn="퇴직자" />
365 381
...@@ -374,9 +390,11 @@ ...@@ -374,9 +390,11 @@
374 android:id="@+id/startupButton" 390 android:id="@+id/startupButton"
375 android:layout_width="300dp" 391 android:layout_width="300dp"
376 android:layout_height="wrap_content" 392 android:layout_height="wrap_content"
393 + android:layout_margin="5dp"
377 android:layout_weight="1" 394 android:layout_weight="1"
378 - android:background="@drawable/profil_selector" 395 + android:background="@drawable/button_selector"
379 android:text="창업예정자" 396 android:text="창업예정자"
397 + android:textColor="#757575"
380 android:textOff="창업예정자" 398 android:textOff="창업예정자"
381 android:textOn="창업예정자" /> 399 android:textOn="창업예정자" />
382 </LinearLayout> 400 </LinearLayout>
...@@ -390,9 +408,11 @@ ...@@ -390,9 +408,11 @@
390 android:id="@+id/seekButton" 408 android:id="@+id/seekButton"
391 android:layout_width="300dp" 409 android:layout_width="300dp"
392 android:layout_height="wrap_content" 410 android:layout_height="wrap_content"
411 + android:layout_margin="5dp"
393 android:layout_weight="1" 412 android:layout_weight="1"
394 - android:background="@drawable/profil_selector" 413 + android:background="@drawable/button_selector"
395 android:text="취준생/구직자" 414 android:text="취준생/구직자"
415 + android:textColor="#757575"
396 android:textOff="취준생/구직자" 416 android:textOff="취준생/구직자"
397 android:textOn="취준생/구직자" /> 417 android:textOn="취준생/구직자" />
398 </LinearLayout> 418 </LinearLayout>
...@@ -404,6 +424,13 @@ ...@@ -404,6 +424,13 @@
404 </LinearLayout> 424 </LinearLayout>
405 425
406 </LinearLayout> 426 </LinearLayout>
427 + </ScrollView>
428 +
429 + <LinearLayout
430 + android:layout_width="match_parent"
431 + android:layout_height="wrap_content"
432 + android:layout_weight="1"
433 + android:orientation="horizontal"></LinearLayout>
407 434
408 <LinearLayout 435 <LinearLayout
409 android:layout_width="match_parent" 436 android:layout_width="match_parent"
...@@ -417,14 +444,18 @@ ...@@ -417,14 +444,18 @@
417 android:layout_width="10dp" 444 android:layout_width="10dp"
418 android:layout_height="wrap_content" 445 android:layout_height="wrap_content"
419 android:layout_weight="1" 446 android:layout_weight="1"
420 - android:text="이전 단계로" /> 447 + android:background="#F4F4F4"
448 + android:text="이전 단계로"
449 + android:textColor="#757575" />
421 450
422 <Button 451 <Button
423 android:id="@+id/nextButton" 452 android:id="@+id/nextButton"
424 android:layout_width="10dp" 453 android:layout_width="10dp"
425 android:layout_height="wrap_content" 454 android:layout_height="wrap_content"
426 android:layout_weight="1" 455 android:layout_weight="1"
427 - android:text="다음 단계로" /> 456 + android:background="#29ABE2"
457 + android:text="다음 단계로"
458 + android:textColor="#FFFFFF" />
428 </LinearLayout> 459 </LinearLayout>
429 460
430 </LinearLayout> 461 </LinearLayout>
......