Refactor Provider to simplify inflating each idp button

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.LayoutRes;
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
@@ -31,6 +32,12 @@ public String getProviderId() {
         return EmailAuthProvider.PROVIDER_ID;
     }
 
+    @Override
+    @LayoutRes
+    public int getButtonLayout() {
+        return R.layout.provider_button_email;
+    }
+
     @Override
     public void startLogin(Activity activity) {
         activity.startActivityForResult(

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.StyleRes;
 import android.util.Log;
 
@@ -91,6 +92,12 @@ public String getProviderId() {
         return FacebookAuthProvider.PROVIDER_ID;
     }
 
+    @Override
+    @LayoutRes
+    public int getButtonLayout() {
+        return R.layout.idp_button_facebook;
+    }
+
     @Override
     public void startLogin(Activity activity) {
         sCallbackManager = CallbackManager.Factory.create();

auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
@@ -107,6 +108,12 @@ public String getProviderId() {
         return GoogleAuthProvider.PROVIDER_ID;
     }
 
+    @Override
+    @LayoutRes
+    public int getButtonLayout() {
+        return R.layout.idp_button_google;
+    }
+
     @Override
     public void setAuthenticationCallback(IdpCallback callback) {
         mIdpCallback = callback;

auth/src/main/java/com/firebase/ui/auth/provider/Provider.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.LayoutRes;
 
 import com.google.firebase.auth.GoogleAuthProvider;
 
@@ -13,6 +14,10 @@ public interface Provider {
     /** Retrieves the id of the IDP, e.g. {@link GoogleAuthProvider#PROVIDER_ID}. */
     String getProviderId();
 
+    /** Retrieves the layout id of the button to inflate and/or set a click listener. */
+    @LayoutRes
+    int getButtonLayout();
+
     /** Start the login process for the IDP, e.g. show the Google sign-in activity. */
     void startLogin(Activity activity);
 

auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.LayoutRes;
 import android.util.Log;
 
 import com.firebase.ui.auth.IdpResponse;
@@ -57,6 +58,12 @@ public String getProviderId() {
         return TwitterAuthProvider.PROVIDER_ID;
     }
 
+    @Override
+    @LayoutRes
+    public int getButtonLayout() {
+        return R.layout.idp_button_twitter;
+    }
+
     @Override
     public void setAuthenticationCallback(IdpCallback callback) {
         mCallbackObject = callback;

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

@@ -43,10 +43,6 @@
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.GoogleAuthProvider;
-import com.google.firebase.auth.TwitterAuthProvider;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -112,41 +108,20 @@ private void populateIdpList(List<IdpConfig> providers) {
 
         ViewGroup btnHolder = (ViewGroup) findViewById(R.id.btn_holder);
         for (final Provider provider : mProviders) {
-            View loginButton = null;
-            switch (provider.getProviderId()) {
-                case GoogleAuthProvider.PROVIDER_ID:
-                    loginButton = getLayoutInflater()
-                            .inflate(R.layout.idp_button_google, btnHolder, false);
-                    break;
-                case FacebookAuthProvider.PROVIDER_ID:
-                    loginButton = getLayoutInflater()
-                            .inflate(R.layout.idp_button_facebook, btnHolder, false);
-                    break;
-                case TwitterAuthProvider.PROVIDER_ID:
-                    loginButton = getLayoutInflater()
-                            .inflate(R.layout.idp_button_twitter, btnHolder, false);
-                    break;
-                case EmailAuthProvider.PROVIDER_ID:
-                    loginButton = getLayoutInflater()
-                            .inflate(R.layout.provider_button_email, btnHolder, false);
-                    break;
-                default:
-                    Log.e(TAG, "No button for provider " + provider.getProviderId());
-            }
-
-            if (loginButton != null) {
-                loginButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
-                        provider.startLogin(AuthMethodPickerActivity.this);
-                    }
-                });
-                if (provider instanceof IdpProvider) {
-                    ((IdpProvider) provider).setAuthenticationCallback(this);
+            View loginButton = getLayoutInflater()
+                    .inflate(provider.getButtonLayout(), btnHolder, false);
+
+            loginButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
+                    provider.startLogin(AuthMethodPickerActivity.this);
                 }
-                btnHolder.addView(loginButton);
+            });
+            if (provider instanceof IdpProvider) {
+                ((IdpProvider) provider).setAuthenticationCallback(this);
             }
+            btnHolder.addView(loginButton);
         }
     }