Start removing progress dialogs

samtstern · samtstern · commit 2fec55498c0c · 2018-05-02T17:04:09.000-07:00
Change-Id: Ie8e5a0c5dd0105b1b9d79ef385836286cfe6375f
diff --git a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
@@ -12,14 +12,14 @@
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.data.remote.SignInKickstarter;
-import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.ui.InvisibleActivityBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class KickoffActivity extends HelperActivityBase {
+public class KickoffActivity extends InvisibleActivityBase {
     private SignInKickstarter mKickstarter;
 
     public static Intent createIntent(Context context, FlowParameters flowParams) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
@@ -7,6 +7,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
+import android.support.annotation.StringRes;
 import android.support.v7.app.AppCompatActivity;
 
 import com.firebase.ui.auth.IdpResponse;
@@ -74,10 +75,6 @@ public AuthHelper getAuthHelper() {
         return mAuthHelper;
     }
 
-    public ProgressDialogHolder getDialogHolder() {
-        return mProgressDialogHolder;
-    }
-
     public void finish(int resultCode, @Nullable Intent intent) {
         setResult(resultCode, intent);
         finish();
@@ -97,4 +94,16 @@ public void startSaveCredentials(
                 this, getFlowParams(), credential, response);
         startActivityForResult(intent, RequestCodes.CRED_SAVE_FLOW);
     }
+
+    public void showProgress(@StringRes int message) {
+        getDialogHolder().showLoadingDialog(message);
+    }
+
+    public void hideProgress() {
+        getDialogHolder().dismissDialog();
+    }
+
+    protected ProgressDialogHolder getDialogHolder() {
+        return mProgressDialogHolder;
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/InvisibleActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/InvisibleActivityBase.java
@@ -0,0 +1,75 @@
+package com.firebase.ui.auth.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
+import android.view.View;
+import android.widget.ProgressBar;
+
+import com.firebase.ui.auth.R;
+
+
+/**
+ * Base classes for activities that are just simple overlays.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class InvisibleActivityBase extends HelperActivityBase {
+
+    private static final long MIN_SPINNER_MS = 1000;
+
+    private Handler mHandler = new Handler();
+    private ProgressBar mProgressBar;
+    private long mLastShownTime = 0;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.fui_activity_kickoff);
+
+        // TODO: Set the color based on passed in theme
+        mProgressBar = findViewById(R.id.progress_spinner);
+    }
+
+    @Override
+    public void showProgress(int message) {
+        if (mProgressBar.getVisibility() == View.VISIBLE) {
+            mHandler.removeCallbacksAndMessages(null);
+            return;
+        }
+
+        mLastShownTime = System.currentTimeMillis();
+        mProgressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideProgress() {
+        doAfterTimeout(new Runnable() {
+            @Override
+            public void run() {
+                mLastShownTime = 0;
+                mProgressBar.setVisibility(View.INVISIBLE);
+            }
+        });
+    }
+
+    @Override
+    public void finish(int resultCode, @Nullable Intent intent) {
+        setResult(resultCode, intent);
+        doAfterTimeout(new Runnable() {
+            @Override
+            public void run() {
+                finish();
+            }
+        });
+    }
+
+    private void doAfterTimeout(Runnable runnable) {
+        long currentTime = System.currentTimeMillis();
+        long diff = currentTime - mLastShownTime;
+        long remaining = Math.max(MIN_SPINNER_MS - diff, 0);
+
+        mHandler.postDelayed(runnable, remaining);
+    }
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java b/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
@@ -18,7 +18,6 @@ public ProgressDialogHolder(Context context) {
 
     private void showLoadingDialog(String message) {
         dismissDialog();
-
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(mContext);
             mProgressDialog.setIndeterminate(true);
@@ -34,10 +33,11 @@ public void showLoadingDialog(@StringRes int stringResource) {
     }
 
     public void dismissDialog() {
-        if (mProgressDialog != null) {
+        if (isProgressDialogShowing()) {
             mProgressDialog.dismiss();
-            mProgressDialog = null;
         }
+
+        mProgressDialog = null;
     }
 
     public boolean isProgressDialogShowing() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java
@@ -12,7 +12,7 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.Resource;
-import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.ui.InvisibleActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.smartlock.SmartLockHandler;
@@ -21,7 +21,7 @@
 /**
  * Invisible Activity used for saving credentials to SmartLock.
  */
-public class CredentialSaveActivity extends HelperActivityBase {
+public class CredentialSaveActivity extends InvisibleActivityBase {
     private static final String TAG = "CredentialSaveActivity";
 
     private SmartLockHandler mHandler;
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java
@@ -4,6 +4,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.StringRes;
+import android.util.Log;
 
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.State;
@@ -34,10 +35,10 @@ private ResourceObserver(HelperActivityBase activity, FragmentBase fragment, int
     @Override
     public final void onChanged(Resource<T> resource) {
         if (resource.getState() == State.LOADING) {
-            mActivity.getDialogHolder().showLoadingDialog(mLoadingMessage);
+            mActivity.showProgress(mLoadingMessage);
             return;
         }
-        mActivity.getDialogHolder().dismissDialog();
+        mActivity.hideProgress();
 
         if (resource.isUsed()) { return; }
 
diff --git a/auth/src/main/res/layout/fui_activity_kickoff.xml b/auth/src/main/res/layout/fui_activity_kickoff.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/progress_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="invisible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:visibility="visible" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
@@ -12,11 +12,11 @@
 
     <style name="FirebaseUI.Transparent" parent="FirebaseUI">
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@color/fui_transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:backgroundDimEnabled">true</item>
     </style>
 
     <style name="FirebaseUI.WrapperStyle">

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public ProgressDialogHolder(Context context) {`
`18`	`18`
`19`	`19`	`private void showLoadingDialog(String message) {`
`20`	`20`	`dismissDialog();`
`21`		`-`
`22`	`21`	`if (mProgressDialog == null) {`
`23`	`22`	`mProgressDialog = new ProgressDialog(mContext);`
`24`	`23`	`mProgressDialog.setIndeterminate(true);`
`@@ -34,10 +33,11 @@ public void showLoadingDialog(@StringRes int stringResource) {`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public void dismissDialog() {`
`37`		`- if (mProgressDialog != null) {`
	`36`	`+ if (isProgressDialogShowing()) {`
`38`	`37`	`mProgressDialog.dismiss();`
`39`		`- mProgressDialog = null;`
`40`	`38`	`}`
	`39`	`+`
	`40`	`+ mProgressDialog = null;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public boolean isProgressDialogShowing() {`