장연우 / WELLO

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

make mutable list

Expand all
Inline Side-by-side
Showing 25 changed files with 386 additions and 87 deletions
...@@ -190,6 +190,9 @@ class InputProfilFifthFourActivity : AppCompatActivity() { ...@@ -190,6 +190,9 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
190 } 190 }
191 191
192 nextButton.setOnClickListener { 192 nextButton.setOnClickListener {
193 + editor.remove("fifth_four")
194 + editor.remove("fifth_four_editText1")
195 + editor.commit()
193 196
194 if((editText1.text.toString()!="")){editor.putString("fifth_four_editText1",editText1.text.toString());editor.putString("fifth_four","done");editor.commit()} 197 if((editText1.text.toString()!="")){editor.putString("fifth_four_editText1",editText1.text.toString());editor.putString("fifth_four","done");editor.commit()}
195 198
...@@ -210,6 +213,59 @@ class InputProfilFifthFourActivity : AppCompatActivity() { ...@@ -210,6 +213,59 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
210 editor.putInt("c15_1",1); editor.commit() 213 editor.putInt("c15_1",1); editor.commit()
211 editor.putInt("c16_1",1); editor.commit() 214 editor.putInt("c16_1",1); editor.commit()
212 215
216 + sendToken()
217 + val user=firebaseAuth?.currentUser!!.uid
218 + Log.d("test:", user.toString())
219 +
220 + val cat_1=listOf("c1_1","c1_2","c1_3")
221 + val cat_2=listOf("c2_1","c2_2","c2_3","c2_4","c2_5","c2_6","c2_7")
222 + val cat_3=listOf("c3_1","c3_2","c3_3")
223 + 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")
224 + val cat_5=listOf("c5_1","c5_2","c5_3","c5_4","c5_5","c5_6","c5_7","c5_8","c5_9")
225 + val cat_6=listOf("c6_1","c6_2","c6_3","c6_4","c6_5","c6_6","c6_7")
226 + val cat_7=listOf("c7_1","c7_2","c7_3")
227 + 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")
228 + 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")
229 + 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")
230 + 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")
231 + 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")
232 + val cat_13=listOf("c13_1","c13_2","c13_3")
233 + val cat_14=listOf("c14_1","c14_2","c14_3")
234 + val cat_15=listOf("c15_1","c15_2","c15_3")
235 + val cat_16=listOf("c16_1","c16_2","c16_3","c16_4","c16_5","c16_6","c16_7")
236 +
237 + val cat_list=mutableListOf<String>()
238 + cat_list.addAll(cat_1)
239 + cat_list.addAll(cat_2)
240 + cat_list.addAll(cat_3)
241 + cat_list.addAll(cat_4)
242 + cat_list.addAll(cat_5)
243 + cat_list.addAll(cat_6)
244 + cat_list.addAll(cat_7)
245 + cat_list.addAll(cat_8)
246 + cat_list.addAll(cat_9)
247 + cat_list.addAll(cat_10)
248 + cat_list.addAll(cat_11)
249 + cat_list.addAll(cat_12)
250 + cat_list.addAll(cat_13)
251 + cat_list.addAll(cat_14)
252 + cat_list.addAll(cat_15)
253 + cat_list.addAll(cat_16)
254 +
255 + var user_topic=""
256 + for(item in cat_list){if(prof.getInt(item,3)==1){user_topic=user_topic+item}}
257 +
258 + if(prof.getString("existing_topic","none")!=user_topic){
259 + FirebaseMessaging.getInstance().unsubscribeFromTopic(prof.getString("existing_topic","none").toString())
260 + FirebaseMessaging.getInstance().subscribeToTopic(user_topic).addOnCompleteListener { task ->
261 + if (!task.isSuccessful) { } // 성공
262 + }
263 + writeNewUser(user_topic) // db에 쓰기
264 + editor.putString("existing_topic",user_topic)
265 + editor.commit()
266 + }else{
267 +
268 + }
213 var intent = Intent(this, SignInActivity::class.java) 269 var intent = Intent(this, SignInActivity::class.java)
214 startActivity(intent) 270 startActivity(intent)
215 } 271 }
......
...@@ -175,6 +175,10 @@ class InputProfilFifthOneActivity : AppCompatActivity() { ...@@ -175,6 +175,10 @@ class InputProfilFifthOneActivity : AppCompatActivity() {
175 } 175 }
176 176
177 nextButton.setOnClickListener { 177 nextButton.setOnClickListener {
178 + editor.remove("fifth_one")
179 + editor.remove("fifth_one_editText1")
180 + editor.remove("fifth_one_editText2")
181 + editor.commit()
178 182
179 if((editText1.text.toString()!="")&&(editText2.text.toString()!="")){editor.putString("fifth_one_editText1",editText1.text.toString());editor.putString("fifth_one_editText2",editText2.text.toString());editor.commit();editor.putString("fifth_one","done");editor.commit()} 183 if((editText1.text.toString()!="")&&(editText2.text.toString()!="")){editor.putString("fifth_one_editText1",editText1.text.toString());editor.putString("fifth_one_editText2",editText2.text.toString());editor.commit();editor.putString("fifth_one","done");editor.commit()}
180 var intent = Intent(this, InputProfilFifthTwoActivity::class.java) 184 var intent = Intent(this, InputProfilFifthTwoActivity::class.java)
......
...@@ -185,6 +185,11 @@ class InputProfilFifthThreeActivity : AppCompatActivity() { ...@@ -185,6 +185,11 @@ class InputProfilFifthThreeActivity : AppCompatActivity() {
185 } 185 }
186 186
187 nextButton.setOnClickListener { 187 nextButton.setOnClickListener {
188 + editor.remove("fifth_three")
189 + editor.remove("fifth_three_editText1")
190 + editor.remove("fifth_three_editText2")
191 + editor.remove("fifth_three_editText3")
192 + editor.commit()
188 if((editText1.text.toString()!="")&&(editText2.text.toString()!="")&&(editText3.text.toString()!="")){editor.putString("fifth_three_editText1",editText1.text.toString());editor.putString("fifth_three_editText2",editText2.text.toString());editor.putString("fifth_three_editText3",editText3.text.toString());editor.commit();editor.putString("fifth_three","done");editor.commit()} 193 if((editText1.text.toString()!="")&&(editText2.text.toString()!="")&&(editText3.text.toString()!="")){editor.putString("fifth_three_editText1",editText1.text.toString());editor.putString("fifth_three_editText2",editText2.text.toString());editor.putString("fifth_three_editText3",editText3.text.toString());editor.commit();editor.putString("fifth_three","done");editor.commit()}
189 194
190 var intent = Intent(this, InputProfilFifthFourActivity::class.java) 195 var intent = Intent(this, InputProfilFifthFourActivity::class.java)
......
...@@ -224,6 +224,15 @@ class InputProfilFifthTwoActivity : AppCompatActivity() { ...@@ -224,6 +224,15 @@ class InputProfilFifthTwoActivity : AppCompatActivity() {
224 } 224 }
225 225
226 nextButton.setOnClickListener { 226 nextButton.setOnClickListener {
227 + editor.remove("fifth_two")
228 + editor.remove("fifth_two_editText1")
229 + editor.remove("fifth_two_jikjaangButton")
230 + editor.remove("fifth_two_editText1")
231 + editor.remove("fifth_two_jiyeokButton")
232 + editor.remove("fifth_two_pibooyaangjikjaangButton")
233 + editor.remove("fifth_two_pibooyaangjiyeokButton")
234 + editor.remove("fifth_two_uieryoButton")
235 + editor.commit()
227 if(jikjaangButton.isChecked&&(editText1.text.toString()!="")){editor.putString("fifth_two_editText1",editText1.text.toString());editor.putString("fifth_two_jikjaangButton","isChecked");editor.putString("fifth_two","done");editor.commit()} 236 if(jikjaangButton.isChecked&&(editText1.text.toString()!="")){editor.putString("fifth_two_editText1",editText1.text.toString());editor.putString("fifth_two_jikjaangButton","isChecked");editor.putString("fifth_two","done");editor.commit()}
228 if(jiyeokButton.isChecked&&(editText1.text.toString()!="")){editor.putString("fifth_two_editText1",editText1.text.toString());editor.putString("fifth_two_jiyeokButton","isChecked");editor.putString("fifth_two","done");editor.commit()} 237 if(jiyeokButton.isChecked&&(editText1.text.toString()!="")){editor.putString("fifth_two_editText1",editText1.text.toString());editor.putString("fifth_two_jiyeokButton","isChecked");editor.putString("fifth_two","done");editor.commit()}
229 if(pibooyaangjikjaangButton.isChecked){editor.putString("fifth_two_pibooyaangjikjaangButton","isChecked");editor.putString("fifth_two","done");editor.commit()} 238 if(pibooyaangjikjaangButton.isChecked){editor.putString("fifth_two_pibooyaangjikjaangButton","isChecked");editor.putString("fifth_two","done");editor.commit()}
......
...@@ -149,6 +149,10 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { ...@@ -149,6 +149,10 @@ class InputProfilFirstFiveActivity : AppCompatActivity() {
149 } 149 }
150 150
151 nextButton.setOnClickListener { 151 nextButton.setOnClickListener {
152 + editor.remove("first_five")
153 + editor.remove("c1_2")
154 + editor.remove("c1_3")
155 + editor.commit()
152 156
153 157
154 158
......
...@@ -12,6 +12,23 @@ import com.google.firebase.database.FirebaseDatabase ...@@ -12,6 +12,23 @@ import com.google.firebase.database.FirebaseDatabase
12 import com.google.firebase.iid.FirebaseInstanceId 12 import com.google.firebase.iid.FirebaseInstanceId
13 import kotlinx.android.synthetic.main.activity_input_profil_first_one.* 13 import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
14 14
15 +val global_cat_1=listOf("c1_1","c1_2","c1_3")
16 +val global_cat_2=listOf("c2_1","c2_2","c2_3","c2_4","c2_5","c2_6","c2_7")
17 +val global_cat_3=listOf("c3_1","c3_2","c3_3")
18 +val global_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")
19 +val global_cat_5=listOf("c5_1","c5_2","c5_3","c5_4","c5_5","c5_6","c5_7","c5_8","c5_9")
20 +val global_cat_6=listOf("c6_1","c6_2","c6_3","c6_4","c6_5","c6_6","c6_7")
21 +val global_cat_7=listOf("c7_1","c7_2","c7_3")
22 +val global_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")
23 +val global_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")
24 +val global_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")
25 +val global_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")
26 +val global_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")
27 +val global_cat_13=listOf("c13_1","c13_2","c13_3")
28 +val global_cat_14=listOf("c14_1","c14_2","c14_3")
29 +val global_cat_15=listOf("c15_1","c15_2","c15_3")
30 +val global_cat_16=listOf("c16_1","c16_2","c16_3","c16_4","c16_5","c16_6","c16_7")
31 +val global_cat_list=mutableListOf<String>("c1_1","c1_2","c1_3","c2_1","c2_2","c2_3","c2_4","c2_5","c2_6","c2_7","c3_1","c3_2","c3_3","c4_1","c4_2","c4_3","c4_4","c4_5","c4_6","c4_7","c4_8","c4_9","c4_10","c4_11","c5_1","c5_2","c5_3","c5_4","c5_5","c5_6","c5_7","c5_8","c5_9","c6_1","c6_2","c6_3","c6_4","c6_5","c6_6","c6_7","c7_1","c7_2","c7_3","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","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","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","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","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","c13_1","c13_2","c13_3","c14_1","c14_2","c14_3","c15_1","c15_2","c15_3","c16_1","c16_2","c16_3","c16_4","c16_5","c16_6","c16_7")
15 class InputProfilFirstOneActivity : AppCompatActivity() { 32 class InputProfilFirstOneActivity : AppCompatActivity() {
16 33
17 private val firebaseAuth = FirebaseAuth.getInstance() 34 private val firebaseAuth = FirebaseAuth.getInstance()
......
...@@ -130,6 +130,10 @@ class InputProfilFirstSixActivity : AppCompatActivity() { ...@@ -130,6 +130,10 @@ class InputProfilFirstSixActivity : AppCompatActivity() {
130 } 130 }
131 131
132 nextButton.setOnClickListener { 132 nextButton.setOnClickListener {
133 + editor.remove("first_six")
134 + editor.remove("c13_2")
135 + editor.remove("c13_3")
136 + editor.commit()
133 137
134 138
135 139
......
...@@ -144,6 +144,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { ...@@ -144,6 +144,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() {
144 } 144 }
145 145
146 nextButton.setOnClickListener { 146 nextButton.setOnClickListener {
147 + editor.remove("c3_2")
148 + editor.remove("c3_3")
149 + editor.remove("first_three")
150 + editor.commit()
151 +
152 +
147 153
148 var intent = Intent(this, InputProfilFirstFourActivity::class.java) 154 var intent = Intent(this, InputProfilFirstFourActivity::class.java)
149 startActivity(intent) 155 startActivity(intent)
...@@ -156,12 +162,14 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { ...@@ -156,12 +162,14 @@ class InputProfilFirstThreeActivity : AppCompatActivity() {
156 162
157 //마지막장에 상관없음 추가 163 //마지막장에 상관없음 추가
158 } 164 }
159 - else{ 165 + else if(womanButton.isChecked){
160 editor.putInt("c3_3",1) 166 editor.putInt("c3_3",1)
161 editor.putString("gender", "여자") 167 editor.putString("gender", "여자")
162 editor.commit() 168 editor.commit()
163 editor.putString("first_three","done");editor.commit() 169 editor.putString("first_three","done");editor.commit()
164 170
171 + }else{
172 +
165 } 173 }
166 } 174 }
167 175
......
...@@ -132,64 +132,78 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -132,64 +132,78 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
132 132
133 //editor.putString("birthdate","none") 133 //editor.putString("birthdate","none")
134 134
135 + previousButton.setOnClickListener {
136 + var intent = Intent(this, InputProfilFirstOneActivity::class.java)
137 + startActivity(intent)
138 + }
135 139
136 nextButton.setOnClickListener { 140 nextButton.setOnClickListener {
141 + editor.remove("c1_2")
142 + editor.remove("c1_3")
143 + editor.remove("c1_4")
144 + editor.remove("c1_5")
145 + editor.remove("c1_6")
146 + editor.remove("c1_7")
147 + editor.remove("first_two")
148 + editor.commit()
149 +
150 +
137 151
138 var birthdateinput=findViewById<EditText>(R.id.editText).text.toString() 152 var birthdateinput=findViewById<EditText>(R.id.editText).text.toString()
139 - var birthdateint = 0 153 + var birthdateint:Int
140 if (birthdateinput == "") { 154 if (birthdateinput == "") {
141 - birthdateint = 0
142 } 155 }
143 else { 156 else {
144 birthdateint = birthdateinput.toInt() 157 birthdateint = birthdateinput.toInt()
145 - } 158 + if ((2019-birthdateint)<19){
146 - 159 + editor.putInt("c1_2",1)
147 - if ((2019-birthdateint)<19){ 160 + editor.commit()
148 - editor.putInt("c1_2",1) 161 +
149 - editor.commit() 162 + editor.putString("first_two","done");editor.commit()
163 +
164 + Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show()
165 + //마지막장에 상관없음 추가
166 + FirebaseMessaging.getInstance().subscribeToTopic("c1_2")
167 + .addOnCompleteListener { task ->
168 + var msg = getString(R.string.msg_subscribed)
169 + if (!task.isSuccessful) {
170 + msg = getString(R.string.msg_subscribe_failed)
171 + }
172 + }
173 + }
174 + else if((2019-birthdateint)<34){
175 + editor.putInt("c1_3",1)
176 + editor.commit()
177 + editor.putString("first_two","done");editor.commit()
150 178
151 - editor.putString("first_two","done");editor.commit() 179 + }
180 + else if((2019-birthdateint)<40){
181 + editor.putInt("c1_4",1)
182 + editor.commit()
183 + editor.putString("first_two","done");editor.commit()
152 184
153 - Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show() 185 + }
154 - //마지막장에 상관없음 추가 186 + else if((2019-birthdateint)<49){
155 - FirebaseMessaging.getInstance().subscribeToTopic("c1_2") 187 + editor.putInt("c1_5",1)
156 - .addOnCompleteListener { task -> 188 + editor.commit()
157 - var msg = getString(R.string.msg_subscribed) 189 + editor.putString("first_two","done");editor.commit()
158 - if (!task.isSuccessful) {
159 - msg = getString(R.string.msg_subscribe_failed)
160 - }
161 - }
162 - }
163 - else if((2019-birthdateint)<34){
164 - editor.putInt("c1_3",1)
165 - editor.commit()
166 - editor.putString("first_two","done");editor.commit()
167 190
168 - } 191 + }
169 - else if((2019-birthdateint)<40){ 192 + else if((2019-birthdateint)<59){
170 - editor.putInt("c1_4",1) 193 + editor.putInt("c1_6",1)
171 - editor.commit() 194 + editor.commit()
172 - editor.putString("first_two","done");editor.commit() 195 + editor.putString("first_two","done");editor.commit()
173 196
174 - } 197 + }
175 - else if((2019-birthdateint)<49){ 198 + else{
176 - editor.putInt("c1_5",1) 199 + editor.putInt("c1_7",1)
177 - editor.commit() 200 + editor.commit()
178 - editor.putString("first_two","done");editor.commit() 201 + editor.putString("first_two","done");editor.commit()
179 202
203 + }
180 } 204 }
181 - else if((2019-birthdateint)<59){
182 - editor.putInt("c1_6",1)
183 - editor.commit()
184 - editor.putString("first_two","done");editor.commit()
185 205
186 - }
187 - else{
188 - editor.putInt("c1_7",1)
189 - editor.commit()
190 - editor.putString("first_two","done");editor.commit()
191 206
192 - }
193 var intent = Intent(this, InputProfilFirstThreeActivity::class.java) 207 var intent = Intent(this, InputProfilFirstThreeActivity::class.java)
194 startActivity(intent) 208 startActivity(intent)
195 209
......
...@@ -161,6 +161,14 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { ...@@ -161,6 +161,14 @@ class InputProfilFourthFiveActivity : AppCompatActivity() {
161 } 161 }
162 162
163 nextButton.setOnClickListener { 163 nextButton.setOnClickListener {
164 + editor.remove("fourth_five")
165 + editor.remove("c8_1")
166 + editor.remove("c8_12")
167 + editor.remove("c8_13")
168 + editor.remove("c8_14")
169 + editor.remove("c8_17")
170 + editor.commit()
171 +
164 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_five","done");editor.commit()} 172 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_five","done");editor.commit()}
165 if(iljaeButton.isChecked){editor.putInt("c8_12",1); editor.commit();editor.putString("fourth_five","done");editor.commit()} 173 if(iljaeButton.isChecked){editor.putInt("c8_12",1); editor.commit();editor.putString("fourth_five","done");editor.commit()}
166 if(specialpihaeButton.isChecked){editor.putInt("c8_13",1); editor.commit();editor.putString("fourth_five","done");editor.commit()} 174 if(specialpihaeButton.isChecked){editor.putInt("c8_13",1); editor.commit();editor.putString("fourth_five","done");editor.commit()}
......
...@@ -163,6 +163,18 @@ class InputProfilFourthFourActivity : AppCompatActivity() { ...@@ -163,6 +163,18 @@ class InputProfilFourthFourActivity : AppCompatActivity() {
163 startActivity(intent) 163 startActivity(intent)
164 } 164 }
165 nextButton.setOnClickListener { 165 nextButton.setOnClickListener {
166 + editor.remove("fourth_four")
167 + editor.remove("c8_1")
168 + editor.remove("c8_9")
169 + editor.remove("c8_9")
170 + editor.remove("c8_9")
171 + editor.remove("c8_9")
172 + editor.remove("c8_15")
173 + editor.remove("c8_9")
174 + editor.remove("c8_16")
175 + editor.remove("c5_9")
176 + editor.remove("c8_17")
177 + editor.commit()
166 178
167 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_four","done");editor.commit()} 179 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_four","done");editor.commit()}
168 if(pokryukButton.isChecked){editor.putInt("c8_9",1); editor.commit();editor.putString("fourth_four","done");editor.commit()} 180 if(pokryukButton.isChecked){editor.putInt("c8_9",1); editor.commit();editor.putString("fourth_four","done");editor.commit()}
......
...@@ -190,6 +190,16 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -190,6 +190,16 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
190 } 190 }
191 191
192 nextButton.setOnClickListener { 192 nextButton.setOnClickListener {
193 + editor.remove("fourth_one")
194 + editor.remove("c14_2")
195 + editor.remove("c14_3")
196 + editor.remove("c16_2")
197 + editor.remove("c16_3")
198 + editor.remove("c16_4")
199 + editor.remove("c16_5")
200 + editor.remove("c16_6")
201 + editor.remove("c16_7")
202 + editor.commit()
193 203
194 if(yesButton.isChecked){ 204 if(yesButton.isChecked){
195 editor.putInt("c14_2",1) 205 editor.putInt("c14_2",1)
...@@ -199,7 +209,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -199,7 +209,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
199 if(noButton.isChecked){ 209 if(noButton.isChecked){
200 editor.putInt("c14_3",1) 210 editor.putInt("c14_3",1)
201 editor.commit() 211 editor.commit()
202 - editor.putString("fourth_one","done");editor.commit() 212 + //editor.putString("fourth_one","done");editor.commit()
203 } 213 }
204 if(jeonsaeButton.isChecked){ 214 if(jeonsaeButton.isChecked){
205 editor.putInt("c16_2",1) 215 editor.putInt("c16_2",1)
......
...@@ -132,6 +132,20 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { ...@@ -132,6 +132,20 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
132 132
133 133
134 nextButton.setOnClickListener { 134 nextButton.setOnClickListener {
135 + editor.remove("fourth_three")
136 + editor.remove("c8_1")
137 + editor.remove("c8_3")
138 + editor.remove("c8_7")
139 + editor.remove("c8_5")
140 + editor.remove("c8_4")
141 + editor.remove("c8_2")
142 + editor.remove("c7_1")
143 + editor.remove("c8_10")
144 + editor.remove("c8_11")
145 + editor.remove("c8_6")
146 + editor.remove("c8_8")
147 + editor.remove("c8_17")
148 + editor.commit()
135 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_three","done");editor.commit()} 149 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("fourth_three","done");editor.commit()}
136 if(jeosodeukButton.isChecked){editor.putInt("c8_3",1); editor.commit();editor.putString("fourth_three","done");editor.commit()} 150 if(jeosodeukButton.isChecked){editor.putInt("c8_3",1); editor.commit();editor.putString("fourth_three","done");editor.commit()}
137 if(hanboomoButton.isChecked){editor.putInt("c8_7",1); editor.commit();editor.putString("fourth_three","done");editor.commit()} 151 if(hanboomoButton.isChecked){editor.putInt("c8_7",1); editor.commit();editor.putString("fourth_three","done");editor.commit()}
......
...@@ -165,8 +165,21 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { ...@@ -165,8 +165,21 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
165 165
166 166
167 nextButton.setOnClickListener { 167 nextButton.setOnClickListener {
168 + editor.remove("fourth_two")
169 + editor.remove("c15_2")
170 + editor.remove("c15_3")
171 + editor.remove("c16_2")
172 + editor.remove("c16_3")
173 + editor.remove("c16_4")
174 + editor.remove("c16_5")
175 + editor.remove("c16_6")
176 + editor.remove("c16_7")
177 + editor.commit()
178 +
168 if(yesButton.isChecked){editor.putInt("c15_2",1); editor.commit();editor.putString("fourth_two","done");editor.commit()} 179 if(yesButton.isChecked){editor.putInt("c15_2",1); editor.commit();editor.putString("fourth_two","done");editor.commit()}
169 - if(noButton.isChecked){editor.putInt("c15_3",1); editor.commit();editor.putString("fourth_two","done");editor.commit()} 180 + if(noButton.isChecked){editor.putInt("c15_3",1); editor.commit();
181 + //editor.putString("fourth_two","done");
182 + editor.commit()}
170 if(jeonsaeButton.isChecked){editor.putInt("c16_2",1); editor.commit();editor.putString("fourth_two","done");editor.commit()} 183 if(jeonsaeButton.isChecked){editor.putInt("c16_2",1); editor.commit();editor.putString("fourth_two","done");editor.commit()}
171 if(wolseButton.isChecked){editor.putInt("c16_3",1); editor.commit();editor.putString("fourth_two","done");editor.commit()} 184 if(wolseButton.isChecked){editor.putInt("c16_3",1); editor.commit();editor.putString("fourth_two","done");editor.commit()}
172 if(kongkongButton.isChecked){editor.putInt("c16_4",1); editor.commit();editor.putString("fourth_two","done");editor.commit()} 185 if(kongkongButton.isChecked){editor.putInt("c16_4",1); editor.commit();editor.putString("fourth_two","done");editor.commit()}
......
...@@ -154,6 +154,25 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -154,6 +154,25 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
154 154
155 155
156 nextButton.setOnClickListener { 156 nextButton.setOnClickListener {
157 + editor.remove("second_one")
158 + editor.remove("with_brothersister")
159 + editor.remove("with_child")
160 + editor.remove("c10_2")
161 + editor.remove("c10_3")
162 + editor.remove("c10_4")
163 + editor.remove("c10_5")
164 + editor.remove("c10_6")
165 + editor.remove("c10_7")
166 + editor.remove("c10_8")
167 + editor.remove("c10_9")
168 + editor.remove("c10_10")
169 + editor.remove("c10_11")
170 + editor.remove("c10_12")
171 + editor.remove("c10_13")
172 + editor.remove("c10_14")
173 + editor.remove("c10_15")
174 + editor.remove("c10_18")
175 + editor.commit()
157 176
158 if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit();editor.putString("second_one","done");editor.commit()} 177 if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit();editor.putString("second_one","done");editor.commit()}
159 if(baewoojaboomoButton.isChecked){editor.putInt("c10_3",1); editor.commit();editor.putString("second_one","done");editor.commit()} 178 if(baewoojaboomoButton.isChecked){editor.putInt("c10_3",1); editor.commit();editor.putString("second_one","done");editor.commit()}
...@@ -178,15 +197,15 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -178,15 +197,15 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
178 ){ 197 ){
179 var intent = Intent(this, InputProfilSecondTwoActivity::class.java) 198 var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
180 startActivity(intent) 199 startActivity(intent)
200 + }else if(janyeoButton.isChecked==false&&brotherButton.isChecked==true){
201 + var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
202 + startActivity(intent)
181 }else{ 203 }else{
182 var intent = Intent(this, InputProfilThirdOneActivity::class.java) 204 var intent = Intent(this, InputProfilThirdOneActivity::class.java)
183 startActivity(intent) 205 startActivity(intent)
184 } 206 }
185 207
186 - if(janyeoButton.isChecked==false&&brotherButton.isChecked==true){ 208 +
187 - var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
188 - startActivity(intent)
189 - }
190 } 209 }
191 210
192 nothingButton.setOnClickListener { 211 nothingButton.setOnClickListener {
......
...@@ -129,18 +129,38 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -129,18 +129,38 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
129 129
130 130
131 previousButton.setOnClickListener { 131 previousButton.setOnClickListener {
132 - var intent = Intent(this, InputProfilSecondTwoActivity::class.java) 132 + if(prof.getString("with_child","none")=="yes"){
133 - startActivity(intent) 133 + var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
134 + startActivity(intent)
135 + }
136 + else{
137 + var intent = Intent(this, InputProfilSecondOneActivity::class.java)
138 + startActivity(intent)
139 + }
140 +
134 } 141 }
135 142
136 nextButton.setOnClickListener { 143 nextButton.setOnClickListener {
137 - var numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt() 144 + editor.remove("second_three")
138 - if(numOfBS>=2){ 145 + editor.remove("c10_16")
139 - editor.putInt("c10_16",1); editor.commit();editor.putString("second_three","done");editor.commit() 146 + editor.remove("c10_17")
140 - } 147 + editor.commit()
141 - if(numOfBS<2){ 148 +
142 - editor.putInt("c10_17",1); editor.commit();editor.putString("second_three","done");editor.commit() 149 + var numOfBS:Int
150 + if(findViewById<EditText>(R.id.bsNumberEditText).text.toString()==""){
151 + numOfBS=0
152 + }else{
153 + numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
154 + if(numOfBS>=2){
155 + editor.putInt("c10_16",1); editor.commit();editor.putString("second_three","done");editor.commit()
156 + }else if(numOfBS<2){
157 + editor.putInt("c10_17",1); editor.commit();editor.putString("second_three","done");editor.commit()
158 + }else{
159 +
160 + }
143 } 161 }
162 +
163 +
144 var intent = Intent(this, InputProfilThirdOneActivity::class.java) 164 var intent = Intent(this, InputProfilThirdOneActivity::class.java)
145 startActivity(intent) 165 startActivity(intent)
146 } 166 }
......
...@@ -130,16 +130,31 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -130,16 +130,31 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
130 startActivity(intent) 130 startActivity(intent)
131 } 131 }
132 nextButton.setOnClickListener { 132 nextButton.setOnClickListener {
133 - var numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() 133 + editor.remove("second_two")
134 - if(numOfChild>=3){ 134 + editor.remove("c10_16")
135 - editor.putInt("c10_16",1); editor.commit();editor.putString("second_two","done");editor.commit() 135 + editor.remove("c10_17")
136 - } 136 + editor.commit()
137 - if(numOfChild<3){ 137 +
138 - editor.putInt("c10_17",1); editor.commit();editor.putString("second_two","done");editor.commit() 138 + var numOfChild:Int
139 + if(findViewById<EditText>(R.id.childNumberEditText).text.toString()==""){
140 + numOfChild=0
141 + }else{
142 + numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
143 + if(numOfChild>=3){
144 + editor.putInt("c10_16",1); editor.commit();editor.putString("second_two","done");editor.commit()
145 + }else if(numOfChild<3){
146 + editor.putInt("c10_17",1); editor.commit();editor.putString("second_two","done");editor.commit()
147 + }else{
148 +
149 + }
139 } 150 }
140 151
141 152
142 153
154 +
155 +
156 +
157 +
143 /* 158 /*
144 editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo birth", childRecyclerView.childBirthEditText.text.toString()); editor.commit() 159 editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo birth", childRecyclerView.childBirthEditText.text.toString()); editor.commit()
145 if(childRecyclerView.womanButton.isChecked){ 160 if(childRecyclerView.womanButton.isChecked){
...@@ -163,23 +178,28 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -163,23 +178,28 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
163 childNumberInputButton.setOnClickListener { 178 childNumberInputButton.setOnClickListener {
164 179
165 childList.clear() 180 childList.clear()
166 - if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){ 181 +
167 - var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() 182 + if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){
168 - var cnt=1 183 + var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
169 - while(childNum>=cnt){ 184 + var cnt=1
170 - childList.add( 185 + while(childNum>=cnt){
171 - ChildItem(cnt) 186 + childList.add(
172 - ) 187 + ChildItem(cnt)
173 - cnt++ 188 + )
189 + cnt++
190 + }
191 + //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show()
174 } 192 }
175 - //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show() 193 + else{
176 - } 194 + var childNum=0
177 - else{ 195 + }
178 - var childNum=0 196 +
179 - } 197 + val adapter = ChildAdapter(childList)
198 + childRecyclerView.adapter = adapter
199 +
200 +
201 +
180 202
181 - val adapter = ChildAdapter(childList)
182 - childRecyclerView.adapter = adapter
183 203
184 204
185 205
......
...@@ -169,6 +169,14 @@ class InputProfilThirdFiveActivity : AppCompatActivity() { ...@@ -169,6 +169,14 @@ class InputProfilThirdFiveActivity : AppCompatActivity() {
169 } 169 }
170 170
171 nextButton.setOnClickListener { 171 nextButton.setOnClickListener {
172 + editor.remove("third_four")
173 + editor.remove("c8_1")
174 + editor.remove("c7_2")
175 + editor.remove("c9_17")
176 + editor.remove("c9_18")
177 + editor.remove("c9_19")
178 + editor.remove("c8_17")
179 + editor.commit()
172 180
173 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("third_four","done");editor.commit()}//DB,pref 뻑 주의 181 if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("third_four","done");editor.commit()}//DB,pref 뻑 주의
174 if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit();editor.putString("third_four","done");editor.commit()} 182 if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit();editor.putString("third_four","done");editor.commit()}
......
...@@ -133,6 +133,24 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -133,6 +133,24 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
133 } 133 }
134 134
135 nextButton.setOnClickListener { 135 nextButton.setOnClickListener {
136 + editor.remove("third_four")
137 + editor.remove("c8_2")
138 + editor.remove("c9_2")
139 + editor.remove("c9_3")
140 + editor.remove("c9_4")
141 + editor.remove("c9_5")
142 + editor.remove("c9_6")
143 + editor.remove("c9_7")
144 + editor.remove("c9_8")
145 + editor.remove("c9_9")
146 + editor.remove("c9_10")
147 + editor.remove("c9_11")
148 + editor.remove("c9_12")
149 + editor.remove("c9_13")
150 + editor.remove("c9_14")
151 + editor.remove("c9_15")
152 + editor.remove("c9_16")
153 + editor.commit()
136 154
137 if(yesButton.isChecked){ 155 if(yesButton.isChecked){
138 editor.putInt("c8_2",1); editor.commit() 156 editor.putInt("c8_2",1); editor.commit()
......
...@@ -184,11 +184,29 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -184,11 +184,29 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
184 } 184 }
185 185
186 previousButton.setOnClickListener { 186 previousButton.setOnClickListener {
187 - var intent = Intent(this, InputProfilSecondThreeActivity::class.java) 187 +
188 - startActivity(intent) 188 + if(prof.getString("with_brothersister","none")=="yes"){
189 + var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
190 + startActivity(intent)
191 + }else if(prof.getString("with_child","none")=="yes"){
192 + var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
193 + startActivity(intent)
194 + }else{
195 + var intent = Intent(this, InputProfilSecondOneActivity::class.java)
196 + startActivity(intent)
197 + }
198 +
189 } 199 }
190 200
191 nextButton.setOnClickListener { 201 nextButton.setOnClickListener {
202 + editor.remove("third_one")
203 + editor.remove("c6_2")
204 + editor.remove("c6_3")
205 + editor.remove("c6_4")
206 + editor.remove("c6_5")
207 + editor.remove("c6_6")
208 + editor.remove("c6_7")
209 + editor.commit()
192 if(elementaryButton.isChecked){ 210 if(elementaryButton.isChecked){
193 editor.putInt("c6_2",1); editor.commit();editor.putString("third_one","done");editor.commit() 211 editor.putInt("c6_2",1); editor.commit();editor.putString("third_one","done");editor.commit()
194 }else if(middleButton.isChecked){ 212 }else if(middleButton.isChecked){
......
...@@ -129,6 +129,19 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { ...@@ -129,6 +129,19 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
129 } 129 }
130 130
131 nextButton.setOnClickListener { 131 nextButton.setOnClickListener {
132 + editor.remove("third_three")
133 + editor.remove("c4_11")
134 + editor.remove("c4_2")
135 + editor.remove("c4_3")
136 + editor.remove("c4_4")
137 + editor.remove("c4_5")
138 + editor.remove("c4_6")
139 + editor.remove("c4_7")
140 + editor.remove("c4_8")
141 + editor.remove("c4_9")
142 + editor.remove("c4_10")
143 + editor.commit()
144 +
132 if(nothingButton.isChecked){ editor.putInt("c4_11",1); editor.commit();editor.putString("third_three","done");editor.commit()} 145 if(nothingButton.isChecked){ editor.putInt("c4_11",1); editor.commit();editor.putString("third_three","done");editor.commit()}
133 if(mipilButton.isChecked){ editor.putInt("c4_2",1); editor.commit();editor.putString("third_three","done");editor.commit()} 146 if(mipilButton.isChecked){ editor.putInt("c4_2",1); editor.commit();editor.putString("third_three","done");editor.commit()}
134 if(myunjaeButton.isChecked){ editor.putInt("c4_3",1); editor.commit();editor.putString("third_three","done");editor.commit()} 147 if(myunjaeButton.isChecked){ editor.putInt("c4_3",1); editor.commit();editor.putString("third_three","done");editor.commit()}
......
...@@ -156,6 +156,13 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { ...@@ -156,6 +156,13 @@ class InputProfilThirdTwoActivity : AppCompatActivity() {
156 } 156 }
157 157
158 nextButton.setOnClickListener { 158 nextButton.setOnClickListener {
159 + editor.remove("third_two")
160 + editor.remove("c5_6")
161 + editor.remove("c5_7")
162 + editor.remove("c5_9")
163 + editor.remove("c5_5")
164 + editor.remove("c5_5")
165 + editor.commit()
159 if(companyButton.isChecked){ editor.putInt("c5_6",1); editor.commit();editor.putString("third_two","done");editor.commit()} 166 if(companyButton.isChecked){ editor.putInt("c5_6",1); editor.commit();editor.putString("third_two","done");editor.commit()}
160 if(workerButton.isChecked){ editor.putInt("c5_7",1); editor.commit();editor.putString("third_two","done");editor.commit()} 167 if(workerButton.isChecked){ editor.putInt("c5_7",1); editor.commit();editor.putString("third_two","done");editor.commit()}
161 if(entireButton.isChecked){ editor.putInt("c5_9",1); editor.commit();editor.putString("third_two","done");editor.commit()} 168 if(entireButton.isChecked){ editor.putInt("c5_9",1); editor.commit();editor.putString("third_two","done");editor.commit()}
......
...@@ -20,19 +20,17 @@ ...@@ -20,19 +20,17 @@
20 </LinearLayout> 20 </LinearLayout>
21 21
22 <LinearLayout 22 <LinearLayout
23 - android:layout_width="match_parent" 23 + android:layout_width="wrap_content"
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 - android:layout_weight="3"
26 android:orientation="vertical"> 25 android:orientation="vertical">
27 26
28 <ImageView 27 <ImageView
29 android:id="@+id/imageView" 28 android:id="@+id/imageView"
30 - android:layout_width="match_parent" 29 + android:layout_width="wrap_content"
31 - android:layout_height="match_parent" 30 + android:layout_height="wrap_content"
32 android:layout_gravity="center" 31 android:layout_gravity="center"
33 - android:layout_marginLeft="50dp" 32 + android:background="@drawable/profile_logo"
34 - android:layout_marginRight="50dp" 33 + android:scaleType="centerCrop" />
35 - android:background="@drawable/inputlogo" />
36 </LinearLayout> 34 </LinearLayout>
37 35
38 <LinearLayout 36 <LinearLayout
......