Merge branch 'track' into done

@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/NoActionBar">
-        <activity android:name=".InputProfilFifthFourActivity"></activity>
+        <activity android:name=".ChildAdapter"></activity>
+        <activity android:name=".InputProfilFifthFourActivity" />
         <activity android:name=".InputProfilFifthThreeActivity" />
         <activity android:name=".InputProfilFifthTwoActivity" />
         <activity android:name=".InputProfilFifthOneActivity" />
@@ -48,7 +49,9 @@
         <activity android:name=".SignInActivity" />
         <activity android:name=".SignUpActivity" />
         <activity android:name=".MainActivity" />
-        <activity android:name=".SearchActivity" android:windowSoftInputMode="adjustNothing"/>
+        <activity
+            android:name=".SearchActivity"
+            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".SplashActivity"
             android:theme="@style/SplashTheme">

+package com.example.vip
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_bs.view.*
+
+class BSAdapter(private val items: ArrayList<BSItem>) :
+    RecyclerView.Adapter<BSAdapter.ViewHolder>() {
+
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: BSAdapter.ViewHolder, position: Int) {
+        val item = items[position]
+
+        holder.apply {
+            bind(item)
+            itemView.tag = item
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
+            BSAdapter.ViewHolder {
+        val inflatedView = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_bs, parent, false)
+        return BSAdapter.ViewHolder(inflatedView)
+    }
+
+    class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
+
+        private var view: View = v
+
+        fun bind(item: BSItem) {
+            view.circleformButton.text=item.numOfBS.toString()
+            view.bsTextView.text=" 형제자매  "+item.numOfBS.toString()
+
+            view.womanButton.setOnClickListener {
+                if(view.manButton.isChecked){
+                    view.manButton.isChecked=false
+                }else{
+                }
+            }
+            view.manButton.setOnClickListener {
+                if(view.womanButton.isChecked){
+                    view.womanButton.isChecked=false
+                }else{
+                }
+            }
+
+        }
+    }
+}
\ No newline at end of file

+package com.example.vip
+class BSItem(val numOfBS: Int)
\ No newline at end of file

+package com.example.vip
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_child.view.*
+import kotlinx.android.synthetic.main.item_policyfield.view.*
+
+class ChildAdapter(private val items: ArrayList<ChildItem>) :
+    RecyclerView.Adapter<ChildAdapter.ViewHolder>() {
+
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: ChildAdapter.ViewHolder, position: Int) {
+        val item = items[position]
+
+        holder.apply {
+            bind(item)
+            itemView.tag = item
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
+            ChildAdapter.ViewHolder {
+        val inflatedView = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_child, parent, false)
+        return ChildAdapter.ViewHolder(inflatedView)
+    }
+
+    class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
+
+        private var view: View = v
+
+        fun bind(item: ChildItem) {
+            view.circleformButton.text=item.numOfChild.toString()
+            view.childTextView.text=" 자녀  "+item.numOfChild.toString()
+
+            view.womanButton.setOnClickListener {
+                if(view.manButton.isChecked){
+                    view.manButton.isChecked=false
+                }else{
+                }
+            }
+            view.manButton.setOnClickListener {
+                if(view.womanButton.isChecked){
+                    view.womanButton.isChecked=false
+                }else{
+                }
+            }
+
+        }
+    }
+}
\ No newline at end of file

+package com.example.vip
+class ChildItem(val numOfChild: Int)
\ No newline at end of file

 package com.example.vip
 
+import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import android.graphics.Color
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
@@ -28,7 +30,17 @@ class InputProfilFirstFiveActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor=prof.edit()
+
         nextButton.setOnClickListener {
+            if(inmanButton.isChecked){
+                editor.putInt("c1_2",1); editor.commit()
+            }else if(outmanButton.isChecked){
+                editor.putInt("c1_3",1); editor.commit()
+            }else{
+
+            }
             var intent = Intent(this, InputProfilFirstSixActivity::class.java)
             startActivity(intent)
         }

 package com.example.vip
 
+import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_input_profil_first_six.*
@@ -16,7 +18,18 @@ class InputProfilFirstSixActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor=prof.edit()
+
         nextButton.setOnClickListener {
+            if(gagoojooButton.isChecked){
+                editor.putInt("c13_2",1); editor.commit()
+            }else if(gagoowonButton.isChecked){
+                editor.putInt("c13_3",1); editor.commit()
+            }else{
+
+            }
+
             var intent = Intent(this, InputProfilSecondOneActivity::class.java)
             startActivity(intent)
         }

@@ -45,12 +45,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() {
             startActivity(intent)
 
             if (manButton.isChecked){
-                editor.putInt("c2_1",1)
+                editor.putInt("c3_2",1)
                 editor.commit()
                 //마지막장에 상관없음 추가
             }
             else{
-                editor.putInt("c2_2",1)
+                editor.putInt("c3_3",1)
                 editor.commit()
             }
         }

@@ -5,7 +5,10 @@ import android.content.Intent
 import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
 import android.widget.EditText
+import android.widget.Toast
+import com.google.firebase.messaging.FirebaseMessaging
 import kotlinx.android.synthetic.main.activity_input_profil_first_two.*
 import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton
 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
@@ -37,7 +40,15 @@ class InputProfilFirstTwoActivity : AppCompatActivity() {
             if ((2019-birthdateint)<19){
                 editor.putInt("c1_2",1)
                 editor.commit()
+                Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show()
                 //마지막장에 상관없음 추가
+                FirebaseMessaging.getInstance().subscribeToTopic("c1_2")
+                    .addOnCompleteListener { task ->
+                        var msg = getString(R.string.msg_subscribed)
+                        if (!task.isSuccessful) {
+                            msg = getString(R.string.msg_subscribe_failed)
+                        }
+                    }
             }
             else if((2019-birthdateint)<34){
                 editor.putInt("c1_3",1)

 package com.example.vip
 
+import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 import android.widget.EditText
 import android.widget.RatingBar
 import android.widget.TextView
@@ -55,9 +58,39 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor=prof.edit()
+
+
         nextButton.setOnClickListener {
+
+            if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit()}
+            if(baewoojaboomoButton.isChecked){editor.putInt("c10_3",1); editor.commit()}
+            if(baewoojajoboomoButton.isChecked){editor.putInt("c10_4",1); editor.commit()}
+            if(brotherButton.isChecked){editor.putInt("c10_5",1); editor.commit()
+            editor.putString("with_brothersister","yes")}
+            if(baewoojabrotherButton.isChecked){editor.putInt("c10_6",1); editor.commit()}
+            if(donggeoButton.isChecked){editor.putInt("c10_7",1); editor.commit()}
+            if(fatherButton.isChecked){editor.putInt("c10_8",1); editor.commit()}
+            if(motherButton.isChecked){editor.putInt("c10_9",1); editor.commit()}
+            if(grandsonbaewoojaButton.isChecked){editor.putInt("c10_10",1); editor.commit()}
+            if(grandfatherButton.isChecked){editor.putInt("c10_11",1); editor.commit()}
+            if(grandmotherButton.isChecked){editor.putInt("c10_12",1); editor.commit()}
+            if(grandsonButton.isChecked){editor.putInt("c10_13",1); editor.commit()}
+            if(janyeoButton.isChecked){editor.putInt("c10_14",1); editor.commit()
+            editor.putString("with_child","yes")}
+            if(janyeobaewoojaButton.isChecked){editor.putInt("c10_15",1); editor.commit()}
+            if(nothingButton.isChecked){editor.putInt("c10_18",1); editor.commit()}
+
+            if(janyeoButton.isChecked
+                //prof.getString("with_child","none")=="yes"
+            ){
                 var intent = Intent(this, InputProfilSecondTwoActivity::class.java)
                 startActivity(intent)
+            }else{
+                var intent = Intent(this, InputProfilThirdOneActivity::class.java)
+                startActivity(intent)
+            }
         }
     }
 }

 package com.example.vip
 
+import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.EditText
 import kotlinx.android.synthetic.main.activity_input_profil_second_three.*
+import kotlinx.android.synthetic.main.activity_input_profil_second_three.nextButton
+import kotlinx.android.synthetic.main.activity_input_profil_second_three.previousButton
+import kotlinx.android.synthetic.main.activity_input_profil_second_three.skipButton
+import kotlinx.android.synthetic.main.activity_input_profil_second_three.toolbar
 
 class InputProfilSecondThreeActivity : AppCompatActivity() {
 
@@ -11,6 +18,10 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_input_profil_second_three)
 
+        val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor=prof.edit()
+
+
         setSupportActionBar(toolbar)
 
         skipButton.setOnClickListener {
@@ -24,8 +35,40 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
         }
 
         nextButton.setOnClickListener {
+            var numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
+            if(numOfBS>=2){
+                editor.putInt("c10_16",1); editor.commit()
+            }
+            if(numOfBS<2){
+                editor.putInt("c10_17",1); editor.commit()
+            }
             var intent = Intent(this, InputProfilThirdOneActivity::class.java)
             startActivity(intent)
         }
+
+        val bsList = ArrayList<BSItem>()
+        bsNumberInputButton.setOnClickListener {
+
+            if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){
+                var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
+                var cnt=1
+                while(bsNum>=cnt){
+                    bsList.add(
+                        BSItem(cnt)
+                    )
+                    cnt++
+                }
+                //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show()
+            }
+            else{
+                var bsNum=0
+            }
+
+            val adapter = BSAdapter(bsList)
+            bsRecyclerView.adapter = adapter
+
+
+
+        }
     }
 }

 package com.example.vip
 
+import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.EditText
+import android.widget.Toast
+import androidx.core.content.ContextCompat
 import kotlinx.android.synthetic.main.activity_input_profil_second_two.*
+import kotlinx.android.synthetic.main.item_child.view.*
 
 class InputProfilSecondTwoActivity : AppCompatActivity() {
 
@@ -13,34 +19,73 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_input_profil_second_two)
 
+        val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor=prof.edit()
 
         setSupportActionBar(toolbar)
-
         skipButton.setOnClickListener {
             var intent = Intent(this, InputProfilSecondOneActivity::class.java)
             startActivity(intent)
         }
-
         previousButton.setOnClickListener {
             var intent = Intent(this, InputProfilSecondOneActivity::class.java)
             startActivity(intent)
         }
-
         nextButton.setOnClickListener {
+            var numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
+            if(numOfChild>=3){
+                editor.putInt("c10_16",1); editor.commit()
+            }
+            if(numOfChild<3){
+                editor.putInt("c10_17",1); editor.commit()
+            }
+
+
+
+            /*
+            editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo birth", childRecyclerView.childBirthEditText.text.toString()); editor.commit()
+            if(childRecyclerView.womanButton.isChecked){
+                editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","woman"); editor.commit()
+            }else{
+                editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","man"); editor.commit()
+            }
+            */
+
+            if(prof.getString("with_brothersister","none")=="yes"){
                 var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
                 startActivity(intent)
+            }else{
+                var intent = Intent(this, InputProfilThirdOneActivity::class.java)
+                startActivity(intent)
+            }
         }
-
 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
         //mainTv.text = dialogText.text.toString()
+        val childList = ArrayList<ChildItem>()
         childNumberInputButton.setOnClickListener {
-            var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString()
-            if(childNum=="3"){
-                child1LinearLayout.visibility=VISIBLE
-                child2LinearLayout.visibility=VISIBLE
-                child3LinearLayout.visibility=VISIBLE
+
+            if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){
+                var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
+                var cnt=1
+                while(childNum>=cnt){
+                    childList.add(
+                        ChildItem(cnt)
+                    )
+                    cnt++
+                }
+                //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show()
+            }
+            else{
+                var childNum=0
             }
+
+            val adapter = ChildAdapter(childList)
+            childRecyclerView.adapter = adapter
+
+
+
         }
 
+
     }
 }

@@ -3,6 +3,7 @@ package com.example.vip
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 import android.widget.TextView
 import kotlinx.android.synthetic.main.activity_input_profil_third_one.*
 
@@ -20,12 +21,71 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        elementaryButton.setOnClickListener {
+            middleButton.isChecked=false
+            highButton.isChecked=false
+            specialButton.isChecked=false
+            universityButton.isChecked=false
+            graduateButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        middleButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            highButton.isChecked=false
+            specialButton.isChecked=false
+            universityButton.isChecked=false
+            graduateButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        highButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            middleButton.isChecked=false
+            specialButton.isChecked=false
+            universityButton.isChecked=false
+            graduateButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        specialButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            middleButton.isChecked=false
+            highButton.isChecked=false
+            universityButton.isChecked=false
+            graduateButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        universityButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            middleButton.isChecked=false
+            highButton.isChecked=false
+            specialButton.isChecked=false
+            graduateButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        graduateButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            middleButton.isChecked=false
+            highButton.isChecked=false
+            specialButton.isChecked=false
+            universityButton.isChecked=false
+            nothingButton.isChecked=false
+        }
+        nothingButton.setOnClickListener {
+            elementaryButton.isChecked=false
+            middleButton.isChecked=false
+            highButton.isChecked=false
+            specialButton.isChecked=false
+            universityButton.isChecked=false
+            graduateButton.isChecked=false
+        }
+
         previousButton.setOnClickListener {
             var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
             startActivity(intent)
         }
 
         nextButton.setOnClickListener {
+
+
             var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
             startActivity(intent)
         }

@@ -26,6 +26,9 @@ class MainActivity : AppCompatActivity() {
 
    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+
+
        //onboarding start
 
        //onboarding end

@@ -98,7 +98,6 @@ class RecommendActivity : AppCompatActivity() {
                             )
                         )
                     }
-
                     val adapter = PolicyAdapter(policyList)
                     policyRecyclerView.adapter = adapter
                 }

@@ -14,6 +14,8 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() {
     val Image = arrayOf(
         R.drawable.hwajilgooji1,
         R.drawable.hwajilgooji2,
+        R.drawable.hwajilgooji3,
+        R.drawable.hwajilgooji3,
         R.drawable.hwajilgooji3
     )
 

@@ -2,11 +2,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 배경 -->
     <item
-        android:drawable="@color/colorPrimary"/>
+        android:drawable="@color/splashfilling"/>
     <!-- 로고 -->
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/splash_main"/>
+            android:src="@drawable/final_splash" />
     </item>
 </layer-list>

@@ -2,11 +2,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 배경 -->
     <item
-        android:drawable="@color/colorPrimary"/>
+        android:drawable="@color/splashfilling"/>
     <!-- 로고 -->
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/splash_main"/>
+            android:src="@drawable/final_splash"/>
     </item>
 </layer-list>

+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="5dp"
+        android:color="#29ABE2" />
+    <corners
+        android:bottomRightRadius="25dp"
+        android:bottomLeftRadius="25dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp"/>
+    <padding
+        android:left="10dp"
+        android:top="10dp"
+        android:right="10dp"
+        android:bottom="10dp" />
+    <solid
+        android:color="#29ABE2"/>
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false" android:drawable="@drawable/button_x" />
+    <item android:state_checked="true" android:drawable="@drawable/button_o" />
+</selector>
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="5dp"
+        android:color="#F4F4F4" />
+    <corners
+        android:bottomRightRadius="25dp"
+        android:bottomLeftRadius="25dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp"/>
+    <padding
+        android:left="10dp"
+        android:top="10dp"
+        android:right="10dp"
+        android:bottom="10dp" />
+    <solid
+        android:color="#F4F4F4"/>
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <stroke
+        android:width="1dp"
+        android:color="#29ABE2" />
+    <!--
+    <corners
+        android:bottomRightRadius="25dp"
+        android:bottomLeftRadius="25dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp"/>
+
+    <padding
+        android:left="10dp"
+        android:top="10dp"
+        android:right="10dp"
+        android:bottom="10dp" />
+    -->
+    <solid
+        android:color="#FFFFFF"/>
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="32dp">
+        <shape android:shape="line">
+            <stroke
+                android:width="5dp"
+                android:color="#29ABE2"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

@@ -81,13 +81,10 @@
                     android:layout_height="wrap_content"
                     android:text="시/도" />
 
-                <EditText
-                    android:id="@+id/doEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="ex1) 서울시 ex2)경기도"
-                    android:inputType="textPersonName" />
+                <Spinner
+                    android:id="@+id/doSpinner"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" />
 
                 <TextView
                     android:id="@+id/cityTextView"
@@ -95,27 +92,10 @@
                     android:layout_height="wrap_content"
                     android:text="시/군/구" />
 
-                <EditText
-                    android:id="@+id/cityEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="ex) 동대문구"
-                    android:inputType="textPersonName" />
-
-                <TextView
-                    android:id="@+id/dongTextView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="읍/면/동" />
-
-                <EditText
-                    android:id="@+id/dongEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="ex) 회기동"
-                    android:inputType="textPersonName" />
+                <Spinner
+                    android:id="@+id/gooSpinner"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" />
 
             </LinearLayout>
 

@@ -76,7 +76,7 @@
                 android:orientation="vertical">
 
                 <ToggleButton
-                    android:id="@+id/inmanButton"
+                    android:id="@+id/gagoojooButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/profil_selector"
@@ -85,7 +85,7 @@
                     android:textOn="가구주" />
 
                 <ToggleButton
-                    android:id="@+id/outmanButton"
+                    android:id="@+id/gagoowonButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/profil_selector"

@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,72 +16,102 @@
             android:layout_width="match_parent"
             android:layout_height="10dp"
             android:layout_weight="1"
-            android:orientation="vertical"></LinearLayout>
+            android:gravity="center"
+            android:orientation="vertical">
 
             <LinearLayout
-            android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
                 android:orientation="vertical">
 
+                <TextView
+                    android:id="@+id/textView6"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="복지야, 안녕!"
+                    android:textSize="15dp" />
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:srcCompat="@tools:sample/avatars"
+                    android:src="@drawable/final_logo"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="350dp"
+                android:layout_height="wrap_content"
+                android:text="이메일"
+                android:textColor="#29ABE2"
+                android:textSize="13dp" />
+
             <EditText
                 android:id="@+id/edit_email"
-                android:layout_width="match_parent"
+                android:layout_width="350dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:ems="10"
-                android:hint="Email"
-                android:inputType="textEmailAddress" />
+
+                android:inputType="textEmailAddress"
+                android:theme="@style/EditTheme" />
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="350dp"
+                android:layout_height="wrap_content"
+                android:text="비밀번호"
+                android:textColor="#29ABE2"
+                android:textSize="13dp" />
 
             <EditText
                 android:id="@+id/edit_password"
-                android:layout_width="match_parent"
+                android:layout_width="350dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:ems="10"
-                android:hint="Password"
-                android:inputType="textPassword" />
+
+                android:inputType="textPassword"
+                android:theme="@style/EditTheme" />
 
             <Button
                 android:id="@+id/emailSigninBtn"
-                android:layout_width="match_parent"
+                android:layout_width="350dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginRight="16dp"
-                android:background="@color/colorPrimary"
+                android:background="@drawable/button_x"
                 android:text="로그인"
-                android:textColor="@color/common_google_signin_btn_text_dark_default" />
+                android:textColor="#DDDDDD" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:layout_weight="1"
+            android:gravity="bottom"
+            android:orientation="vertical">
 
             <Button
                 android:id="@+id/emailSignupBtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:background="@color/colorPrimary"
+                android:background="#29ABE2"
                 android:text="회원가입"
                 android:textColor="@color/common_google_signin_btn_text_dark_default" />
-
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:layout_weight="1"
-            android:orientation="vertical"></LinearLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

@@ -27,7 +27,10 @@
             android:layout_width="wrap_content"
             android:layout_height="70dp"
             android:layout_weight="1"
-            android:text="시작하기" />
+            android:background="#FF29ABE2"
+            android:text="회원가입/로그인하기"
+            android:textColor="@android:color/white"
+            android:textSize="16dp" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="25dp"
+    tools:context=".BSAdapter">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="2dp">
+
+        <Button
+            android:id="@+id/circleformButton"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_margin="3dp"
+            android:background="@drawable/circle_shape"
+            android:textColor="#29ABE2"
+            android:textSize="10dp" />
+
+        <TextView
+            android:id="@+id/bsTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="내용"
+            android:textColor="#29ABE2"
+            android:textSize="20dp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="생년월일"
+        android:textColor="#29ABE2"
+        android:textSize="13dp" />
+
+    <EditText
+        android:id="@+id/bsBirthEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:ems="10"
+        android:hint="ex)19951029"
+        android:inputType="number"
+        android:theme="@style/EditTheme" />
+
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="성별 *"
+        android:textColor="#29ABE2"
+        android:textSize="13dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ToggleButton
+            android:id="@+id/womanButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_selector"
+            android:textOff="여성"
+            android:textOn="여성" />
+
+        <ToggleButton
+            android:id="@+id/manButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_selector"
+            android:textOff="남성"
+            android:textOn="남성" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="25dp"
+    tools:context=".ChildAdapter">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="2dp">
+
+        <Button
+            android:id="@+id/circleformButton"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_margin="3dp"
+            android:background="@drawable/circle_shape"
+            android:textColor="#29ABE2"
+            android:textSize="10dp" />
+
+        <TextView
+            android:id="@+id/childTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="내용"
+            android:textColor="#29ABE2"
+            android:textSize="20dp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="생년월일"
+        android:textColor="#29ABE2"
+        android:textSize="13dp" />
+
+    <EditText
+        android:id="@+id/childBirthEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:ems="10"
+        android:hint="ex)19951029"
+        android:inputType="number"
+        android:theme="@style/EditTheme" />
+
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="성별 *"
+        android:textColor="#29ABE2"
+        android:textSize="13dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ToggleButton
+            android:id="@+id/womanButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_selector"
+            android:textOff="여성"
+            android:textOn="여성" />
+
+        <ToggleButton
+            android:id="@+id/manButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_selector"
+            android:textOff="남성"
+            android:textOn="남성" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

@@ -5,6 +5,11 @@
     <color name="colorAccent">#D81B60</color>
     <color name="infomainColor">#F1F9FF</color>
 
+    <color name="splashfilling">#FFFFFF</color>
+
+    <color name="cursorColor">#000000</color>
+    <color name="nomalColor">#29ABE2</color>
+
     <drawable name="profil_selected">#1E90FF</drawable>
     <drawable name="profil_unselected">#FFFFFF</drawable>
 

@@ -11,8 +11,15 @@
     </style>
 
     <!-- Splash screen -->
+
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/background_splash</item>
     </style>
 
+    <style name="EditTheme" >
+        <!--위에 에딧템 뒤에 parent="Theme.AppCompat.Light.NoActionBar"-->
+        <item name="colorAccent">#29ABE2</item>
+        <item name="android:colorControlNormal">#29ABE2</item>
+    </style>
+
 </resources>