장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
f88ebb49 2 parents bf8c8215 44c75f02

Merge branch 'done' of http://khuhub.khu.ac.kr/2014104141/WELLO into done

Inline Side-by-side
Showing 60 changed files with 782 additions and 146 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
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 android:roundIcon="@mipmap/ic_launcher_round" 9 android:roundIcon="@mipmap/ic_launcher_round"
10 android:supportsRtl="true" 10 android:supportsRtl="true"
11 android:theme="@style/NoActionBar"> 11 android:theme="@style/NoActionBar">
12 - <activity android:name=".ChildAdapter"></activity> 12 + <activity android:name=".SignUpCompleteActivity"></activity>
13 + <activity android:name=".ChildAdapter" />
13 <activity android:name=".InputProfilFifthFourActivity" /> 14 <activity android:name=".InputProfilFifthFourActivity" />
14 <activity android:name=".InputProfilFifthThreeActivity" /> 15 <activity android:name=".InputProfilFifthThreeActivity" />
15 <activity android:name=".InputProfilFifthTwoActivity" /> 16 <activity android:name=".InputProfilFifthTwoActivity" />
...@@ -32,19 +33,19 @@ ...@@ -32,19 +33,19 @@
32 <activity android:name=".InputProfilFirstThreeActivity" /> 33 <activity android:name=".InputProfilFirstThreeActivity" />
33 <activity android:name=".InputProfilFirstTwoActivity" /> 34 <activity android:name=".InputProfilFirstTwoActivity" />
34 <activity android:name=".InputProfilFirstOneActivity" /> 35 <activity android:name=".InputProfilFirstOneActivity" />
35 - <activity android:name=".AccountSettingActivity"/> 36 + <activity android:name=".AccountSettingActivity" />
36 - <activity android:name=".PrivacyPolicyActivity"/> 37 + <activity android:name=".PrivacyPolicyActivity" />
37 - <activity android:name=".TermsOfUserActivity"/> 38 + <activity android:name=".TermsOfUserActivity" />
38 - <activity android:name=".NoticeActivity"/> 39 + <activity android:name=".NoticeActivity" />
39 - <activity android:name=".QuestionsActivity"/> 40 + <activity android:name=".QuestionsActivity" />
40 <activity android:name=".WelcomeActivity" /> 41 <activity android:name=".WelcomeActivity" />
41 - <activity android:name=".PushInfoActivity"/> 42 + <activity android:name=".PushInfoActivity" />
42 <activity android:name=".SettingActivity" /> 43 <activity android:name=".SettingActivity" />
43 - <activity android:name=".TermsDetailActivity"/> 44 + <activity android:name=".TermsDetailActivity" />
44 <activity android:name=".DetailActivity" /> 45 <activity android:name=".DetailActivity" />
45 <activity android:name=".InfoActivity" /> 46 <activity android:name=".InfoActivity" />
46 <activity android:name=".FavoritesActivity" /> 47 <activity android:name=".FavoritesActivity" />
47 - <activity android:name=".SettingsInForm"/> 48 + <activity android:name=".SettingsInForm" />
48 <activity android:name=".RecommendActivity" /> 49 <activity android:name=".RecommendActivity" />
49 <activity android:name=".SignInActivity" /> 50 <activity android:name=".SignInActivity" />
50 <activity android:name=".SignUpActivity" /> 51 <activity android:name=".SignUpActivity" />
......
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
...@@ -33,7 +34,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -33,7 +34,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
33 34
34 questionButton.setOnClickListener { 35 questionButton.setOnClickListener {
35 val builder = AlertDialog.Builder(this) 36 val builder = AlertDialog.Builder(this)
36 - val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null) 37 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
37 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 38 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
38 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb) 39 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
39 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?" 40 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
...@@ -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 }
......
...@@ -5,32 +5,85 @@ import android.content.Intent ...@@ -5,32 +5,85 @@ 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.widget.Button 8 +import android.util.Log
9 -import android.widget.EditText
10 -import android.widget.RatingBar
11 import android.widget.TextView 9 import android.widget.TextView
10 +import android.widget.Toast
12 import androidx.appcompat.app.AlertDialog 11 import androidx.appcompat.app.AlertDialog
12 +import com.google.android.gms.tasks.OnCompleteListener
13 +import com.google.firebase.auth.FirebaseAuth
14 +import com.google.firebase.database.FirebaseDatabase
15 +import com.google.firebase.iid.FirebaseInstanceId
13 import kotlinx.android.synthetic.main.activity_input_profil_second_one.* 16 import kotlinx.android.synthetic.main.activity_input_profil_second_one.*
14 -import kotlinx.android.synthetic.main.family_member_dialog.*
15 -import kotlinx.android.synthetic.main.family_member_dialog.view.*
16 17
17 class InputProfilSecondOneActivity : AppCompatActivity() { 18 class InputProfilSecondOneActivity : AppCompatActivity() {
18 19
20 + private val firebaseAuth = FirebaseAuth.getInstance()
21 + val user_db = FirebaseDatabase.getInstance("https://capstone-vip-user.firebaseio.com/").reference
22 +
23 + private fun sendToken(){
24 + FirebaseInstanceId.getInstance().instanceId
25 + .addOnCompleteListener(OnCompleteListener { task ->
26 + if (!task.isSuccessful) {
27 + //Log.w(TAG, "getInstanceId failed", task.exception)
28 + return@OnCompleteListener
29 + }
30 +
31 + // Get new Instance ID token
32 + tkn = task.result!!.token
33 +
34 + // Log and toast
35 + val msg = getString(R.string.msg_token_fmt, tkn)
36 + //Log.d(TAG, msg)
37 + Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
38 + })
39 + }
40 +
41 + private fun writeNewUser(u_id: String, u_token: String, Policy: String?) {
42 + val user = User(u_token, Policy!!)
43 + user_db.child(u_id).setValue(user)/// .setValue(user)
44 + }
45 +
46 +
19 override fun onCreate(savedInstanceState: Bundle?) { 47 override fun onCreate(savedInstanceState: Bundle?) {
20 super.onCreate(savedInstanceState) 48 super.onCreate(savedInstanceState)
21 setContentView(R.layout.activity_input_profil_second_one) 49 setContentView(R.layout.activity_input_profil_second_one)
22 50
51 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
52 + val editor: SharedPreferences.Editor=prof.edit()
53 +
23 // 1. 툴바 사용 설정 54 // 1. 툴바 사용 설정
24 setSupportActionBar(toolbar) 55 setSupportActionBar(toolbar)
25 56
57 + //pushing code start
58 + intent.extras?.let {
59 + for (key in it.keySet()) {
60 + val value = intent.extras?.get(key)
61 + //Log.d(TAG, "Key: $key Value: $value")
62 + }
63 + }
64 + //pushing code end
65 +
66 +
26 skipButton.setOnClickListener { 67 skipButton.setOnClickListener {
27 - var intent = Intent(this, InputProfilSecondOneActivity::class.java) 68 + sendToken()
69 + val user=firebaseAuth?.currentUser
70 + val cat_list=listOf("c1_1")
71 + val policy_string_list=listOf("")
72 + var policy_string=""
73 + prof.getInt("c1_1",1)
74 + if(prof.getInt("c1_1",1)==1){
75 + policy_string=policy_string
76 + }
77 +
78 + writeNewUser(user!!.uid,"$tkn",policy_string)
79 +
80 + var intent = Intent(this, SignInActivity::class.java)
28 startActivity(intent) 81 startActivity(intent)
29 } 82 }
30 83
31 questionButton.setOnClickListener { 84 questionButton.setOnClickListener {
32 val builder = AlertDialog.Builder(this) 85 val builder = AlertDialog.Builder(this)
33 - val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null) 86 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
34 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 87 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
35 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb) 88 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
36 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?" 89 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
...@@ -58,8 +111,7 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -58,8 +111,7 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
58 startActivity(intent) 111 startActivity(intent)
59 } 112 }
60 113
61 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 114 +
62 - val editor: SharedPreferences.Editor=prof.edit()
63 115
64 116
65 nextButton.setOnClickListener { 117 nextButton.setOnClickListener {
......
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 }
......
...@@ -14,7 +14,10 @@ import android.view.View ...@@ -14,7 +14,10 @@ import android.view.View
14 import android.view.ViewGroup 14 import android.view.ViewGroup
15 import android.widget.ImageView 15 import android.widget.ImageView
16 import android.widget.Toast 16 import android.widget.Toast
17 +import com.google.android.gms.tasks.OnCompleteListener
17 import com.google.firebase.auth.FirebaseAuth 18 import com.google.firebase.auth.FirebaseAuth
19 +import com.google.firebase.iid.FirebaseInstanceId
20 +import com.google.firebase.iid.FirebaseInstanceId.getInstance
18 import kotlinx.android.synthetic.main.activity_main.* 21 import kotlinx.android.synthetic.main.activity_main.*
19 import org.w3c.dom.Node 22 import org.w3c.dom.Node
20 import java.lang.Boolean.getBoolean 23 import java.lang.Boolean.getBoolean
...@@ -26,17 +29,16 @@ class MainActivity : AppCompatActivity() { ...@@ -26,17 +29,16 @@ class MainActivity : AppCompatActivity() {
26 29
27 override fun onCreate(savedInstanceState: Bundle?) { 30 override fun onCreate(savedInstanceState: Bundle?) {
28 super.onCreate(savedInstanceState) 31 super.onCreate(savedInstanceState)
29 -
30 -
31 -
32 - //onboarding start
33 -
34 - //onboarding end
35 setContentView(R.layout.activity_main) 32 setContentView(R.layout.activity_main)
36 33
37 -
38 emailSigninBtn.setOnClickListener{ 34 emailSigninBtn.setOnClickListener{
39 loginEmail() 35 loginEmail()
36 + }
37 +
38 + textview2.setOnClickListener{
39 +
40 + }
41 + textview3.setOnClickListener{
40 42
41 } 43 }
42 44
...@@ -47,6 +49,8 @@ class MainActivity : AppCompatActivity() { ...@@ -47,6 +49,8 @@ class MainActivity : AppCompatActivity() {
47 49
48 } 50 }
49 51
52 +
53 +
50 private fun loginEmail(){ 54 private fun loginEmail(){
51 firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString()) 55 firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString())
52 .addOnCompleteListener(this) { 56 .addOnCompleteListener(this) {
...@@ -61,12 +65,13 @@ class MainActivity : AppCompatActivity() { ...@@ -61,12 +65,13 @@ class MainActivity : AppCompatActivity() {
61 65
62 } 66 }
63 67
64 -
65 } else { 68 } else {
66 // If sign in fails, display a message to the user. 69 // If sign in fails, display a message to the user.
67 Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show() 70 Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show()
68 71
69 } 72 }
73 +
74 +
70 } 75 }
71 } 76 }
72 77
......
...@@ -4,8 +4,10 @@ import android.content.Intent ...@@ -4,8 +4,10 @@ import android.content.Intent
4 import android.os.Bundle 4 import android.os.Bundle
5 import android.view.Menu 5 import android.view.Menu
6 import android.view.MenuItem 6 import android.view.MenuItem
7 +import android.widget.TextView
7 import android.widget.Toast 8 import android.widget.Toast
8 import androidx.appcompat.app.ActionBar 9 import androidx.appcompat.app.ActionBar
10 +import androidx.appcompat.app.AlertDialog
9 import androidx.appcompat.app.AppCompatActivity 11 import androidx.appcompat.app.AppCompatActivity
10 import androidx.core.content.ContextCompat 12 import androidx.core.content.ContextCompat
11 import androidx.viewpager.widget.ViewPager 13 import androidx.viewpager.widget.ViewPager
...@@ -23,6 +25,27 @@ class SignInActivity : AppCompatActivity() { ...@@ -23,6 +25,27 @@ class SignInActivity : AppCompatActivity() {
23 super.onCreate(savedInstanceState) 25 super.onCreate(savedInstanceState)
24 setContentView(R.layout.activity_signin) 26 setContentView(R.layout.activity_signin)
25 27
28 + val builder = AlertDialog.Builder(this)
29 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
30 + //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
31 + //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
32 + dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!"
33 + dialogView.findViewById<TextView>(R.id.dialogContent).text="정확한 정책 추천을 얻으려면 더 많은 프로필 정보가 필요해요!"
34 +
35 + builder.setView(dialogView)
36 + .setPositiveButton("다음에 하기") { dialogInterface, i ->
37 + //mainTv.text = dialogText.text.toString()
38 + //mainRb.rating = dialogRatingBar.rating
39 + /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
40 + }
41 + .setNegativeButton("지금할게요 :)") { dialogInterface, i ->
42 + /* 취소일 때 아무 액션이 없으므로 빈칸 */
43 + val intent = Intent(this, InputProfilFirstOneActivity::class.java)
44 + startActivity(intent)
45 + }
46 + .show()
47 +
48 +
26 val policyFieldList = ArrayList<PolicyFieldItem>() 49 val policyFieldList = ArrayList<PolicyFieldItem>()
27 50
28 policyFieldList.add( 51 policyFieldList.add(
......
...@@ -81,7 +81,7 @@ class SignUpActivity : AppCompatActivity() { ...@@ -81,7 +81,7 @@ class SignUpActivity : AppCompatActivity() {
81 cnt ++ 81 cnt ++
82 82
83 if(user!=null){ 83 if(user!=null){
84 - var intent = Intent(this, InputProfilFirstOneActivity::class.java) 84 + var intent = Intent(this, SignUpCompleteActivity::class.java)
85 startActivity(intent) 85 startActivity(intent)
86 } 86 }
87 } else { 87 } else {
......
1 +package com.example.vip
2 +
3 +import android.content.Intent
4 +import androidx.appcompat.app.AppCompatActivity
5 +import android.os.Bundle
6 +import kotlinx.android.synthetic.main.activity_sign_up_complete.*
7 +
8 +class SignUpCompleteActivity : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_sign_up_complete)
13 +
14 + goToLoginButton.setOnClickListener {
15 + var intent = Intent(this, MainActivity::class.java)
16 + startActivity(intent)
17 + }
18 + }
19 +}
...@@ -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.hwajilgooji1, 15 + R.drawable.onboarding_1,
16 - R.drawable.hwajilgooji2, 16 + R.drawable.onboarding_2,
17 - R.drawable.hwajilgooji3, 17 + R.drawable.onboarding_3,
18 - R.drawable.hwajilgooji3, 18 + R.drawable.onboarding_4,
19 - R.drawable.hwajilgooji3 19 + R.drawable.onboarding_5
20 ) 20 )
21 21
22 22
......
...@@ -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
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
...@@ -219,7 +222,7 @@ ...@@ -219,7 +222,7 @@
219 android:layout_height="wrap_content" 222 android:layout_height="wrap_content"
220 android:layout_weight="1" 223 android:layout_weight="1"
221 android:orientation="vertical" 224 android:orientation="vertical"
222 - android:visibility="visible"> 225 + android:visibility="gone">
223 226
224 <LinearLayout 227 <LinearLayout
225 android:layout_width="match_parent" 228 android:layout_width="match_parent"
...@@ -349,6 +352,9 @@ ...@@ -349,6 +352,9 @@
349 352
350 </LinearLayout> 353 </LinearLayout>
351 354
355 + </LinearLayout>
356 + </ScrollView>
357 +
352 <LinearLayout 358 <LinearLayout
353 android:layout_width="match_parent" 359 android:layout_width="match_parent"
354 android:layout_height="wrap_content" 360 android:layout_height="wrap_content"
...@@ -368,8 +374,6 @@ ...@@ -368,8 +374,6 @@
368 android:layout_weight="1" 374 android:layout_weight="1"
369 android:text="다음 단계로" /> 375 android:text="다음 단계로" />
370 </LinearLayout> 376 </LinearLayout>
371 - </LinearLayout>
372 - </ScrollView>
373 377
374 </LinearLayout> 378 </LinearLayout>
375 </LinearLayout> 379 </LinearLayout>
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
...@@ -131,6 +134,7 @@ ...@@ -131,6 +134,7 @@
131 <LinearLayout 134 <LinearLayout
132 android:layout_width="match_parent" 135 android:layout_width="match_parent"
133 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
137 + android:layout_gravity="center"
134 android:orientation="vertical"> 138 android:orientation="vertical">
135 139
136 <LinearLayout 140 <LinearLayout
...@@ -214,10 +218,12 @@ ...@@ -214,10 +218,12 @@
214 </LinearLayout> 218 </LinearLayout>
215 219
216 <LinearLayout 220 <LinearLayout
221 + android:id="@+id/subLayout"
217 android:layout_width="match_parent" 222 android:layout_width="match_parent"
218 android:layout_height="wrap_content" 223 android:layout_height="wrap_content"
219 android:layout_weight="1" 224 android:layout_weight="1"
220 - android:orientation="vertical"> 225 + android:orientation="vertical"
226 + android:visibility="gone">
221 227
222 <LinearLayout 228 <LinearLayout
223 android:layout_width="match_parent" 229 android:layout_width="match_parent"
...@@ -347,6 +353,9 @@ ...@@ -347,6 +353,9 @@
347 353
348 </LinearLayout> 354 </LinearLayout>
349 355
356 + </LinearLayout>
357 + </ScrollView>
358 +
350 <LinearLayout 359 <LinearLayout
351 android:layout_width="match_parent" 360 android:layout_width="match_parent"
352 android:layout_height="wrap_content" 361 android:layout_height="wrap_content"
...@@ -366,8 +375,6 @@ ...@@ -366,8 +375,6 @@
366 android:layout_weight="1" 375 android:layout_weight="1"
367 android:text="다음 단계로" /> 376 android:text="다음 단계로" />
368 </LinearLayout> 377 </LinearLayout>
369 - </LinearLayout>
370 - </ScrollView>
371 378
372 </LinearLayout> 379 </LinearLayout>
373 </LinearLayout> 380 </LinearLayout>
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -32,32 +32,31 @@ ...@@ -32,32 +32,31 @@
32 android:layout_width="10dp" 32 android:layout_width="10dp"
33 android:layout_height="match_parent" 33 android:layout_height="match_parent"
34 android:layout_weight="1.5" 34 android:layout_weight="1.5"
35 - android:text="건너뛰기" /> 35 + android:background="#FFFFFF"
36 - 36 + android:text="나가기"
37 + android:textColor="#29ABE2"
38 + android:textSize="16dp" />
37 <LinearLayout 39 <LinearLayout
38 android:layout_width="10dp" 40 android:layout_width="10dp"
39 android:layout_height="match_parent" 41 android:layout_height="match_parent"
40 - android:layout_weight="1" 42 + android:orientation="horizontal"
41 - android:orientation="horizontal" /> 43 + android:layout_weight="1"/>
42 -
43 <ImageView 44 <ImageView
44 android:layout_width="77dp" 45 android:layout_width="77dp"
45 android:layout_height="44dp" 46 android:layout_height="44dp"
46 android:layout_gravity="center" 47 android:layout_gravity="center"
47 android:layout_weight="1" 48 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 49 android:src="@drawable/toolbar_logo" />
49 -
50 <LinearLayout 50 <LinearLayout
51 android:layout_width="10dp" 51 android:layout_width="10dp"
52 android:layout_height="match_parent" 52 android:layout_height="match_parent"
53 - android:layout_weight="1" 53 + android:orientation="horizontal"
54 - android:orientation="horizontal" /> 54 + android:layout_weight="1"/>
55 -
56 <LinearLayout 55 <LinearLayout
57 android:layout_width="10dp" 56 android:layout_width="10dp"
58 android:layout_height="match_parent" 57 android:layout_height="match_parent"
59 - android:layout_weight="1.5" 58 + android:orientation="horizontal"
60 - android:orientation="horizontal" /> 59 + android:layout_weight="1.5"/>
61 60
62 </LinearLayout> 61 </LinearLayout>
63 62
......
...@@ -32,32 +32,31 @@ ...@@ -32,32 +32,31 @@
32 android:layout_width="10dp" 32 android:layout_width="10dp"
33 android:layout_height="match_parent" 33 android:layout_height="match_parent"
34 android:layout_weight="1.5" 34 android:layout_weight="1.5"
35 - android:text="건너뛰기" /> 35 + android:background="#FFFFFF"
36 - 36 + android:text="나가기"
37 + android:textColor="#29ABE2"
38 + android:textSize="16dp" />
37 <LinearLayout 39 <LinearLayout
38 android:layout_width="10dp" 40 android:layout_width="10dp"
39 android:layout_height="match_parent" 41 android:layout_height="match_parent"
40 - android:layout_weight="1" 42 + android:orientation="horizontal"
41 - android:orientation="horizontal" /> 43 + android:layout_weight="1"/>
42 -
43 <ImageView 44 <ImageView
44 android:layout_width="77dp" 45 android:layout_width="77dp"
45 android:layout_height="44dp" 46 android:layout_height="44dp"
46 android:layout_gravity="center" 47 android:layout_gravity="center"
47 android:layout_weight="1" 48 android:layout_weight="1"
48 android:src="@drawable/toolbar_logo" /> 49 android:src="@drawable/toolbar_logo" />
49 -
50 <LinearLayout 50 <LinearLayout
51 android:layout_width="10dp" 51 android:layout_width="10dp"
52 android:layout_height="match_parent" 52 android:layout_height="match_parent"
53 - android:layout_weight="1" 53 + android:orientation="horizontal"
54 - android:orientation="horizontal" /> 54 + android:layout_weight="1"/>
55 -
56 <LinearLayout 55 <LinearLayout
57 android:layout_width="10dp" 56 android:layout_width="10dp"
58 android:layout_height="match_parent" 57 android:layout_height="match_parent"
59 - android:layout_weight="1.5" 58 + android:orientation="horizontal"
60 - android:orientation="horizontal" /> 59 + android:layout_weight="1.5"/>
61 60
62 </LinearLayout> 61 </LinearLayout>
63 62
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
...@@ -213,10 +216,12 @@ ...@@ -213,10 +216,12 @@
213 </LinearLayout> 216 </LinearLayout>
214 217
215 <LinearLayout 218 <LinearLayout
219 + android:id="@+id/eightoneLayout"
216 android:layout_width="match_parent" 220 android:layout_width="match_parent"
217 android:layout_height="wrap_content" 221 android:layout_height="wrap_content"
218 android:layout_weight="1" 222 android:layout_weight="1"
219 - android:orientation="vertical"> 223 + android:orientation="vertical"
224 + android:visibility="gone">
220 225
221 <LinearLayout 226 <LinearLayout
222 android:layout_width="match_parent" 227 android:layout_width="match_parent"
...@@ -452,10 +457,12 @@ ...@@ -452,10 +457,12 @@
452 </LinearLayout> 457 </LinearLayout>
453 458
454 <LinearLayout 459 <LinearLayout
460 + android:id="@+id/eighttwoLayout"
455 android:layout_width="match_parent" 461 android:layout_width="match_parent"
456 android:layout_height="wrap_content" 462 android:layout_height="wrap_content"
457 android:layout_weight="1" 463 android:layout_weight="1"
458 - android:orientation="vertical"> 464 + android:orientation="vertical"
465 + android:visibility="gone">
459 466
460 <LinearLayout 467 <LinearLayout
461 android:layout_width="match_parent" 468 android:layout_width="match_parent"
...@@ -585,6 +592,9 @@ ...@@ -585,6 +592,9 @@
585 592
586 </LinearLayout> 593 </LinearLayout>
587 594
595 + </LinearLayout>
596 + </ScrollView>
597 +
588 <LinearLayout 598 <LinearLayout
589 android:layout_width="match_parent" 599 android:layout_width="match_parent"
590 android:layout_height="wrap_content" 600 android:layout_height="wrap_content"
...@@ -604,8 +614,6 @@ ...@@ -604,8 +614,6 @@
604 android:layout_weight="1" 614 android:layout_weight="1"
605 android:text="다음 단계로" /> 615 android:text="다음 단계로" />
606 </LinearLayout> 616 </LinearLayout>
607 - </LinearLayout>
608 - </ScrollView>
609 617
610 </LinearLayout> 618 </LinearLayout>
611 </LinearLayout> 619 </LinearLayout>
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
31 android:layout_width="10dp" 31 android:layout_width="10dp"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 android:layout_weight="1.5" 33 android:layout_weight="1.5"
34 - android:text="건너뛰기"/> 34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
35 <LinearLayout 38 <LinearLayout
36 android:layout_width="10dp" 39 android:layout_width="10dp"
37 android:layout_height="match_parent" 40 android:layout_height="match_parent"
...@@ -120,22 +123,17 @@ ...@@ -120,22 +123,17 @@
120 android:layout_width="match_parent" 123 android:layout_width="match_parent"
121 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
122 android:layout_weight="1" 125 android:layout_weight="1"
126 + android:gravity="center"
123 android:orientation="vertical"> 127 android:orientation="vertical">
124 128
125 <LinearLayout 129 <LinearLayout
126 android:layout_width="match_parent" 130 android:layout_width="match_parent"
127 android:layout_height="wrap_content" 131 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"> 132 android:orientation="vertical">
135 133
136 <RelativeLayout 134 <RelativeLayout
137 android:layout_width="match_parent" 135 android:layout_width="match_parent"
138 - android:layout_height="match_parent"> 136 + android:layout_height="wrap_content">
139 137
140 <TextView 138 <TextView
141 android:id="@+id/explainTextView" 139 android:id="@+id/explainTextView"
...@@ -157,7 +155,6 @@ ...@@ -157,7 +155,6 @@
157 android:text=" ? " 155 android:text=" ? "
158 android:textSize="8sp" /> 156 android:textSize="8sp" />
159 </RelativeLayout> 157 </RelativeLayout>
160 - </LinearLayout>
161 158
162 <LinearLayout 159 <LinearLayout
163 android:layout_width="match_parent" 160 android:layout_width="match_parent"
...@@ -208,11 +205,15 @@ ...@@ -208,11 +205,15 @@
208 </LinearLayout> 205 </LinearLayout>
209 </LinearLayout> 206 </LinearLayout>
210 207
208 + </LinearLayout>
209 +
211 <LinearLayout 210 <LinearLayout
211 + android:id="@+id/sixoneLayout"
212 android:layout_width="match_parent" 212 android:layout_width="match_parent"
213 android:layout_height="50dp" 213 android:layout_height="50dp"
214 android:layout_weight="1" 214 android:layout_weight="1"
215 - android:orientation="vertical"> 215 + android:orientation="vertical"
216 + android:visibility="gone">
216 217
217 <LinearLayout 218 <LinearLayout
218 android:layout_width="match_parent" 219 android:layout_width="match_parent"
...@@ -297,10 +298,12 @@ ...@@ -297,10 +298,12 @@
297 </LinearLayout> 298 </LinearLayout>
298 299
299 <LinearLayout 300 <LinearLayout
301 + android:id="@+id/sixtwoLayout"
300 android:layout_width="match_parent" 302 android:layout_width="match_parent"
301 android:layout_height="100dp" 303 android:layout_height="100dp"
302 android:layout_weight="1" 304 android:layout_weight="1"
303 - android:orientation="vertical"> 305 + android:orientation="vertical"
306 + android:visibility="gone">
304 307
305 <LinearLayout 308 <LinearLayout
306 android:layout_width="match_parent" 309 android:layout_width="match_parent"
...@@ -400,9 +403,13 @@ ...@@ -400,9 +403,13 @@
400 403
401 </LinearLayout> 404 </LinearLayout>
402 405
406 + </LinearLayout>
407 +
403 <LinearLayout 408 <LinearLayout
404 android:layout_width="match_parent" 409 android:layout_width="match_parent"
405 android:layout_height="wrap_content" 410 android:layout_height="wrap_content"
411 + android:layout_gravity="bottom"
412 + android:gravity="bottom"
406 android:orientation="horizontal"> 413 android:orientation="horizontal">
407 414
408 <Button 415 <Button
...@@ -419,6 +426,6 @@ ...@@ -419,6 +426,6 @@
419 android:layout_weight="1" 426 android:layout_weight="1"
420 android:text="다음 단계로" /> 427 android:text="다음 단계로" />
421 </LinearLayout> 428 </LinearLayout>
422 - </LinearLayout> 429 +
423 </LinearLayout> 430 </LinearLayout>
424 </androidx.constraintlayout.widget.ConstraintLayout> 431 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
91 android:layout_marginTop="8dp" 91 android:layout_marginTop="8dp"
92 android:layout_marginEnd="16dp" 92 android:layout_marginEnd="16dp"
93 android:layout_marginRight="16dp" 93 android:layout_marginRight="16dp"
94 - android:background="@drawable/button_x" 94 + android:background="@drawable/button_o"
95 android:text="로그인" 95 android:text="로그인"
96 - android:textColor="#DDDDDD" /> 96 + android:textColor="#FFFFFF" />
97 97
98 </LinearLayout> 98 </LinearLayout>
99 99
...@@ -104,6 +104,58 @@ ...@@ -104,6 +104,58 @@
104 android:gravity="bottom" 104 android:gravity="bottom"
105 android:orientation="vertical"> 105 android:orientation="vertical">
106 106
107 + <LinearLayout
108 + android:layout_width="wrap_content"
109 + android:layout_height="wrap_content"
110 + android:layout_gravity="center"
111 + android:layout_marginBottom="10dp"
112 + android:gravity="left"
113 + android:orientation="horizontal"
114 + android:padding="3dp">
115 +
116 + <TextView
117 + android:id="@+id/textview1"
118 + android:layout_width="wrap_content"
119 + android:layout_height="wrap_content"
120 + android:layout_weight="1"
121 + android:gravity="right"
122 + android:text="*회원가입을 진행하실 경우, "
123 + android:textColor="#757575"
124 + android:textSize="7dp" />
125 +
126 + <TextView
127 + android:id="@+id/textview2"
128 + android:layout_width="wrap_content"
129 + android:layout_height="wrap_content"
130 + android:layout_weight="1"
131 + android:gravity="right"
132 + android:text="서비스 이용약관, "
133 + android:textColor="#757575"
134 + android:textSize="7dp" />
135 +
136 + <TextView
137 + android:id="@+id/textview3"
138 + android:layout_width="wrap_content"
139 + android:layout_height="wrap_content"
140 + android:layout_weight="1"
141 + android:gravity="right"
142 + android:text="개인 정보 취급 방침"
143 + android:textColor="#757575"
144 + android:textSize="7dp" />
145 +
146 + <TextView
147 + android:id="@+id/textview4"
148 + android:layout_width="wrap_content"
149 + android:layout_height="wrap_content"
150 + android:layout_weight="1"
151 + android:gravity="right"
152 + android:text="에 동의하시게 됩니다."
153 + android:textColor="#757575"
154 + android:textSize="7dp" />
155 +
156 +
157 + </LinearLayout>
158 +
107 <Button 159 <Button
108 android:id="@+id/emailSignupBtn" 160 android:id="@+id/emailSignupBtn"
109 android:layout_width="match_parent" 161 android:layout_width="match_parent"
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + android:orientation="vertical"
8 + tools:context=".SignUpCompleteActivity">
9 +
10 + <LinearLayout
11 + android:layout_width="match_parent"
12 + android:layout_height="wrap_content"
13 + android:layout_weight="1"
14 + android:orientation="horizontal"></LinearLayout>
15 +
16 + <ImageView
17 + android:id="@+id/logoImageView"
18 + android:layout_width="wrap_content"
19 + android:layout_height="wrap_content"
20 + android:layout_gravity="center"
21 + android:layout_margin="10dp"
22 + android:src="@drawable/final_logo"
23 + tools:srcCompat="@tools:sample/avatars" />
24 +
25 + <ImageView
26 + android:id="@+id/characterImageView"
27 + android:layout_width="wrap_content"
28 + android:layout_height="wrap_content"
29 + android:layout_gravity="center"
30 + android:layout_margin="10dp"
31 + android:src="@drawable/character_righthandsup"
32 + tools:srcCompat="@tools:sample/avatars" />
33 +
34 + <TextView
35 + android:id="@+id/textView1"
36 + android:layout_width="match_parent"
37 + android:layout_height="wrap_content"
38 + android:layout_margin="10dp"
39 + android:gravity="center"
40 + android:text="가입이 완료되었습니다 :)" />
41 +
42 + <TextView
43 + android:id="@+id/textView2"
44 + android:layout_width="match_parent"
45 + android:layout_height="wrap_content"
46 + android:layout_margin="10dp"
47 + android:gravity="center"
48 + android:text="wello의 가족이 된 걸 환영해요!" />
49 +
50 + <TextView
51 + android:id="@+id/textView3"
52 + android:layout_width="match_parent"
53 + android:layout_height="wrap_content"
54 + android:layout_margin="10dp"
55 + android:gravity="center"
56 + android:text="당신이 필요한 정책을 추천해 드릴게요." />
57 +
58 + <LinearLayout
59 + android:layout_width="match_parent"
60 + android:layout_height="wrap_content"
61 + android:layout_weight="1"
62 + android:orientation="horizontal"></LinearLayout>
63 +
64 + <LinearLayout
65 + android:layout_width="match_parent"
66 + android:layout_height="wrap_content"
67 + android:orientation="horizontal">
68 +
69 + <Button
70 + android:id="@+id/goToLoginButton"
71 + android:layout_width="match_parent"
72 + android:layout_height="70dp"
73 + android:layout_gravity="bottom"
74 + android:background="#FF29ABE2"
75 + android:text="로그인 하기"
76 + android:textColor="@android:color/white"
77 + android:textSize="16dp" />
78 + </LinearLayout>
79 +
80 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
51 android:layout_marginStart="16dp" 51 android:layout_marginStart="16dp"
52 android:layout_marginEnd="16dp" 52 android:layout_marginEnd="16dp"
53 android:ems="10" 53 android:ems="10"
54 - android:gravity="center"
55 android:hint="Email" 54 android:hint="Email"
56 android:inputType="textEmailAddress" /> 55 android:inputType="textEmailAddress" />
57 56
...@@ -63,7 +62,6 @@ ...@@ -63,7 +62,6 @@
63 android:layout_marginStart="16dp" 62 android:layout_marginStart="16dp"
64 android:layout_marginEnd="16dp" 63 android:layout_marginEnd="16dp"
65 android:ems="10" 64 android:ems="10"
66 - android:gravity="center"
67 android:hint="Password" 65 android:hint="Password"
68 android:inputType="textPassword" /> 66 android:inputType="textPassword" />
69 67
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
74 android:layout_gravity="center" 72 android:layout_gravity="center"
75 android:layout_marginStart="16dp" 73 android:layout_marginStart="16dp"
76 android:layout_marginEnd="16dp" 74 android:layout_marginEnd="16dp"
77 - android:background="@color/colorPrimary" 75 + android:background="@drawable/button_o"
78 android:gravity="center" 76 android:gravity="center"
79 android:text="회원가입" 77 android:text="회원가입"
80 android:textColor="@color/common_google_signin_btn_text_dark_default" /> 78 android:textColor="@color/common_google_signin_btn_text_dark_default" />
......
...@@ -29,4 +29,9 @@ ...@@ -29,4 +29,9 @@
29 android:gravity="center" 29 android:gravity="center"
30 android:text="다이얼로그 내용" /> 30 android:text="다이얼로그 내용" />
31 31
32 + <LinearLayout
33 + android:layout_width="match_parent"
34 + android:layout_height="match_parent"
35 + android:orientation="horizontal"/>
36 +
32 </LinearLayout> 37 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji1">
6 -
7 -</LinearLayout>
...\ 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
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji2">
6 -
7 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji3">
6 -
7 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <ImageView 8 <ImageView
9 android:id="@+id/imageview" 9 android:id="@+id/imageview"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="wrap_content" 11 + android:layout_height="match_parent"
12 android:layout_weight="1" 12 android:layout_weight="1"
13 tools:srcCompat="@tools:sample/avatars" /> 13 tools:srcCompat="@tools:sample/avatars" />
14 </LinearLayout> 14 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......