장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
4c76b2c3 1 parent e1cc2899

merge done

Inline Side-by-side
Showing 24 changed files with 432 additions and 50 deletions
...@@ -2,6 +2,7 @@ package com.example.vip ...@@ -2,6 +2,7 @@ package com.example.vip
2 2
3 import androidx.test.platform.app.InstrumentationRegistry 3 import androidx.test.platform.app.InstrumentationRegistry
4 import androidx.test.ext.junit.runners.AndroidJUnit4 4 import androidx.test.ext.junit.runners.AndroidJUnit4
5 +import androidx.test.runner.AndroidJUnit4
5 6
6 import org.junit.Test 7 import org.junit.Test
7 import org.junit.runner.RunWith 8 import org.junit.runner.RunWith
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.* 8 import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.*
...@@ -16,7 +18,28 @@ class InputProfilFifthFourActivity : AppCompatActivity() { ...@@ -16,7 +18,28 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
16 startActivity(intent) 18 startActivity(intent)
17 } 19 }
18 20
21 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 + val editor: SharedPreferences.Editor=prof.edit()
23 +
19 nextButton.setOnClickListener { 24 nextButton.setOnClickListener {
25 +
26 + editor.putInt("c1_1",1); editor.commit()
27 + editor.putInt("c2_1",1); editor.commit()
28 + editor.putInt("c3_1",1); editor.commit()
29 + editor.putInt("c4_1",1); editor.commit()
30 + editor.putInt("c5_1",1); editor.commit()
31 + editor.putInt("c6_1",1); editor.commit()
32 + editor.putInt("c7_1",1); editor.commit()
33 + editor.putInt("c8_1",1); editor.commit()
34 + editor.putInt("c9_1",1); editor.commit()
35 + editor.putInt("c10_1",1); editor.commit()
36 + editor.putInt("c11_1",1); editor.commit()
37 + editor.putInt("c12_1",1); editor.commit()
38 + editor.putInt("c13_1",1); editor.commit()
39 + editor.putInt("c14_1",1); editor.commit()
40 + editor.putInt("c15_1",1); editor.commit()
41 + editor.putInt("c16_1",1); editor.commit()
42 +
20 var intent = Intent(this, SignInActivity::class.java) 43 var intent = Intent(this, SignInActivity::class.java)
21 startActivity(intent) 44 startActivity(intent)
22 } 45 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.* 8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.*
...@@ -16,7 +18,36 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { ...@@ -16,7 +18,36 @@ class InputProfilFourthFiveActivity : AppCompatActivity() {
16 startActivity(intent) 18 startActivity(intent)
17 } 19 }
18 20
21 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 + val editor: SharedPreferences.Editor=prof.edit()
23 +
19 nextButton.setOnClickListener { 24 nextButton.setOnClickListener {
25 + if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
26 + if(iljaeButton.isChecked){editor.putInt("c8_12",1); editor.commit()}
27 + if(specialpihaeButton.isChecked){editor.putInt("c8_13",1); editor.commit()}
28 + if(sanuppihaeButton.isChecked){editor.putInt("c8_14",1); editor.commit()}
29 + if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
30 + //기타가 똑같은거 지정
31 +
32 + editor.putInt("c1_1",1); editor.commit()
33 + editor.putInt("c2_1",1); editor.commit()
34 + editor.putInt("c3_1",1); editor.commit()
35 + editor.putInt("c4_1",1); editor.commit()
36 + editor.putInt("c5_1",1); editor.commit()
37 + editor.putInt("c6_1",1); editor.commit()
38 + editor.putInt("c7_1",1); editor.commit()
39 + editor.putInt("c8_1",1); editor.commit()
40 + editor.putInt("c9_1",1); editor.commit()
41 + editor.putInt("c10_1",1); editor.commit()
42 + editor.putInt("c11_1",1); editor.commit()
43 + editor.putInt("c12_1",1); editor.commit()
44 + editor.putInt("c13_1",1); editor.commit()
45 + editor.putInt("c14_1",1); editor.commit()
46 + editor.putInt("c15_1",1); editor.commit()
47 + editor.putInt("c16_1",1); editor.commit()
48 +
49 +
50 +
20 var intent = Intent(this, InputProfilFifthOneActivity::class.java) 51 var intent = Intent(this, InputProfilFifthOneActivity::class.java)
21 startActivity(intent) 52 startActivity(intent)
22 } 53 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.* 8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.*
...@@ -16,11 +18,30 @@ class InputProfilFourthFourActivity : AppCompatActivity() { ...@@ -16,11 +18,30 @@ class InputProfilFourthFourActivity : AppCompatActivity() {
16 startActivity(intent) 18 startActivity(intent)
17 } 19 }
18 20
21 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 + val editor: SharedPreferences.Editor=prof.edit()
23 +
19 nextButton.setOnClickListener { 24 nextButton.setOnClickListener {
25 +
26 + if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
27 + if(pokryukButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
28 + if(pihaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
29 + if(kachoolButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
30 + if(sagoButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
31 + if(ihonButton.isChecked){editor.putInt("c8_15",1); editor.commit()}
32 + if(jaehaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
33 + if(hakkyobaakButton.isChecked){editor.putInt("c8_16",1); editor.commit()}
34 + if(siljikButton.isChecked){editor.putInt("c5_9",1); editor.commit()}
35 + if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
36 +
20 var intent = Intent(this, InputProfilFourthFiveActivity::class.java) 37 var intent = Intent(this, InputProfilFourthFiveActivity::class.java)
21 startActivity(intent) 38 startActivity(intent)
22 } 39 }
23 40
24 41
42 +
43 +
44 +
45 +
25 } 46 }
26 } 47 }
......
...@@ -5,6 +5,7 @@ import android.content.Intent ...@@ -5,6 +5,7 @@ import android.content.Intent
5 import android.content.SharedPreferences 5 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.view.View.GONE
8 import android.view.View.VISIBLE 9 import android.view.View.VISIBLE
9 import android.widget.TextView 10 import android.widget.TextView
10 import androidx.appcompat.app.AlertDialog 11 import androidx.appcompat.app.AlertDialog
...@@ -59,48 +60,56 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -59,48 +60,56 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
59 val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) 60 val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE)
60 val editor: SharedPreferences.Editor=prof.edit() 61 val editor: SharedPreferences.Editor=prof.edit()
61 62
62 - noButton.setOnClickListener{
63 - subLinearLayout.visibility=VISIBLE
64 -
65 - }
66 -
67 -
68 previousButton.setOnClickListener { 63 previousButton.setOnClickListener {
69 var intent = Intent(this, InputProfilThirdFourActivity::class.java) 64 var intent = Intent(this, InputProfilThirdFourActivity::class.java)
70 startActivity(intent) 65 startActivity(intent)
71 } 66 }
72 67
68 + yesButton.setOnClickListener {
69 + subLinearLayout.visibility=GONE
70 + noButton.isChecked=false
71 + }
72 +
73 + noButton.setOnClickListener {
74 + subLinearLayout.visibility=VISIBLE
75 + yesButton.isChecked=false
76 + }
77 +
73 nextButton.setOnClickListener { 78 nextButton.setOnClickListener {
74 79
75 if(yesButton.isChecked){ 80 if(yesButton.isChecked){
76 - editor.putInt("c7_2",1) 81 + editor.putInt("c14_2",1)
82 + editor.commit()
83 + }
84 + if(noButton.isChecked){
85 + editor.putInt("c14_3",1)
77 editor.commit() 86 editor.commit()
78 } 87 }
79 -
80 if(jeonsaeButton.isChecked){ 88 if(jeonsaeButton.isChecked){
81 - editor.putInt("c7_31",1) 89 + editor.putInt("c16_2",1)
82 editor.commit() 90 editor.commit()
83 } 91 }
84 if(wolseButton.isChecked){ 92 if(wolseButton.isChecked){
85 - editor.putInt("c7_31",1) 93 + editor.putInt("c16_3",1)
86 editor.commit() 94 editor.commit()
87 } 95 }
88 if(kongkongButton.isChecked){ 96 if(kongkongButton.isChecked){
89 - editor.putInt("c7_31",1) 97 + editor.putInt("c16_4",1)
90 editor.commit() 98 editor.commit()
91 } 99 }
92 if(moosangButton.isChecked){ 100 if(moosangButton.isChecked){
93 - editor.putInt("c7_31",1) 101 + editor.putInt("c16_5",1)
94 editor.commit() 102 editor.commit()
95 } 103 }
96 if(bojangButton.isChecked){ 104 if(bojangButton.isChecked){
97 - editor.putInt("c7_31",1) 105 + editor.putInt("c16_6",1)
98 editor.commit() 106 editor.commit()
99 } 107 }
100 if(guitarButton.isChecked){ 108 if(guitarButton.isChecked){
101 - editor.putInt("c7_31",1) 109 + editor.putInt("c16_7",1)
102 editor.commit() 110 editor.commit()
103 } 111 }
112 +
104 var intent = Intent(this, InputProfilFourthTwoActivity::class.java) 113 var intent = Intent(this, InputProfilFourthTwoActivity::class.java)
105 startActivity(intent) 114 startActivity(intent)
106 } 115 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.* 8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.*
...@@ -16,7 +18,24 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { ...@@ -16,7 +18,24 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
16 startActivity(intent) 18 startActivity(intent)
17 } 19 }
18 20
21 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 + val editor: SharedPreferences.Editor=prof.edit()
23 +
24 +
19 nextButton.setOnClickListener { 25 nextButton.setOnClickListener {
26 + if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
27 + if(jeosodeukButton.isChecked){editor.putInt("c8_3",1); editor.commit()}
28 + if(hanboomoButton.isChecked){editor.putInt("c8_7",1); editor.commit()}
29 + if(oegookinButton.isChecked){editor.putInt("c8_5",1); editor.commit()}
30 + if(damoonhwaButton.isChecked){editor.putInt("c8_4",1); editor.commit()}
31 + if(jaangaeButton.isChecked){editor.putInt("c8_2",1); editor.commit()}
32 + if(imshinchoolsanButton.isChecked){editor.putInt("c7_1",1); editor.commit()}
33 + if(ipyaangButton.isChecked){editor.putInt("c8_10",1); editor.commit()}
34 + if(gaajungButton.isChecked){editor.putInt("c8_11",1); editor.commit()}
35 + if(bookhanButton.isChecked){editor.putInt("c8_6",1); editor.commit()}
36 + if(gookgayoogongButton.isChecked){editor.putInt("c8_8",1); editor.commit()}
37 + if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
38 +
20 var intent = Intent(this, InputProfilFourthFourActivity::class.java) 39 var intent = Intent(this, InputProfilFourthFourActivity::class.java)
21 startActivity(intent) 40 startActivity(intent)
22 } 41 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
8 +import android.view.View.GONE
9 +import android.view.View.VISIBLE
6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.* 10 import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.*
7 11
8 class InputProfilFourthTwoActivity : AppCompatActivity() { 12 class InputProfilFourthTwoActivity : AppCompatActivity() {
...@@ -16,10 +20,31 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { ...@@ -16,10 +20,31 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
16 startActivity(intent) 20 startActivity(intent)
17 } 21 }
18 22
23 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
24 + val editor: SharedPreferences.Editor=prof.edit()
25 +
19 nextButton.setOnClickListener { 26 nextButton.setOnClickListener {
27 + if(yesButton.isChecked){editor.putInt("c15_2",1); editor.commit()}
28 + if(noButton.isChecked){editor.putInt("c15_3",1); editor.commit()}
29 + if(jeonsaeButton.isChecked){editor.putInt("c16_2",1); editor.commit()}
30 + if(wolseButton.isChecked){editor.putInt("c16_3",1); editor.commit()}
31 + if(kongkongButton.isChecked){editor.putInt("c16_4",1); editor.commit()}
32 + if(moosangButton.isChecked){editor.putInt("c16_5",1); editor.commit()}
33 + if(bojangButton.isChecked){editor.putInt("c16_6",1); editor.commit()}
34 + if(guitarButton.isChecked){editor.putInt("c16_7",1); editor.commit()}
35 +
20 var intent = Intent(this, InputProfilFourthThreeActivity::class.java) 36 var intent = Intent(this, InputProfilFourthThreeActivity::class.java)
21 startActivity(intent) 37 startActivity(intent)
22 } 38 }
23 39
40 + yesButton.setOnClickListener {
41 + subLayout.visibility=GONE
42 + noButton.isChecked=false
43 + }
44 + noButton.setOnClickListener {
45 + subLayout.visibility=VISIBLE
46 + yesButton.isChecked=false
47 + }
48 +
24 } 49 }
25 } 50 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
8 +import android.view.View.GONE
9 +import android.view.View.VISIBLE
6 import kotlinx.android.synthetic.main.activity_input_profil_third_four.* 10 import kotlinx.android.synthetic.main.activity_input_profil_third_four.*
7 11
8 class InputProfilThirdFourActivity : AppCompatActivity() { 12 class InputProfilThirdFourActivity : AppCompatActivity() {
...@@ -17,9 +21,51 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -17,9 +21,51 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
17 startActivity(intent) 21 startActivity(intent)
18 } 22 }
19 23
24 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
25 + val editor: SharedPreferences.Editor=prof.edit()
26 +
20 nextButton.setOnClickListener { 27 nextButton.setOnClickListener {
28 +
29 + if(yesButton.isChecked){
30 + editor.putInt("c8_2",1); editor.commit()
31 + }
32 + if(jichaeButton.isChecked){editor.putInt("c9_2",1); editor.commit()}
33 + if(noebyungbyunButton.isChecked){editor.putInt("c9_3",1); editor.commit()}
34 + if(sigaakButton.isChecked){editor.putInt("c9_4",1); editor.commit()}
35 + if(chungkaakButton.isChecked){editor.putInt("c9_5",1); editor.commit()}
36 + if(unuhButton.isChecked){editor.putInt("c9_6",1); editor.commit()}
37 + if(ahnmyunButton.isChecked){editor.putInt("c9_7",1); editor.commit()}
38 + if(sinjaangButton.isChecked){editor.putInt("c9_8",1); editor.commit()}
39 + if(simjaangButton.isChecked){editor.putInt("c9_9",1); editor.commit()}
40 + if(gaanjaangButton.isChecked){editor.putInt("c9_10",1); editor.commit()}
41 + if(jaangrooButton.isChecked){editor.putInt("c9_11",1); editor.commit()}
42 + if(noejungjeungButton.isChecked){editor.putInt("c9_12",1); editor.commit()}
43 + if(hoheupkiButton.isChecked){editor.putInt("c9_13",1); editor.commit()}
44 + if(jijukButton.isChecked){editor.putInt("c9_14",1); editor.commit()}
45 + if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit()}
46 + if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit()}
47 +
48 + if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}//DB,pref 뻑 주의
49 + if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit()}
50 + if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit()}
51 + if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit()}
52 + if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit()}
53 + if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
54 +
21 var intent = Intent(this, InputProfilFourthOneActivity::class.java) 55 var intent = Intent(this, InputProfilFourthOneActivity::class.java)
22 startActivity(intent) 56 startActivity(intent)
23 } 57 }
58 +
59 + yesButton.setOnClickListener {
60 + eightoneLayout.visibility=VISIBLE
61 + eighttwoLayout.visibility= GONE
62 +
63 + }
64 + noButton.setOnClickListener {
65 + eightoneLayout.visibility= GONE
66 + eighttwoLayout.visibility= VISIBLE
67 + }
68 +
69 +
24 } 70 }
25 } 71 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import android.widget.Button 8 import android.widget.Button
...@@ -83,7 +85,25 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -83,7 +85,25 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
83 startActivity(intent) 85 startActivity(intent)
84 } 86 }
85 87
88 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
89 + val editor: SharedPreferences.Editor=prof.edit()
90 +
86 nextButton.setOnClickListener { 91 nextButton.setOnClickListener {
92 + if(elementaryButton.isChecked){
93 + editor.putInt("c6_2",1); editor.commit()
94 + }else if(middleButton.isChecked){
95 + editor.putInt("c6_3",1); editor.commit()
96 + }else if(highButton.isChecked){
97 + editor.putInt("c6_4",1); editor.commit()
98 + }else if(universityButton.isChecked){
99 + editor.putInt("c6_5",1); editor.commit()
100 + }else if(graduateButton.isChecked){
101 + editor.putInt("c6_6",1); editor.commit()
102 + }else if(nothingButton.isChecked){
103 + editor.putInt("c6_7",1); editor.commit()
104 + }else{
105 +
106 + }
87 107
88 108
89 var intent = Intent(this, InputProfilThirdTwoActivity::class.java) 109 var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import kotlinx.android.synthetic.main.activity_input_profil_third_three.* 8 import kotlinx.android.synthetic.main.activity_input_profil_third_three.*
...@@ -24,9 +26,135 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { ...@@ -24,9 +26,135 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
24 startActivity(intent) 26 startActivity(intent)
25 } 27 }
26 28
29 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
30 + val editor: SharedPreferences.Editor=prof.edit()
31 +
27 nextButton.setOnClickListener { 32 nextButton.setOnClickListener {
33 + if(nothingButton.isChecked){ editor.putInt("c4_11",1); editor.commit()}
34 + if(mipilButton.isChecked){ editor.putInt("c4_2",1); editor.commit()}
35 + if(myunjaeButton.isChecked){ editor.putInt("c4_3",1); editor.commit()}
36 + if(jobsoldierButton.isChecked){ editor.putInt("c4_4",1); editor.commit()}
37 + if(bokmoojoongButton.isChecked){ editor.putInt("c4_5",1); editor.commit()}
38 + if(mangijedaeButton.isChecked){ editor.putInt("c4_6",1); editor.commit()}
39 + if(specialmanryoButton.isChecked){ editor.putInt("c4_7",1); editor.commit()}
40 + if(specialbokmoosanupButton.isChecked){ editor.putInt("c4_8",1); editor.commit()}
41 + if(specialbokmoojeonmoonButton.isChecked){ editor.putInt("c4_9",1); editor.commit()}
42 + if(jedaeguitarButton.isChecked){ editor.putInt("c4_10",1); editor.commit()}
43 +
28 var intent = Intent(this, InputProfilThirdFourActivity::class.java) 44 var intent = Intent(this, InputProfilThirdFourActivity::class.java)
29 startActivity(intent) 45 startActivity(intent)
30 } 46 }
47 +
48 + nothingButton.setOnClickListener {
49 + mipilButton.isChecked=false
50 + myunjaeButton.isChecked=false
51 + jobsoldierButton.isChecked=false
52 + bokmoojoongButton.isChecked=false
53 + mangijedaeButton.isChecked=false
54 + specialmanryoButton.isChecked=false
55 + specialbokmoosanupButton.isChecked=false
56 + specialbokmoojeonmoonButton.isChecked=false
57 + jedaeguitarButton.isChecked=false
58 + }
59 + mipilButton.setOnClickListener {
60 + nothingButton.isChecked=false
61 + myunjaeButton.isChecked=false
62 + jobsoldierButton.isChecked=false
63 + bokmoojoongButton.isChecked=false
64 + mangijedaeButton.isChecked=false
65 + specialmanryoButton.isChecked=false
66 + specialbokmoosanupButton.isChecked=false
67 + specialbokmoojeonmoonButton.isChecked=false
68 + jedaeguitarButton.isChecked=false
69 + }
70 + myunjaeButton.setOnClickListener {
71 + nothingButton.isChecked=false
72 + mipilButton.isChecked=false
73 + jobsoldierButton.isChecked=false
74 + bokmoojoongButton.isChecked=false
75 + mangijedaeButton.isChecked=false
76 + specialmanryoButton.isChecked=false
77 + specialbokmoosanupButton.isChecked=false
78 + specialbokmoojeonmoonButton.isChecked=false
79 + jedaeguitarButton.isChecked=false
80 + }
81 + jobsoldierButton.setOnClickListener {
82 + nothingButton.isChecked=false
83 + mipilButton.isChecked=false
84 + myunjaeButton.isChecked=false
85 + bokmoojoongButton.isChecked=false
86 + mangijedaeButton.isChecked=false
87 + specialmanryoButton.isChecked=false
88 + specialbokmoosanupButton.isChecked=false
89 + specialbokmoojeonmoonButton.isChecked=false
90 + jedaeguitarButton.isChecked=false
91 + }
92 + bokmoojoongButton.setOnClickListener {
93 + nothingButton.isChecked=false
94 + mipilButton.isChecked=false
95 + myunjaeButton.isChecked=false
96 + jobsoldierButton.isChecked=false
97 + mangijedaeButton.isChecked=false
98 + specialmanryoButton.isChecked=false
99 + specialbokmoosanupButton.isChecked=false
100 + specialbokmoojeonmoonButton.isChecked=false
101 + jedaeguitarButton.isChecked=false
102 + }
103 + mangijedaeButton.setOnClickListener {
104 + nothingButton.isChecked=false
105 + mipilButton.isChecked=false
106 + myunjaeButton.isChecked=false
107 + jobsoldierButton.isChecked=false
108 + bokmoojoongButton.isChecked=false
109 + specialmanryoButton.isChecked=false
110 + specialbokmoosanupButton.isChecked=false
111 + specialbokmoojeonmoonButton.isChecked=false
112 + jedaeguitarButton.isChecked=false
113 + }
114 + specialmanryoButton.setOnClickListener {
115 + nothingButton.isChecked=false
116 + mipilButton.isChecked=false
117 + myunjaeButton.isChecked=false
118 + jobsoldierButton.isChecked=false
119 + bokmoojoongButton.isChecked=false
120 + mangijedaeButton.isChecked=false
121 + specialbokmoosanupButton.isChecked=false
122 + specialbokmoojeonmoonButton.isChecked=false
123 + jedaeguitarButton.isChecked=false
124 + }
125 + specialbokmoosanupButton.setOnClickListener {
126 + nothingButton.isChecked=false
127 + mipilButton.isChecked=false
128 + myunjaeButton.isChecked=false
129 + jobsoldierButton.isChecked=false
130 + bokmoojoongButton.isChecked=false
131 + mangijedaeButton.isChecked=false
132 + specialmanryoButton.isChecked=false
133 + specialbokmoojeonmoonButton.isChecked=false
134 + jedaeguitarButton.isChecked=false
135 + }
136 + specialbokmoojeonmoonButton.setOnClickListener {
137 + nothingButton.isChecked=false
138 + mipilButton.isChecked=false
139 + myunjaeButton.isChecked=false
140 + jobsoldierButton.isChecked=false
141 + bokmoojoongButton.isChecked=false
142 + mangijedaeButton.isChecked=false
143 + specialmanryoButton.isChecked=false
144 + specialbokmoosanupButton.isChecked=false
145 + jedaeguitarButton.isChecked=false
146 + }
147 + jedaeguitarButton.setOnClickListener {
148 + nothingButton.isChecked=false
149 + mipilButton.isChecked=false
150 + myunjaeButton.isChecked=false
151 + jobsoldierButton.isChecked=false
152 + bokmoojoongButton.isChecked=false
153 + mangijedaeButton.isChecked=false
154 + specialmanryoButton.isChecked=false
155 + specialbokmoosanupButton.isChecked=false
156 + specialbokmoojeonmoonButton.isChecked=false
157 + }
158 +
31 } 159 }
32 } 160 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
8 +import android.view.View.GONE
9 +import android.view.View.VISIBLE
6 import kotlinx.android.synthetic.main.activity_input_profil_third_two.* 10 import kotlinx.android.synthetic.main.activity_input_profil_third_two.*
7 11
8 class InputProfilThirdTwoActivity : AppCompatActivity() { 12 class InputProfilThirdTwoActivity : AppCompatActivity() {
...@@ -24,9 +28,48 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { ...@@ -24,9 +28,48 @@ class InputProfilThirdTwoActivity : AppCompatActivity() {
24 startActivity(intent) 28 startActivity(intent)
25 } 29 }
26 30
31 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
32 + val editor: SharedPreferences.Editor=prof.edit()
33 +
27 nextButton.setOnClickListener { 34 nextButton.setOnClickListener {
35 + if(companyButton.isChecked){ editor.putInt("c5_6",1); editor.commit()}
36 + if(workerButton.isChecked){ editor.putInt("c5_7",1); editor.commit()}
37 + if(entireButton.isChecked){ editor.putInt("c5_9",1); editor.commit()}
38 + if(startupButton.isChecked){ editor.putInt("c5_5",1); editor.commit()}
39 + if(seekButton.isChecked){ editor.putInt("c5_5",1); editor.commit()}
40 + //창업예정자랑 취준생이랑 같은 카테고리 맞음????
41 +
28 var intent = Intent(this, InputProfilThirdThreeActivity::class.java) 42 var intent = Intent(this, InputProfilThirdThreeActivity::class.java)
29 startActivity(intent) 43 startActivity(intent)
30 } 44 }
45 +
46 + jobButton.setOnClickListener {
47 + nojobButton.isChecked=false
48 + sixoneLayout.visibility=VISIBLE
49 + sixtwoLayout.visibility= GONE
50 + }
51 + nojobButton.setOnClickListener {
52 + jobButton.isChecked=false
53 + sixoneLayout.visibility=GONE
54 + sixtwoLayout.visibility= VISIBLE
55 + }
56 + companyButton.setOnClickListener {
57 + workerButton.isChecked=false
58 + }
59 + workerButton.setOnClickListener {
60 + companyButton.isChecked=false
61 + }
62 + entireButton.setOnClickListener {
63 + startupButton.isChecked=false
64 + seekButton.isChecked=false
65 + }
66 + startupButton.setOnClickListener {
67 + entireButton.isChecked=false
68 + seekButton.isChecked=false
69 + }
70 + seekButton.setOnClickListener {
71 + entireButton.isChecked=false
72 + startupButton.isChecked=false
73 + }
31 } 74 }
32 } 75 }
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> 2 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 <!-- 배경 --> 3 <!-- 배경 -->
4 <item 4 <item
5 - android:drawable="@color/colorPrimary"/> 5 + android:drawable="@color/splashfilling"/>
6 <!-- 로고 --> 6 <!-- 로고 -->
7 <item> 7 <item>
8 <bitmap 8 <bitmap
9 android:gravity="center" 9 android:gravity="center"
10 - android:src="@drawable/splash_main"/> 10 + android:src="@drawable/final_splash"/>
11 </item> 11 </item>
12 </layer-list> 12 </layer-list>
......
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" 4 + <item android:state_checked="false"
5 android:drawable="@drawable/heart_stroke" /> 5 android:drawable="@drawable/heart_stroke" />
6 -<item android:state_checked="true" 6 + <item android:state_checked="true"
7 android:drawable="@drawable/heart_fill" /> 7 android:drawable="@drawable/heart_fill" />
8 </selector> 8 </selector>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
219 android:layout_height="wrap_content" 219 android:layout_height="wrap_content"
220 android:layout_weight="1" 220 android:layout_weight="1"
221 android:orientation="vertical" 221 android:orientation="vertical"
222 - android:visibility="visible"> 222 + android:visibility="gone">
223 223
224 <LinearLayout 224 <LinearLayout
225 android:layout_width="match_parent" 225 android:layout_width="match_parent"
...@@ -349,6 +349,9 @@ ...@@ -349,6 +349,9 @@
349 349
350 </LinearLayout> 350 </LinearLayout>
351 351
352 + </LinearLayout>
353 + </ScrollView>
354 +
352 <LinearLayout 355 <LinearLayout
353 android:layout_width="match_parent" 356 android:layout_width="match_parent"
354 android:layout_height="wrap_content" 357 android:layout_height="wrap_content"
...@@ -368,8 +371,6 @@ ...@@ -368,8 +371,6 @@
368 android:layout_weight="1" 371 android:layout_weight="1"
369 android:text="다음 단계로" /> 372 android:text="다음 단계로" />
370 </LinearLayout> 373 </LinearLayout>
371 - </LinearLayout>
372 - </ScrollView>
373 374
374 </LinearLayout> 375 </LinearLayout>
375 </LinearLayout> 376 </LinearLayout>
......
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
131 <LinearLayout 131 <LinearLayout
132 android:layout_width="match_parent" 132 android:layout_width="match_parent"
133 android:layout_height="wrap_content" 133 android:layout_height="wrap_content"
134 + android:layout_gravity="center"
134 android:orientation="vertical"> 135 android:orientation="vertical">
135 136
136 <LinearLayout 137 <LinearLayout
...@@ -214,10 +215,12 @@ ...@@ -214,10 +215,12 @@
214 </LinearLayout> 215 </LinearLayout>
215 216
216 <LinearLayout 217 <LinearLayout
218 + android:id="@+id/subLayout"
217 android:layout_width="match_parent" 219 android:layout_width="match_parent"
218 android:layout_height="wrap_content" 220 android:layout_height="wrap_content"
219 android:layout_weight="1" 221 android:layout_weight="1"
220 - android:orientation="vertical"> 222 + android:orientation="vertical"
223 + android:visibility="gone">
221 224
222 <LinearLayout 225 <LinearLayout
223 android:layout_width="match_parent" 226 android:layout_width="match_parent"
...@@ -347,6 +350,9 @@ ...@@ -347,6 +350,9 @@
347 350
348 </LinearLayout> 351 </LinearLayout>
349 352
353 + </LinearLayout>
354 + </ScrollView>
355 +
350 <LinearLayout 356 <LinearLayout
351 android:layout_width="match_parent" 357 android:layout_width="match_parent"
352 android:layout_height="wrap_content" 358 android:layout_height="wrap_content"
...@@ -366,8 +372,6 @@ ...@@ -366,8 +372,6 @@
366 android:layout_weight="1" 372 android:layout_weight="1"
367 android:text="다음 단계로" /> 373 android:text="다음 단계로" />
368 </LinearLayout> 374 </LinearLayout>
369 - </LinearLayout>
370 - </ScrollView>
371 375
372 </LinearLayout> 376 </LinearLayout>
373 </LinearLayout> 377 </LinearLayout>
......
...@@ -213,10 +213,12 @@ ...@@ -213,10 +213,12 @@
213 </LinearLayout> 213 </LinearLayout>
214 214
215 <LinearLayout 215 <LinearLayout
216 + android:id="@+id/eightoneLayout"
216 android:layout_width="match_parent" 217 android:layout_width="match_parent"
217 android:layout_height="wrap_content" 218 android:layout_height="wrap_content"
218 android:layout_weight="1" 219 android:layout_weight="1"
219 - android:orientation="vertical"> 220 + android:orientation="vertical"
221 + android:visibility="gone">
220 222
221 <LinearLayout 223 <LinearLayout
222 android:layout_width="match_parent" 224 android:layout_width="match_parent"
...@@ -452,10 +454,12 @@ ...@@ -452,10 +454,12 @@
452 </LinearLayout> 454 </LinearLayout>
453 455
454 <LinearLayout 456 <LinearLayout
457 + android:id="@+id/eighttwoLayout"
455 android:layout_width="match_parent" 458 android:layout_width="match_parent"
456 android:layout_height="wrap_content" 459 android:layout_height="wrap_content"
457 android:layout_weight="1" 460 android:layout_weight="1"
458 - android:orientation="vertical"> 461 + android:orientation="vertical"
462 + android:visibility="gone">
459 463
460 <LinearLayout 464 <LinearLayout
461 android:layout_width="match_parent" 465 android:layout_width="match_parent"
...@@ -585,6 +589,9 @@ ...@@ -585,6 +589,9 @@
585 589
586 </LinearLayout> 590 </LinearLayout>
587 591
592 + </LinearLayout>
593 + </ScrollView>
594 +
588 <LinearLayout 595 <LinearLayout
589 android:layout_width="match_parent" 596 android:layout_width="match_parent"
590 android:layout_height="wrap_content" 597 android:layout_height="wrap_content"
...@@ -604,8 +611,6 @@ ...@@ -604,8 +611,6 @@
604 android:layout_weight="1" 611 android:layout_weight="1"
605 android:text="다음 단계로" /> 612 android:text="다음 단계로" />
606 </LinearLayout> 613 </LinearLayout>
607 - </LinearLayout>
608 - </ScrollView>
609 614
610 </LinearLayout> 615 </LinearLayout>
611 </LinearLayout> 616 </LinearLayout>
......
...@@ -120,22 +120,17 @@ ...@@ -120,22 +120,17 @@
120 android:layout_width="match_parent" 120 android:layout_width="match_parent"
121 android:layout_height="wrap_content" 121 android:layout_height="wrap_content"
122 android:layout_weight="1" 122 android:layout_weight="1"
123 + android:gravity="center"
123 android:orientation="vertical"> 124 android:orientation="vertical">
124 125
125 <LinearLayout 126 <LinearLayout
126 android:layout_width="match_parent" 127 android:layout_width="match_parent"
127 android:layout_height="wrap_content" 128 android:layout_height="wrap_content"
128 - android:layout_weight="1"
129 - android:orientation="horizontal"></LinearLayout>
130 -
131 - <LinearLayout
132 - android:layout_width="match_parent"
133 - android:layout_height="wrap_content"
134 android:orientation="vertical"> 129 android:orientation="vertical">
135 130
136 <RelativeLayout 131 <RelativeLayout
137 android:layout_width="match_parent" 132 android:layout_width="match_parent"
138 - android:layout_height="match_parent"> 133 + android:layout_height="wrap_content">
139 134
140 <TextView 135 <TextView
141 android:id="@+id/explainTextView" 136 android:id="@+id/explainTextView"
...@@ -157,7 +152,6 @@ ...@@ -157,7 +152,6 @@
157 android:text=" ? " 152 android:text=" ? "
158 android:textSize="8sp" /> 153 android:textSize="8sp" />
159 </RelativeLayout> 154 </RelativeLayout>
160 - </LinearLayout>
161 155
162 <LinearLayout 156 <LinearLayout
163 android:layout_width="match_parent" 157 android:layout_width="match_parent"
...@@ -208,11 +202,15 @@ ...@@ -208,11 +202,15 @@
208 </LinearLayout> 202 </LinearLayout>
209 </LinearLayout> 203 </LinearLayout>
210 204
205 + </LinearLayout>
206 +
211 <LinearLayout 207 <LinearLayout
208 + android:id="@+id/sixoneLayout"
212 android:layout_width="match_parent" 209 android:layout_width="match_parent"
213 android:layout_height="50dp" 210 android:layout_height="50dp"
214 android:layout_weight="1" 211 android:layout_weight="1"
215 - android:orientation="vertical"> 212 + android:orientation="vertical"
213 + android:visibility="gone">
216 214
217 <LinearLayout 215 <LinearLayout
218 android:layout_width="match_parent" 216 android:layout_width="match_parent"
...@@ -297,10 +295,12 @@ ...@@ -297,10 +295,12 @@
297 </LinearLayout> 295 </LinearLayout>
298 296
299 <LinearLayout 297 <LinearLayout
298 + android:id="@+id/sixtwoLayout"
300 android:layout_width="match_parent" 299 android:layout_width="match_parent"
301 android:layout_height="100dp" 300 android:layout_height="100dp"
302 android:layout_weight="1" 301 android:layout_weight="1"
303 - android:orientation="vertical"> 302 + android:orientation="vertical"
303 + android:visibility="gone">
304 304
305 <LinearLayout 305 <LinearLayout
306 android:layout_width="match_parent" 306 android:layout_width="match_parent"
...@@ -400,9 +400,13 @@ ...@@ -400,9 +400,13 @@
400 400
401 </LinearLayout> 401 </LinearLayout>
402 402
403 + </LinearLayout>
404 +
403 <LinearLayout 405 <LinearLayout
404 android:layout_width="match_parent" 406 android:layout_width="match_parent"
405 android:layout_height="wrap_content" 407 android:layout_height="wrap_content"
408 + android:layout_gravity="bottom"
409 + android:gravity="bottom"
406 android:orientation="horizontal"> 410 android:orientation="horizontal">
407 411
408 <Button 412 <Button
...@@ -419,6 +423,6 @@ ...@@ -419,6 +423,6 @@
419 android:layout_weight="1" 423 android:layout_weight="1"
420 android:text="다음 단계로" /> 424 android:text="다음 단계로" />
421 </LinearLayout> 425 </LinearLayout>
422 - </LinearLayout> 426 +
423 </LinearLayout> 427 </LinearLayout>
424 </androidx.constraintlayout.widget.ConstraintLayout> 428 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
4 android:layout_width="100dp" 4 android:layout_width="100dp"
5 android:layout_height="100dp" 5 android:layout_height="100dp"
6 android:layout_gravity="center" 6 android:layout_gravity="center"
7 + android:layout_margin="10dp"
7 android:gravity="center" 8 android:gravity="center"
8 - android:orientation="vertical"> 9 + android:orientation="vertical"
10 + android:padding="3dp">
9 11
10 12
11 <ImageView 13 <ImageView
......