Merge pull request #872 from firebase/version-2.3.0-release

Version 2.3.0

Author: samtstern

README.md

@@ -11,6 +11,8 @@ android {
         targetSdkVersion targetSdk
         versionCode 1
         versionName "1.0"
+
+        vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
@@ -42,15 +44,15 @@ dependencies {
     compile "com.google.firebase:firebase-database:$firebaseVersion"
     compile "com.google.firebase:firebase-storage:$firebaseVersion"
 
-    compile('com.facebook.android:facebook-android-sdk:4.23.0')
+    compile('com.facebook.android:facebook-android-sdk:4.25.0')
     compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
 
     // The following dependencies are not required to use the Firebase UI library.
     // 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.
-    compile 'pub.devrel:easypermissions:0.4.2'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'pub.devrel:easypermissions:0.4.3'
+    compile 'com.jakewharton:butterknife:8.7.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'

app/build.gradle

@@ -13,6 +13,7 @@
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">

app/src/main/AndroidManifest.xml

@@ -35,7 +35,6 @@
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.ResultCodes;
 import com.firebase.uidemo.R;
 import com.google.android.gms.common.Scopes;
 import com.google.firebase.auth.FirebaseAuth;
@@ -54,6 +53,7 @@ public class AuthUiActivity extends AppCompatActivity {
     private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
     private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google.com/policies/privacy/";
     private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google.com/terms/analytics/#7_privacy";
+
     private static final int RC_SIGN_IN = 100;
 
     @BindView(R.id.default_theme)
@@ -138,9 +138,7 @@ public class AuthUiActivity extends AppCompatActivity {
     CheckBox mGoogleScopeYoutubeData;
 
     public static Intent createIntent(Context context) {
-        Intent in = new Intent();
-        in.setClass(context, AuthUiActivity.class);
-        return in;
+        return new Intent(context, AuthUiActivity.class);
     }
 
     @Override
@@ -229,7 +227,7 @@ private void handleSignInResponse(int resultCode, Intent data) {
         IdpResponse response = IdpResponse.fromResultIntent(data);
 
         // Successfully signed in
-        if (resultCode == ResultCodes.OK) {
+        if (resultCode == RESULT_OK) {
             startSignedInActivity(response);
             finish();
             return;
@@ -307,7 +305,7 @@ private int getSelectedLogo() {
         if (mFirebaseLogo.isChecked()) {
             return R.drawable.firebase_auth_120dp;
         } else if (mGoogleLogo.isChecked()) {
-            return R.drawable.logo_googleg_color_144dp;
+            return R.drawable.ic_googleg_color_144dp;
         }
         return AuthUI.NO_LOGO;
     }

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

@@ -133,8 +133,7 @@ public void onComplete(@NonNull Task<Void> task) {
 
     @OnClick(R.id.delete_account)
     public void deleteAccountClicked() {
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setMessage("Are you sure you want to delete this account?")
                 .setPositiveButton("Yes, nuke it!", new DialogInterface.OnClickListener() {
                     @Override
@@ -143,9 +142,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                     }
                 })
                 .setNegativeButton("No", null)
-                .create();
-
-        dialog.show();
+                .show();
     }
 
     private void deleteAccount() {