Add support for specifying a logo in the AuthMethodPickerActivity (#150)

Author: amandle

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.MainThread;
 import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
@@ -78,6 +79,16 @@ public class AuthUiActivity extends Activity {
     @BindView(android.R.id.content)
     View mRootView;
 
+    @BindView(R.id.firebase_logo)
+    RadioButton mFirebaseLogo;
+
+    @BindView(R.id.google_logo)
+    RadioButton mGoogleLogo;
+
+    @BindView(R.id.no_logo)
+    RadioButton mNoLogo;
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -113,6 +124,7 @@ public void signIn(View view) {
         startActivityForResult(
                 AuthUI.getInstance().createSignInIntentBuilder()
                         .setTheme(getSelectedTheme())
+                        .setLogo(getSelectedLogo())
                         .setProviders(getSelectedProviders())
                         .setTosUrl(getSelectedTosUrl())
                         .build(),
@@ -160,6 +172,17 @@ private int getSelectedTheme() {
         return R.style.GreenTheme;
     }
 
+    @MainThread
+    @DrawableRes
+    private int getSelectedLogo() {
+        if (mFirebaseLogo.isChecked()) {
+            return R.drawable.firebase_auth_120dp;
+        } else if (mGoogleLogo.isChecked()) {
+            return R.drawable.logo_googleg_color_144dp;
+        }
+        return AuthUI.NO_LOGO;
+    }
+
     @MainThread
     private String[] getSelectedProviders() {
         ArrayList<String> selectedProviders = new ArrayList<>();

app/src/main/res/drawable-hdpi/logo_googleg_color_144dp.png

@@ -117,6 +117,39 @@
                 android:text="@string/firebase_tos_label" />
         </RadioGroup>
 
+        <TextView
+            style="@style/Base.TextAppearance.AppCompat.Subhead"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/logo_header" />
+
+        <RadioGroup
+            android:layout_marginBottom="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RadioButton
+                android:id="@+id/firebase_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/firebase_logo_label" />
+
+            <RadioButton
+                android:id="@+id/google_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/google_logo_label" />
+
+            <RadioButton
+                android:id="@+id/no_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/no_logo_label" />
+        </RadioGroup>
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>

app/src/main/res/drawable-mdpi/logo_googleg_color_144dp.png

@@ -14,6 +14,10 @@
     <string name="green_theme">Green Theme</string>
     <string name="purple_theme">Purple Theme</string>
     <string name="use_theme_header">Use theme:</string>
+    <string name="logo_header">Logo:</string>
+    <string name="firebase_logo_label">Firebase Auth</string>
+    <string name="google_logo_label">Google</string>
+    <string name="no_logo_label">None</string>
     <string name="auth_providers_header">Use auth providers:</string>
     <string name="email_label">Email</string>
     <string name="facebook_label">Facebook</string>

app/src/main/res/drawable-xhdpi/logo_googleg_color_144dp.png

@@ -17,13 +17,15 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StyleRes;
 
 import com.firebase.ui.auth.provider.IDPProviderParcel;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.ChooseAccountActivity;
+import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.util.CredentialsApiHelper;
 import com.firebase.ui.auth.util.Preconditions;
 import com.firebase.ui.auth.util.ProviderHelper;
@@ -220,6 +222,12 @@ public class AuthUI {
      */
     public static final String FACEBOOK_PROVIDER = "facebook";
 
+    /**
+     * Default value for logo resource, omits the logo from the
+     * {@link AuthMethodPickerActivity}
+     */
+    public static final int NO_LOGO = -1;
+
     /**
      * The set of authentication providers supported in Firebase Auth UI.
      */
@@ -306,6 +314,7 @@ public static AuthUI getInstance(FirebaseApp app) {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder {
+        private int mLogo = NO_LOGO;
         private int mTheme = getDefaultTheme();
         private List<String> mProviders = Collections.singletonList(EMAIL_PROVIDER);
         private String mTosUrl;
@@ -325,6 +334,15 @@ public SignInIntentBuilder setTheme(@StyleRes int theme) {
             return this;
         }
 
+        /**
+         * Specifies the logo to use for the {@link AuthMethodPickerActivity}. If no logo
+         * is specified, none will be used.
+         */
+        public SignInIntentBuilder setLogo(@DrawableRes int logo) {
+            mLogo = logo;
+            return this;
+        }
+
         /**
          * Specifies the terms-of-service URL for the application.
          */
@@ -365,6 +383,7 @@ public Intent build() {
                             mApp.getName(),
                             providerInfo,
                             mTheme,
+                            mLogo,
                             mTosUrl));
         }
     }

app/src/main/res/drawable-xxhdpi/logo_googleg_color_144dp.png

@@ -15,6 +15,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StyleRes;
@@ -39,17 +40,22 @@ public class FlowParameters implements Parcelable {
     @StyleRes
     public final int themeId;
 
+    @DrawableRes
+    public final int logoId;
+
     @Nullable
     public final String termsOfServiceUrl;
 
     public FlowParameters(
             @NonNull String appName,
             @NonNull List<IDPProviderParcel> providerInfo,
             @StyleRes int themeId,
+            @DrawableRes int logoId,
             @Nullable String termsOfServiceUrl) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providerInfo = Preconditions.checkNotNull(providerInfo, "providerInfo cannot be null");
         this.themeId = themeId;
+        this.logoId = logoId;
         this.termsOfServiceUrl = termsOfServiceUrl;
     }
 
@@ -58,6 +64,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(appName);
         dest.writeTypedList(providerInfo);
         dest.writeInt(themeId);
+        dest.writeInt(logoId);
         dest.writeString(termsOfServiceUrl);
     }
 
@@ -73,8 +80,9 @@ public FlowParameters createFromParcel(Parcel in) {
             List<IDPProviderParcel> providerInfo =
                     in.createTypedArrayList(IDPProviderParcel.CREATOR);
             int themeId = in.readInt();
+            int logoId = in.readInt();
             String termsOfServiceUrl = in.readString();
-            return new FlowParameters(appName, providerInfo, themeId, termsOfServiceUrl);
+            return new FlowParameters(appName, providerInfo, themeId, logoId, termsOfServiceUrl);
         }
 
         @Override