Login branch

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'

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"
+}

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,37 +21,35 @@
             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"/>
-        <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>
 

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)
+                }
+            }
     }
-}

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)
         }
 
     }

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()
+                    }
+                }
     }
 }