From 571b9944f9563e03aa46e070a4b2fe818992045c Mon Sep 17 00:00:00 2001
From: Developer-HyeonJi <dev.hyeonji@gmail.com>
Date: Thu, 25 Aug 2022 22:10:49 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.name                                   |  1 +
 .idea/deploymentTargetDropDown.xml            | 17 +++++
 .idea/misc.xml                                | 33 +++++++++
 app/build.gradle                              | 13 +++-
 app/google-services.json                      | 39 ++++++++++
 app/src/main/AndroidManifest.xml              | 28 ++------
 .../java/com/example/kb/SignUpActivity1.kt    | 64 +++++++++++++++--
 .../java/com/example/kb/SignUpActivity2.kt    | 15 +++-
 .../java/com/example/kb/SignUpActivity3.kt    | 41 +++++++++++
 .../java/com/example/kb/SignUpActivity4.kt    | 28 ++++++++
 .../java/com/example/kb/SignUpActivity5.kt    | 17 +++++
 .../java/com/example/kb/SignUpActivity6.kt    | 14 +++-
 app/src/main/res/layout/activity_sign_up2.xml |  4 +-
 app/src/main/res/layout/activity_sign_up3.xml | 50 ++++++++-----
 app/src/main/res/layout/activity_sign_up4.xml | 72 +++++++++++--------
 app/src/main/res/layout/activity_sign_up5.xml |  2 +-
 app/src/main/res/values/colors.xml            |  1 +
 build.gradle                                  | 11 +++
 18 files changed, 364 insertions(+), 86 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/google-services.json

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..9f1ea5d
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+KB
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..abd046f
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\kamja\.android\avd\Pixel_2_API_31.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-08-24T14:02:41.676224100Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 46d3d26..1b547f9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,39 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable-v24/ic_launcher_background.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/circle_btn.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/edit_box_custom.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/fund_edit_custom.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/fund_progress_custom.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/radius_beige.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/radius_beige_empty.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/radius_gray.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/selector_btn_color.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/selector_country_btn_color.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/selector_sign_up_check.xml" value="0.118" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/drawable/sign_up_bottom_sheet_background.xml" value="0.141" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_fund_open.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_main.xml" value="0.20989583333333334" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up1.xml" value="0.152" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up2.xml" value="0.20989583333333334" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up3.xml" value="0.264" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up4.xml" value="0.2" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up5.xml" value="0.1140625" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/activity_sign_up6.xml" value="0.20989583333333334" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_contents.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_contents_culture.xml" value="0.20989583333333334" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_contents_story.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_fund.xml" value="0.20989583333333334" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_fund_home.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_fund_new.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_mypage.xml" value="0.20572916666666666" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fragment_qa.xml" value="0.19369369369369369" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/fund_list_custom.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/layout/sing_up_bottom_sheet.xml" value="0.16875" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1" />
+        <entry key="..\:/Users/kamja/Documents/GitHub/KBxml/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.1" />
         <entry key="..\:/Users/yur51/AndroidStudioProjects/KB/app/src/main/res/drawable-v24/ic_launcher_background.xml" value="0.1885" />
         <entry key="..\:/Users/yur51/AndroidStudioProjects/KB/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2295" />
         <entry key="..\:/Users/yur51/AndroidStudioProjects/KB/app/src/main/res/drawable/circle_btn.xml" value="0.2565" />
diff --git a/app/build.gradle b/app/build.gradle
index 0758bdb..fe4b13a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'com.google.gms.google-services'
+    id 'kotlin-android-extensions'
 }
 
 android {
@@ -30,16 +32,21 @@ android {
         jvmTarget = '1.8'
     }
 
+
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation platform('com.google.firebase:firebase-bom:30.3.2')
+    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
+    implementation 'com.google.firebase:firebase-auth:21.0.7'
+    implementation 'com.google.android.gms:play-services-auth:19.0.0'
+    implementation 'com.google.android.gms:play-services-auth:20.2.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 0000000..41cf986
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "367622756287",
+    "project_id": "kb-project-3956a",
+    "storage_bucket": "kb-project-3956a.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:367622756287:android:3c67bed6c467835b69730a",
+        "android_client_info": {
+          "package_name": "com.example.kb"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "367622756287-pfs7amud4qrn0n34kd6hj4dhvr8dk3lg.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOWfCh4cGjhZ0EuQUGs2XIn_4TioS5IKg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "367622756287-pfs7amud4qrn0n34kd6hj4dhvr8dk3lg.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index abb00d4..d2ec54f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,22 +13,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.KB"
         tools:targetApi="31">
-        <activity
-            android:name=".QaActivity2"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize"/>
-        <activity
-            android:name=".FundParticipationActivity3"
-            android:exported="false" />
-        <activity
-            android:name=".FundParticipationActivity2"
-            android:exported="false" />
-        <activity
-            android:name=".FundParticipationActivity"
-            android:exported="false" />
-        <activity
-            android:name=".FundOpenActivity2"
-            android:exported="false" />
         <activity
             android:name=".FundOpenActivity"
             android:exported="false" />
@@ -37,23 +21,19 @@
             android:exported="false" />
         <activity
             android:name=".SignUpActivity5"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize"/>
+            android:exported="false" />
         <activity
             android:name=".SignUpActivity4"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize"/>
+            android:exported="false" />
         <activity
             android:name=".SignUpActivity3"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize" />
+            android:exported="false" />
         <activity
             android:name=".SignUpActivity6"
             android:exported="false" />
         <activity
             android:name=".SignUpActivity2"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize"/>
+            android:exported="false" />
         <activity
             android:name=".SignUpActivity1"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/kb/SignUpActivity1.kt b/app/src/main/java/com/example/kb/SignUpActivity1.kt
index f1c3ef5..e8a5aa0 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity1.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity1.kt
@@ -1,20 +1,74 @@
 /*회원가입_1*/
 package com.example.kb
 
+
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
+import com.google.android.gms.auth.api.Auth
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.GoogleAuthProvider
+import kotlinx.android.synthetic.main.activity_sign_up1.*
 
-class SignUpActivity1 : AppCompatActivity() {
-
-    lateinit var signupBtn: Button
-    lateinit var googleBtn: Button
 
+@Suppress("DEPRECATION")
+class SignUpActivity1 : AppCompatActivity() {
+    var auth : FirebaseAuth? = null
+    var googleSignInClient : GoogleSignInClient? = null
+    var GOOGLE_LOGIN_CODE = 9001
     override fun onCreate(savedInstanceState: Bundle?) {
+        lateinit var signupBtn: Button
+        lateinit var googleBtn: Button
+
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up1)
 
         signupBtn = findViewById(R.id.sign_up_btn)
         googleBtn = findViewById(R.id.google_login_btn)
+
+        signupBtn.setOnClickListener {
+            startActivity(Intent(this, SignUpActivity2::class.java))
+            finish()
+        }
+        google_login_btn.setOnClickListener {
+            //First step
+            googleLogin()
+        }
+        var gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestIdToken("367622756287-pfs7amud4qrn0n34kd6hj4dhvr8dk3lg.apps.googleusercontent.com")
+            .requestEmail()
+            .build()
+        googleSignInClient = GoogleSignIn.getClient(this, gso)
+    }
+    @Suppress("DEPRECATION")
+    fun googleLogin(){
+        var signInIntent= googleSignInClient?.signInIntent
+        startActivityForResult(signInIntent, GOOGLE_LOGIN_CODE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if(requestCode == GOOGLE_LOGIN_CODE){
+            var result = Auth.GoogleSignInApi.getSignInResultFromIntent(data!!)
+            if(result!!.isSuccess){
+                var account = result.signInAccount
+                //Second step
+                firebaseAuthWithGoogle(account)
+            }
+        }
+    }
+    fun firebaseAuthWithGoogle(account : GoogleSignInAccount?){
+        var credential = GoogleAuthProvider.getCredential(account?.idToken, null)
+        auth?.signInWithCredential(credential)
+            ?.addOnCompleteListener {
+                    task ->
+                val intent = Intent(this, SignUpActivity6::class.java)
+                startActivity(intent)
+                }
+            }
     }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kb/SignUpActivity2.kt b/app/src/main/java/com/example/kb/SignUpActivity2.kt
index d99081e..bacc841 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity2.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity2.kt
@@ -1,10 +1,13 @@
 /*회원가입_2*/
 package com.example.kb
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import kotlinx.android.synthetic.main.activity_sign_up2.*
+
 
 class SignUpActivity2 : AppCompatActivity() {
 
@@ -16,8 +19,16 @@ class SignUpActivity2 : AppCompatActivity() {
         val bottomSheetDialog = BottomSheetDialog(this)
         bottomSheetDialog.setContentView(bottomSheetView)
 
-        findViewById<Button>(R.id.next_btn).setOnClickListener {
-            bottomSheetDialog.show()
+        contents_back_btn2.setOnClickListener(){
+            val intent = Intent(this, SignUpActivity1::class.java)
+            startActivity(intent)
+        }
+        next_btn2.setOnClickListener() {
+            //bottomSheetDialog.show()
+            val intent = Intent(this, SignUpActivity3::class.java)
+            val text = editTextTextEmailAddress.text.toString()
+            intent.putExtra("email", text)
+            startActivity(intent)
         }
 
     }
diff --git a/app/src/main/java/com/example/kb/SignUpActivity3.kt b/app/src/main/java/com/example/kb/SignUpActivity3.kt
index 9a56a21..11be3c4 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity3.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity3.kt
@@ -1,12 +1,53 @@
 /*회원가입_3*/
 package com.example.kb
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.text.Editable
+import android.widget.Button
+import android.widget.Toast
+import com.google.firebase.auth.FirebaseAuth
+import kotlinx.android.synthetic.main.activity_sign_up2.*
+import kotlinx.android.synthetic.main.activity_sign_up3.*
+import kotlinx.android.synthetic.main.activity_sign_up2.editTextTextEmailAddress as editTextTextEmailAddress1
 
 class SignUpActivity3 : AppCompatActivity() {
+    var auth : FirebaseAuth? = null
     override fun onCreate(savedInstanceState: Bundle?) {
+        auth = FirebaseAuth.getInstance()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up3)
+
+        val editText = intent.getStringExtra("email")
+        editTextTextEmailAddress3.setText(editText)
+
+        contents_back_btn3.setOnClickListener() {
+            val intent = Intent(this, SignUpActivity2::class.java)
+            startActivity(intent)
+        }
+
+        next_btn3.setOnClickListener() {
+            signinAndSignup()
+            val intent = Intent(this, SignUpActivity4::class.java)
+            val text = editTextTextEmailAddress3.text.toString()
+            val text2 = editTextTextPassword.text.toString()
+
+            intent.putExtra("email", text)
+            intent.putExtra("pw", text2)
+            startActivity(intent)
+
+        }
+    }
+        fun signinAndSignup() {
+            auth?.createUserWithEmailAndPassword(editTextTextEmailAddress3.text.toString(), editTextTextPassword.text.toString())
+                ?.addOnCompleteListener { task ->
+                    if (task.isSuccessful) {
+                        //Creating a user account
+                    } else if (task.exception?.message.isNullOrEmpty()) {
+                        //Show the error message
+                        Toast.makeText(this, task.exception?.message, Toast.LENGTH_LONG).show()
+                    }
+                }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kb/SignUpActivity4.kt b/app/src/main/java/com/example/kb/SignUpActivity4.kt
index be4cae5..f2b7c58 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity4.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity4.kt
@@ -1,12 +1,40 @@
 /*회원가입_4*/
 package com.example.kb
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.Toast
+import androidx.core.content.ContentProviderCompat.requireContext
+import kotlinx.android.synthetic.main.activity_sign_up3.*
+import kotlinx.android.synthetic.main.activity_sign_up4.*
 
 class SignUpActivity4 : AppCompatActivity() {
+
+    lateinit var next_btn: Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up4)
+
+        val editEmail = intent.getStringExtra("email")
+        editTextTextEmailAddress.setText(editEmail)
+        val editPw = intent.getStringExtra("pw")
+        editTextTextPassword2.setText(editPw)
+
+        contents_back_btn4.setOnClickListener(){
+            val intent = Intent(this, SignUpActivity3::class.java)
+            startActivity(intent)
+        }
+
+        next_btn4.setOnClickListener {
+            val intent = Intent(this, SignUpActivity5::class.java)
+            startActivity(intent)
+        }
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kb/SignUpActivity5.kt b/app/src/main/java/com/example/kb/SignUpActivity5.kt
index 16fde71..fdbbbe4 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity5.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity5.kt
@@ -1,12 +1,29 @@
 /*회원가입_5*/
 package com.example.kb
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
+import kotlinx.android.synthetic.main.activity_sign_up3.*
+import kotlinx.android.synthetic.main.activity_sign_up5.*
 
 class SignUpActivity5 : AppCompatActivity() {
+
+    lateinit var next_btn: Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up5)
+
+        contents_back_btn5.setOnClickListener(){
+            val intent = Intent(this, SignUpActivity4::class.java)
+            startActivity(intent)
+        }
+
+        findViewById<Button>(R.id.complete_btn).setOnClickListener {
+            val intent = Intent(this, SignUpActivity6::class.java)
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kb/SignUpActivity6.kt b/app/src/main/java/com/example/kb/SignUpActivity6.kt
index 7e76706..4f512fc 100644
--- a/app/src/main/java/com/example/kb/SignUpActivity6.kt
+++ b/app/src/main/java/com/example/kb/SignUpActivity6.kt
@@ -1,12 +1,24 @@
 /*회원가입_6*/
 package com.example.kb
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 
 class SignUpActivity6 : AppCompatActivity() {
+
+    lateinit var next_btn: Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up6)
+
+        Handler().postDelayed(Runnable {
+            val intent = Intent(this, MainActivity::class.java)
+            startActivity(intent)
+        }, 4000)
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up2.xml b/app/src/main/res/layout/activity_sign_up2.xml
index d815319..6fc0e74 100644
--- a/app/src/main/res/layout/activity_sign_up2.xml
+++ b/app/src/main/res/layout/activity_sign_up2.xml
@@ -15,7 +15,7 @@
         android:weightSum="6">
 
         <ImageButton
-            android:id="@+id/contents_back_btn"
+            android:id="@+id/contents_back_btn2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="35dp"
@@ -53,7 +53,7 @@
     </LinearLayout>
 
     <android.widget.Button
-        android:id="@+id/next_btn"
+        android:id="@+id/next_btn2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/activity_sign_up3.xml b/app/src/main/res/layout/activity_sign_up3.xml
index e9a95ed..b12273b 100644
--- a/app/src/main/res/layout/activity_sign_up3.xml
+++ b/app/src/main/res/layout/activity_sign_up3.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    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="match_parent"
     tools:context=".SignUpActivity3">
-
     <!--회원가입_3-->
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,7 +14,7 @@
         android:weightSum="6">
 
         <ImageButton
-            android:id="@+id/contents_back_btn"
+            android:id="@+id/contents_back_btn3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="35dp"
@@ -36,24 +35,39 @@
             android:textSize="16dp" />
 
         <!-- 글자수 설정 필요-->
-        <EditText
-            android:id="@+id/editTextTextPassword"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/til_pw"
+            app:boxBackgroundColor="@android:color/transparent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="35dp"
-            android:layout_marginRight="35dp"
-            android:backgroundTint="#66ffffff"
-            android:drawableRight="@drawable/confirm_password"
-            android:ems="10"
-            android:hint="비밀번호"
-            android:inputType="numberPassword"
-            android:paddingBottom="15dp"
-            android:textColor="@color/white"
             android:textColorHint="@color/white_44"
-            android:textSize="12dp" />
+            android:backgroundTint="#66ffffff"
+
+            app:passwordToggleEnabled="true">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editTextTextPassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:layout_marginLeft="35dp"
+                android:layout_marginRight="35dp"
+                android:background="@android:color/transparent"
+                android:backgroundTint="#66ffffff"
+                android:drawableRight="@drawable/confirm_password"
+                android:ems="10"
+                android:hint="비밀번호"
+                android:inputType="textPassword"
+                android:paddingBottom="15dp"
+                android:textColor="@color/white"
+                android:textSize="12dp"
+                app:counterEnabled="true"
+                app:counterMaxLength="20" />
+        </com.google.android.material.textfield.TextInputLayout>
 
         <EditText
-            android:id="@+id/editTextTextEmailAddress"
+
+            android:id="@+id/editTextTextEmailAddress3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="35dp"
@@ -70,7 +84,7 @@
     </LinearLayout>
 
     <android.widget.Button
-        android:id="@+id/next_btn"
+        android:id="@+id/next_btn3"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/activity_sign_up4.xml b/app/src/main/res/layout/activity_sign_up4.xml
index fbb84e6..ee3b839 100644
--- a/app/src/main/res/layout/activity_sign_up4.xml
+++ b/app/src/main/res/layout/activity_sign_up4.xml
@@ -15,7 +15,7 @@
         android:weightSum="6">
 
         <ImageButton
-            android:id="@+id/contents_back_btn"
+            android:id="@+id/contents_back_btn4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="35dp"
@@ -31,42 +31,54 @@
             android:layout_marginLeft="35dp"
             android:layout_marginRight="35dp"
             android:layout_weight="0.4"
-            android:text="비밀번호를 입력해주세요"
+            android:text="비밀번호를 다시 입력해주세요"
             android:textColor="@color/white"
             android:textSize="16dp" />
 
         <!-- 글자수 설정 필요-->
-        <EditText
-            android:id="@+id/editTextTextPassword_confirm"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/til_pw"
+            app:boxBackgroundColor="@android:color/transparent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="35dp"
-            android:layout_marginRight="35dp"
-            android:backgroundTint="#66ffffff"
-            android:drawableRight="@drawable/confirm_password"
-            android:ems="10"
-            android:hint="비밀번호 확인"
-            android:inputType="numberPassword"
-            android:paddingBottom="15dp"
-            android:textColor="@color/white"
             android:textColorHint="@color/white_44"
-            android:textSize="12dp" />
-
-        <EditText
-            android:id="@+id/editTextTextPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="35dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="35dp"
             android:backgroundTint="#66ffffff"
-            android:ems="10"
-            android:hint="비밀번호"
-            android:inputType="textEmailAddress"
-            android:paddingBottom="15dp"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white_44"
-            android:textSize="12dp" />
+
+            app:passwordToggleEnabled="true">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editTextTextPassword_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="35dp"
+                android:layout_marginRight="35dp"
+                android:textColor="@color/white"
+                android:background="@android:color/transparent"
+                android:ems="10"
+                android:hint="비밀번호 확인"
+                android:drawableRight="@drawable/confirm_password"
+                android:inputType="textPassword"
+                android:paddingBottom="15dp"
+                android:textSize="12dp"
+                app:counterEnabled="true"
+                android:backgroundTint="#66ffffff"
+                app:counterMaxLength ="20" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+            <EditText
+                android:id="@+id/editTextTextPassword2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="35dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="35dp"
+                android:backgroundTint="#66ffffff"
+                android:ems="10"
+                android:hint="비밀번호"
+                android:inputType="textPassword"
+                android:paddingBottom="15dp"
+                android:textColor="@color/white"
+                android:textColorHint="@color/white_44"
+                android:textSize="12dp" />
 
         <EditText
             android:id="@+id/editTextTextEmailAddress"
@@ -86,7 +98,7 @@
     </LinearLayout>
 
     <android.widget.Button
-        android:id="@+id/next_btn"
+        android:id="@+id/next_btn4"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/activity_sign_up5.xml b/app/src/main/res/layout/activity_sign_up5.xml
index 199f101..3d6c180 100644
--- a/app/src/main/res/layout/activity_sign_up5.xml
+++ b/app/src/main/res/layout/activity_sign_up5.xml
@@ -15,7 +15,7 @@
         android:weightSum="6">
 
         <ImageButton
-            android:id="@+id/contents_back_btn"
+            android:id="@+id/contents_back_btn5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="35dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8620d5d..b232a3b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,5 +14,6 @@
     <color name="btn_gray">#646464</color>
     <color name="white_44">#66F4F3F0</color>
     <color name="white">#F4F3F0</color>
+    <color name="transparent">#00FFFFFF</color>
 
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 932e4c5..c8bc2da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.google.gms:google-services:4.3.13'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+    }
+}
 plugins {
     id 'com.android.application' version '7.2.1' apply false
     id 'com.android.library' version '7.2.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file

From f0c91dee5c7eb57b8486acefa170200e46c96eb4 Mon Sep 17 00:00:00 2001
From: Developer-HyeonJi <dev.hyeonji@gmail.com>
Date: Fri, 26 Aug 2022 12:59:02 +0900
Subject: [PATCH 2/2] manifest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

시작 부분 설정 추가
---
 app/src/main/AndroidManifest.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2ec54f..2aaf271 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,20 +34,22 @@
         <activity
             android:name=".SignUpActivity2"
             android:exported="false" />
-        <activity
-            android:name=".SignUpActivity1"
-            android:exported="false" />
+
         <activity
             android:name=".ContentsStoryListActivity"
             android:exported="false" />
         <activity
             android:name=".MainActivity"
+            android:exported="true"/>
+        <activity
+            android:name=".SignUpActivity1"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
     </application>