Merge pull request #1222 from firebase/version-3.3.0

Version 3.3.0

Author: samtstern

README.md

@@ -47,16 +47,16 @@ libraries.
 ```groovy
 dependencies {
 // FirebaseUI for Firebase Realtime Database
-implementation 'com.firebaseui:firebase-ui-database:3.2.2'
+implementation 'com.firebaseui:firebase-ui-database:3.3.0'
 
 // FirebaseUI for Cloud Firestore
-implementation 'com.firebaseui:firebase-ui-firestore:3.2.2'
+implementation 'com.firebaseui:firebase-ui-firestore:3.3.0'
 
 // FirebaseUI for Firebase Auth
-implementation 'com.firebaseui:firebase-ui-auth:3.2.2'
+implementation 'com.firebaseui:firebase-ui-auth:3.3.0'
 
 // FirebaseUI for Cloud Storage
-implementation 'com.firebaseui:firebase-ui-storage:3.2.2'
+implementation 'com.firebaseui:firebase-ui-storage:3.3.0'
 }
 ```
 
@@ -103,6 +103,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 3.3.0              | 12.0.1                         |
 | 3.2.2              | 11.8.0                         |
 | 3.1.3              | 11.8.0                         |
 | 3.1.2              | 11.6.2                         |

app/build.gradle

@@ -38,14 +38,14 @@ android {
 dependencies {
     implementation "com.google.firebase:firebase-core:$firebaseVersion"
     implementation "com.android.support:design:$supportLibraryVersion"
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'com.android.support:multidex:1.0.3'
 
     implementation project(path: ':auth')
     implementation project(path: ':firestore')
     implementation project(path: ':database')
     implementation project(path: ':storage')
 
-    implementation 'com.facebook.android:facebook-login:4.30.0'
+    implementation 'com.facebook.android:facebook-login:4.31.0'
     // Needed to override Facebook
     implementation "com.android.support:cardview-v7:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
@@ -58,7 +58,7 @@ dependencies {
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
     implementation "android.arch.lifecycle:runtime:$architectureVersion"
-    implementation 'pub.devrel:easypermissions:1.1.3'
+    implementation 'pub.devrel:easypermissions:1.2.0'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
@@ -38,7 +39,7 @@ public class ChooserActivity extends AppCompatActivity {
     RecyclerView mActivities;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chooser);
         ButterKnife.bind(this);

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

@@ -18,6 +18,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
 import android.support.design.widget.Snackbar;
@@ -58,96 +59,49 @@ public class AuthUiActivity extends AppCompatActivity {
 
     private static final int RC_SIGN_IN = 100;
 
-    @BindView(R.id.default_theme)
-    RadioButton mUseDefaultTheme;
+    @BindView(R.id.root) View mRootView;
+    @BindView(R.id.sign_in) Button mSignIn;
 
-    @BindView(R.id.green_theme)
-    RadioButton mUseGreenTheme;
+    @BindView(R.id.google_provider) CheckBox mUseGoogleProvider;
+    @BindView(R.id.facebook_provider) CheckBox mUseFacebookProvider;
+    @BindView(R.id.twitter_provider) CheckBox mUseTwitterProvider;
+    @BindView(R.id.email_provider) CheckBox mUseEmailProvider;
+    @BindView(R.id.phone_provider) CheckBox mUsePhoneProvider;
 
-    @BindView(R.id.purple_theme)
-    RadioButton mUsePurpleTheme;
+    @BindView(R.id.default_theme) RadioButton mUseDefaultTheme;
+    @BindView(R.id.green_theme) RadioButton mUseGreenTheme;
+    @BindView(R.id.purple_theme) RadioButton mUsePurpleTheme;
+    @BindView(R.id.dark_theme) RadioButton mUseDarkTheme;
 
-    @BindView(R.id.dark_theme)
-    RadioButton mUseDarkTheme;
+    @BindView(R.id.firebase_logo) RadioButton mFirebaseLogo;
+    @BindView(R.id.google_logo) RadioButton mGoogleLogo;
+    @BindView(R.id.no_logo) RadioButton mNoLogo;
 
-    @BindView(R.id.email_provider)
-    CheckBox mUseEmailProvider;
+    @BindView(R.id.google_tos) RadioButton mUseGoogleTos;
+    @BindView(R.id.firebase_tos) RadioButton mUseFirebaseTos;
 
-    @BindView(R.id.phone_provider)
-    CheckBox mUsePhoneProvider;
+    @BindView(R.id.google_privacy) RadioButton mUseGooglePrivacyPolicy;
+    @BindView(R.id.firebase_privacy) RadioButton mUseFirebasePrivacyPolicy;
 
-    @BindView(R.id.google_provider)
-    CheckBox mUseGoogleProvider;
+    @BindView(R.id.google_scopes_header) TextView mGoogleScopesLabel;
+    @BindView(R.id.google_scope_drive_file) CheckBox mGoogleScopeDriveFile;
+    @BindView(R.id.google_scope_youtube_data) CheckBox mGoogleScopeYoutubeData;
 
-    @BindView(R.id.facebook_provider)
-    CheckBox mUseFacebookProvider;
+    @BindView(R.id.facebook_permissions_header) TextView mFacebookScopesLabel;
+    @BindView(R.id.facebook_permission_friends) CheckBox mFacebookScopeFriends;
+    @BindView(R.id.facebook_permission_photos) CheckBox mFacebookScopePhotos;
 
-    @BindView(R.id.twitter_provider)
-    CheckBox mUseTwitterProvider;
-
-    @BindView(R.id.google_tos)
-    RadioButton mUseGoogleTos;
-
-    @BindView(R.id.firebase_tos)
-    RadioButton mUseFirebaseTos;
-
-    @BindView(R.id.google_privacy)
-    RadioButton mUseGooglePrivacyPolicy;
-
-    @BindView(R.id.firebase_privacy)
-    RadioButton mUseFirebasePrivacyPolicy;
-
-    @BindView(R.id.sign_in)
-    Button mSignIn;
-
-    @BindView(R.id.root)
-    View mRootView;
-
-    @BindView(R.id.firebase_logo)
-    RadioButton mFirebaseLogo;
-
-    @BindView(R.id.google_logo)
-    RadioButton mGoogleLogo;
-
-    @BindView(R.id.no_logo)
-    RadioButton mNoLogo;
-
-    @BindView(R.id.credential_selector_enabled)
-    CheckBox mEnableCredentialSelector;
-
-    @BindView(R.id.hint_selector_enabled)
-    CheckBox mEnableHintSelector;
-
-    @BindView(R.id.allow_new_email_accounts)
-    CheckBox mAllowNewEmailAccounts;
-
-    @BindView(R.id.require_name)
-    CheckBox mRequireName;
-
-    @BindView(R.id.facebook_scopes_label)
-    TextView mFacebookScopesLabel;
-
-    @BindView(R.id.facebook_scope_friends)
-    CheckBox mFacebookScopeFriends;
-
-    @BindView(R.id.facebook_scope_photos)
-    CheckBox mFacebookScopePhotos;
-
-    @BindView(R.id.google_scopes_label)
-    TextView mGoogleScopesLabel;
-
-    @BindView(R.id.google_scope_drive_file)
-    CheckBox mGoogleScopeDriveFile;
-
-    @BindView(R.id.google_scope_youtube_data)
-    CheckBox mGoogleScopeYoutubeData;
+    @BindView(R.id.credential_selector_enabled) CheckBox mEnableCredentialSelector;
+    @BindView(R.id.hint_selector_enabled) CheckBox mEnableHintSelector;
+    @BindView(R.id.allow_new_email_accounts) CheckBox mAllowNewEmailAccounts;
+    @BindView(R.id.require_name) CheckBox mRequireName;
 
     public static Intent createIntent(Context context) {
         return new Intent(context, AuthUiActivity.class);
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.auth_ui_layout);
         ButterKnife.bind(this);
@@ -217,10 +171,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == RC_SIGN_IN) {
             handleSignInResponse(resultCode, data);
-            return;
         }
-
-        showSnackbar(R.string.unknown_response);
     }
 
     @Override
@@ -259,29 +210,7 @@ private void handleSignInResponse(int resultCode, Intent data) {
     }
 
     private void startSignedInActivity(IdpResponse response) {
-        startActivity(
-                SignedInActivity.createIntent(
-                        this,
-                        response,
-                        new SignedInActivity.SignedInConfig(
-                                getSelectedLogo(),
-                                getSelectedTheme(),
-                                getSelectedProviders(),
-                                getSelectedTosUrl(),
-                                mEnableCredentialSelector.isChecked(),
-                                mEnableHintSelector.isChecked())));
-    }
-
-    private void setGoogleScopesEnabled(boolean enabled) {
-        mGoogleScopesLabel.setEnabled(enabled);
-        mGoogleScopeDriveFile.setEnabled(enabled);
-        mGoogleScopeYoutubeData.setEnabled(enabled);
-    }
-
-    private void setFacebookScopesEnabled(boolean enabled) {
-        mFacebookScopesLabel.setEnabled(enabled);
-        mFacebookScopeFriends.setEnabled(enabled);
-        mFacebookScopePhotos.setEnabled(enabled);
+        startActivity(SignedInActivity.createIntent(this, response));
     }
 
     @OnClick({R.id.default_theme, R.id.purple_theme, R.id.green_theme, R.id.dark_theme})
@@ -380,19 +309,16 @@ private boolean isTwitterMisconfigured() {
         return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
     }
 
-    private void showSnackbar(@StringRes int errorMessageRes) {
-        Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
+    private void setGoogleScopesEnabled(boolean enabled) {
+        mGoogleScopesLabel.setEnabled(enabled);
+        mGoogleScopeDriveFile.setEnabled(enabled);
+        mGoogleScopeYoutubeData.setEnabled(enabled);
     }
 
-    private List<String> getFacebookPermissions() {
-        List<String> result = new ArrayList<>();
-        if (mFacebookScopeFriends.isChecked()) {
-            result.add("user_friends");
-        }
-        if (mFacebookScopePhotos.isChecked()) {
-            result.add("user_photos");
-        }
-        return result;
+    private void setFacebookScopesEnabled(boolean enabled) {
+        mFacebookScopesLabel.setEnabled(enabled);
+        mFacebookScopeFriends.setEnabled(enabled);
+        mFacebookScopePhotos.setEnabled(enabled);
     }
 
     private List<String> getGoogleScopes() {
@@ -405,4 +331,19 @@ private List<String> getGoogleScopes() {
         }
         return result;
     }
+
+    private List<String> getFacebookPermissions() {
+        List<String> result = new ArrayList<>();
+        if (mFacebookScopeFriends.isChecked()) {
+            result.add("user_friends");
+        }
+        if (mFacebookScopePhotos.isChecked()) {
+            result.add("user_photos");
+        }
+        return result;
+    }
+
+    private void showSnackbar(@StringRes int errorMessageRes) {
+        Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
+    }
 }