implemented logout

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MainActivity.kt

@@ -1,27 +1,24 @@
 package com.google.samples.quickstart.canonical
 
-import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.AttributeSet
 import android.util.Log
-import android.view.View
-import android.widget.Button
 import androidx.fragment.app.FragmentTransaction
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.SignInButton
 import com.google.android.gms.common.api.ApiException
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
 
 class MainActivity : AppCompatActivity() {
-  private lateinit var mGoogleSignInClient: GoogleSignInClient
+  lateinit var mGoogleSignInClient: GoogleSignInClient
   private lateinit var auth: FirebaseAuth
+  private val tag = "MainActivity-Login"
+  private val firebaseTag = "MainActivity-Login"
 
   private fun googleSignInInit() {
     val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
@@ -38,6 +35,51 @@ class MainActivity : AppCompatActivity() {
     startActivityForResult(signInIntent, RC_SIGN_IN)
   }
 
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+
+    // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
+    if (requestCode == RC_SIGN_IN) {
+      val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+      if (task.isSuccessful) {
+        try {
+          // Google Sign In was successful, authenticate with Firebase
+          val account = task.getResult(ApiException::class.java)!!
+          Log.d(tag, "firebaseAuthWithGoogle:" + account.id)
+          firebaseAuthWithGoogle(account.idToken!!)
+          setContentView(R.layout.activity_main)
+          setupNavigationBar()
+        } catch (e: ApiException) {
+          // Google Sign In failed
+          Log.w(tag, "Google sign in failed", e)
+        }
+      } else {
+        Log.w(tag, "Google sign in unsuccessful")
+      }
+
+    }
+    // No other requestCode, ignore it.
+  }
+
+
+  private fun firebaseAuthWithGoogle(idToken: String) {
+    val credential = GoogleAuthProvider.getCredential(idToken, null)
+    auth.signInWithCredential(credential)
+      .addOnCompleteListener(this) { task ->
+        if (task.isSuccessful) {
+          // Firebase Sign in success, update UI with the signed-in user's information
+          Log.d(firebaseTag, "signInWithCredential:success")
+          val user = auth.currentUser
+          Log.d(firebaseTag, "signed-in user's Email:" + user!!.email)
+        } else {
+          // If sign in fails, log a message to the user.
+          Log.w(firebaseTag, "signInWithCredential:failure", task.exception)
+        }
+      }
+  }
+
+
   private fun setupNavigationBar() {
     val runFragment = RunFragment()
     supportFragmentManager
@@ -85,78 +127,32 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
 
     googleSignInInit()
     setupNavigationBar()
+
   }
 
+
   override fun onStart() {
     super.onStart()
     val account = GoogleSignIn.getLastSignedInAccount(this)
     if (account == null) {
       setContentView(R.layout.login_in_page)
-
       findViewById<SignInButton>(R.id.sign_in_button).setOnClickListener {
         signIn()
       }
-
-    }
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    super.onActivityResult(requestCode, resultCode, data)
-
-    // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
-    if (requestCode == RC_SIGN_IN) {
-      val task = GoogleSignIn.getSignedInAccountFromIntent(data)
-      if (task.isSuccessful) {
-        try {
-          // Google Sign In was successful, authenticate with Firebase
-          val account = task.getResult(ApiException::class.java)!!
-          Log.d("MainActivity-Login", "firebaseAuthWithGoogle:" + account.id)
-          firebaseAuthWithGoogle(account.idToken!!)
-          setContentView(R.layout.activity_main)
-          setupNavigationBar()
-        } catch (e: ApiException) {
-          // Google Sign In failed, update UI appropriately
-          Log.w("MainActivity-Login", "Google sign in failed", e)
-          // ...
-        }
-      } else {
-        Log.w("MainActivity-Login", "Google sign in unsuccessful")
-      }
-
     }
   }
 
-  private fun firebaseAuthWithGoogle(idToken: String) {
-    val credential = GoogleAuthProvider.getCredential(idToken, null)
-    auth.signInWithCredential(credential)
-      .addOnCompleteListener(this) { task ->
-        if (task.isSuccessful) {
-          // Sign in success, update UI with the signed-in user's information
-          Log.d("firebaseAuthWithGoogle", "signInWithCredential:success")
-          val user = auth.currentUser
-        } else {
-          // If sign in fails, display a message to the user.
-          Log.w("firebaseAuthWithGoogle", "signInWithCredential:failure", task.exception)
-          // ...
-        }
-
-        // ...
-      }
-  }
-
-
 
   companion object {
     private const val RC_SIGN_IN = 0
   }
 
 
-
-
 }

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MeFragment.kt

@@ -1,20 +1,20 @@
 package com.google.samples.quickstart.canonical
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.firebase.auth.FirebaseAuth
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
 private const val ARG_PARAM1 = "param1"
 private const val ARG_PARAM2 = "param2"
+private const val meTag = "MeFragment"
 
 /**
  * A simple [Fragment] subclass.
@@ -25,24 +25,13 @@ class MeFragment : Fragment() {
     // TODO: Rename and change types of parameters
     private var param1: String? = null
     private var param2: String? = null
-    private lateinit var mAuth : FirebaseAuth
-    private lateinit var mGoogleSignInClient : GoogleSignInClient
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
             param1 = it.getString(ARG_PARAM1)
             param2 = it.getString(ARG_PARAM2)
         }
-
-//        // Configure Google Sign In
-//        val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-//            .requestIdToken(getString(R.string.default_web_client_id))
-//            .requestEmail()
-//            .build()
-//
-//        mGoogleSignInClient = GoogleSignIn.getClient(this.context!!, gso)
-//        mAuth = FirebaseAuth.getInstance()
     }
 
 
@@ -54,16 +43,33 @@ class MeFragment : Fragment() {
         return inflater.inflate(R.layout.fragment_me, container, false)
     }
 
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val logoutButton : Button = view.findViewById(R.id.logout_button)
+        logoutButton.setOnClickListener {
+            // Sign out both Google account and Firebase
+            FirebaseAuth.getInstance().signOut()
+            (activity as MainActivity).mGoogleSignInClient.signOut().addOnCompleteListener {
+                val intent = Intent(context, MainActivity::class.java)
+                startActivity(intent)
+            }
+        }
+    }
+
+
     override fun onStart() {
         super.onStart()
         val account = GoogleSignIn.getLastSignedInAccount(this.context)
         account?.let {
-            Log.i("MeFragment", "No login")
+            Log.i(meTag, "Already login")
+            view?.findViewById<TextView>(R.id.textView)?.text = account.displayName
         } ?.run {
-            Log.i("MeFragment", "Already login")
+            Log.i(meTag, "No login")
         }
     }
 
+
     companion object {
         /**
          * Use this factory method to create a new instance of

android/canonical/app/src/main/res/layout/fragment_me.xml

@@ -17,4 +17,14 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/logout_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/logout_button_text"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

android/canonical/app/src/main/res/values/strings.xml

@@ -10,4 +10,5 @@
     <string name="stopped">Stopped</string>
     <string name="my_location_title">My location</string>
     <string name="cannot_access_location">Cannot access location now. Please Try later</string>
+    <string name="logout_button_text">Logout</string>
 </resources>