AuthMethodPicker

Change-Id: Ia02bdc186239fe32e804f37ac2c3c74ea715dd14

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java

@@ -31,8 +31,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mKickstarter = ViewModelProviders.of(this).get(SignInKickstarter.class);
         mKickstarter.init(getFlowParams());
-        mKickstarter.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                this, R.string.fui_progress_dialog_loading) {
+        mKickstarter.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 finish(RESULT_OK, response.toIntent());

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java

@@ -9,7 +9,6 @@
 import android.util.Log;
 
 import com.firebase.ui.auth.IdpResponse;
-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.InvisibleActivityBase;
@@ -47,8 +46,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mHandler.init(getFlowParams());
         mHandler.setResponse(response);
 
-        mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                this, R.string.fui_progress_dialog_loading) {
+        mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 finish(RESULT_OK, response.toIntent());

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -28,6 +28,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.firebase.ui.auth.AuthUI;
@@ -57,9 +58,13 @@
 /** Presents the list of authentication options for this app to the user. */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AuthMethodPickerActivity extends AppCompatBase {
+
     private SocialProviderResponseHandler mHandler;
     private List<ProviderSignInBase<?>> mProviders;
 
+    private ProgressBar mProgressBar;
+    private ViewGroup mProviderHolder;
+
     public static Intent createIntent(Context context, FlowParameters flowParams) {
         return createBaseIntent(context, AuthMethodPickerActivity.class, flowParams);
     }
@@ -69,6 +74,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fui_auth_method_picker_layout);
 
+        mProgressBar = findViewById(R.id.top_progress_bar);
+        mProviderHolder = findViewById(R.id.btn_holder);
+
         FlowParameters params = getFlowParams();
         mHandler = ViewModelProviders.of(this).get(SocialProviderResponseHandler.class);
         mHandler.init(params);
@@ -111,7 +119,6 @@ protected void onFailure(@NonNull Exception e) {
     private void populateIdpList(List<IdpConfig> providerConfigs,
                                  final SocialProviderResponseHandler handler) {
         ViewModelProvider supplier = ViewModelProviders.of(this);
-        ViewGroup providerHolder = findViewById(R.id.btn_holder);
 
         mProviders = new ArrayList<>();
         for (IdpConfig idpConfig : providerConfigs) {
@@ -158,8 +165,7 @@ private void populateIdpList(List<IdpConfig> providerConfigs,
             }
             mProviders.add(provider);
 
-            provider.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                    this, R.string.fui_progress_dialog_loading) {
+            provider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
                 @Override
                 protected void onSuccess(@NonNull IdpResponse response) {
                     handleResponse(response);
@@ -186,14 +192,14 @@ private void handleResponse(@NonNull IdpResponse response) {
                 }
             });
 
-            View loginButton = getLayoutInflater().inflate(buttonLayout, providerHolder, false);
+            View loginButton = getLayoutInflater().inflate(buttonLayout, mProviderHolder, false);
             loginButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     provider.startSignIn(AuthMethodPickerActivity.this);
                 }
             });
-            providerHolder.addView(loginButton);
+            mProviderHolder.addView(loginButton);
         }
     }
 
@@ -205,4 +211,24 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             provider.onActivityResult(requestCode, resultCode, data);
         }
     }
+
+    @Override
+    public void showProgress(int message) {
+        mProgressBar.setVisibility(View.VISIBLE);
+        for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
+            View child = mProviderHolder.getChildAt(i);
+            child.setEnabled(false);
+            child.setAlpha(0.75f);
+        }
+    }
+
+    @Override
+    public void hideProgress() {
+        mProgressBar.setVisibility(View.INVISIBLE);
+        for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
+            View child = mProviderHolder.getChildAt(i);
+            child.setEnabled(true);
+            child.setAlpha(1.0f);
+        }
+    }
 }

auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java

@@ -79,8 +79,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 throw new IllegalStateException("Invalid provider id: " + provider);
         }
 
-        mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                this, R.string.fui_progress_dialog_loading) {
+        mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 mHandler.startSignIn(response);

auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java

@@ -130,8 +130,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 throw new IllegalStateException("Invalid provider id: " + providerId);
         }
 
-        mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                this, R.string.fui_progress_dialog_loading) {
+        mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 handler.startSignIn(response);
@@ -155,8 +154,7 @@ public void onClick(View view) {
             }
         });
 
-        handler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
-                this, R.string.fui_progress_dialog_loading) {
+        handler.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 finish(RESULT_OK, response.toIntent());

auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java

@@ -5,6 +5,7 @@
 import android.support.annotation.RestrictTo;
 import android.support.annotation.StringRes;
 
+import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.State;
 import com.firebase.ui.auth.ui.FragmentBase;
@@ -20,6 +21,10 @@ public abstract class ResourceObserver<T> implements Observer<Resource<T>> {
     private final FragmentBase mFragment;
     private final int mLoadingMessage;
 
+    protected ResourceObserver(@NonNull HelperActivityBase activity) {
+        this(activity, null, activity, R.string.fui_progress_dialog_loading);
+    }
+
     protected ResourceObserver(@NonNull HelperActivityBase activity, @StringRes int message) {
         this(activity, null, activity, message);
     }

auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml

@@ -9,6 +9,13 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/top_progress_bar"
+        style="@style/FirebaseUI.TopProgressBar"
+        android:visibility="invisible"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible"/>
+
     <ImageView
         android:id="@+id/logo"
         style="@style/FirebaseUI.AuthMethodPicker.Logo"

auth/src/main/res/layout/fui_auth_method_picker_layout.xml

@@ -9,6 +9,13 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/top_progress_bar"
+        style="@style/FirebaseUI.TopProgressBar"
+        android:visibility="invisible"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible"/>
+
     <ImageView
         android:id="@+id/logo"
         style="@style/FirebaseUI.AuthMethodPicker.Logo"