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() {

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

@@ -0,0 +1,31 @@
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    xmlns:tools="http://schemas.android.com/tools">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/material_gray_300" />
+            <size
+                android:width="48dp"
+                android:height="48dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
+        <aapt:attr name="android:drawable">
+            <vector
+                android:width="44dp"
+                android:height="44dp"
+                android:viewportHeight="24.0"
+                android:viewportWidth="24.0"
+                tools:targetApi="lollipop">
+                <path
+                    android:fillColor="@color/material_gray_500"
+                    android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+            </vector>
+        </aapt:attr>
+    </item>
+</layer-list>

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

@@ -0,0 +1,19 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="144dp"
+    android:height="144dp"
+    android:viewportHeight="512.0"
+    android:viewportWidth="512.0">
+    <path
+        android:fillColor="#4285f4"
+        android:pathData="M482.6,261.4c0,-16.7 -1.5,-32.8 -4.3,-48.3H256v91.3h127c-5.5,29.5 -22.1,54.5 -47.1,71.2v59.2h76.3c44.6,-41.1 70.4,-101.6 70.4,-173.5z" />
+    <path
+        android:fillColor="#34a853"
+        android:pathData="M256,492c63.7,0 117.1,-21.1 156.2,-57.2l-76.3,-59.2c-21.1,14.2 -48.2,22.5 -79.9,22.5 -61.5,0 -113.5,-41.5 -132.1,-97.3H45.1v61.2c38.8,77.1 118.6,130 210.9,130z" />
+    <path
+        android:fillColor="#fbbc05"
+        android:pathData="M123.9,300.8c-4.7,-14.2 -7.4,-29.3 -7.4,-44.8s2.7,-30.7 7.4,-44.8V150H45.1C29.1,181.9 20,217.9 20,256c0,38.1 9.1,74.1 25.1,106l78.8,-61.2z" />
+    <path
+        android:fillColor="#ea4335"
+        android:pathData="M256,113.9c34.7,0 65.8,11.9 90.2,35.3l67.7,-67.7C373,43.4 319.6,20 256,20c-92.3,0 -172.1,52.9 -210.9,130l78.8,61.2c18.6,-55.8 70.6,-97.3 132.1,-97.3z" />
+</vector>

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

@@ -14,7 +14,7 @@
         android:layout_height="50dp"
         android:layout_marginStart="2dp"
         android:layout_marginLeft="2dp"
-        android:background="@drawable/chat_message_arrow"
+        android:background="@drawable/ic_chat_message_arrow"
         android:rotation="180" />
 
 
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="26dp"
         android:layout_marginRight="26dp"
-        android:background="@drawable/chat_message_background"
+        android:background="@drawable/ic_chat_message_background"
         android:orientation="vertical"
         android:padding="10dp">
 
@@ -56,7 +56,7 @@
         android:layout_alignRight="@+id/message"
         android:layout_marginRight="25dp"
         android:layout_alignParentTop="true"
-        android:background="@drawable/chat_message_arrow"
+        android:background="@drawable/ic_chat_message_arrow"
         android:rotation="180" />
 
 </RelativeLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -71,7 +72,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_margin="16dp"
                 android:contentDescription="@string/profile_picture_content_desc"
-                android:src="@drawable/anon_user_48dp" />
+                app:srcCompat="@drawable/ic_anon_user_48dp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -19,6 +19,7 @@
     <color name="material_green_300">#AED581</color>
 
     <color name="material_gray_300">#E0E0E0</color>
+    <color name="material_gray_500">#9e9e9e</color>
     <color name="material_gray_850">#ff303030</color>
     <color name="material_gray_900">#ff212121</color>
 

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

@@ -1,2 +1,14 @@
+# Twitter and Facebook are optional
 -dontwarn com.twitter.**
--dontwarn com.facebook.**
+-dontwarn com.facebook.**
+
+# Recommended flags for Firebase Auth
+-keepattributes Signature
+-keepattributes *Annotation*
+
+# Don't warn about retrofit or okio classes
+-dontwarn okio.**
+-dontwarn retrofit2.Call
+-dontnote retrofit2.Platform
+-dontnote retrofit2.Platform$IOS$MainThreadExecutor
+-dontwarn retrofit2.Platform$Java8

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

@@ -11,6 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
+        vectorDrawables.useSupportLibrary = true
         resourcePrefix "fui_"
     }
 
@@ -19,7 +20,7 @@ android {
             manifestPlaceholders = [enableFbLogging: true]
 
             minifyEnabled false
-            consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'auth-proguard.pro'
+            consumerProguardFiles 'auth-proguard.pro'
         }
 
         debug {
@@ -50,7 +51,7 @@ dependencies {
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"
 
-    provided 'com.facebook.android:facebook-android-sdk:4.23.0'
+    provided 'com.facebook.android:facebook-android-sdk:4.25.0'
     provided("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
 
     // The following libraries are needed to prevent incompatibilities with the facebook
@@ -61,7 +62,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     testCompile 'org.mockito:mockito-core:2.8.+'
     testCompile 'org.robolectric:robolectric:3.4'
-    testCompile 'com.facebook.android:facebook-android-sdk:4.23.0'
+    testCompile 'com.facebook.android:facebook-android-sdk:4.25.0'
 }
 
 javadoc.exclude([

app/src/main/res/drawable-xxxhdpi/anon_user_48dp.png

@@ -47,6 +47,8 @@
 import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -73,6 +75,7 @@ public class AuthUI {
                        FacebookAuthProvider.PROVIDER_ID, FACEBOOK_PROVIDER,
                        TwitterAuthProvider.PROVIDER_ID, TWITTER_PROVIDER
                })
+    @Retention(RetentionPolicy.SOURCE)
     public @interface SupportedProvider {}
 
     /**