장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
95c6bddf 1 parent 85c061a5

button wrong word changing

Inline Side-by-side
Showing 28 changed files with 139 additions and 83 deletions
...@@ -126,6 +126,15 @@ class DetailActivity : AppCompatActivity() { ...@@ -126,6 +126,15 @@ class DetailActivity : AppCompatActivity() {
126 } 126 }
127 } 127 }
128 128
129 + linkBtn.setOnClickListener {
130 + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(memo.Link))
131 + startActivity(intent)
132 + }
133 +
134 + shareBtn.setOnClickListener {
135 +
136 + }
137 +
129 bottomBar=supportActionBar!! 138 bottomBar=supportActionBar!!
130 val r_bottomNavigation: BottomNavigationView =findViewById(R.id.rightBottomBVW) 139 val r_bottomNavigation: BottomNavigationView =findViewById(R.id.rightBottomBVW)
131 val l_bottomNavigation: BottomNavigationView=findViewById(R.id.leftBottomBVW) 140 val l_bottomNavigation: BottomNavigationView=findViewById(R.id.leftBottomBVW)
......
...@@ -182,6 +182,11 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -182,6 +182,11 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
182 var intent = Intent(this, InputProfilThirdOneActivity::class.java) 182 var intent = Intent(this, InputProfilThirdOneActivity::class.java)
183 startActivity(intent) 183 startActivity(intent)
184 } 184 }
185 +
186 + if(janyeoButton.isChecked==false&&brotherButton.isChecked==true){
187 + var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
188 + startActivity(intent)
189 + }
185 } 190 }
186 191
187 nothingButton.setOnClickListener { 192 nothingButton.setOnClickListener {
......
...@@ -148,6 +148,7 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -148,6 +148,7 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
148 val bsList = ArrayList<BSItem>() 148 val bsList = ArrayList<BSItem>()
149 bsNumberInputButton.setOnClickListener { 149 bsNumberInputButton.setOnClickListener {
150 150
151 + bsList.clear()
151 if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){ 152 if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){
152 var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt() 153 var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
153 var cnt=1 154 var cnt=1
......
...@@ -162,6 +162,7 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -162,6 +162,7 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
162 val childList = ArrayList<ChildItem>() 162 val childList = ArrayList<ChildItem>()
163 childNumberInputButton.setOnClickListener { 163 childNumberInputButton.setOnClickListener {
164 164
165 + childList.clear()
165 if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){ 166 if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){
166 var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() 167 var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
167 var cnt=1 168 var cnt=1
......
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">
3 3
4 - <item android:state_checked="false" android:drawable="@drawable/detail_heart_x" /> 4 + <item android:state_checked="false" android:drawable="@drawable/heart_x" />
5 - <item android:state_checked="true" android:drawable="@drawable/detail_heart_o" /> 5 + <item android:state_checked="true" android:drawable="@drawable/heart_o" />
6 </selector> 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 + <gradient
4 + android:startColor="#00000000"
5 +
6 + android:endColor="#33000000"
7 + android:angle="270"/>
8 + <!--android:centerY="0.95"-->
9 +</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">
3 3
4 - <item android:state_checked="false" android:drawable="@drawable/heart_stroke" /> 4 + <item android:state_checked="false" android:drawable="@drawable/heart_x" />
5 - <item android:state_checked="true" android:drawable="@drawable/heart_fill" /> 5 + <item android:state_checked="true" android:drawable="@drawable/heart_o" />
6 </selector> 6 </selector>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 android:layout_marginBottom="11dp" 25 android:layout_marginBottom="11dp"
26 android:background="#FFF" 26 android:background="#FFF"
27 + android:elevation="5dp"
27 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 28 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
28 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> 29 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
29 30
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
39 android:layout_height="match_parent" 40 android:layout_height="match_parent"
40 android:layout_marginLeft="8dp" 41 android:layout_marginLeft="8dp"
41 android:layout_marginRight="8dp" 42 android:layout_marginRight="8dp"
42 - android:layout_marginBottom="8dp" 43 + android:layout_marginBottom="5dp"
43 android:layout_weight="1" 44 android:layout_weight="1"
44 android:background="@drawable/round_ratangle" 45 android:background="@drawable/round_ratangle"
45 android:elevation="3dp" 46 android:elevation="3dp"
...@@ -134,8 +135,8 @@ ...@@ -134,8 +135,8 @@
134 135
135 <LinearLayout 136 <LinearLayout
136 android:layout_width="match_parent" 137 android:layout_width="match_parent"
137 - android:layout_height="5dp" 138 + android:layout_height="3dp"
138 - android:background="@drawable/gradation" 139 + android:background="@drawable/gradation_for_shadow"
139 android:orientation="horizontal"></LinearLayout> 140 android:orientation="horizontal"></LinearLayout>
140 141
141 <FrameLayout 142 <FrameLayout
...@@ -157,29 +158,58 @@ ...@@ -157,29 +158,58 @@
157 android:gravity="center" 158 android:gravity="center"
158 android:orientation="horizontal"> 159 android:orientation="horizontal">
159 160
161 + <LinearLayout
162 + android:layout_width="0dp"
163 + android:layout_height="match_parent"
164 + android:layout_weight="3"
165 + android:orientation="horizontal">
166 +
167 + <LinearLayout
168 + android:layout_width="wrap_content"
169 + android:layout_height="match_parent"
170 + android:layout_weight="1.5"
171 + android:gravity="center"
172 + android:orientation="horizontal">
173 +
160 <ToggleButton 174 <ToggleButton
161 android:id="@+id/favorBtn" 175 android:id="@+id/favorBtn"
162 - android:layout_width="32dp" 176 + android:layout_width="20dp"
163 - android:layout_height="32dp" 177 + android:layout_height="20dp"
164 - android:layout_marginRight="50dp"
165 android:background="@drawable/detail_favor_selector" 178 android:background="@drawable/detail_favor_selector"
166 android:textOff=" " 179 android:textOff=" "
167 android:textOn=" " /> 180 android:textOn=" " />
181 + </LinearLayout>
182 +
183 + <LinearLayout
184 + android:layout_width="wrap_content"
185 + android:layout_height="match_parent"
186 + android:layout_weight="1.5"
187 + android:gravity="center"
188 + android:orientation="horizontal">
168 189
169 <Button 190 <Button
170 android:id="@+id/shareBtn" 191 android:id="@+id/shareBtn"
171 - android:layout_width="30dp" 192 + android:layout_width="20dp"
172 - android:layout_height="30dp" 193 + android:layout_height="20dp"
173 - android:background="@drawable/share" 194 + android:background="@drawable/share_x"
174 android:textOff=" " 195 android:textOff=" "
175 android:textOn=" " /> 196 android:textOn=" " />
197 + </LinearLayout>
198 +
199 + </LinearLayout>
200 +
201 + <Button
202 + android:id="@+id/linkBtn"
203 + android:layout_width="0dp"
204 + android:layout_height="50dp"
205 + android:layout_weight="4"
206 + android:background="@drawable/link_cut" />
176 207
177 <com.google.android.material.bottomnavigation.BottomNavigationView 208 <com.google.android.material.bottomnavigation.BottomNavigationView
178 android:id="@+id/leftBottomBVW" 209 android:id="@+id/leftBottomBVW"
179 android:layout_width="wrap_content" 210 android:layout_width="wrap_content"
180 android:layout_height="wrap_content" 211 android:layout_height="wrap_content"
181 android:layout_gravity="bottom" 212 android:layout_gravity="bottom"
182 - android:background="#FFF"
183 android:elevation="5dp" 213 android:elevation="5dp"
184 android:visibility="gone" 214 android:visibility="gone"
185 app:itemIconTint="#DDDDDD" 215 app:itemIconTint="#DDDDDD"
...@@ -191,7 +221,8 @@ ...@@ -191,7 +221,8 @@
191 android:layout_width="match_parent" 221 android:layout_width="match_parent"
192 android:layout_height="match_parent" 222 android:layout_height="match_parent"
193 android:layout_weight="1" 223 android:layout_weight="1"
194 - android:orientation="horizontal"> 224 + android:orientation="horizontal"
225 + android:visibility="gone">
195 226
196 <com.google.android.material.bottomnavigation.BottomNavigationView 227 <com.google.android.material.bottomnavigation.BottomNavigationView
197 android:id="@+id/rightBottomBVW" 228 android:id="@+id/rightBottomBVW"
......
...@@ -221,10 +221,10 @@ ...@@ -221,10 +221,10 @@
221 android:layout_margin="10dp" 221 android:layout_margin="10dp"
222 android:background="@drawable/circle_selector" 222 android:background="@drawable/circle_selector"
223 android:gravity="center" 223 android:gravity="center"
224 - android:text="피부양자(직장)" 224 + android:text="피부양자\n(직장)"
225 android:textColor="#757575" 225 android:textColor="#757575"
226 - android:textOff="피부양자(직장)" 226 + android:textOff="피부양자\n(직장)"
227 - android:textOn="피부양자(직장)" 227 + android:textOn="피부양자\n(직장)"
228 android:textSize="16dp" /> 228 android:textSize="16dp" />
229 229
230 <ToggleButton 230 <ToggleButton
...@@ -234,10 +234,10 @@ ...@@ -234,10 +234,10 @@
234 android:layout_margin="10dp" 234 android:layout_margin="10dp"
235 android:background="@drawable/circle_selector" 235 android:background="@drawable/circle_selector"
236 android:gravity="center" 236 android:gravity="center"
237 - android:text="피부양자(지역)" 237 + android:text="피부양자\n(지역)"
238 android:textColor="#757575" 238 android:textColor="#757575"
239 - android:textOff="피부양자(지역)" 239 + android:textOff="피부양자\n(지역)"
240 - android:textOn="피부양자(지역)" 240 + android:textOn="피부양자\n(지역)"
241 android:textSize="16dp" /> 241 android:textSize="16dp" />
242 242
243 </LinearLayout> 243 </LinearLayout>
...@@ -256,10 +256,10 @@ ...@@ -256,10 +256,10 @@
256 android:layout_margin="10dp" 256 android:layout_margin="10dp"
257 android:background="@drawable/circle_selector" 257 android:background="@drawable/circle_selector"
258 android:gravity="center" 258 android:gravity="center"
259 - android:text="의료급여수급건자" 259 + android:text="의료급여\n수급권자"
260 android:textColor="#757575" 260 android:textColor="#757575"
261 - android:textOff="의료급여수급건자" 261 + android:textOff="의료급여\n수급권자"
262 - android:textOn="의료급여수급건자" 262 + android:textOn="의료급여\n수급권자"
263 android:textSize="16dp" /> 263 android:textSize="16dp" />
264 264
265 <ToggleButton 265 <ToggleButton
......
...@@ -215,10 +215,10 @@ ...@@ -215,10 +215,10 @@
215 android:layout_gravity="center" 215 android:layout_gravity="center"
216 android:layout_margin="10dp" 216 android:layout_margin="10dp"
217 android:background="@drawable/circle_selector" 217 android:background="@drawable/circle_selector"
218 - android:text="일제강점기피해자" 218 + android:text="일제강점기\n피해자"
219 android:textColor="#757575" 219 android:textColor="#757575"
220 - android:textOff="일제강점기피해자" 220 + android:textOff="일제강점기\n피해자"
221 - android:textOn="일제강점기피해자" 221 + android:textOn="일제강점기\n피해자"
222 android:textSize="16dp" /> 222 android:textSize="16dp" />
223 223
224 </LinearLayout> 224 </LinearLayout>
...@@ -236,10 +236,10 @@ ...@@ -236,10 +236,10 @@
236 android:layout_gravity="center" 236 android:layout_gravity="center"
237 android:layout_margin="10dp" 237 android:layout_margin="10dp"
238 android:background="@drawable/circle_selector" 238 android:background="@drawable/circle_selector"
239 - android:text="특수상황피해자" 239 + android:text="특수상황\n피해자"
240 android:textColor="#757575" 240 android:textColor="#757575"
241 - android:textOff="특수상황피해자" 241 + android:textOff="특수상황\n피해자"
242 - android:textOn="특수상황피해자" 242 + android:textOn="특수상황\n피해자"
243 android:textSize="16dp" /> 243 android:textSize="16dp" />
244 244
245 <ToggleButton 245 <ToggleButton
...@@ -249,10 +249,10 @@ ...@@ -249,10 +249,10 @@
249 android:layout_gravity="center" 249 android:layout_gravity="center"
250 android:layout_margin="10dp" 250 android:layout_margin="10dp"
251 android:background="@drawable/circle_selector" 251 android:background="@drawable/circle_selector"
252 - android:text="산업재해피해자/가족" 252 + android:text="산업재해\n피해자/가족"
253 android:textColor="#757575" 253 android:textColor="#757575"
254 - android:textOff="산업재해피해자/가족" 254 + android:textOff="산업재해\n피해자/가족"
255 - android:textOn="산업재해피해자/가족" 255 + android:textOn="산업재해\n피해자/가족"
256 android:textSize="16dp" /> 256 android:textSize="16dp" />
257 257
258 </LinearLayout> 258 </LinearLayout>
...@@ -269,13 +269,13 @@ ...@@ -269,13 +269,13 @@
269 android:layout_width="100dp" 269 android:layout_width="100dp"
270 android:layout_height="100dp" 270 android:layout_height="100dp"
271 android:layout_gravity="center" 271 android:layout_gravity="center"
272 + android:layout_margin="10dp"
272 android:background="@drawable/circle_selector" 273 android:background="@drawable/circle_selector"
273 - android:text="기타피해상황" 274 + android:text="기타\n피해상황"
274 android:textColor="#757575" 275 android:textColor="#757575"
275 - android:textOff="기타피해상황" 276 + android:textOff="기타\n피해상황"
276 - android:textOn="기타피해상황" 277 + android:textOn="기타\n피해상황"
277 - android:textSize="16dp" 278 + android:textSize="16dp" />
278 - android:layout_margin="10dp" />
279 279
280 <ToggleButton 280 <ToggleButton
281 android:id="@+id/emptyButton" 281 android:id="@+id/emptyButton"
......
...@@ -241,10 +241,10 @@ ...@@ -241,10 +241,10 @@
241 android:layout_gravity="center" 241 android:layout_gravity="center"
242 android:layout_margin="10dp" 242 android:layout_margin="10dp"
243 android:background="@drawable/circle_selector" 243 android:background="@drawable/circle_selector"
244 - android:text="가출/실종/사망" 244 + android:text="가출\n/실종/사망"
245 android:textColor="#757575" 245 android:textColor="#757575"
246 - android:textOff="가출/실종/사망" 246 + android:textOff="가출\n/실종/사망"
247 - android:textOn="가출/실종/사망" 247 + android:textOn="가출\n/실종/사망"
248 android:textSize="16dp" /> 248 android:textSize="16dp" />
249 249
250 <ToggleButton 250 <ToggleButton
...@@ -301,10 +301,10 @@ ...@@ -301,10 +301,10 @@
301 android:layout_gravity="center" 301 android:layout_gravity="center"
302 android:layout_margin="10dp" 302 android:layout_margin="10dp"
303 android:background="@drawable/circle_selector" 303 android:background="@drawable/circle_selector"
304 - android:text="학교밖청소년" 304 + android:text="학교 밖\n청소년"
305 android:textColor="#757575" 305 android:textColor="#757575"
306 - android:textOff="학교밖청소년" 306 + android:textOff="학교 밖\n청소년"
307 - android:textOn="학교밖청소년" 307 + android:textOn="학교 밖\n청소년"
308 android:textSize="16dp" /> 308 android:textSize="16dp" />
309 309
310 <ToggleButton 310 <ToggleButton
......
...@@ -358,10 +358,10 @@ ...@@ -358,10 +358,10 @@
358 android:layout_margin="10dp" 358 android:layout_margin="10dp"
359 android:layout_weight="1" 359 android:layout_weight="1"
360 android:background="@drawable/circle_selector" 360 android:background="@drawable/circle_selector"
361 - android:text="보장기관제공주거" 361 + android:text="보장기관\n제공 주거"
362 android:textColor="#757575" 362 android:textColor="#757575"
363 - android:textOff="보장기관제공주거" 363 + android:textOff="보장기관\n제공 주거"
364 - android:textOn="보장기관제공주거" 364 + android:textOn="보장기관\n제공 주거"
365 android:textSize="16dp" /> 365 android:textSize="16dp" />
366 366
367 <ToggleButton 367 <ToggleButton
......
...@@ -355,10 +355,10 @@ ...@@ -355,10 +355,10 @@
355 android:layout_margin="10dp" 355 android:layout_margin="10dp"
356 android:layout_weight="1" 356 android:layout_weight="1"
357 android:background="@drawable/circle_selector" 357 android:background="@drawable/circle_selector"
358 - android:text="보장기관제공주거" 358 + android:text="보장기관\n제공 주거"
359 android:textColor="#757575" 359 android:textColor="#757575"
360 - android:textOff="보장기관제공주거" 360 + android:textOff="보장기관\n제공 주거"
361 - android:textOn="보장기관제공주거" 361 + android:textOn="보장기관\n제공 주거"
362 android:textSize="16dp" /> 362 android:textSize="16dp" />
363 363
364 <ToggleButton 364 <ToggleButton
......
...@@ -231,10 +231,10 @@ ...@@ -231,10 +231,10 @@
231 android:layout_margin="10dp" 231 android:layout_margin="10dp"
232 android:layout_weight="1" 232 android:layout_weight="1"
233 android:background="@drawable/circle_selector" 233 android:background="@drawable/circle_selector"
234 - android:text="배우자의조부모" 234 + android:text="배우자의\n조부모"
235 android:textColor="#757575" 235 android:textColor="#757575"
236 - android:textOff="배우자의조부모" 236 + android:textOff="배우자의\n조부모"
237 - android:textOn="배우자의조부모" /> 237 + android:textOn="배우자의\n조부모" />
238 238
239 </LinearLayout> 239 </LinearLayout>
240 240
......
...@@ -215,10 +215,10 @@ ...@@ -215,10 +215,10 @@
215 android:layout_margin="10dp" 215 android:layout_margin="10dp"
216 android:layout_weight="1" 216 android:layout_weight="1"
217 android:background="@drawable/circle_selector" 217 android:background="@drawable/circle_selector"
218 - android:text="임신및출산(예정)" 218 + android:text="임신 및 출산\n(예정)"
219 android:textColor="#757575" 219 android:textColor="#757575"
220 - android:textOff="임신및출산(예정)" 220 + android:textOff="임신 및 출산\n(예정)"
221 - android:textOn="임신및출산(예정)" 221 + android:textOn="임신 및 출산\n(예정)"
222 android:textSize="16dp" /> 222 android:textSize="16dp" />
223 223
224 </LinearLayout> 224 </LinearLayout>
...@@ -236,11 +236,11 @@ ...@@ -236,11 +236,11 @@
236 android:layout_margin="10dp" 236 android:layout_margin="10dp"
237 android:layout_weight="1" 237 android:layout_weight="1"
238 android:background="@drawable/circle_selector" 238 android:background="@drawable/circle_selector"
239 - android:text="희귀난치성및중증질환" 239 + android:text="희귀난치성\n및\n중증질환"
240 android:textColor="#757575" 240 android:textColor="#757575"
241 - android:textOff="희귀난치성및중증질환" 241 + android:textOff="희귀난치성\n및\n중증질환"
242 - android:textOn="희귀난치성및중증질환" 242 + android:textOn="희귀난치성\n및\n중증질환"
243 - android:textSize="16dp" /> 243 + android:textSize="12dp" />
244 244
245 <ToggleButton 245 <ToggleButton
246 android:id="@+id/oeButton" 246 android:id="@+id/oeButton"
...@@ -250,10 +250,10 @@ ...@@ -250,10 +250,10 @@
250 android:layout_margin="10dp" 250 android:layout_margin="10dp"
251 android:layout_weight="1" 251 android:layout_weight="1"
252 android:background="@drawable/circle_selector" 252 android:background="@drawable/circle_selector"
253 - android:text="중증질환외질병" 253 + android:text="중증질환 외\n질병"
254 android:textColor="#757575" 254 android:textColor="#757575"
255 - android:textOff="중증질환외질병" 255 + android:textOff="중증질환 외\n질병"
256 - android:textOn="중증질환외질병" 256 + android:textOn="중증질환 외\n질병"
257 android:textSize="16dp" /> 257 android:textSize="16dp" />
258 </LinearLayout> 258 </LinearLayout>
259 259
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
274 android:textColor="#757575" 274 android:textColor="#757575"
275 android:textOff="(장기)요양환자" 275 android:textOff="(장기)요양환자"
276 android:textOn="(장기)요양환자" 276 android:textOn="(장기)요양환자"
277 - android:textSize="16dp" /> 277 + android:textSize="14dp" />
278 278
279 <ToggleButton 279 <ToggleButton
280 android:id="@+id/guitarButton" 280 android:id="@+id/guitarButton"
......
...@@ -250,10 +250,10 @@ ...@@ -250,10 +250,10 @@
250 android:layout_gravity="center" 250 android:layout_gravity="center"
251 android:layout_margin="10dp" 251 android:layout_margin="10dp"
252 android:background="@drawable/circle_selector" 252 android:background="@drawable/circle_selector"
253 - android:text="복무중(현역병)" 253 + android:text="복무중\n(현역병)"
254 android:textColor="#757575" 254 android:textColor="#757575"
255 - android:textOff="복무중(현역병)" 255 + android:textOff="복무중\n(현역병)"
256 - android:textOn="복무중(현역병)" /> 256 + android:textOn="복무중\n(현역병)" />
257 257
258 <ToggleButton 258 <ToggleButton
259 android:id="@+id/mangijedaeButton" 259 android:id="@+id/mangijedaeButton"
...@@ -262,10 +262,10 @@ ...@@ -262,10 +262,10 @@
262 android:layout_gravity="center" 262 android:layout_gravity="center"
263 android:layout_margin="10dp" 263 android:layout_margin="10dp"
264 android:background="@drawable/circle_selector" 264 android:background="@drawable/circle_selector"
265 - android:text="만기제대" 265 + android:text="만기 제대"
266 android:textColor="#757575" 266 android:textColor="#757575"
267 - android:textOff="만기제대" 267 + android:textOff="만기 제대"
268 - android:textOn="만기제대" /> 268 + android:textOn="만기 제대" />
269 </LinearLayout> 269 </LinearLayout>
270 270
271 271
...@@ -281,10 +281,10 @@ ...@@ -281,10 +281,10 @@
281 android:layout_gravity="center" 281 android:layout_gravity="center"
282 android:layout_margin="10dp" 282 android:layout_margin="10dp"
283 android:background="@drawable/circle_selector" 283 android:background="@drawable/circle_selector"
284 - android:text="병역특례(복무만료)" 284 + android:text="병역특례\n(복무만료)"
285 android:textColor="#757575" 285 android:textColor="#757575"
286 - android:textOff="병역특례(복무만료)" 286 + android:textOff="병역특례\n(복무만료)"
287 - android:textOn="병역특례(복무만료)" /> 287 + android:textOn="병역특례\n(복무만료)" />
288 288
289 <ToggleButton 289 <ToggleButton
290 android:id="@+id/specialbokmoosanupButton" 290 android:id="@+id/specialbokmoosanupButton"
...@@ -293,10 +293,10 @@ ...@@ -293,10 +293,10 @@
293 android:layout_gravity="center" 293 android:layout_gravity="center"
294 android:layout_margin="10dp" 294 android:layout_margin="10dp"
295 android:background="@drawable/circle_selector" 295 android:background="@drawable/circle_selector"
296 - android:text="병역특례(산업복무중)" 296 + android:text="병역특례\n(산업복무중)"
297 android:textColor="#757575" 297 android:textColor="#757575"
298 - android:textOff="병역특례(산업복무중)" 298 + android:textOff="병역특례\n(산업복무중)"
299 - android:textOn="병역특례(산업복무중)" /> 299 + android:textOn="병역특례\n(산업복무중)" />
300 300
301 <ToggleButton 301 <ToggleButton
302 android:id="@+id/specialbokmoojeonmoonButton" 302 android:id="@+id/specialbokmoojeonmoonButton"
...@@ -305,10 +305,10 @@ ...@@ -305,10 +305,10 @@
305 android:layout_gravity="center" 305 android:layout_gravity="center"
306 android:layout_margin="10dp" 306 android:layout_margin="10dp"
307 android:background="@drawable/circle_selector" 307 android:background="@drawable/circle_selector"
308 - android:text="병역특례(전문복무중)" 308 + android:text="병역특례\n(전문복무중)"
309 android:textColor="#757575" 309 android:textColor="#757575"
310 - android:textOff="병역특례(전문복무중)" 310 + android:textOff="병역특례\n(전문복무중)"
311 - android:textOn="병역특례(전문복무중)" /> 311 + android:textOn="병역특례\n(전문복무중)" />
312 </LinearLayout> 312 </LinearLayout>
313 313
314 <LinearLayout 314 <LinearLayout
......
...@@ -4,25 +4,25 @@ ...@@ -4,25 +4,25 @@
4 <item 4 <item
5 android:id="@+id/bottomHome" 5 android:id="@+id/bottomHome"
6 android:enabled="true" 6 android:enabled="true"
7 - android:icon="@drawable/home" 7 + android:icon="@drawable/bottom_home"
8 android:title="WELLO" 8 android:title="WELLO"
9 app:showAsAction="ifRoom" /> 9 app:showAsAction="ifRoom" />
10 <item 10 <item
11 android:id="@+id/bottomRecommend" 11 android:id="@+id/bottomRecommend"
12 android:enabled="true" 12 android:enabled="true"
13 - android:icon="@drawable/wish" 13 + android:icon="@drawable/bottom_recommend"
14 android:title="추천정책" 14 android:title="추천정책"
15 app:showAsAction="ifRoom" /> 15 app:showAsAction="ifRoom" />
16 <item 16 <item
17 android:id="@+id/bottomFavorites" 17 android:id="@+id/bottomFavorites"
18 android:enabled="true" 18 android:enabled="true"
19 - android:icon="@drawable/instagram" 19 + android:icon="@drawable/bottom_favor"
20 android:title="찜한목록" 20 android:title="찜한목록"
21 app:showAsAction="ifRoom" /> 21 app:showAsAction="ifRoom" />
22 <item 22 <item
23 android:id="@+id/bottomInfo" 23 android:id="@+id/bottomInfo"
24 android:enabled="true" 24 android:enabled="true"
25 - android:icon="@drawable/info" 25 + android:icon="@drawable/bottom_info"
26 android:title="내 정보" 26 android:title="내 정보"
27 app:showAsAction="ifRoom" /> 27 app:showAsAction="ifRoom" />
28 </menu> 28 </menu>
...\ No newline at end of file ...\ No newline at end of file
......