refactor(rtdb): replace ProgressDialog with ProgressBar (firebase#1018)

Author: thatfiredev

database/app/src/main/java/com/google/firebase/quickstart/database/java/BaseActivity.java

@@ -1,28 +1,30 @@
 package com.google.firebase.quickstart.database.java;
 
-import android.app.ProgressDialog;
+import android.view.View;
+import android.widget.ProgressBar;
+
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.firebase.auth.FirebaseAuth;
 
 
 public class BaseActivity extends AppCompatActivity {
 
-    private ProgressDialog mProgressDialog;
+    private ProgressBar mProgressBar;
 
-    public void showProgressDialog() {
-        if (mProgressDialog == null) {
-            mProgressDialog = new ProgressDialog(this);
-            mProgressDialog.setCancelable(false);
-            mProgressDialog.setMessage("Loading...");
-        }
+    public void setProgressBar(int resId) {
+        mProgressBar = findViewById(resId);
+    }
 
-        mProgressDialog.show();
+    public void showProgressBar() {
+        if (mProgressBar != null) {
+            mProgressBar.setVisibility(View.VISIBLE);
+        }
     }
 
-    public void hideProgressDialog() {
-        if (mProgressDialog != null && mProgressDialog.isShowing()) {
-            mProgressDialog.dismiss();
+    public void hideProgressBar() {
+        if (mProgressBar != null) {
+            mProgressBar.setVisibility(View.INVISIBLE);
         }
     }
 

database/app/src/main/java/com/google/firebase/quickstart/database/java/SignInActivity.java

@@ -45,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPasswordField = findViewById(R.id.fieldPassword);
         mSignInButton = findViewById(R.id.buttonSignIn);
         mSignUpButton = findViewById(R.id.buttonSignUp);
+        setProgressBar(R.id.progressBar);
 
         // Click listeners
         mSignInButton.setOnClickListener(this);
@@ -67,7 +68,7 @@ private void signIn() {
             return;
         }
 
-        showProgressDialog();
+        showProgressBar();
         String email = mEmailField.getText().toString();
         String password = mPasswordField.getText().toString();
 
@@ -76,7 +77,7 @@ private void signIn() {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
                         Log.d(TAG, "signIn:onComplete:" + task.isSuccessful());
-                        hideProgressDialog();
+                        hideProgressBar();
 
                         if (task.isSuccessful()) {
                             onAuthSuccess(task.getResult().getUser());
@@ -94,7 +95,7 @@ private void signUp() {
             return;
         }
 
-        showProgressDialog();
+        showProgressBar();
         String email = mEmailField.getText().toString();
         String password = mPasswordField.getText().toString();
 
@@ -103,7 +104,7 @@ private void signUp() {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
                         Log.d(TAG, "createUser:onComplete:" + task.isSuccessful());
-                        hideProgressDialog();
+                        hideProgressBar();
 
                         if (task.isSuccessful()) {
                             onAuthSuccess(task.getResult().getUser());

database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/BaseActivity.kt

@@ -1,33 +1,26 @@
 package com.google.firebase.quickstart.database.kotlin
 
-import android.app.ProgressDialog
+import android.view.View
+import android.widget.ProgressBar
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.auth.FirebaseAuth
 
 open class BaseActivity : AppCompatActivity() {
 
-    private var progressDialog: ProgressDialog? = null
+    private var progressBar: ProgressBar? = null
 
     val uid: String
         get() = FirebaseAuth.getInstance().currentUser!!.uid
 
-    fun showProgressDialog() {
-        if (progressDialog == null) {
-            val pd = ProgressDialog(this)
-            pd.setCancelable(false)
-            pd.setMessage("Loading...")
-
-            progressDialog = pd
-        }
+    fun setProgressBar(resId: Int) {
+        progressBar = findViewById(resId)
+    }
 
-        progressDialog?.show()
+    fun showProgressBar() {
+        progressBar?.visibility = View.VISIBLE
     }
 
-    fun hideProgressDialog() {
-        progressDialog?.let {
-            if (it.isShowing) {
-                it.dismiss()
-            }
-        }
+    fun hideProgressBar() {
+        progressBar?.visibility = View.INVISIBLE
     }
 }

database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/SignInActivity.kt

@@ -29,6 +29,8 @@ class SignInActivity : BaseActivity(), View.OnClickListener {
         database = FirebaseDatabase.getInstance().reference
         auth = FirebaseAuth.getInstance()
 
+        setProgressBar(R.id.progressBar)
+
         // Click listeners
         buttonSignIn.setOnClickListener(this)
         buttonSignUp.setOnClickListener(this)
@@ -49,14 +51,14 @@ class SignInActivity : BaseActivity(), View.OnClickListener {
             return
         }
 
-        showProgressDialog()
+        showProgressBar()
         val email = fieldEmail.text.toString()
         val password = fieldPassword.text.toString()
 
         auth.signInWithEmailAndPassword(email, password)
                 .addOnCompleteListener(this) { task ->
                     Log.d(TAG, "signIn:onComplete:" + task.isSuccessful)
-                    hideProgressDialog()
+                    hideProgressBar()
 
                     if (task.isSuccessful) {
                         onAuthSuccess(task.result?.user!!)
@@ -73,14 +75,14 @@ class SignInActivity : BaseActivity(), View.OnClickListener {
             return
         }
 
-        showProgressDialog()
+        showProgressBar()
         val email = fieldEmail.text.toString()
         val password = fieldPassword.text.toString()
 
         auth.createUserWithEmailAndPassword(email, password)
                 .addOnCompleteListener(this) { task ->
                     Log.d(TAG, "createUser:onComplete:" + task.isSuccessful)
-                    hideProgressDialog()
+                    hideProgressBar()
 
                     if (task.isSuccessful) {
                         onAuthSuccess(task.result?.user!!)

database/app/src/main/res/layout/activity_sign_in.xml

@@ -8,13 +8,21 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin">
 
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:indeterminate="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        style="?android:attr/progressBarStyleHorizontal"/>
 
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:layout_below="@+id/progressBar"
         android:src="@drawable/firebase_lockup_400" />
 
     <LinearLayout