장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
4376bed4 1 parent 5b9c8afe

prototype complete. previous button pressed

Expand all
Inline Side-by-side
Showing 28 changed files with 228 additions and 19 deletions
...@@ -53,6 +53,8 @@ class InputProfilFifthFourActivity : AppCompatActivity() { ...@@ -53,6 +53,8 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
54 val editor: SharedPreferences.Editor=prof.edit() 54 val editor: SharedPreferences.Editor=prof.edit()
55 55
56 + if(prof.getString("fifth_four_editText1","")!=""){editText1.setText(prof.getString("fifth_four_editText1",""))}
57 +
56 // 1. 툴바 사용 설정 58 // 1. 툴바 사용 설정
57 setSupportActionBar(toolbar) 59 setSupportActionBar(toolbar)
58 60
......
...@@ -53,6 +53,9 @@ class InputProfilFifthOneActivity : AppCompatActivity() { ...@@ -53,6 +53,9 @@ class InputProfilFifthOneActivity : AppCompatActivity() {
53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
54 val editor: SharedPreferences.Editor=prof.edit() 54 val editor: SharedPreferences.Editor=prof.edit()
55 55
56 + if(prof.getString("fifth_one_editText1","")!=""){editText1.setText(prof.getString("fifth_one_editText1",""))}
57 + if(prof.getString("fifth_one_editText2","")!=""){editText2.setText(prof.getString("fifth_one_editText2",""))}
58 +
56 // 1. 툴바 사용 설정 59 // 1. 툴바 사용 설정
57 setSupportActionBar(toolbar) 60 setSupportActionBar(toolbar)
58 61
......
...@@ -52,6 +52,10 @@ class InputProfilFifthThreeActivity : AppCompatActivity() { ...@@ -52,6 +52,10 @@ class InputProfilFifthThreeActivity : AppCompatActivity() {
52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
53 val editor: SharedPreferences.Editor=prof.edit() 53 val editor: SharedPreferences.Editor=prof.edit()
54 54
55 + if(prof.getString("fifth_three_editText1","")!=""){editText1.setText(prof.getString("fifth_three_editText1",""))}
56 + if(prof.getString("fifth_three_editText2","")!=""){editText2.setText(prof.getString("fifth_three_editText2",""))}
57 + if(prof.getString("fifth_three_editText3","")!=""){editText3.setText(prof.getString("fifth_three_editText3",""))}
58 +
55 // 1. 툴바 사용 설정 59 // 1. 툴바 사용 설정
56 setSupportActionBar(toolbar) 60 setSupportActionBar(toolbar)
57 61
......
...@@ -54,6 +54,14 @@ class InputProfilFifthTwoActivity : AppCompatActivity() { ...@@ -54,6 +54,14 @@ class InputProfilFifthTwoActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 55 val editor: SharedPreferences.Editor=prof.edit()
56 56
57 + if(prof.getString("fifth_two_jikjaangButton","none")=="isChecked"){ subLinearLayout.visibility=VISIBLE;jikjaangButton.isChecked=true;}
58 + if(prof.getString("fifth_two_jiyeokButton","none")=="isChecked"){ subLinearLayout.visibility=VISIBLE;jiyeokButton.isChecked=true;}
59 + if(prof.getString("fifth_two_pibooyaangjikjaangButton","none")=="isChecked"){ pibooyaangjikjaangButton.isChecked=true}
60 + if(prof.getString("fifth_two_pibooyaangjiyeokButton","none")=="isChecked"){ pibooyaangjiyeokButton.isChecked=true}
61 + if(prof.getString("fifth_two_uieryoButton","none")=="isChecked"){ uieryoButton.isChecked=true}
62 +
63 + if(prof.getString("fifth_two_editText1","")!=""){editText1.setText(prof.getString("fifth_two_editText1",""))}
64 +
57 // 1. 툴바 사용 설정 65 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 66 setSupportActionBar(toolbar)
59 67
......
...@@ -7,6 +7,7 @@ import android.graphics.Color ...@@ -7,6 +7,7 @@ import android.graphics.Color
7 import androidx.appcompat.app.AppCompatActivity 7 import androidx.appcompat.app.AppCompatActivity
8 import android.os.Bundle 8 import android.os.Bundle
9 import android.util.Log 9 import android.util.Log
10 +import android.widget.Button
10 import android.widget.TextView 11 import android.widget.TextView
11 import android.widget.Toast 12 import android.widget.Toast
12 import androidx.appcompat.app.AlertDialog 13 import androidx.appcompat.app.AlertDialog
...@@ -60,6 +61,12 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { ...@@ -60,6 +61,12 @@ class InputProfilFirstFiveActivity : AppCompatActivity() {
60 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 61 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
61 val editor: SharedPreferences.Editor=prof.edit() 62 val editor: SharedPreferences.Editor=prof.edit()
62 63
64 +
65 + if(prof.getInt("c1_2",0)==1){
66 + inmanButton.isChecked=true}
67 + if(prof.getInt("c1_3",0)==1){outmanButton.isChecked=true}
68 +
69 +
63 // 1. 툴바 사용 설정 70 // 1. 툴바 사용 설정
64 setSupportActionBar(toolbar) 71 setSupportActionBar(toolbar)
65 72
......
...@@ -52,6 +52,12 @@ class InputProfilFirstSixActivity : AppCompatActivity() { ...@@ -52,6 +52,12 @@ class InputProfilFirstSixActivity : AppCompatActivity() {
52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
53 val editor: SharedPreferences.Editor=prof.edit() 53 val editor: SharedPreferences.Editor=prof.edit()
54 54
55 +
56 + if(prof.getInt("c13_2",0)==1){gagoojooButton.isChecked=true}
57 + if(prof.getInt("c13_3",0)==1){gagoowonButton.isChecked=true}
58 +
59 +
60 +
55 // 1. 툴바 사용 설정 61 // 1. 툴바 사용 설정
56 setSupportActionBar(toolbar) 62 setSupportActionBar(toolbar)
57 63
......
...@@ -54,6 +54,11 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { ...@@ -54,6 +54,11 @@ class InputProfilFirstThreeActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 55 val editor: SharedPreferences.Editor=prof.edit()
56 56
57 +
58 + if(prof.getInt("c3_2",0)==1){manButton.isChecked=true}
59 + if(prof.getInt("c3_3",0)==1){womanButton.isChecked=true}
60 +
61 +
57 // 1. 툴바 사용 설정 62 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 63 setSupportActionBar(toolbar)
59 64
......
...@@ -6,6 +6,7 @@ import android.content.SharedPreferences ...@@ -6,6 +6,7 @@ import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 7 import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 +import android.widget.Button
9 import android.widget.EditText 10 import android.widget.EditText
10 import android.widget.TextView 11 import android.widget.TextView
11 import android.widget.Toast 12 import android.widget.Toast
...@@ -51,6 +52,16 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -51,6 +52,16 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
51 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
52 val editor: SharedPreferences.Editor=prof.edit() 53 val editor: SharedPreferences.Editor=prof.edit()
53 54
55 +
56 + if(prof.getInt("c1_2",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
57 + if(prof.getInt("c1_3",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
58 + if(prof.getInt("c1_4",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
59 + if(prof.getInt("c1_5",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
60 + if(prof.getInt("c1_6",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
61 + if(prof.getInt("c1_7",0)==1){findViewById<EditText>(R.id.editText).setText(prof.getString("birthdateinput",""))}
62 +
63 +
64 +
54 // 1. 툴바 사용 설정 65 // 1. 툴바 사용 설정
55 setSupportActionBar(toolbar) 66 setSupportActionBar(toolbar)
56 67
...@@ -138,31 +149,35 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -138,31 +149,35 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
138 } 149 }
139 150
140 nextButton.setOnClickListener { 151 nextButton.setOnClickListener {
141 - editor.remove("c1_2") 152 + editor.remove("c2_2")
142 - editor.remove("c1_3") 153 + editor.remove("c2_3")
143 - editor.remove("c1_4") 154 + editor.remove("c2_4")
144 - editor.remove("c1_5") 155 + editor.remove("c2_5")
145 - editor.remove("c1_6") 156 + editor.remove("c2_6")
146 - editor.remove("c1_7") 157 + editor.remove("c2_7")
147 editor.remove("first_two") 158 editor.remove("first_two")
148 editor.commit() 159 editor.commit()
149 160
150 - 161 + editor.remove("birthdateinput")
162 + editor.commit()
151 163
152 var birthdateinput=findViewById<EditText>(R.id.editText).text.toString() 164 var birthdateinput=findViewById<EditText>(R.id.editText).text.toString()
153 var birthdateint:Int 165 var birthdateint:Int
154 if (birthdateinput == "") { 166 if (birthdateinput == "") {
155 } 167 }
156 else { 168 else {
169 + editor.putString("birthdateinput",birthdateinput)
170 + editor.commit()
157 birthdateint = birthdateinput.toInt() 171 birthdateint = birthdateinput.toInt()
158 if ((2019-birthdateint)<19){ 172 if ((2019-birthdateint)<19){
159 - editor.putInt("c1_2",1) 173 + editor.putInt("c2_2",1)
160 editor.commit() 174 editor.commit()
161 175
162 editor.putString("first_two","done");editor.commit() 176 editor.putString("first_two","done");editor.commit()
163 177
164 - Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show() 178 + //Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show()
165 //마지막장에 상관없음 추가 179 //마지막장에 상관없음 추가
180 + /*
166 FirebaseMessaging.getInstance().subscribeToTopic("c1_2") 181 FirebaseMessaging.getInstance().subscribeToTopic("c1_2")
167 .addOnCompleteListener { task -> 182 .addOnCompleteListener { task ->
168 var msg = getString(R.string.msg_subscribed) 183 var msg = getString(R.string.msg_subscribed)
...@@ -170,34 +185,37 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -170,34 +185,37 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
170 msg = getString(R.string.msg_subscribe_failed) 185 msg = getString(R.string.msg_subscribe_failed)
171 } 186 }
172 } 187 }
188 +
189 + */
190 +
173 } 191 }
174 else if((2019-birthdateint)<34){ 192 else if((2019-birthdateint)<34){
175 - editor.putInt("c1_3",1) 193 + editor.putInt("c2_3",1)
176 editor.commit() 194 editor.commit()
177 editor.putString("first_two","done");editor.commit() 195 editor.putString("first_two","done");editor.commit()
178 196
179 } 197 }
180 else if((2019-birthdateint)<40){ 198 else if((2019-birthdateint)<40){
181 - editor.putInt("c1_4",1) 199 + editor.putInt("c2_4",1)
182 editor.commit() 200 editor.commit()
183 editor.putString("first_two","done");editor.commit() 201 editor.putString("first_two","done");editor.commit()
184 202
185 } 203 }
186 else if((2019-birthdateint)<49){ 204 else if((2019-birthdateint)<49){
187 - editor.putInt("c1_5",1) 205 + editor.putInt("c2_5",1)
188 editor.commit() 206 editor.commit()
189 editor.putString("first_two","done");editor.commit() 207 editor.putString("first_two","done");editor.commit()
190 208
191 209
192 } 210 }
193 else if((2019-birthdateint)<59){ 211 else if((2019-birthdateint)<59){
194 - editor.putInt("c1_6",1) 212 + editor.putInt("c2_6",1)
195 editor.commit() 213 editor.commit()
196 editor.putString("first_two","done");editor.commit() 214 editor.putString("first_two","done");editor.commit()
197 215
198 } 216 }
199 else{ 217 else{
200 - editor.putInt("c1_7",1) 218 + editor.putInt("c2_7",1)
201 editor.commit() 219 editor.commit()
202 editor.putString("first_two","done");editor.commit() 220 editor.putString("first_two","done");editor.commit()
203 221
......
...@@ -51,6 +51,12 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { ...@@ -51,6 +51,12 @@ class InputProfilFourthFiveActivity : AppCompatActivity() {
51 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 51 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
52 val editor: SharedPreferences.Editor=prof.edit() 52 val editor: SharedPreferences.Editor=prof.edit()
53 53
54 + if(prof.getInt("c8_1",0)==1){ nothingButton.isChecked=true}
55 + if(prof.getInt("c8_12",0)==1){ iljaeButton.isChecked=true}
56 + if(prof.getInt("c8_13",0)==1){ specialpihaeButton.isChecked=true}
57 + if(prof.getInt("c8_14",0)==1){ sanuppihaeButton.isChecked=true}
58 + if(prof.getInt("c8_17",0)==1){ guitarButton.isChecked=true}
59 +
54 // 1. 툴바 사용 설정 60 // 1. 툴바 사용 설정
55 setSupportActionBar(toolbar) 61 setSupportActionBar(toolbar)
56 62
......
...@@ -54,6 +54,18 @@ class InputProfilFourthFourActivity : AppCompatActivity() { ...@@ -54,6 +54,18 @@ class InputProfilFourthFourActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 55 val editor: SharedPreferences.Editor=prof.edit()
56 56
57 + if(prof.getInt("c8_1",0)==1){ nothingButton.isChecked=true}
58 + if(prof.getInt("c8_9",0)==1){ pokryukButton.isChecked=true}
59 + if(prof.getInt("c8_9",0)==1){ pihaeButton.isChecked=true}
60 + if(prof.getInt("c8_9",0)==1){ kachoolButton.isChecked=true}
61 + if(prof.getInt("c8_9",0)==1){ sagoButton.isChecked=true}
62 + if(prof.getInt("c8_15",0)==1){ ihonButton.isChecked=true}
63 + if(prof.getInt("c8_9",0)==1){ jaehaeButton.isChecked=true}
64 + if(prof.getInt("c8_16",0)==1){ hakkyobaakButton.isChecked=true}
65 + if(prof.getInt("c5_9",0)==1){ siljikButton.isChecked=true}
66 + if(prof.getInt("c8_17",0)==1){ guitarButton.isChecked=true}
67 +
68 +
57 // 1. 툴바 사용 설정 69 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 70 setSupportActionBar(toolbar)
59 71
......
...@@ -55,6 +55,16 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -55,6 +55,16 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
56 val editor: SharedPreferences.Editor=prof.edit() 56 val editor: SharedPreferences.Editor=prof.edit()
57 57
58 + if(prof.getInt("c14_2",0)==1){ yesButton.isChecked=true}
59 + if(prof.getInt("c14_3",0)==1){ subLinearLayout.visibility=VISIBLE;noButton.isChecked=true;}
60 + if(prof.getInt("c16_2",0)==1){ jeonsaeButton.isChecked=true}
61 + if(prof.getInt("c16_3",0)==1){ wolseButton.isChecked=true}
62 + if(prof.getInt("c16_4",0)==1){ kongkongButton.isChecked=true}
63 + if(prof.getInt("c16_5",0)==1){ moosangButton.isChecked=true}
64 + if(prof.getInt("c16_6",0)==1){ bojangButton.isChecked=true}
65 + if(prof.getInt("c16_7",0)==1){ guitarButton.isChecked=true}
66 +
67 +
58 // 1. 툴바 사용 설정 68 // 1. 툴바 사용 설정
59 setSupportActionBar(toolbar) 69 setSupportActionBar(toolbar)
60 70
......
...@@ -54,6 +54,19 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { ...@@ -54,6 +54,19 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 55 val editor: SharedPreferences.Editor=prof.edit()
56 56
57 + if(prof.getInt("c8_1",0)==1){ nothingButton.isChecked=true}
58 + if(prof.getInt("c8_3",0)==1){ jeosodeukButton.isChecked=true}
59 + if(prof.getInt("c8_7",0)==1){ hanboomoButton.isChecked=true}
60 + if(prof.getInt("c8_5",0)==1){ oegookinButton.isChecked=true}
61 + if(prof.getInt("c8_4",0)==1){ damoonhwaButton.isChecked=true}
62 + if(prof.getInt("c8_2",0)==1){ jaangaeButton.isChecked=true}
63 + if(prof.getInt("c7_1",0)==1){ imshinchoolsanButton.isChecked=true}
64 + if(prof.getInt("c8_10",0)==1){ ipyaangButton.isChecked=true}
65 + if(prof.getInt("c8_11",0)==1){ gaajungButton.isChecked=true}
66 + if(prof.getInt("c8_6",0)==1){ bookhanButton.isChecked=true}
67 + if(prof.getInt("c8_8",0)==1){ gookgayoogongButton.isChecked=true}
68 + if(prof.getInt("c8_17",0)==1){ guitarButton.isChecked=true}
69 +
57 // 1. 툴바 사용 설정 70 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 71 setSupportActionBar(toolbar)
59 72
......
...@@ -8,6 +8,7 @@ import android.os.Bundle ...@@ -8,6 +8,7 @@ import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 import android.view.View.GONE 9 import android.view.View.GONE
10 import android.view.View.VISIBLE 10 import android.view.View.VISIBLE
11 +import android.widget.Button
11 import android.widget.TextView 12 import android.widget.TextView
12 import android.widget.Toast 13 import android.widget.Toast
13 import androidx.appcompat.app.AlertDialog 14 import androidx.appcompat.app.AlertDialog
...@@ -54,6 +55,15 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { ...@@ -54,6 +55,15 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 56 val editor: SharedPreferences.Editor=prof.edit()
56 57
58 + if(prof.getInt("c15_2",0)==1){ yesButton.isChecked=true}
59 + if(prof.getInt("c15_3",0)==1){ subLinearLayout.visibility= VISIBLE;noButton.isChecked=true;}
60 + if(prof.getInt("c16_2",0)==1){ jeonsaeButton.isChecked=true}
61 + if(prof.getInt("c16_3",0)==1){ wolseButton.isChecked=true}
62 + if(prof.getInt("c16_4",0)==1){ kongkongButton.isChecked=true}
63 + if(prof.getInt("c16_5",0)==1){ moosangButton.isChecked=true}
64 + if(prof.getInt("c16_6",0)==1){ bojangButton.isChecked=true}
65 + if(prof.getInt("c16_7",0)==1){ guitarButton.isChecked=true}
66 +
57 // 1. 툴바 사용 설정 67 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 68 setSupportActionBar(toolbar)
59 69
......
...@@ -6,6 +6,7 @@ import android.content.SharedPreferences ...@@ -6,6 +6,7 @@ import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 7 import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 +import android.widget.Button
9 import android.widget.TextView 10 import android.widget.TextView
10 import android.widget.Toast 11 import android.widget.Toast
11 import androidx.appcompat.app.AlertDialog 12 import androidx.appcompat.app.AlertDialog
...@@ -49,6 +50,41 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -49,6 +50,41 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
49 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 50 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
50 val editor: SharedPreferences.Editor=prof.edit() 51 val editor: SharedPreferences.Editor=prof.edit()
51 52
53 +
54 + if(prof.getInt("c10_2 ",0)==1){baewoojaButton.isChecked=true}
55 + if(prof.getInt("c10_3 ",0)==1){baewoojaboomoButton.isChecked=true}
56 + if(prof.getInt("c10_4 ",0)==1){baewoojajoboomoButton.isChecked=true}
57 + if(prof.getInt("c10_5 ",0)==1){brotherButton.isChecked=true}
58 + if(prof.getInt("c10_6 ",0)==1){baewoojabrotherButton.isChecked=true}
59 + if(prof.getInt("c10_7 ",0)==1){donggeoButton.isChecked=true}
60 + if(prof.getInt("c10_8 ",0)==1){fatherButton.isChecked=true}
61 + if(prof.getInt("c10_9 ",0)==1){motherButton.isChecked=true}
62 + if(prof.getInt("c10_10",0)==1){grandsonbaewoojaButton.isChecked=true}
63 + if(prof.getInt("c10_11",0)==1){grandfatherButton.isChecked=true}
64 + if(prof.getInt("c10_12",0)==1){grandmotherButton.isChecked=true}
65 + if(prof.getInt("c10_13",0)==1){grandsonButton.isChecked=true}
66 + if(prof.getInt("c10_14",0)==1){janyeoButton.isChecked=true}
67 + if(prof.getInt("c10_15",0)==1){janyeobaewoojaButton.isChecked=true}
68 + if(prof.getInt("c10_18",0)==1){nothingButton.isChecked=true}
69 +
70 +
71 +
72 +
73 +
74 +
75 +
76 +
77 +
78 +
79 +
80 +
81 +
82 +
83 +
84 +
85 +
86 +
87 +
52 // 1. 툴바 사용 설정 88 // 1. 툴바 사용 설정
53 setSupportActionBar(toolbar) 89 setSupportActionBar(toolbar)
54 90
......
...@@ -57,6 +57,10 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -57,6 +57,10 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
57 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 57 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
58 val editor: SharedPreferences.Editor=prof.edit() 58 val editor: SharedPreferences.Editor=prof.edit()
59 59
60 + if(prof.getString("numOfBS","")!=""){
61 + findViewById<EditText>(R.id.bsNumberEditText).setText(prof.getString("numOfBS",""))
62 + }
63 +
60 // 1. 툴바 사용 설정 64 // 1. 툴바 사용 설정
61 setSupportActionBar(toolbar) 65 setSupportActionBar(toolbar)
62 66
...@@ -151,6 +155,7 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -151,6 +155,7 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
151 numOfBS=0 155 numOfBS=0
152 }else{ 156 }else{
153 numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt() 157 numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
158 + editor.putString("numOfBS",findViewById<EditText>(R.id.bsNumberEditText).text.toString())
154 if(numOfBS>=2){ 159 if(numOfBS>=2){
155 editor.putInt("c10_16",1); editor.commit();editor.putString("second_three","done");editor.commit() 160 editor.putInt("c10_16",1); editor.commit();editor.putString("second_three","done");editor.commit()
156 }else if(numOfBS<2){ 161 }else if(numOfBS<2){
......
...@@ -54,6 +54,9 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -54,6 +54,9 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 54 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
55 val editor: SharedPreferences.Editor=prof.edit() 55 val editor: SharedPreferences.Editor=prof.edit()
56 56
57 + if(prof.getString("numOfChild","")!=""){
58 + findViewById<EditText>(R.id.childNumberEditText).setText(prof.getString("numOfChild",""))
59 + }
57 // 1. 툴바 사용 설정 60 // 1. 툴바 사용 설정
58 setSupportActionBar(toolbar) 61 setSupportActionBar(toolbar)
59 62
...@@ -140,6 +143,8 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -140,6 +143,8 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
140 numOfChild=0 143 numOfChild=0
141 }else{ 144 }else{
142 numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() 145 numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
146 + editor.putString("numOfChild",findViewById<EditText>(R.id.childNumberEditText).text.toString())
147 + editor.commit()
143 if(numOfChild>=3){ 148 if(numOfChild>=3){
144 editor.putInt("c10_16",1); editor.commit();editor.putString("second_two","done");editor.commit() 149 editor.putInt("c10_16",1); editor.commit();editor.putString("second_two","done");editor.commit()
145 }else if(numOfChild<3){ 150 }else if(numOfChild<3){
......
...@@ -56,6 +56,13 @@ class InputProfilThirdFiveActivity : AppCompatActivity() { ...@@ -56,6 +56,13 @@ class InputProfilThirdFiveActivity : AppCompatActivity() {
56 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 56 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
57 val editor: SharedPreferences.Editor=prof.edit() 57 val editor: SharedPreferences.Editor=prof.edit()
58 58
59 + if(prof.getInt("c8_1",0)==1){ nothingButton.isChecked=true}
60 + if(prof.getInt("c7_2",0)==1){ imshinButton.isChecked=true}
61 + if(prof.getInt("c9_17",0)==1){ nanchiButton.isChecked=true}
62 + if(prof.getInt("c9_18",0)==1){ oeButton.isChecked=true}
63 + if(prof.getInt("c9_19",0)==1){ yoyaangButton.isChecked=true}
64 + if(prof.getInt("c8_17",0)==1){ guitarButton.isChecked=true}
65 +
59 // 1. 툴바 사용 설정 66 // 1. 툴바 사용 설정
60 setSupportActionBar(toolbar) 67 setSupportActionBar(toolbar)
61 68
......
...@@ -8,6 +8,7 @@ import android.os.Bundle ...@@ -8,6 +8,7 @@ import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 import android.view.View.GONE 9 import android.view.View.GONE
10 import android.view.View.VISIBLE 10 import android.view.View.VISIBLE
11 +import android.widget.Button
11 import android.widget.TextView 12 import android.widget.TextView
12 import android.widget.Toast 13 import android.widget.Toast
13 import androidx.appcompat.app.AlertDialog 14 import androidx.appcompat.app.AlertDialog
...@@ -55,6 +56,25 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -55,6 +56,25 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 56 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
56 val editor: SharedPreferences.Editor=prof.edit() 57 val editor: SharedPreferences.Editor=prof.edit()
57 58
59 + if(prof.getInt("c8_2",0)==1){ yesButton.isChecked=true}
60 + if(prof.getInt("c9_2",0)==1){ jichaeButton.isChecked=true}
61 + if(prof.getInt("c9_3",0)==1){ noebyungbyunButton.isChecked=true}
62 + if(prof.getInt("c9_4",0)==1){ sigaakButton.isChecked=true}
63 + if(prof.getInt("c9_5",0)==1){ chungkaakButton.isChecked=true}
64 + if(prof.getInt("c9_6",0)==1){ unuhButton.isChecked=true}
65 + if(prof.getInt("c9_7",0)==1){ ahnmyunButton.isChecked=true}
66 + if(prof.getInt("c9_8",0)==1){ sinjaangButton.isChecked=true}
67 + if(prof.getInt("c9_9",0)==1){ simjaangButton.isChecked=true}
68 + if(prof.getInt("c9_10",0)==1){ gaanjaangButton.isChecked=true}
69 + if(prof.getInt("c9_11",0)==1){ jaangrooButton.isChecked=true}
70 + if(prof.getInt("c9_12",0)==1){ noejungjeungButton.isChecked=true}
71 + if(prof.getInt("c9_13",0)==1){ hoheupkiButton.isChecked=true}
72 + if(prof.getInt("c9_14",0)==1){ jijukButton.isChecked=true}
73 + if(prof.getInt("c9_15",0)==1){ japyeahButton.isChecked=true}
74 + if(prof.getInt("c9_16",0)==1){ jeongshinButton.isChecked=true}
75 +
76 + if(prof.getString("noButton","")=="isChecked"){noButton.isChecked=true}
77 +
58 // 1. 툴바 사용 설정 78 // 1. 툴바 사용 설정
59 setSupportActionBar(toolbar) 79 setSupportActionBar(toolbar)
60 80
...@@ -150,11 +170,19 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -150,11 +170,19 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
150 editor.remove("c9_14") 170 editor.remove("c9_14")
151 editor.remove("c9_15") 171 editor.remove("c9_15")
152 editor.remove("c9_16") 172 editor.remove("c9_16")
173 + editor.remove("noButton")
174 +
153 editor.commit() 175 editor.commit()
154 176
155 if(yesButton.isChecked){ 177 if(yesButton.isChecked){
156 editor.putInt("c8_2",1); editor.commit() 178 editor.putInt("c8_2",1); editor.commit()
157 } 179 }
180 +
181 + if(noButton.isChecked){
182 + editor.putString("noButton","isChecked")
183 + editor.commit()
184 + }
185 +
158 if(jichaeButton.isChecked){editor.putInt("c9_2",1); editor.commit();editor.putString("third_four","done");editor.commit()} 186 if(jichaeButton.isChecked){editor.putInt("c9_2",1); editor.commit();editor.putString("third_four","done");editor.commit()}
159 if(noebyungbyunButton.isChecked){editor.putInt("c9_3",1); editor.commit();editor.putString("third_four","done");editor.commit()} 187 if(noebyungbyunButton.isChecked){editor.putInt("c9_3",1); editor.commit();editor.putString("third_four","done");editor.commit()}
160 if(sigaakButton.isChecked){editor.putInt("c9_4",1); editor.commit();editor.putString("third_four","done");editor.commit()} 188 if(sigaakButton.isChecked){editor.putInt("c9_4",1); editor.commit();editor.putString("third_four","done");editor.commit()}
......
...@@ -53,6 +53,13 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -53,6 +53,13 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
54 val editor: SharedPreferences.Editor=prof.edit() 54 val editor: SharedPreferences.Editor=prof.edit()
55 55
56 + if(prof.getInt("c6_2",0)==1){elementaryButton.isChecked=true}
57 + if(prof.getInt("c6_3",0)==1){middleButton.isChecked=true}
58 + if(prof.getInt("c6_4",0)==1){highButton.isChecked=true}
59 + if(prof.getInt("c6_5",0)==1){universityButton.isChecked=true}
60 + if(prof.getInt("c6_6",0)==1){graduateButton.isChecked=true}
61 + if(prof.getInt("c6_7",0)==1){specialButton.isChecked=true}
62 +
56 // 1. 툴바 사용 설정 63 // 1. 툴바 사용 설정
57 setSupportActionBar(toolbar) 64 setSupportActionBar(toolbar)
58 65
......
...@@ -6,6 +6,7 @@ import android.content.SharedPreferences ...@@ -6,6 +6,7 @@ import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 7 import android.os.Bundle
8 import android.util.Log 8 import android.util.Log
9 +import android.widget.Button
9 import android.widget.TextView 10 import android.widget.TextView
10 import android.widget.Toast 11 import android.widget.Toast
11 import androidx.appcompat.app.AlertDialog 12 import androidx.appcompat.app.AlertDialog
...@@ -52,6 +53,17 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { ...@@ -52,6 +53,17 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
52 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 53 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
53 val editor: SharedPreferences.Editor=prof.edit() 54 val editor: SharedPreferences.Editor=prof.edit()
54 55
56 + if(prof.getInt("c4_11",0)==1){nothingButton.isChecked=true}
57 + if(prof.getInt("c4_2",0)==1){ mipilButton.isChecked=true}
58 + if(prof.getInt("c4_3",0)==1){ myunjaeButton.isChecked=true}
59 + if(prof.getInt("c4_4",0)==1){ jobsoldierButton.isChecked=true}
60 + if(prof.getInt("c4_5",0)==1){ bokmoojoongButton.isChecked=true}
61 + if(prof.getInt("c4_6",0)==1){ mangijedaeButton.isChecked=true}
62 + if(prof.getInt("c4_7",0)==1){ specialmanryoButton.isChecked=true}
63 + if(prof.getInt("c4_8",0)==1){ specialbokmoosanupButton.isChecked=true}
64 + if(prof.getInt("c4_9",0)==1){ specialbokmoojeonmoonButton.isChecked=true}
65 + if(prof.getInt("c4_10",0)==1){jedaeguitarButton.isChecked=true}
66 +
55 // 1. 툴바 사용 설정 67 // 1. 툴바 사용 설정
56 setSupportActionBar(toolbar) 68 setSupportActionBar(toolbar)
57 69
......
...@@ -55,6 +55,11 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { ...@@ -55,6 +55,11 @@ class InputProfilThirdTwoActivity : AppCompatActivity() {
55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 55 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
56 val editor: SharedPreferences.Editor=prof.edit() 56 val editor: SharedPreferences.Editor=prof.edit()
57 57
58 + if(prof.getInt("c5_6",0)==1){companyButton.isChecked=true}
59 + if(prof.getInt("c5_7",0)==1){workerButton.isChecked=true}
60 + if(prof.getInt("c5_9",0)==1){entireButton.isChecked=true}
61 + if(prof.getInt("c5_5",0)==1){startupButton.isChecked=true}
62 + if(prof.getInt("c5_5",0)==1){seekButton.isChecked=true}
58 // 1. 툴바 사용 설정 63 // 1. 툴바 사용 설정
59 setSupportActionBar(toolbar) 64 setSupportActionBar(toolbar)
60 65
......
...@@ -12,11 +12,11 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -12,11 +12,11 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() {
12 12
13 private var layoutInflater : LayoutInflater? = null 13 private var layoutInflater : LayoutInflater? = null
14 val Image = arrayOf( 14 val Image = arrayOf(
15 - R.drawable.onboarding1, 15 + R.drawable.a,
16 - R.drawable.onboarding2, 16 + R.drawable.b,
17 - R.drawable.onboarding3, 17 + R.drawable.c,
18 - R.drawable.onboarding4, 18 + R.drawable.d,
19 - R.drawable.onboarding5 19 + R.drawable.e
20 ) 20 )
21 21
22 22
......