From f3d87a8df21e7722b8a48179dd8f820ddaf057b0 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Sat, 25 Mar 2023 00:17:31 -0400
Subject: [PATCH] Added circular progress indicator during google sign in

---
 Habitica/res/layout/activity_login.xml        | 29 ++++++++++++++-----
 Habitica/res/values/styles.xml                |  8 +++++
 .../habitica/ui/activities/LoginActivity.kt   |  7 ++++-
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 830501bb8..6aa208a94 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -193,14 +193,29 @@
                         android:layout_marginTop="@dimen/spacing_xlarge"
                         style="@style/LoginButton"/>
 
-                    <Button
-                        android:id="@+id/google_login_button"
-                        android:layout_width="match_parent"
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
-                        android:layout_height="@dimen/diamond_button_height"
-                        android:text="@string/login_btn_google"
-                        android:drawableStart="@drawable/google_icon"
-                        style="@style/LoginButton"/>
+                        android:layout_height="wrap_content">
+
+                        <Button
+                            android:id="@+id/google_login_button"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/diamond_button_height"
+                            android:text="@string/login_btn_google"
+                            android:drawableStart="@drawable/google_icon"
+                            style="@style/LoginButton"/>
+
+                        <com.google.android.material.progressindicator.CircularProgressIndicator
+                            android:id="@+id/google_login_progress"
+                            style="@style/LoginButtonProgress"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:indeterminate="true"
+                            android:visibility="gone"
+                            app:indicatorColor="@color/white" />
+                        
+                    </RelativeLayout>
 
                     <Button
                         android:id="@+id/apple_login_button"
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 91a68d4e1..96eeaa7b0 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -718,6 +718,14 @@
         <item name="android:paddingEnd">32dp</item>
     </style>
 
+    <style name="LoginButtonProgress" parent="@style/Widget.Material3.CircularProgressIndicator">
+        <item name="indicatorSize">22dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:indeterminate">false</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginStart">@dimen/spacing_xlarge</item>
+    </style>
+
     <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/diamond_button</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index 70b09be29..ac50caf13 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -169,7 +169,9 @@ class LoginActivity : BaseActivity() {
         binding.showLoginButton.setOnClickListener { showLoginButtonClicked() }
         binding.backButton.setOnClickListener { backButtonClicked() }
         binding.forgotPassword.setOnClickListener { onForgotPasswordClicked() }
-        binding.googleLoginButton.setOnClickListener { viewModel.handleGoogleLogin(this, pickAccountResult) }
+        binding.googleLoginButton.setOnClickListener {
+            binding.googleLoginProgress.visibility = View.VISIBLE
+            viewModel.handleGoogleLogin(this, pickAccountResult) }
     }
 
     override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
@@ -304,6 +306,7 @@ class LoginActivity : BaseActivity() {
 
     private fun hideProgress() {
         runOnUiThread {
+            binding.googleLoginProgress.visibility = View.GONE
             binding.PBAsyncTask.visibility = View.GONE
         }
     }
@@ -327,6 +330,8 @@ class LoginActivity : BaseActivity() {
             viewModel.handleGoogleLoginResult(this, recoverFromPlayServicesErrorResult) { isNew ->
                 handleAuthResponse(isNew)
             }
+        } else {
+            binding.googleLoginProgress.visibility = View.GONE
         }
     }