Merge pull request #245 from Ayush0Chaudhary/copilot/fix-211-2

Fix login loader disappearing prematurely during Google authentication

Author: Ayush0Chaudhary

app/src/main/java/com/blurr/voice/LoginActivity.kt.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.View
 import android.widget.Button // Changed from SignInButton
 import android.widget.ProgressBar
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
@@ -32,6 +33,7 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var firebaseAuth: FirebaseAuth
     private lateinit var signInButton: Button // Changed from SignInButton
     private lateinit var progressBar: ProgressBar
+    private lateinit var loadingText: TextView
 
     // New ActivityResultLauncher for the modern Identity API
     private lateinit var googleSignInLauncher: ActivityResultLauncher<IntentSenderRequest>
@@ -42,6 +44,7 @@ class LoginActivity : AppCompatActivity() {
 
         signInButton = findViewById(R.id.googleSignInButton)
         progressBar = findViewById(R.id.progressBar)
+        loadingText = findViewById(R.id.loadingText)
         firebaseAuth = Firebase.auth
 
         // 1. Initialize the OneTapClient
@@ -70,19 +73,25 @@ class LoginActivity : AppCompatActivity() {
                     val googleIdToken = credential.googleIdToken
                     if (googleIdToken != null) {
                         Log.d("LoginActivity", "Got Google ID Token.")
-                        // Pass the token to Firebase
+                        // Pass the token to Firebase - keep progress bar visible during Firebase auth
                         firebaseAuthWithGoogle(googleIdToken)
                     } else {
                         Log.e("LoginActivity", "Google ID Token was null.")
                         Toast.makeText(this, "Google Sign-In failed.", Toast.LENGTH_SHORT).show()
+                        progressBar.visibility = View.GONE
+                        loadingText.visibility = View.GONE
                     }
                 } catch (e: ApiException) {
                     Log.w("LoginActivity", "Google sign in failed", e)
                     Toast.makeText(this, "Google Sign-In failed.", Toast.LENGTH_SHORT).show()
+                    progressBar.visibility = View.GONE
+                    loadingText.visibility = View.GONE
                 }
+            } else {
+                // User cancelled or there was an error - hide progress bar
+                progressBar.visibility = View.GONE
+                loadingText.visibility = View.GONE
             }
-            // Always hide the progress bar after the attempt
-            progressBar.visibility = View.GONE
         }
 
 
@@ -93,6 +102,7 @@ class LoginActivity : AppCompatActivity() {
 
     private fun signIn() {
         progressBar.visibility = View.VISIBLE
+        loadingText.visibility = View.VISIBLE
         // 4. Launch the sign-in flow
         oneTapClient.beginSignIn(signInRequest)
             .addOnSuccessListener(this) { result ->
@@ -104,19 +114,25 @@ class LoginActivity : AppCompatActivity() {
                 } catch (e: Exception) {
                     Log.e("LoginActivity", "Couldn't start One Tap UI: ${e.localizedMessage}")
                     progressBar.visibility = View.GONE
+                    loadingText.visibility = View.GONE
                 }
             }
             .addOnFailureListener(this) { e ->
                 Log.e("LoginActivity", "Sign-in failed: ${e.localizedMessage}")
                 Toast.makeText(this, "Sign-in failed. Please try again.", Toast.LENGTH_SHORT).show()
                 progressBar.visibility = View.GONE
+                loadingText.visibility = View.GONE
             }
     }
 
     private fun firebaseAuthWithGoogle(idToken: String) {
         val credential = GoogleAuthProvider.getCredential(idToken, null)
         firebaseAuth.signInWithCredential(credential)
             .addOnCompleteListener(this) { task ->
+                // Hide progress bar and loading text when Firebase authentication completes
+                progressBar.visibility = View.GONE
+                loadingText.visibility = View.GONE
+                
                 if (task.isSuccessful) {
                     val isNewUser = task.result?.additionalUserInfo?.isNewUser ?: false
 

app/src/main/res/layout/activity_onboarding.xml

@@ -25,7 +25,7 @@
         android:layout_above="@id/googleSignInButton"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="16dp"
-        android:text="Use the invited email to unlock most of the features"
+        android:text="Your AI assistant for Android"
         android:textAlignment="center"
         android:textColor="@android:color/white"
         android:textSize="16sp" />
@@ -59,4 +59,16 @@
         android:layout_centerInParent="true"
         android:visibility="gone"/>
 
+    <TextView
+        android:id="@+id/loadingText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/progressBar"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="16dp"
+        android:text="Signing you in..."
+        android:textColor="@android:color/white"
+        android:textSize="14sp"
+        android:visibility="gone" />
+
 </RelativeLayout>