장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
e1cc2899 2 parents 72caba2c 65fc84f3

Merge branch 'track' into done

Expand all
Inline Side-by-side
Showing 36 changed files with 717 additions and 89 deletions
...@@ -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=".InputProfilFifthFourActivity"></activity> 12 + <activity android:name=".ChildAdapter"></activity>
13 + <activity android:name=".InputProfilFifthFourActivity" />
13 <activity android:name=".InputProfilFifthThreeActivity" /> 14 <activity android:name=".InputProfilFifthThreeActivity" />
14 <activity android:name=".InputProfilFifthTwoActivity" /> 15 <activity android:name=".InputProfilFifthTwoActivity" />
15 <activity android:name=".InputProfilFifthOneActivity" /> 16 <activity android:name=".InputProfilFifthOneActivity" />
...@@ -48,7 +49,9 @@ ...@@ -48,7 +49,9 @@
48 <activity android:name=".SignInActivity" /> 49 <activity android:name=".SignInActivity" />
49 <activity android:name=".SignUpActivity" /> 50 <activity android:name=".SignUpActivity" />
50 <activity android:name=".MainActivity" /> 51 <activity android:name=".MainActivity" />
51 - <activity android:name=".SearchActivity" android:windowSoftInputMode="adjustNothing"/> 52 + <activity
53 + android:name=".SearchActivity"
54 + android:windowSoftInputMode="adjustNothing" />
52 <activity 55 <activity
53 android:name=".SplashActivity" 56 android:name=".SplashActivity"
54 android:theme="@style/SplashTheme"> 57 android:theme="@style/SplashTheme">
......
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 +class BSItem(val numOfBS: Int)
...\ 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.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import android.graphics.Color 6 import android.graphics.Color
5 import androidx.appcompat.app.AppCompatActivity 7 import androidx.appcompat.app.AppCompatActivity
6 import android.os.Bundle 8 import android.os.Bundle
...@@ -28,7 +30,17 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { ...@@ -28,7 +30,17 @@ class InputProfilFirstFiveActivity : AppCompatActivity() {
28 startActivity(intent) 30 startActivity(intent)
29 } 31 }
30 32
33 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
34 + val editor: SharedPreferences.Editor=prof.edit()
35 +
31 nextButton.setOnClickListener { 36 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 + }
32 var intent = Intent(this, InputProfilFirstSixActivity::class.java) 44 var intent = Intent(this, InputProfilFirstSixActivity::class.java)
33 startActivity(intent) 45 startActivity(intent)
34 } 46 }
......
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_first_six.* 8 import kotlinx.android.synthetic.main.activity_input_profil_first_six.*
...@@ -16,7 +18,18 @@ class InputProfilFirstSixActivity : AppCompatActivity() { ...@@ -16,7 +18,18 @@ class InputProfilFirstSixActivity : 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(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 +
20 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 33 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
21 startActivity(intent) 34 startActivity(intent)
22 } 35 }
......
...@@ -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("c2_1",1) 48 + editor.putInt("c3_2",1)
49 editor.commit() 49 editor.commit()
50 //마지막장에 상관없음 추가 50 //마지막장에 상관없음 추가
51 } 51 }
52 else{ 52 else{
53 - editor.putInt("c2_2",1) 53 + editor.putInt("c3_3",1)
54 editor.commit() 54 editor.commit()
55 } 55 }
56 } 56 }
......
...@@ -5,7 +5,10 @@ import android.content.Intent ...@@ -5,7 +5,10 @@ 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
8 import android.widget.EditText 9 import android.widget.EditText
10 +import android.widget.Toast
11 +import com.google.firebase.messaging.FirebaseMessaging
9 import kotlinx.android.synthetic.main.activity_input_profil_first_two.* 12 import kotlinx.android.synthetic.main.activity_input_profil_first_two.*
10 import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton 13 import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton
11 import kotlinx.android.synthetic.main.activity_input_profil_second_two.* 14 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
...@@ -37,7 +40,15 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { ...@@ -37,7 +40,15 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
37 if ((2019-birthdateint)<19){ 40 if ((2019-birthdateint)<19){
38 editor.putInt("c1_2",1) 41 editor.putInt("c1_2",1)
39 editor.commit() 42 editor.commit()
43 + Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show()
40 //마지막장에 상관없음 추가 44 //마지막장에 상관없음 추가
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 + }
41 } 52 }
42 else if((2019-birthdateint)<34){ 53 else if((2019-birthdateint)<34){
43 editor.putInt("c1_3",1) 54 editor.putInt("c1_3",1)
......
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.widget.Button
6 import android.widget.EditText 9 import android.widget.EditText
7 import android.widget.RatingBar 10 import android.widget.RatingBar
8 import android.widget.TextView 11 import android.widget.TextView
...@@ -55,9 +58,39 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -55,9 +58,39 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
55 startActivity(intent) 58 startActivity(intent)
56 } 59 }
57 60
61 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
62 + val editor: SharedPreferences.Editor=prof.edit()
63 +
64 +
58 nextButton.setOnClickListener { 65 nextButton.setOnClickListener {
59 - var intent = Intent(this, InputProfilSecondTwoActivity::class.java) 66 +
60 - startActivity(intent) 67 + if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit()}
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 + }
61 } 94 }
62 } 95 }
63 } 96 }
......
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.widget.EditText
6 import kotlinx.android.synthetic.main.activity_input_profil_second_three.* 9 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
7 14
8 class InputProfilSecondThreeActivity : AppCompatActivity() { 15 class InputProfilSecondThreeActivity : AppCompatActivity() {
9 16
...@@ -11,6 +18,10 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -11,6 +18,10 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
11 super.onCreate(savedInstanceState) 18 super.onCreate(savedInstanceState)
12 setContentView(R.layout.activity_input_profil_second_three) 19 setContentView(R.layout.activity_input_profil_second_three)
13 20
21 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
22 + val editor: SharedPreferences.Editor=prof.edit()
23 +
24 +
14 setSupportActionBar(toolbar) 25 setSupportActionBar(toolbar)
15 26
16 skipButton.setOnClickListener { 27 skipButton.setOnClickListener {
...@@ -24,8 +35,40 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { ...@@ -24,8 +35,40 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
24 } 35 }
25 36
26 nextButton.setOnClickListener { 37 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 + }
27 var intent = Intent(this, InputProfilThirdOneActivity::class.java) 45 var intent = Intent(this, InputProfilThirdOneActivity::class.java)
28 startActivity(intent) 46 startActivity(intent)
29 } 47 }
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 + }
30 } 73 }
31 } 74 }
......
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
6 import android.view.View.VISIBLE 9 import android.view.View.VISIBLE
7 import android.widget.EditText 10 import android.widget.EditText
11 +import android.widget.Toast
12 +import androidx.core.content.ContextCompat
8 import kotlinx.android.synthetic.main.activity_input_profil_second_two.* 13 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
14 +import kotlinx.android.synthetic.main.item_child.view.*
9 15
10 class InputProfilSecondTwoActivity : AppCompatActivity() { 16 class InputProfilSecondTwoActivity : AppCompatActivity() {
11 17
...@@ -13,34 +19,73 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { ...@@ -13,34 +19,73 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
13 super.onCreate(savedInstanceState) 19 super.onCreate(savedInstanceState)
14 setContentView(R.layout.activity_input_profil_second_two) 20 setContentView(R.layout.activity_input_profil_second_two)
15 21
22 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
23 + val editor: SharedPreferences.Editor=prof.edit()
16 24
17 setSupportActionBar(toolbar) 25 setSupportActionBar(toolbar)
18 -
19 skipButton.setOnClickListener { 26 skipButton.setOnClickListener {
20 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 27 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
21 startActivity(intent) 28 startActivity(intent)
22 } 29 }
23 -
24 previousButton.setOnClickListener { 30 previousButton.setOnClickListener {
25 var intent = Intent(this, InputProfilSecondOneActivity::class.java) 31 var intent = Intent(this, InputProfilSecondOneActivity::class.java)
26 startActivity(intent) 32 startActivity(intent)
27 } 33 }
28 -
29 nextButton.setOnClickListener { 34 nextButton.setOnClickListener {
30 - var intent = Intent(this, InputProfilSecondThreeActivity::class.java) 35 + var numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
31 - startActivity(intent) 36 + if(numOfChild>=3){
32 - } 37 + editor.putInt("c10_16",1); editor.commit()
38 + }
39 + if(numOfChild<3){
40 + editor.putInt("c10_17",1); editor.commit()
41 + }
42 +
43 +
44 +
45 + /*
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 + */
33 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 + }
34 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 62 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
35 //mainTv.text = dialogText.text.toString() 63 //mainTv.text = dialogText.text.toString()
64 + val childList = ArrayList<ChildItem>()
36 childNumberInputButton.setOnClickListener { 65 childNumberInputButton.setOnClickListener {
37 - var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString() 66 +
38 - if(childNum=="3"){ 67 + if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){
39 - child1LinearLayout.visibility=VISIBLE 68 + var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
40 - child2LinearLayout.visibility=VISIBLE 69 + var cnt=1
41 - child3LinearLayout.visibility=VISIBLE 70 + while(childNum>=cnt){
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
42 } 80 }
81 +
82 + val adapter = ChildAdapter(childList)
83 + childRecyclerView.adapter = adapter
84 +
85 +
86 +
43 } 87 }
44 88
89 +
45 } 90 }
46 } 91 }
......
...@@ -3,6 +3,7 @@ package com.example.vip ...@@ -3,6 +3,7 @@ package com.example.vip
3 import android.content.Intent 3 import android.content.Intent
4 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 5 import android.os.Bundle
6 +import android.widget.Button
6 import android.widget.TextView 7 import android.widget.TextView
7 import kotlinx.android.synthetic.main.activity_input_profil_third_one.* 8 import kotlinx.android.synthetic.main.activity_input_profil_third_one.*
8 9
...@@ -20,12 +21,71 @@ class InputProfilThirdOneActivity : AppCompatActivity() { ...@@ -20,12 +21,71 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
20 startActivity(intent) 21 startActivity(intent)
21 } 22 }
22 23
24 + elementaryButton.setOnClickListener {
25 + middleButton.isChecked=false
26 + highButton.isChecked=false
27 + specialButton.isChecked=false
28 + universityButton.isChecked=false
29 + graduateButton.isChecked=false
30 + nothingButton.isChecked=false
31 + }
32 + middleButton.setOnClickListener {
33 + elementaryButton.isChecked=false
34 + highButton.isChecked=false
35 + specialButton.isChecked=false
36 + universityButton.isChecked=false
37 + graduateButton.isChecked=false
38 + nothingButton.isChecked=false
39 + }
40 + highButton.setOnClickListener {
41 + elementaryButton.isChecked=false
42 + middleButton.isChecked=false
43 + specialButton.isChecked=false
44 + universityButton.isChecked=false
45 + graduateButton.isChecked=false
46 + nothingButton.isChecked=false
47 + }
48 + specialButton.setOnClickListener {
49 + elementaryButton.isChecked=false
50 + middleButton.isChecked=false
51 + highButton.isChecked=false
52 + universityButton.isChecked=false
53 + graduateButton.isChecked=false
54 + nothingButton.isChecked=false
55 + }
56 + universityButton.setOnClickListener {
57 + elementaryButton.isChecked=false
58 + middleButton.isChecked=false
59 + highButton.isChecked=false
60 + specialButton.isChecked=false
61 + graduateButton.isChecked=false
62 + nothingButton.isChecked=false
63 + }
64 + graduateButton.setOnClickListener {
65 + elementaryButton.isChecked=false
66 + middleButton.isChecked=false
67 + highButton.isChecked=false
68 + specialButton.isChecked=false
69 + universityButton.isChecked=false
70 + nothingButton.isChecked=false
71 + }
72 + nothingButton.setOnClickListener {
73 + elementaryButton.isChecked=false
74 + middleButton.isChecked=false
75 + highButton.isChecked=false
76 + specialButton.isChecked=false
77 + universityButton.isChecked=false
78 + graduateButton.isChecked=false
79 + }
80 +
23 previousButton.setOnClickListener { 81 previousButton.setOnClickListener {
24 var intent = Intent(this, InputProfilSecondThreeActivity::class.java) 82 var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
25 startActivity(intent) 83 startActivity(intent)
26 } 84 }
27 85
28 nextButton.setOnClickListener { 86 nextButton.setOnClickListener {
87 +
88 +
29 var intent = Intent(this, InputProfilThirdTwoActivity::class.java) 89 var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
30 startActivity(intent) 90 startActivity(intent)
31 } 91 }
......
...@@ -26,6 +26,9 @@ class MainActivity : AppCompatActivity() { ...@@ -26,6 +26,9 @@ 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 +
29 //onboarding start 32 //onboarding start
30 33
31 //onboarding end 34 //onboarding end
......
...@@ -98,7 +98,6 @@ class RecommendActivity : AppCompatActivity() { ...@@ -98,7 +98,6 @@ class RecommendActivity : AppCompatActivity() {
98 ) 98 )
99 ) 99 )
100 } 100 }
101 -
102 val adapter = PolicyAdapter(policyList) 101 val adapter = PolicyAdapter(policyList)
103 policyRecyclerView.adapter = adapter 102 policyRecyclerView.adapter = adapter
104 } 103 }
......
...@@ -14,6 +14,8 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -14,6 +14,8 @@ 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,
17 R.drawable.hwajilgooji3 19 R.drawable.hwajilgooji3
18 ) 20 )
19 21
......
...@@ -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"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <stroke
5 + android:width="5dp"
6 + android:color="#29ABE2" />
7 + <corners
8 + android:bottomRightRadius="25dp"
9 + android:bottomLeftRadius="25dp"
10 + android:topLeftRadius="25dp"
11 + android:topRightRadius="25dp"/>
12 + <padding
13 + android:left="10dp"
14 + android:top="10dp"
15 + android:right="10dp"
16 + android:bottom="10dp" />
17 + <solid
18 + android:color="#29ABE2"/>
19 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 +
4 + <item android:state_checked="false" android:drawable="@drawable/button_x" />
5 + <item android:state_checked="true" android:drawable="@drawable/button_o" />
6 +</selector>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <stroke
5 + android:width="5dp"
6 + android:color="#F4F4F4" />
7 + <corners
8 + android:bottomRightRadius="25dp"
9 + android:bottomLeftRadius="25dp"
10 + android:topLeftRadius="25dp"
11 + android:topRightRadius="25dp"/>
12 + <padding
13 + android:left="10dp"
14 + android:top="10dp"
15 + android:right="10dp"
16 + android:bottom="10dp" />
17 + <solid
18 + android:color="#F4F4F4"/>
19 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="oval">
4 + <stroke
5 + android:width="1dp"
6 + android:color="#29ABE2" />
7 + <!--
8 + <corners
9 + android:bottomRightRadius="25dp"
10 + android:bottomLeftRadius="25dp"
11 + android:topLeftRadius="25dp"
12 + android:topRightRadius="25dp"/>
13 +
14 + <padding
15 + android:left="10dp"
16 + android:top="10dp"
17 + android:right="10dp"
18 + android:bottom="10dp" />
19 + -->
20 + <solid
21 + android:color="#FFFFFF"/>
22 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item
4 + android:top="32dp">
5 + <shape android:shape="line">
6 + <stroke
7 + android:width="5dp"
8 + android:color="#29ABE2"/>
9 + </shape>
10 + </item>
11 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
...@@ -81,13 +81,10 @@ ...@@ -81,13 +81,10 @@
81 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
82 android:text="시/도" /> 82 android:text="시/도" />
83 83
84 - <EditText 84 + <Spinner
85 - android:id="@+id/doEditText" 85 + android:id="@+id/doSpinner"
86 - android:layout_width="match_parent" 86 + android:layout_width="fill_parent"
87 - android:layout_height="wrap_content" 87 + android:layout_height="wrap_content" />
88 - android:ems="10"
89 - android:hint="ex1) 서울시 ex2)경기도"
90 - android:inputType="textPersonName" />
91 88
92 <TextView 89 <TextView
93 android:id="@+id/cityTextView" 90 android:id="@+id/cityTextView"
...@@ -95,27 +92,10 @@ ...@@ -95,27 +92,10 @@
95 android:layout_height="wrap_content" 92 android:layout_height="wrap_content"
96 android:text="시/군/구" /> 93 android:text="시/군/구" />
97 94
98 - <EditText 95 + <Spinner
99 - android:id="@+id/cityEditText" 96 + android:id="@+id/gooSpinner"
100 - android:layout_width="match_parent" 97 + android:layout_width="fill_parent"
101 - android:layout_height="wrap_content" 98 + android:layout_height="wrap_content" />
102 - android:ems="10"
103 - android:hint="ex) 동대문구"
104 - android:inputType="textPersonName" />
105 -
106 - <TextView
107 - android:id="@+id/dongTextView"
108 - android:layout_width="match_parent"
109 - android:layout_height="wrap_content"
110 - android:text="읍/면/동" />
111 -
112 - <EditText
113 - android:id="@+id/dongEditText"
114 - android:layout_width="match_parent"
115 - android:layout_height="wrap_content"
116 - android:ems="10"
117 - android:hint="ex) 회기동"
118 - android:inputType="textPersonName" />
119 99
120 </LinearLayout> 100 </LinearLayout>
121 101
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 android:orientation="vertical"> 76 android:orientation="vertical">
77 77
78 <ToggleButton 78 <ToggleButton
79 - android:id="@+id/inmanButton" 79 + android:id="@+id/gagoojooButton"
80 android:layout_width="match_parent" 80 android:layout_width="match_parent"
81 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
82 android:background="@drawable/profil_selector" 82 android:background="@drawable/profil_selector"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 android:textOn="가구주" /> 85 android:textOn="가구주" />
86 86
87 <ToggleButton 87 <ToggleButton
88 - android:id="@+id/outmanButton" 88 + android:id="@+id/gagoowonButton"
89 android:layout_width="match_parent" 89 android:layout_width="match_parent"
90 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
91 android:background="@drawable/profil_selector" 91 android:background="@drawable/profil_selector"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 tools:context=".MainActivity"> 7 tools:context=".MainActivity">
8 8
9 +
9 <LinearLayout 10 <LinearLayout
10 android:layout_width="match_parent" 11 android:layout_width="match_parent"
11 android:layout_height="match_parent" 12 android:layout_height="match_parent"
...@@ -15,72 +16,102 @@ ...@@ -15,72 +16,102 @@
15 android:layout_width="match_parent" 16 android:layout_width="match_parent"
16 android:layout_height="10dp" 17 android:layout_height="10dp"
17 android:layout_weight="1" 18 android:layout_weight="1"
18 - android:orientation="vertical"></LinearLayout> 19 + android:gravity="center"
20 + android:orientation="vertical">
21 +
22 + <LinearLayout
23 + android:layout_width="wrap_content"
24 + android:layout_height="wrap_content"
25 + android:layout_gravity="center"
26 + android:gravity="center"
27 + android:orientation="vertical">
28 +
29 + <TextView
30 + android:id="@+id/textView6"
31 + android:layout_width="match_parent"
32 + android:layout_height="wrap_content"
33 + android:text="복지야, 안녕!"
34 + android:textSize="15dp" />
35 +
36 + <ImageView
37 + android:id="@+id/imageView2"
38 + android:layout_width="wrap_content"
39 + android:layout_height="wrap_content"
40 + tools:srcCompat="@tools:sample/avatars"
41 + android:src="@drawable/final_logo"/>
42 + </LinearLayout>
43 +
44 + </LinearLayout>
19 45
20 <LinearLayout 46 <LinearLayout
21 android:layout_width="match_parent" 47 android:layout_width="match_parent"
22 android:layout_height="wrap_content" 48 android:layout_height="wrap_content"
23 - android:orientation="vertical"> 49 + android:gravity="center"
50 + android:orientation="vertical"
51 + android:padding="10dp">
52 +
53 + <TextView
54 + android:id="@+id/textView4"
55 + android:layout_width="350dp"
56 + android:layout_height="wrap_content"
57 + android:text="이메일"
58 + android:textColor="#29ABE2"
59 + android:textSize="13dp" />
24 60
25 <EditText 61 <EditText
26 android:id="@+id/edit_email" 62 android:id="@+id/edit_email"
27 - android:layout_width="match_parent" 63 + android:layout_width="350dp"
28 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
29 - android:layout_marginStart="16dp" 65 +
30 - android:layout_marginLeft="16dp" 66 + android:inputType="textEmailAddress"
31 - android:layout_marginTop="8dp" 67 + android:theme="@style/EditTheme" />
32 - android:layout_marginEnd="16dp" 68 +
33 - android:layout_marginRight="16dp" 69 + <TextView
34 - android:ems="10" 70 + android:id="@+id/textView5"
35 - android:hint="Email" 71 + android:layout_width="350dp"
36 - android:inputType="textEmailAddress" /> 72 + android:layout_height="wrap_content"
73 + android:text="비밀번호"
74 + android:textColor="#29ABE2"
75 + android:textSize="13dp" />
37 76
38 <EditText 77 <EditText
39 android:id="@+id/edit_password" 78 android:id="@+id/edit_password"
40 - android:layout_width="match_parent" 79 + android:layout_width="350dp"
41 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
42 - android:layout_marginStart="16dp" 81 +
43 - android:layout_marginLeft="16dp" 82 + android:inputType="textPassword"
44 - android:layout_marginTop="8dp" 83 + android:theme="@style/EditTheme" />
45 - android:layout_marginEnd="16dp"
46 - android:layout_marginRight="16dp"
47 - android:ems="10"
48 - android:hint="Password"
49 - android:inputType="textPassword" />
50 84
51 <Button 85 <Button
52 android:id="@+id/emailSigninBtn" 86 android:id="@+id/emailSigninBtn"
53 - android:layout_width="match_parent" 87 + android:layout_width="350dp"
54 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
55 android:layout_marginStart="16dp" 89 android:layout_marginStart="16dp"
56 android:layout_marginLeft="16dp" 90 android:layout_marginLeft="16dp"
57 android:layout_marginTop="8dp" 91 android:layout_marginTop="8dp"
58 android:layout_marginEnd="16dp" 92 android:layout_marginEnd="16dp"
59 android:layout_marginRight="16dp" 93 android:layout_marginRight="16dp"
60 - android:background="@color/colorPrimary" 94 + android:background="@drawable/button_x"
61 android:text="로그인" 95 android:text="로그인"
62 - android:textColor="@color/common_google_signin_btn_text_dark_default" /> 96 + android:textColor="#DDDDDD" />
97 +
98 + </LinearLayout>
99 +
100 + <LinearLayout
101 + android:layout_width="match_parent"
102 + android:layout_height="10dp"
103 + android:layout_weight="1"
104 + android:gravity="bottom"
105 + android:orientation="vertical">
63 106
64 <Button 107 <Button
65 android:id="@+id/emailSignupBtn" 108 android:id="@+id/emailSignupBtn"
66 android:layout_width="match_parent" 109 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 110 android:layout_height="wrap_content"
68 - android:layout_marginStart="16dp" 111 + android:background="#29ABE2"
69 - android:layout_marginLeft="16dp"
70 - android:layout_marginTop="8dp"
71 - android:layout_marginEnd="16dp"
72 - android:layout_marginRight="16dp"
73 - android:background="@color/colorPrimary"
74 android:text="회원가입" 112 android:text="회원가입"
75 android:textColor="@color/common_google_signin_btn_text_dark_default" /> 113 android:textColor="@color/common_google_signin_btn_text_dark_default" />
76 -
77 </LinearLayout> 114 </LinearLayout>
78 -
79 - <LinearLayout
80 - android:layout_width="match_parent"
81 - android:layout_height="10dp"
82 - android:layout_weight="1"
83 - android:orientation="vertical"></LinearLayout>
84 </LinearLayout> 115 </LinearLayout>
85 116
86 </androidx.constraintlayout.widget.ConstraintLayout> 117 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -27,7 +27,10 @@ ...@@ -27,7 +27,10 @@
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="70dp" 28 android:layout_height="70dp"
29 android:layout_weight="1" 29 android:layout_weight="1"
30 - android:text="시작하기" /> 30 + android:background="#FF29ABE2"
31 + android:text="회원가입/로그인하기"
32 + android:textColor="@android:color/white"
33 + android:textSize="16dp" />
31 34
32 </LinearLayout> 35 </LinearLayout>
33 </LinearLayout> 36 </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 + 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="wrap_content"
7 + android:orientation="vertical"
8 + android:padding="25dp"
9 + tools:context=".BSAdapter">
10 +
11 + <LinearLayout
12 + android:layout_width="match_parent"
13 + android:layout_height="wrap_content"
14 + android:orientation="horizontal"
15 + android:padding="2dp">
16 +
17 + <Button
18 + android:id="@+id/circleformButton"
19 + android:layout_width="20dp"
20 + android:layout_height="20dp"
21 + android:layout_gravity="center"
22 + android:layout_margin="3dp"
23 + android:background="@drawable/circle_shape"
24 + android:textColor="#29ABE2"
25 + android:textSize="10dp" />
26 +
27 + <TextView
28 + android:id="@+id/bsTextView"
29 + android:layout_width="wrap_content"
30 + android:layout_height="wrap_content"
31 + android:text="내용"
32 + android:textColor="#29ABE2"
33 + android:textSize="20dp" />
34 +
35 + </LinearLayout>
36 +
37 + <TextView
38 + android:id="@+id/textView8"
39 + android:layout_width="match_parent"
40 + android:layout_height="wrap_content"
41 + android:layout_margin="10dp"
42 + android:text="생년월일"
43 + android:textColor="#29ABE2"
44 + android:textSize="13dp" />
45 +
46 + <EditText
47 + android:id="@+id/bsBirthEditText"
48 + android:layout_width="match_parent"
49 + android:layout_height="wrap_content"
50 + android:layout_margin="10dp"
51 + android:ems="10"
52 + android:hint="ex)19951029"
53 + android:inputType="number"
54 + android:theme="@style/EditTheme" />
55 +
56 + <TextView
57 + android:id="@+id/textView9"
58 + android:layout_width="match_parent"
59 + android:layout_height="wrap_content"
60 + android:layout_margin="10dp"
61 + android:text="성별 *"
62 + android:textColor="#29ABE2"
63 + android:textSize="13dp" />
64 +
65 + <LinearLayout
66 + android:layout_width="match_parent"
67 + android:layout_height="wrap_content"
68 + android:orientation="horizontal">
69 +
70 + <ToggleButton
71 + android:id="@+id/womanButton"
72 + android:layout_width="wrap_content"
73 + android:layout_height="wrap_content"
74 + android:layout_margin="10dp"
75 + android:layout_weight="1"
76 + android:background="@drawable/button_selector"
77 + android:textOff="여성"
78 + android:textOn="여성" />
79 +
80 + <ToggleButton
81 + android:id="@+id/manButton"
82 + android:layout_width="wrap_content"
83 + android:layout_height="wrap_content"
84 + android:layout_margin="10dp"
85 + android:layout_weight="1"
86 + android:background="@drawable/button_selector"
87 + android:textOff="남성"
88 + android:textOn="남성" />
89 + </LinearLayout>
90 +</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 + 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="wrap_content"
7 + android:orientation="vertical"
8 + android:padding="25dp"
9 + tools:context=".ChildAdapter">
10 +
11 + <LinearLayout
12 + android:layout_width="match_parent"
13 + android:layout_height="wrap_content"
14 + android:orientation="horizontal"
15 + android:padding="2dp">
16 +
17 + <Button
18 + android:id="@+id/circleformButton"
19 + android:layout_width="20dp"
20 + android:layout_height="20dp"
21 + android:layout_gravity="center"
22 + android:layout_margin="3dp"
23 + android:background="@drawable/circle_shape"
24 + android:textColor="#29ABE2"
25 + android:textSize="10dp" />
26 +
27 + <TextView
28 + android:id="@+id/childTextView"
29 + android:layout_width="wrap_content"
30 + android:layout_height="wrap_content"
31 + android:text="내용"
32 + android:textColor="#29ABE2"
33 + android:textSize="20dp" />
34 +
35 + </LinearLayout>
36 +
37 + <TextView
38 + android:id="@+id/textView8"
39 + android:layout_width="match_parent"
40 + android:layout_height="wrap_content"
41 + android:layout_margin="10dp"
42 + android:text="생년월일"
43 + android:textColor="#29ABE2"
44 + android:textSize="13dp" />
45 +
46 + <EditText
47 + android:id="@+id/childBirthEditText"
48 + android:layout_width="match_parent"
49 + android:layout_height="wrap_content"
50 + android:layout_margin="10dp"
51 + android:ems="10"
52 + android:hint="ex)19951029"
53 + android:inputType="number"
54 + android:theme="@style/EditTheme" />
55 +
56 + <TextView
57 + android:id="@+id/textView9"
58 + android:layout_width="match_parent"
59 + android:layout_height="wrap_content"
60 + android:layout_margin="10dp"
61 + android:text="성별 *"
62 + android:textColor="#29ABE2"
63 + android:textSize="13dp" />
64 +
65 + <LinearLayout
66 + android:layout_width="match_parent"
67 + android:layout_height="wrap_content"
68 + android:orientation="horizontal">
69 +
70 + <ToggleButton
71 + android:id="@+id/womanButton"
72 + android:layout_width="wrap_content"
73 + android:layout_height="wrap_content"
74 + android:layout_margin="10dp"
75 + android:layout_weight="1"
76 + android:background="@drawable/button_selector"
77 + android:textOff="여성"
78 + android:textOn="여성" />
79 +
80 + <ToggleButton
81 + android:id="@+id/manButton"
82 + android:layout_width="wrap_content"
83 + android:layout_height="wrap_content"
84 + android:layout_margin="10dp"
85 + android:layout_weight="1"
86 + android:background="@drawable/button_selector"
87 + android:textOff="남성"
88 + android:textOn="남성" />
89 + </LinearLayout>
90 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
5 <color name="colorAccent">#D81B60</color> 5 <color name="colorAccent">#D81B60</color>
6 <color name="infomainColor">#F1F9FF</color> 6 <color name="infomainColor">#F1F9FF</color>
7 7
8 + <color name="splashfilling">#FFFFFF</color>
9 +
10 + <color name="cursorColor">#000000</color>
11 + <color name="nomalColor">#29ABE2</color>
12 +
8 <drawable name="profil_selected">#1E90FF</drawable> 13 <drawable name="profil_selected">#1E90FF</drawable>
9 <drawable name="profil_unselected">#FFFFFF</drawable> 14 <drawable name="profil_unselected">#FFFFFF</drawable>
10 15
......
...@@ -11,8 +11,15 @@ ...@@ -11,8 +11,15 @@
11 </style> 11 </style>
12 12
13 <!-- Splash screen --> 13 <!-- Splash screen -->
14 +
14 <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> 15 <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
15 <item name="android:windowBackground">@drawable/background_splash</item> 16 <item name="android:windowBackground">@drawable/background_splash</item>
16 </style> 17 </style>
17 18
19 + <style name="EditTheme" >
20 + <!--위에 에딧템 뒤에 parent="Theme.AppCompat.Light.NoActionBar"-->
21 + <item name="colorAccent">#29ABE2</item>
22 + <item name="android:colorControlNormal">#29ABE2</item>
23 + </style>
24 +
18 </resources> 25 </resources>
......