신기성 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
6d73810e 1 parent 0d5accc7

Revert "merging" 

This reverts commit 0d5accc7
Expand all
Inline Side-by-side
Showing 240 changed files with 420 additions and 764 deletions
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
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=".InputProfilFifthFourActivity"></activity>
13 - <activity android:name=".InputProfilFifthFourActivity" />
14 <activity android:name=".InputProfilFifthThreeActivity" /> 13 <activity android:name=".InputProfilFifthThreeActivity" />
15 <activity android:name=".InputProfilFifthTwoActivity" /> 14 <activity android:name=".InputProfilFifthTwoActivity" />
16 <activity android:name=".InputProfilFifthOneActivity" /> 15 <activity android:name=".InputProfilFifthOneActivity" />
...@@ -31,21 +30,25 @@ ...@@ -31,21 +30,25 @@
31 <activity android:name=".InputProfilFirstFourActivity" /> 30 <activity android:name=".InputProfilFirstFourActivity" />
32 <activity android:name=".InputProfilFirstThreeActivity" /> 31 <activity android:name=".InputProfilFirstThreeActivity" />
33 <activity android:name=".InputProfilFirstTwoActivity" /> 32 <activity android:name=".InputProfilFirstTwoActivity" />
34 - <activity android:name=".FragmentActivity" />
35 - <activity android:name=".FragmentLayout" />
36 <activity android:name=".InputProfilFirstOneActivity" /> 33 <activity android:name=".InputProfilFirstOneActivity" />
34 + <activity android:name=".AccountSettingActivity"/>
35 + <activity android:name=".PrivacyPolicyActivity"/>
36 + <activity android:name=".TermsOfUserActivity"/>
37 + <activity android:name=".NoticeActivity"/>
38 + <activity android:name=".QuestionsActivity"/>
37 <activity android:name=".WelcomeActivity" /> 39 <activity android:name=".WelcomeActivity" />
40 + <activity android:name=".PushInfoActivity"/>
38 <activity android:name=".SettingActivity" /> 41 <activity android:name=".SettingActivity" />
42 + <activity android:name=".TermsDetailActivity"/>
39 <activity android:name=".DetailActivity" /> 43 <activity android:name=".DetailActivity" />
40 <activity android:name=".InfoActivity" /> 44 <activity android:name=".InfoActivity" />
41 <activity android:name=".FavoritesActivity" /> 45 <activity android:name=".FavoritesActivity" />
46 + <activity android:name=".SettingsInForm"/>
42 <activity android:name=".RecommendActivity" /> 47 <activity android:name=".RecommendActivity" />
43 <activity android:name=".SignInActivity" /> 48 <activity android:name=".SignInActivity" />
44 <activity android:name=".SignUpActivity" /> 49 <activity android:name=".SignUpActivity" />
45 <activity android:name=".MainActivity" /> 50 <activity android:name=".MainActivity" />
46 - <activity 51 + <activity android:name=".SearchActivity" android:windowSoftInputMode="adjustNothing"/>
47 - android:name=".SearchActivity"
48 - android:windowSoftInputMode="adjustNothing" />
49 <activity 52 <activity
50 android:name=".SplashActivity" 53 android:name=".SplashActivity"
51 android:theme="@style/SplashTheme"> 54 android:theme="@style/SplashTheme">
......
1 +package com.example.vip
2 +
3 +import android.os.Bundle
4 +import androidx.appcompat.app.AppCompatActivity
5 +
6 +class AccountSettingActivity : AppCompatActivity() {
7 + override fun onCreate(savedInstanceState: Bundle?) {
8 + super.onCreate(savedInstanceState)
9 + setContentView(R.layout.activity_account_settings)
10 + }
11 +}
...\ No newline at end of file ...\ No newline at end of file
1 -package com.example.vip
2 -
3 -import android.content.Context
4 -import android.content.Intent
5 -import android.content.SharedPreferences
6 -import androidx.appcompat.app.AppCompatActivity
7 -import android.os.Bundle
8 -import android.view.LayoutInflater
9 -import android.view.View
10 -import android.view.ViewGroup
11 -import androidx.recyclerview.widget.RecyclerView
12 -import kotlinx.android.synthetic.main.item_bs.view.*
13 -
14 -class BSAdapter(private val items: ArrayList<BSItem>) :
15 - RecyclerView.Adapter<BSAdapter.ViewHolder>() {
16 -
17 - override fun getItemCount() = items.size
18 -
19 - override fun onBindViewHolder(holder: BSAdapter.ViewHolder, position: Int) {
20 - val item = items[position]
21 -
22 - holder.apply {
23 - bind(item)
24 - itemView.tag = item
25 - }
26 - }
27 -
28 - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
29 - BSAdapter.ViewHolder {
30 - val inflatedView = LayoutInflater.from(parent.context)
31 - .inflate(R.layout.item_bs, parent, false)
32 - return BSAdapter.ViewHolder(inflatedView)
33 - }
34 -
35 - class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
36 -
37 - private var view: View = v
38 -
39 - fun bind(item: BSItem) {
40 - view.circleformButton.text=item.numOfBS.toString()
41 - view.bsTextView.text=" 형제자매 "+item.numOfBS.toString()
42 -
43 - view.womanButton.setOnClickListener {
44 - if(view.manButton.isChecked){
45 - view.manButton.isChecked=false
46 - }else{
47 - }
48 - }
49 - view.manButton.setOnClickListener {
50 - if(view.womanButton.isChecked){
51 - view.womanButton.isChecked=false
52 - }else{
53 - }
54 - }
55 -
56 - }
57 - }
58 -}
...\ No newline at end of file ...\ No newline at end of file
1 -package com.example.vip
2 -
3 -import android.content.Context
4 -import android.content.Intent
5 -import android.content.SharedPreferences
6 -import androidx.appcompat.app.AppCompatActivity
7 -import android.os.Bundle
8 -import android.view.LayoutInflater
9 -import android.view.View
10 -import android.view.ViewGroup
11 -import androidx.recyclerview.widget.RecyclerView
12 -import kotlinx.android.synthetic.main.item_child.view.*
13 -import kotlinx.android.synthetic.main.item_policyfield.view.*
14 -
15 -class ChildAdapter(private val items: ArrayList<ChildItem>) :
16 - RecyclerView.Adapter<ChildAdapter.ViewHolder>() {
17 -
18 - override fun getItemCount() = items.size
19 -
20 - override fun onBindViewHolder(holder: ChildAdapter.ViewHolder, position: Int) {
21 - val item = items[position]
22 -
23 - holder.apply {
24 - bind(item)
25 - itemView.tag = item
26 - }
27 - }
28 -
29 - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
30 - ChildAdapter.ViewHolder {
31 - val inflatedView = LayoutInflater.from(parent.context)
32 - .inflate(R.layout.item_child, parent, false)
33 - return ChildAdapter.ViewHolder(inflatedView)
34 - }
35 -
36 - class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
37 -
38 - private var view: View = v
39 -
40 - fun bind(item: ChildItem) {
41 - view.circleformButton.text=item.numOfChild.toString()
42 - view.childTextView.text=" 자녀 "+item.numOfChild.toString()
43 -
44 - view.womanButton.setOnClickListener {
45 - if(view.manButton.isChecked){
46 - view.manButton.isChecked=false
47 - }else{
48 - }
49 - }
50 - view.manButton.setOnClickListener {
51 - if(view.womanButton.isChecked){
52 - view.womanButton.isChecked=false
53 - }else{
54 - }
55 - }
56 -
57 - }
58 - }
59 -}
...\ No newline at end of file ...\ No newline at end of file
1 -package com.example.vip
2 -class ChildItem(val numOfChild: Int)
...\ No newline at end of file ...\ No newline at end of file
1 package com.example.vip 1 package com.example.vip
2 2
3 import android.app.Activity 3 import android.app.Activity
4 +import android.content.Context
4 import android.content.Intent 5 import android.content.Intent
6 +import android.graphics.drawable.GradientDrawable
5 import android.os.Bundle 7 import android.os.Bundle
6 import android.util.Half.toFloat 8 import android.util.Half.toFloat
7 import android.view.Menu 9 import android.view.Menu
...@@ -75,7 +77,7 @@ class DetailActivity : AppCompatActivity() { ...@@ -75,7 +77,7 @@ class DetailActivity : AppCompatActivity() {
75 detailDday.text=memo!!.Date 77 detailDday.text=memo!!.Date
76 detailTitle.text=memo!!.Policy 78 detailTitle.text=memo!!.Policy
77 detailScore.rating=4.toFloat() 79 detailScore.rating=4.toFloat()
78 - detailFavor.text="0" 80 + detailFavor.text=" [실행 부처]"
79 81
80 val web : WebView = findViewById(R.id.policy_context) 82 val web : WebView = findViewById(R.id.policy_context)
81 val summary : String = memo!!.Content 83 val summary : String = memo!!.Content
...@@ -104,8 +106,11 @@ class DetailActivity : AppCompatActivity() { ...@@ -104,8 +106,11 @@ class DetailActivity : AppCompatActivity() {
104 } 106 }
105 ////bottom navigation view operation start 2 107 ////bottom navigation view operation start 2
106 bottomBar=supportActionBar!! 108 bottomBar=supportActionBar!!
107 - val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation) 109 + val bottomNavigation: BottomNavigationView =findViewById(R.id.rightBottomBVW)
108 bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) 110 bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
111 + val bottomNavigation2: BottomNavigationView =findViewById(R.id.leftBottomBVW)
112 + bottomNavigation2.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
113 +
109 ////bottom navigation view operation end 2 114 ////bottom navigation view operation end 2
110 115
111 116
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.app.Activity
3 import android.content.Context 4 import android.content.Context
4 import android.content.Intent 5 import android.content.Intent
5 import android.content.SharedPreferences 6 import android.content.SharedPreferences
7 +import android.os.Build
6 import androidx.appcompat.app.AppCompatActivity 8 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 9 import android.os.Bundle
10 +import android.view.Window
11 +import android.view.WindowManager
8 import android.widget.ImageView 12 import android.widget.ImageView
9 import android.widget.Toast 13 import android.widget.Toast
10 import kotlinx.android.synthetic.main.activity_info.* 14 import kotlinx.android.synthetic.main.activity_info.*
15 +import android.graphics.drawable.ColorDrawable
16 +import androidx.core.content.ContextCompat
17 +import kotlinx.android.synthetic.main.activity_settings_in_form.*
11 18
12 class InfoActivity : AppCompatActivity() { 19 class InfoActivity : AppCompatActivity() {
13 20
...@@ -15,34 +22,46 @@ class InfoActivity : AppCompatActivity() { ...@@ -15,34 +22,46 @@ class InfoActivity : AppCompatActivity() {
15 super.onCreate(savedInstanceState) 22 super.onCreate(savedInstanceState)
16 setContentView(R.layout.activity_info) 23 setContentView(R.layout.activity_info)
17 24
25 + // statusbar color chacnge
26 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
27 + getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
28 + getWindow().setStatusBarColor(getResources().getColor(R.color.infomainColor));
29 + }
30 +
18 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 31 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
19 val editor: SharedPreferences.Editor=prof.edit() 32 val editor: SharedPreferences.Editor=prof.edit()
20 33
21 Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"), 34 Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"),
22 Toast.LENGTH_SHORT).show() 35 Toast.LENGTH_SHORT).show()
23 36
24 - //temp 37 + InfoProfilModify.setOnClickListener {
25 - var accountImage: ImageView =findViewById(R.id.infoAccountImage) 38 + var intent = Intent(this, SettingActivity::class.java)
26 - var profilImage: ImageView =findViewById(R.id.InfoProfilImage) 39 + startActivity(intent)
27 - 40 + }
28 - accountImage.setImageResource(R.drawable.image01)
29 - profilImage.setImageResource(R.drawable.image01)
30 41
31 - //temp 42 + InfoButtonSettings.setOnClickListener {
43 + var intent = Intent(this, SettingsInForm::class.java)
44 + startActivity(intent)
45 + // 설정 눌렀을 때
46 + }
32 47
33 - InfoButtonLaw.setOnClickListener { 48 + InfoButtonNotice.setOnClickListener {
34 - var intent = Intent(this, SettingActivity::class.java) 49 + var intent = Intent(this, NoticeActivity::class.java)
50 + startActivity(intent)
51 + }
52 + InfoButtonFAQ.setOnClickListener {
53 + var intent = Intent(this, QuestionsActivity::class.java)
35 startActivity(intent) 54 startActivity(intent)
36 } 55 }
37 56
38 //pushing test start 57 //pushing test start
39 - InfoButtonSettings.setOnClickListener { 58 + // InfoButtonSettings.setOnClickListener {
40 - //var intent = Intent(this, SettingActivity::class.java) 59 + // //var intent = Intent(this, SettingActivity::class.java)
41 //test start 60 //test start
42 - var intent = Intent(this, InputProfilFirstOneActivity::class.java) 61 + // var intent = Intent(this, InputProfilFirstOneActivity::class.java)
43 //test end 62 //test end
44 - startActivity(intent) 63 + // startActivity(intent)
45 - } 64 + // }
46 //pushing test end 65 //pushing test end
47 } 66 }
48 } 67 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.* 6 import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.*
...@@ -18,28 +16,7 @@ class InputProfilFifthFourActivity : AppCompatActivity() { ...@@ -18,28 +16,7 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
18 startActivity(intent) 16 startActivity(intent)
19 } 17 }
20 18
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 nextButton.setOnClickListener { 19 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 -
43 var intent = Intent(this, SignInActivity::class.java) 20 var intent = Intent(this, SignInActivity::class.java)
44 startActivity(intent) 21 startActivity(intent)
45 } 22 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import android.graphics.Color 4 import android.graphics.Color
7 import androidx.appcompat.app.AppCompatActivity 5 import androidx.appcompat.app.AppCompatActivity
8 import android.os.Bundle 6 import android.os.Bundle
...@@ -30,17 +28,7 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { ...@@ -30,17 +28,7 @@ class InputProfilFirstFiveActivity : AppCompatActivity() {
30 startActivity(intent) 28 startActivity(intent)
31 } 29 }
32 30
33 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
34 - val editor: SharedPreferences.Editor=prof.edit()
35 -
36 nextButton.setOnClickListener { 31 nextButton.setOnClickListener {
37 - if(inmanButton.isChecked){
38 - editor.putInt("c1_2",1); editor.commit()
39 - }else if(outmanButton.isChecked){
40 - editor.putInt("c1_3",1); editor.commit()
41 - }else{
42 -
43 - }
44 var intent = Intent(this, InputProfilFirstSixActivity::class.java) 32 var intent = Intent(this, InputProfilFirstSixActivity::class.java)
45 startActivity(intent) 33 startActivity(intent)
46 } 34 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_first_six.* 6 import kotlinx.android.synthetic.main.activity_input_profil_first_six.*
...@@ -18,18 +16,7 @@ class InputProfilFirstSixActivity : AppCompatActivity() { ...@@ -18,18 +16,7 @@ class InputProfilFirstSixActivity : AppCompatActivity() {
18 startActivity(intent) 16 startActivity(intent)
19 } 17 }
20 18
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 nextButton.setOnClickListener { 19 nextButton.setOnClickListener {
25 - if(gagoojooButton.isChecked){
26 - editor.putInt("c13_2",1); editor.commit()
27 - }else if(gagoowonButton.isChecked){
28 - editor.putInt("c13_3",1); editor.commit()
29 - }else{
30 -
31 - }
32 -
33 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 20 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
34 startActivity(intent) 21 startActivity(intent)
35 } 22 }
......
...@@ -45,12 +45,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { ...@@ -45,12 +45,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() {
45 startActivity(intent) 45 startActivity(intent)
46 46
47 if (manButton.isChecked){ 47 if (manButton.isChecked){
48 - editor.putInt("c3_2",1) 48 + editor.putInt("c2_1",1)
49 editor.commit() 49 editor.commit()
50 //마지막장에 상관없음 추가 50 //마지막장에 상관없음 추가
51 } 51 }
52 else{ 52 else{
53 - editor.putInt("c3_3",1) 53 + editor.putInt("c2_2",1)
54 editor.commit() 54 editor.commit()
55 } 55 }
56 } 56 }
......
...@@ -5,10 +5,7 @@ import android.content.Intent ...@@ -5,10 +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.util.Log
9 import android.widget.EditText 8 import android.widget.EditText
10 -import android.widget.Toast
11 -import com.google.firebase.messaging.FirebaseMessaging
12 import kotlinx.android.synthetic.main.activity_input_profil_first_two.* 9 import kotlinx.android.synthetic.main.activity_input_profil_first_two.*
13 import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton 10 import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton
14 import kotlinx.android.synthetic.main.activity_input_profil_second_two.* 11 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
...@@ -40,15 +37,7 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -40,15 +37,7 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
40 if ((2019-birthdateint)<19){ 37 if ((2019-birthdateint)<19){
41 editor.putInt("c1_2",1) 38 editor.putInt("c1_2",1)
42 editor.commit() 39 editor.commit()
43 - Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show()
44 //마지막장에 상관없음 추가 40 //마지막장에 상관없음 추가
45 - FirebaseMessaging.getInstance().subscribeToTopic("c1_2")
46 - .addOnCompleteListener { task ->
47 - var msg = getString(R.string.msg_subscribed)
48 - if (!task.isSuccessful) {
49 - msg = getString(R.string.msg_subscribe_failed)
50 - }
51 - }
52 } 41 }
53 else if((2019-birthdateint)<34){ 42 else if((2019-birthdateint)<34){
54 editor.putInt("c1_3",1) 43 editor.putInt("c1_3",1)
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.* 6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.*
...@@ -18,36 +16,7 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { ...@@ -18,36 +16,7 @@ class InputProfilFourthFiveActivity : AppCompatActivity() {
18 startActivity(intent) 16 startActivity(intent)
19 } 17 }
20 18
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 nextButton.setOnClickListener { 19 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 -
51 var intent = Intent(this, InputProfilFifthOneActivity::class.java) 20 var intent = Intent(this, InputProfilFifthOneActivity::class.java)
52 startActivity(intent) 21 startActivity(intent)
53 } 22 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.* 6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.*
...@@ -18,30 +16,11 @@ class InputProfilFourthFourActivity : AppCompatActivity() { ...@@ -18,30 +16,11 @@ class InputProfilFourthFourActivity : AppCompatActivity() {
18 startActivity(intent) 16 startActivity(intent)
19 } 17 }
20 18
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 nextButton.setOnClickListener { 19 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 -
37 var intent = Intent(this, InputProfilFourthFiveActivity::class.java) 20 var intent = Intent(this, InputProfilFourthFiveActivity::class.java)
38 startActivity(intent) 21 startActivity(intent)
39 } 22 }
40 23
41 24
42 -
43 -
44 -
45 -
46 } 25 }
47 } 26 }
......
...@@ -5,7 +5,6 @@ import android.content.Intent ...@@ -5,7 +5,6 @@ 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
9 import android.view.View.VISIBLE 8 import android.view.View.VISIBLE
10 import android.widget.TextView 9 import android.widget.TextView
11 import androidx.appcompat.app.AlertDialog 10 import androidx.appcompat.app.AlertDialog
...@@ -60,56 +59,48 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -60,56 +59,48 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
60 val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) 59 val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE)
61 val editor: SharedPreferences.Editor=prof.edit() 60 val editor: SharedPreferences.Editor=prof.edit()
62 61
63 - previousButton.setOnClickListener { 62 + noButton.setOnClickListener{
64 - var intent = Intent(this, InputProfilThirdFourActivity::class.java) 63 + subLinearLayout.visibility=VISIBLE
65 - startActivity(intent)
66 - }
67 64
68 - yesButton.setOnClickListener {
69 - subLinearLayout.visibility=GONE
70 - noButton.isChecked=false
71 } 65 }
72 66
73 - noButton.setOnClickListener { 67 +
74 - subLinearLayout.visibility=VISIBLE 68 + previousButton.setOnClickListener {
75 - yesButton.isChecked=false 69 + var intent = Intent(this, InputProfilThirdFourActivity::class.java)
70 + startActivity(intent)
76 } 71 }
77 72
78 nextButton.setOnClickListener { 73 nextButton.setOnClickListener {
79 74
80 if(yesButton.isChecked){ 75 if(yesButton.isChecked){
81 - editor.putInt("c14_2",1) 76 + editor.putInt("c7_2",1)
82 - editor.commit()
83 - }
84 - if(noButton.isChecked){
85 - editor.putInt("c14_3",1)
86 editor.commit() 77 editor.commit()
87 } 78 }
79 +
88 if(jeonsaeButton.isChecked){ 80 if(jeonsaeButton.isChecked){
89 - editor.putInt("c16_2",1) 81 + editor.putInt("c7_31",1)
90 editor.commit() 82 editor.commit()
91 } 83 }
92 if(wolseButton.isChecked){ 84 if(wolseButton.isChecked){
93 - editor.putInt("c16_3",1) 85 + editor.putInt("c7_31",1)
94 editor.commit() 86 editor.commit()
95 } 87 }
96 if(kongkongButton.isChecked){ 88 if(kongkongButton.isChecked){
97 - editor.putInt("c16_4",1) 89 + editor.putInt("c7_31",1)
98 editor.commit() 90 editor.commit()
99 } 91 }
100 if(moosangButton.isChecked){ 92 if(moosangButton.isChecked){
101 - editor.putInt("c16_5",1) 93 + editor.putInt("c7_31",1)
102 editor.commit() 94 editor.commit()
103 } 95 }
104 if(bojangButton.isChecked){ 96 if(bojangButton.isChecked){
105 - editor.putInt("c16_6",1) 97 + editor.putInt("c7_31",1)
106 editor.commit() 98 editor.commit()
107 } 99 }
108 if(guitarButton.isChecked){ 100 if(guitarButton.isChecked){
109 - editor.putInt("c16_7",1) 101 + editor.putInt("c7_31",1)
110 editor.commit() 102 editor.commit()
111 } 103 }
112 -
113 var intent = Intent(this, InputProfilFourthTwoActivity::class.java) 104 var intent = Intent(this, InputProfilFourthTwoActivity::class.java)
114 startActivity(intent) 105 startActivity(intent)
115 } 106 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.* 6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.*
...@@ -18,24 +16,7 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { ...@@ -18,24 +16,7 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
18 startActivity(intent) 16 startActivity(intent)
19 } 17 }
20 18
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 -
25 nextButton.setOnClickListener { 19 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 -
39 var intent = Intent(this, InputProfilFourthFourActivity::class.java) 20 var intent = Intent(this, InputProfilFourthFourActivity::class.java)
40 startActivity(intent) 21 startActivity(intent)
41 } 22 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.view.View.GONE
9 -import android.view.View.VISIBLE
10 import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.* 6 import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.*
11 7
12 class InputProfilFourthTwoActivity : AppCompatActivity() { 8 class InputProfilFourthTwoActivity : AppCompatActivity() {
...@@ -20,31 +16,10 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { ...@@ -20,31 +16,10 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
20 startActivity(intent) 16 startActivity(intent)
21 } 17 }
22 18
23 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
24 - val editor: SharedPreferences.Editor=prof.edit()
25 -
26 nextButton.setOnClickListener { 19 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 -
36 var intent = Intent(this, InputProfilFourthThreeActivity::class.java) 20 var intent = Intent(this, InputProfilFourthThreeActivity::class.java)
37 startActivity(intent) 21 startActivity(intent)
38 } 22 }
39 23
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 -
49 } 24 }
50 } 25 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.widget.Button
9 import android.widget.EditText 6 import android.widget.EditText
10 import android.widget.RatingBar 7 import android.widget.RatingBar
11 import android.widget.TextView 8 import android.widget.TextView
...@@ -58,39 +55,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -58,39 +55,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
58 startActivity(intent) 55 startActivity(intent)
59 } 56 }
60 57
61 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
62 - val editor: SharedPreferences.Editor=prof.edit()
63 -
64 -
65 nextButton.setOnClickListener { 58 nextButton.setOnClickListener {
66 - 59 + var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
67 - if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit()} 60 + startActivity(intent)
68 - if(baewoojaboomoButton.isChecked){editor.putInt("c10_3",1); editor.commit()}
69 - if(baewoojajoboomoButton.isChecked){editor.putInt("c10_4",1); editor.commit()}
70 - if(brotherButton.isChecked){editor.putInt("c10_5",1); editor.commit()
71 - editor.putString("with_brothersister","yes")}
72 - if(baewoojabrotherButton.isChecked){editor.putInt("c10_6",1); editor.commit()}
73 - if(donggeoButton.isChecked){editor.putInt("c10_7",1); editor.commit()}
74 - if(fatherButton.isChecked){editor.putInt("c10_8",1); editor.commit()}
75 - if(motherButton.isChecked){editor.putInt("c10_9",1); editor.commit()}
76 - if(grandsonbaewoojaButton.isChecked){editor.putInt("c10_10",1); editor.commit()}
77 - if(grandfatherButton.isChecked){editor.putInt("c10_11",1); editor.commit()}
78 - if(grandmotherButton.isChecked){editor.putInt("c10_12",1); editor.commit()}
79 - if(grandsonButton.isChecked){editor.putInt("c10_13",1); editor.commit()}
80 - if(janyeoButton.isChecked){editor.putInt("c10_14",1); editor.commit()
81 - editor.putString("with_child","yes")}
82 - if(janyeobaewoojaButton.isChecked){editor.putInt("c10_15",1); editor.commit()}
83 - if(nothingButton.isChecked){editor.putInt("c10_18",1); editor.commit()}
84 -
85 - if(janyeoButton.isChecked
86 - //prof.getString("with_child","none")=="yes"
87 - ){
88 - var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
89 - startActivity(intent)
90 - }else{
91 - var intent = Intent(this, InputProfilThirdOneActivity::class.java)
92 - startActivity(intent)
93 - }
94 } 61 }
95 } 62 }
96 } 63 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.widget.EditText
9 import kotlinx.android.synthetic.main.activity_input_profil_second_three.* 6 import kotlinx.android.synthetic.main.activity_input_profil_second_three.*
10 -import kotlinx.android.synthetic.main.activity_input_profil_second_three.nextButton
11 -import kotlinx.android.synthetic.main.activity_input_profil_second_three.previousButton
12 -import kotlinx.android.synthetic.main.activity_input_profil_second_three.skipButton
13 -import kotlinx.android.synthetic.main.activity_input_profil_second_three.toolbar
14 7
15 class InputProfilSecondThreeActivity : AppCompatActivity() { 8 class InputProfilSecondThreeActivity : AppCompatActivity() {
16 9
...@@ -18,10 +11,6 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -18,10 +11,6 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
18 super.onCreate(savedInstanceState) 11 super.onCreate(savedInstanceState)
19 setContentView(R.layout.activity_input_profil_second_three) 12 setContentView(R.layout.activity_input_profil_second_three)
20 13
21 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 - val editor: SharedPreferences.Editor=prof.edit()
23 -
24 -
25 setSupportActionBar(toolbar) 14 setSupportActionBar(toolbar)
26 15
27 skipButton.setOnClickListener { 16 skipButton.setOnClickListener {
...@@ -35,40 +24,8 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -35,40 +24,8 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
35 } 24 }
36 25
37 nextButton.setOnClickListener { 26 nextButton.setOnClickListener {
38 - var numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
39 - if(numOfBS>=2){
40 - editor.putInt("c10_16",1); editor.commit()
41 - }
42 - if(numOfBS<2){
43 - editor.putInt("c10_17",1); editor.commit()
44 - }
45 var intent = Intent(this, InputProfilThirdOneActivity::class.java) 27 var intent = Intent(this, InputProfilThirdOneActivity::class.java)
46 startActivity(intent) 28 startActivity(intent)
47 } 29 }
48 -
49 - val bsList = ArrayList<BSItem>()
50 - bsNumberInputButton.setOnClickListener {
51 -
52 - if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){
53 - var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
54 - var cnt=1
55 - while(bsNum>=cnt){
56 - bsList.add(
57 - BSItem(cnt)
58 - )
59 - cnt++
60 - }
61 - //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show()
62 - }
63 - else{
64 - var bsNum=0
65 - }
66 -
67 - val adapter = BSAdapter(bsList)
68 - bsRecyclerView.adapter = adapter
69 -
70 -
71 -
72 - }
73 } 30 }
74 } 31 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.view.View.GONE
9 import android.view.View.VISIBLE 6 import android.view.View.VISIBLE
10 import android.widget.EditText 7 import android.widget.EditText
11 -import android.widget.Toast
12 -import androidx.core.content.ContextCompat
13 import kotlinx.android.synthetic.main.activity_input_profil_second_two.* 8 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
14 -import kotlinx.android.synthetic.main.item_child.view.*
15 9
16 class InputProfilSecondTwoActivity : AppCompatActivity() { 10 class InputProfilSecondTwoActivity : AppCompatActivity() {
17 11
...@@ -19,73 +13,34 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -19,73 +13,34 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
19 super.onCreate(savedInstanceState) 13 super.onCreate(savedInstanceState)
20 setContentView(R.layout.activity_input_profil_second_two) 14 setContentView(R.layout.activity_input_profil_second_two)
21 15
22 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
23 - val editor: SharedPreferences.Editor=prof.edit()
24 16
25 setSupportActionBar(toolbar) 17 setSupportActionBar(toolbar)
18 +
26 skipButton.setOnClickListener { 19 skipButton.setOnClickListener {
27 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 20 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
28 startActivity(intent) 21 startActivity(intent)
29 } 22 }
23 +
30 previousButton.setOnClickListener { 24 previousButton.setOnClickListener {
31 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 25 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
32 startActivity(intent) 26 startActivity(intent)
33 } 27 }
34 - nextButton.setOnClickListener {
35 - var numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
36 - if(numOfChild>=3){
37 - editor.putInt("c10_16",1); editor.commit()
38 - }
39 - if(numOfChild<3){
40 - editor.putInt("c10_17",1); editor.commit()
41 - }
42 28
43 - 29 + nextButton.setOnClickListener {
44 - 30 + var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
45 - /* 31 + startActivity(intent)
46 - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo birth", childRecyclerView.childBirthEditText.text.toString()); editor.commit()
47 - if(childRecyclerView.womanButton.isChecked){
48 - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","woman"); editor.commit()
49 - }else{
50 - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","man"); editor.commit()
51 - }
52 - */
53 -
54 - if(prof.getString("with_brothersister","none")=="yes"){
55 - var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
56 - startActivity(intent)
57 - }else{
58 - var intent = Intent(this, InputProfilThirdOneActivity::class.java)
59 - startActivity(intent)
60 - }
61 } 32 }
33 +
62 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 34 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
63 //mainTv.text = dialogText.text.toString() 35 //mainTv.text = dialogText.text.toString()
64 - val childList = ArrayList<ChildItem>()
65 childNumberInputButton.setOnClickListener { 36 childNumberInputButton.setOnClickListener {
66 - 37 + var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString()
67 - if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){ 38 + if(childNum=="3"){
68 - var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() 39 + child1LinearLayout.visibility=VISIBLE
69 - var cnt=1 40 + child2LinearLayout.visibility=VISIBLE
70 - while(childNum>=cnt){ 41 + child3LinearLayout.visibility=VISIBLE
71 - childList.add(
72 - ChildItem(cnt)
73 - )
74 - cnt++
75 - }
76 - //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show()
77 - }
78 - else{
79 - var childNum=0
80 } 42 }
81 -
82 - val adapter = ChildAdapter(childList)
83 - childRecyclerView.adapter = adapter
84 -
85 -
86 -
87 } 43 }
88 44
89 -
90 } 45 }
91 } 46 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.view.View.GONE
9 -import android.view.View.VISIBLE
10 import kotlinx.android.synthetic.main.activity_input_profil_third_four.* 6 import kotlinx.android.synthetic.main.activity_input_profil_third_four.*
11 7
12 class InputProfilThirdFourActivity : AppCompatActivity() { 8 class InputProfilThirdFourActivity : AppCompatActivity() {
...@@ -21,51 +17,9 @@ class InputProfilThirdFourActivity : AppCompatActivity() { ...@@ -21,51 +17,9 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
21 startActivity(intent) 17 startActivity(intent)
22 } 18 }
23 19
24 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
25 - val editor: SharedPreferences.Editor=prof.edit()
26 -
27 nextButton.setOnClickListener { 20 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 -
55 var intent = Intent(this, InputProfilFourthOneActivity::class.java) 21 var intent = Intent(this, InputProfilFourthOneActivity::class.java)
56 startActivity(intent) 22 startActivity(intent)
57 } 23 }
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 -
70 } 24 }
71 } 25 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.widget.Button
9 import android.widget.TextView 6 import android.widget.TextView
10 import kotlinx.android.synthetic.main.activity_input_profil_third_one.* 7 import kotlinx.android.synthetic.main.activity_input_profil_third_one.*
11 8
...@@ -23,89 +20,12 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -23,89 +20,12 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
23 startActivity(intent) 20 startActivity(intent)
24 } 21 }
25 22
26 - elementaryButton.setOnClickListener {
27 - middleButton.isChecked=false
28 - highButton.isChecked=false
29 - specialButton.isChecked=false
30 - universityButton.isChecked=false
31 - graduateButton.isChecked=false
32 - nothingButton.isChecked=false
33 - }
34 - middleButton.setOnClickListener {
35 - elementaryButton.isChecked=false
36 - highButton.isChecked=false
37 - specialButton.isChecked=false
38 - universityButton.isChecked=false
39 - graduateButton.isChecked=false
40 - nothingButton.isChecked=false
41 - }
42 - highButton.setOnClickListener {
43 - elementaryButton.isChecked=false
44 - middleButton.isChecked=false
45 - specialButton.isChecked=false
46 - universityButton.isChecked=false
47 - graduateButton.isChecked=false
48 - nothingButton.isChecked=false
49 - }
50 - specialButton.setOnClickListener {
51 - elementaryButton.isChecked=false
52 - middleButton.isChecked=false
53 - highButton.isChecked=false
54 - universityButton.isChecked=false
55 - graduateButton.isChecked=false
56 - nothingButton.isChecked=false
57 - }
58 - universityButton.setOnClickListener {
59 - elementaryButton.isChecked=false
60 - middleButton.isChecked=false
61 - highButton.isChecked=false
62 - specialButton.isChecked=false
63 - graduateButton.isChecked=false
64 - nothingButton.isChecked=false
65 - }
66 - graduateButton.setOnClickListener {
67 - elementaryButton.isChecked=false
68 - middleButton.isChecked=false
69 - highButton.isChecked=false
70 - specialButton.isChecked=false
71 - universityButton.isChecked=false
72 - nothingButton.isChecked=false
73 - }
74 - nothingButton.setOnClickListener {
75 - elementaryButton.isChecked=false
76 - middleButton.isChecked=false
77 - highButton.isChecked=false
78 - specialButton.isChecked=false
79 - universityButton.isChecked=false
80 - graduateButton.isChecked=false
81 - }
82 -
83 previousButton.setOnClickListener { 23 previousButton.setOnClickListener {
84 var intent = Intent(this, InputProfilSecondThreeActivity::class.java) 24 var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
85 startActivity(intent) 25 startActivity(intent)
86 } 26 }
87 27
88 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
89 - val editor: SharedPreferences.Editor=prof.edit()
90 -
91 nextButton.setOnClickListener { 28 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 - }
107 -
108 -
109 var intent = Intent(this, InputProfilThirdTwoActivity::class.java) 29 var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
110 startActivity(intent) 30 startActivity(intent)
111 } 31 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 import kotlinx.android.synthetic.main.activity_input_profil_third_three.* 6 import kotlinx.android.synthetic.main.activity_input_profil_third_three.*
...@@ -26,135 +24,9 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { ...@@ -26,135 +24,9 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
26 startActivity(intent) 24 startActivity(intent)
27 } 25 }
28 26
29 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
30 - val editor: SharedPreferences.Editor=prof.edit()
31 -
32 nextButton.setOnClickListener { 27 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 -
44 var intent = Intent(this, InputProfilThirdFourActivity::class.java) 28 var intent = Intent(this, InputProfilThirdFourActivity::class.java)
45 startActivity(intent) 29 startActivity(intent)
46 } 30 }
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 -
159 } 31 }
160 } 32 }
......
1 package com.example.vip 1 package com.example.vip
2 2
3 -import android.content.Context
4 import android.content.Intent 3 import android.content.Intent
5 -import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 5 import android.os.Bundle
8 -import android.view.View.GONE
9 -import android.view.View.VISIBLE
10 import kotlinx.android.synthetic.main.activity_input_profil_third_two.* 6 import kotlinx.android.synthetic.main.activity_input_profil_third_two.*
11 7
12 class InputProfilThirdTwoActivity : AppCompatActivity() { 8 class InputProfilThirdTwoActivity : AppCompatActivity() {
...@@ -28,48 +24,9 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { ...@@ -28,48 +24,9 @@ class InputProfilThirdTwoActivity : AppCompatActivity() {
28 startActivity(intent) 24 startActivity(intent)
29 } 25 }
30 26
31 - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
32 - val editor: SharedPreferences.Editor=prof.edit()
33 -
34 nextButton.setOnClickListener { 27 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 -
42 var intent = Intent(this, InputProfilThirdThreeActivity::class.java) 28 var intent = Intent(this, InputProfilThirdThreeActivity::class.java)
43 startActivity(intent) 29 startActivity(intent)
44 } 30 }
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 - }
74 } 31 }
75 } 32 }
......
...@@ -26,9 +26,6 @@ class MainActivity : AppCompatActivity() { ...@@ -26,9 +26,6 @@ class MainActivity : AppCompatActivity() {
26 26
27 override fun onCreate(savedInstanceState: Bundle?) { 27 override fun onCreate(savedInstanceState: Bundle?) {
28 super.onCreate(savedInstanceState) 28 super.onCreate(savedInstanceState)
29 -
30 -
31 -
32 //onboarding start 29 //onboarding start
33 30
34 //onboarding end 31 //onboarding end
......
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_notice.*
7 +
8 +class NoticeActivity : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_notice)
13 +
14 +
15 + }
16 +}
This diff is collapsed. Click to expand it.
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_push_alarm.*
7 +
8 +class PushInfoActivity : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_push_alarm)
13 +
14 +
15 + }
16 +}
1 +package com.example.vip
2 +
3 +import android.content.Context
4 +import android.view.LayoutInflater
5 +import android.view.View
6 +import android.view.ViewGroup
7 +import android.widget.ImageView
8 +import android.widget.TextView
9 +import androidx.core.view.isGone
10 +import androidx.recyclerview.widget.RecyclerView
11 +import kotlinx.android.synthetic.main.qna_rv_item.view.*
12 +
13 +
14 +class QnAAdapter : RecyclerView.Adapter<QnAAdapter.MainViewHolder>() {
15 +
16 + var items: MutableList<QnAItem> = mutableListOf(
17 + QnAItem("1. 버그가 있어요.", "\n사용 중에 버그를 발견하셨다면\n" +
18 + "‘wello.khu@gmail.com’을 통해 건의해주세요.\n" +
19 + "보다 나은 서비스를 제공하기 위해 늘 노력하는 wello팀이 되도록 노력하겠습니다.\n", "asdf"),
20 + QnAItem("2. 회원탈퇴는 어떻게 하나요?", "\n아래 메뉴를 통해 회원탈퇴가 가능합니다.\n" +
21 + "\n" +
22 + "홈 화면 오른쪽 하단의 \n" +
23 + "내 정보> 설정 > 계정설정 > 회원탈퇴 \n" +
24 + "\n" +
25 + "wello 서비스에 불편한 점을 느끼셨다면\n" +
26 + "회원탈퇴 경로 및 wello.khu@gmail.com를 통해 건의해주세요.\n" +
27 + "보다 나은 서비스를 제공하기 위해 늘 노력하는 wello팀이 되도록 노력하겠습니다.\n", "asdff"),
28 + QnAItem("3. 'Wello'가 무슨 뜻인가요?", "\n‘Wello’는 ‘복지(Welfare) + 안녕(Hello)’의 합성어로, \n" +
29 + "\n" +
30 + "1) 당신만을 위한 복지정보를 만날 수 있는 어플리케이션\n" +
31 + "2) 전국민의 복지의 안녕을 챙기는 어플리케이션\n" +
32 + "\n" +
33 + "이 되겠다는 Wello의 다짐을 담고 있습니다.\n", "asdff"),
34 + QnAItem("4. 'Wello'는 어떤 어플인가요?", "\nWello는 복지정책알림 통합 어플리케이션으로, 사용자에게 적합한 복지정책을 알려주는 서비스를 제공합니다. \n 주요 기능으로는 1) 프로필 정보 입력 2) 추천정책리스트 3) 정책 찜하기 4) 푸시알림 등이 있습니다.\n", "asdff"),
35 + QnAItem("5. 프로필정보를 왜 수집하나요?", "\n수집한 사용자의 프로필정보는 보다 정확한 복지정책을 추천하기 위해 사용됩니다.\n", "asdff"),
36 + QnAItem("6. 추천정책리스트는 어떤 서비스인가요?", "\n추천정책리스트를 통해 자신이 수혜 받을 수 있는 정책 정보를 한 눈에 확인할 수 있습니다.\n", "asdff"),
37 + QnAItem("7. 푸시 알림설정/해제는 어떻게 하나요?", "\n아래 메뉴를 통해 푸시 알림설정/해제를 할 수 있습니다.\n" +
38 + "\n" +
39 + "홈 화면 오른쪽 하단의 \n" +
40 + "내 정보> 설정> 푸시 알림> 찜한 목록 소식받기에서 설정/해제 가능합니다.\n", "asdff"),
41 + QnAItem("8. 푸시 알림은 어떤 내용인가요?", "\n‘사용자의 찜한 목록에 있는 정책의 마감일’과 ‘새로 업데이트된 정책’에 대한 내용이 알림으로 가게 됩니다.\n", "asdff"),
42 + QnAItem("9. 푸시 알림은 언제 받을 수 있나요?", "\n푸시 알림은 3일에 한 번씩, 9:00~18:00 사이에 보내드립니다.\n", "asdff"),
43 + QnAItem("10. 정책 찜하기는 어떤 기능인가요?", "\n마감일을 확인하고 싶은 정책, 좀 더 관심이 가는 정책 등 사용자가 한 번 더 확인하고 싶은 정책을 체크해두는 기능입니다.\n", "asdff"),
44 +
45 + QnAItem("11. 민간 복지서비스 등록은 어떻게 하나요?", "\n현재 서비스 준비 중에 있습니다.\n", "adffff"))
46 +
47 + override fun onCreateViewHolder(parent: ViewGroup, p1: Int) = MainViewHolder(parent)
48 +
49 +
50 + override fun getItemCount(): Int = items.size
51 +
52 + override fun onBindViewHolder(holer: MainViewHolder, position: Int) {
53 + items[position].let { item ->
54 + with(holer) {
55 + tvTitle.text = item.answer
56 + tvContent.text = item.question
57 + tvSecond.setOnClickListener{
58 + tvTitle.setVisibility(View.GONE)
59 + }
60 +
61 +/* if (item.arrow != "") {
62 + val resourceId = context.resources.getIdentifier(dog.photo, "drawable", context.packageName)
63 + tvSecond?.setImageResource(resourceId)
64 + } else {
65 + tvSecond?.setImageResource(R.mipmap.ic_launcher)
66 + }*/
67 + }
68 + }
69 + }
70 +
71 + inner class MainViewHolder(parent: ViewGroup) : RecyclerView.ViewHolder(
72 + LayoutInflater.from(parent.context).inflate(R.layout.qna_rv_item, parent, false)) {
73 + val tvTitle = itemView.answerText
74 + val tvContent = itemView.questionText
75 + val tvSecond = itemView.bottomArrow
76 + }
77 +}
...\ No newline at end of file ...\ No newline at end of file
1 package com.example.vip 1 package com.example.vip
2 -class BSItem(val numOfBS: Int)
...\ No newline at end of file ...\ No newline at end of file
2 +
3 +class QnAItem (val question: String, val answer: String, val arrow: String)
...\ No newline at end of file ...\ No newline at end of file
......
1 +package com.example.vip
2 +
3 +import android.content.Intent
4 +import androidx.appcompat.app.AppCompatActivity
5 +import android.os.Bundle
6 +import androidx.recyclerview.widget.LinearLayoutManager
7 +import kotlinx.android.synthetic.main.activity_questions.*
8 +
9 +var QnAList = arrayListOf<QnAItem>()
10 +
11 +class QuestionsActivity : AppCompatActivity() {
12 +
13 + override fun onCreate(savedInstanceState: Bundle?) {
14 + super.onCreate(savedInstanceState)
15 + setContentView(R.layout.activity_questions)
16 +
17 + qna_rv.adapter = QnAAdapter()
18 + qna_rv.layoutManager = LinearLayoutManager(this)
19 +
20 + }
21 +}
...@@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() {
61 policyList.add( 61 policyList.add(
62 PolicyItem( 62 PolicyItem(
63 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 63 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
64 - memo!!.Policy, 64 + "상시",
65 memo!!.Policy, 65 memo!!.Policy,
66 memo!!.Policy, 66 memo!!.Policy,
67 4.toFloat(), 67 4.toFloat(),
...@@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() {
89 policyList.add( 89 policyList.add(
90 PolicyItem( 90 PolicyItem(
91 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 91 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
92 - memo!!.Policy, 92 + "상시",
93 memo!!.Policy, 93 memo!!.Policy,
94 memo!!.Policy, 94 memo!!.Policy,
95 4.toFloat(), 95 4.toFloat(),
...@@ -98,6 +98,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -98,6 +98,7 @@ class RecommendActivity : AppCompatActivity() {
98 ) 98 )
99 ) 99 )
100 } 100 }
101 +
101 val adapter = PolicyAdapter(policyList) 102 val adapter = PolicyAdapter(policyList)
102 policyRecyclerView.adapter = adapter 103 policyRecyclerView.adapter = adapter
103 } 104 }
......
...@@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() { ...@@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() {
66 } 66 }
67 override fun onDataChange(dataSnapshot: DataSnapshot) { 67 override fun onDataChange(dataSnapshot: DataSnapshot) {
68 if (dataSnapshot.exists() == false){ // 값 없을 때 68 if (dataSnapshot.exists() == false){ // 값 없을 때
69 + policy_scroll_view.setVisibility(View.GONE)
69 no_search.setVisibility(View.VISIBLE) 70 no_search.setVisibility(View.VISIBLE)
70 } 71 }
71 else { 72 else {
72 no_search.setVisibility(View.GONE) 73 no_search.setVisibility(View.GONE)
74 + policy_scroll_view.setVisibility(View.VISIBLE)
73 } 75 }
74 76
75 for (memoSnapshot in dataSnapshot.children){ 77 for (memoSnapshot in dataSnapshot.children){
......
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_settings_in_form.*
7 +
8 +class SettingsInForm : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_settings_in_form)
13 +
14 + accountBtn.setOnClickListener {
15 + var intent = Intent(this, AccountSettingActivity::class.java)
16 + startActivity(intent)
17 + }
18 +
19 + info_push.setOnClickListener {
20 + var intent = Intent(this, PushInfoActivity::class.java)
21 + startActivity(intent)
22 + // 설정 눌렀을 때
23 + }
24 + terms_of_use.setOnClickListener{
25 + var intent = Intent(this, TermsOfUserActivity::class.java)
26 + startActivity(intent)
27 + }
28 + }
29 +}
This diff is collapsed. Click to expand it.
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_terms_of_use.*
7 +
8 +class TermsOfUserActivity : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_terms_of_use)
13 +
14 + terms_use.setOnClickListener{
15 + var intent = Intent(this, TermsDetailActivity::class.java)
16 + startActivity(intent)
17 + }
18 + terms_use2.setOnClickListener {
19 + var intent = Intent(this, PrivacyPolicyActivity::class.java)
20 + startActivity(intent)
21 + }
22 + }
23 +}
...@@ -12,9 +12,9 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -12,9 +12,9 @@ class ViewPagerAdapter(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.temp_view_pager_image, 15 + R.drawable.image01,
16 - R.drawable.temp_view_pager_image, 16 + R.drawable.image02,
17 - R.drawable.temp_view_pager_image 17 + R.drawable.image03
18 ) 18 )
19 19
20 20
......
...@@ -14,8 +14,6 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -14,8 +14,6 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() {
14 val Image = arrayOf( 14 val Image = arrayOf(
15 R.drawable.hwajilgooji1, 15 R.drawable.hwajilgooji1,
16 R.drawable.hwajilgooji2, 16 R.drawable.hwajilgooji2,
17 - R.drawable.hwajilgooji3,
18 - R.drawable.hwajilgooji3,
19 R.drawable.hwajilgooji3 17 R.drawable.hwajilgooji3
20 ) 18 )
21 19
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <!-- 배경 -->
4 + <item
5 + android:drawable="@color/colorPrimary"/>
6 + <!-- 로고 -->
7 + <item>
8 + <bitmap
9 + android:gravity="center"
10 + android:src="@drawable/splash_main"/>
11 + </item>
12 +</layer-list>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:aapt="http://schemas.android.com/aapt"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillType="evenOdd"
9 + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10 + android:strokeWidth="1"
11 + android:strokeColor="#00000000">
12 + <aapt:attr name="android:fillColor">
13 + <gradient
14 + android:endX="78.5885"
15 + android:endY="90.9159"
16 + android:startX="48.7653"
17 + android:startY="61.0927"
18 + android:type="linear">
19 + <item
20 + android:color="#44000000"
21 + android:offset="0.0" />
22 + <item
23 + android:color="#00000000"
24 + android:offset="1.0" />
25 + </gradient>
26 + </aapt:attr>
27 + </path>
28 + <path
29 + android:fillColor="#FFFFFF"
30 + android:fillType="nonZero"
31 + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32 + android:strokeWidth="1"
33 + android:strokeColor="#00000000" />
34 +</vector>
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <!-- 배경 -->
4 + <item
5 + android:drawable="@color/colorPrimary"/>
6 + <!-- 로고 -->
7 + <item>
8 + <bitmap
9 + android:gravity="center"
10 + android:src="@drawable/splash_main"/>
11 + </item>
12 +</layer-list>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:aapt="http://schemas.android.com/aapt"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillType="evenOdd"
9 + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10 + android:strokeWidth="1"
11 + android:strokeColor="#00000000">
12 + <aapt:attr name="android:fillColor">
13 + <gradient
14 + android:endX="78.5885"
15 + android:endY="90.9159"
16 + android:startX="48.7653"
17 + android:startY="61.0927"
18 + android:type="linear">
19 + <item
20 + android:color="#44000000"
21 + android:offset="0.0" />
22 + <item
23 + android:color="#00000000"
24 + android:offset="1.0" />
25 + </gradient>
26 + </aapt:attr>
27 + </path>
28 + <path
29 + android:fillColor="#FFFFFF"
30 + android:fillType="nonZero"
31 + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32 + android:strokeWidth="1"
33 + android:strokeColor="#00000000" />
34 +</vector>
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <!-- 배경 -->
4 + <item
5 + android:drawable="@color/colorPrimary"/>
6 + <!-- 로고 -->
7 + <item>
8 + <bitmap
9 + android:gravity="center"
10 + android:src="@drawable/splash_main"/>
11 + </item>
12 +</layer-list>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:aapt="http://schemas.android.com/aapt"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillType="evenOdd"
9 + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10 + android:strokeWidth="1"
11 + android:strokeColor="#00000000">
12 + <aapt:attr name="android:fillColor">
13 + <gradient
14 + android:endX="78.5885"
15 + android:endY="90.9159"
16 + android:startX="48.7653"
17 + android:startY="61.0927"
18 + android:type="linear">
19 + <item
20 + android:color="#44000000"
21 + android:offset="0.0" />
22 + <item
23 + android:color="#00000000"
24 + android:offset="1.0" />
25 + </gradient>
26 + </aapt:attr>
27 + </path>
28 + <path
29 + android:fillColor="#FFFFFF"
30 + android:fillType="nonZero"
31 + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32 + android:strokeWidth="1"
33 + android:strokeColor="#00000000" />
34 +</vector>
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.