Version 6.0.0

Author: samtstern

.opensource/project.json

@@ -17,7 +17,8 @@
         "docs/upgrade-to-2.0.md": "Upgrade to v2.0",
         "docs/upgrade-to-3.0.md": "Upgrade to v3.0",
         "docs/upgrade-to-4.0.md": "Upgrade to v4.0",
-        "docs/upgrade-to-5.0.md": "Upgrade to v5.0"
+        "docs/upgrade-to-5.0.md": "Upgrade to v5.0",
+        "docs/upgrade-to-6.0.md": "Upgrade to v6.0"
     },
 
     "related": [

README.md

@@ -48,16 +48,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:5.1.0'
+    implementation 'com.firebaseui:firebase-ui-database:6.0.0'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:5.1.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:6.0.0'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:5.1.0'
+    implementation 'com.firebaseui:firebase-ui-auth:6.0.0'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:5.1.0'
+    implementation 'com.firebaseui:firebase-ui-storage:6.0.0'
 }
 ```
 
@@ -71,6 +71,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
 If you are using an old version of FirebaseUI and upgrading, please see the appropriate
 migration guide:
 
+* [Upgrade from 5.1.0 to 6.x.x](./docs/upgrade-to-6.0.md)
 * [Upgrade from 4.3.2 to 5.x.x](./docs/upgrade-to-5.0.md)
 * [Upgrade from 3.3.1 to 4.x.x](./docs/upgrade-to-4.0.md)
 * [Upgrade from 2.3.0 to 3.x.x](./docs/upgrade-to-3.0.md)

app/build.gradle.kts

@@ -22,14 +22,19 @@ android {
     }
 
     lintOptions {
-        disable("ResourceName", "MissingTranslation")
+        disable("ResourceName", "MissingTranslation", "DuplicateStrings")
+    }
+
+    compileOptions {
+        setSourceCompatibility(JavaVersion.VERSION_1_8)
+        setTargetCompatibility(JavaVersion.VERSION_1_8)
     }
 }
 
 dependencies {
     implementation(Config.Libs.Firebase.core)
-    implementation(Config.Libs.Support.design)
-    implementation(Config.Libs.Support.multidex)
+    implementation(Config.Libs.Androidx.design)
+    implementation(Config.Libs.Androidx.multidex)
 
     implementation(project(":auth"))
     implementation(project(":auth-github"))
@@ -39,8 +44,8 @@ dependencies {
 
     implementation(Config.Libs.Provider.facebook)
     // Needed to override Facebook
-    implementation(Config.Libs.Support.cardView)
-    implementation(Config.Libs.Support.customTabs)
+    implementation(Config.Libs.Androidx.cardView)
+    implementation(Config.Libs.Androidx.customTabs)
     implementation(Config.Libs.Provider.twitter) { isTransitive = true }
 
     implementation(Config.Libs.Misc.glide)
@@ -54,7 +59,7 @@ dependencies {
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
     implementation(Config.Libs.Misc.permissions)
     implementation(Config.Libs.Misc.butterKnife)
-    implementation(Config.Libs.Support.constraint)
+    implementation(Config.Libs.Androidx.constraint)
     annotationProcessor(Config.Libs.Misc.butterKnifeCompiler)
     debugImplementation(Config.Libs.Misc.leakCanary)
     debugImplementation(Config.Libs.Misc.leakCanaryFragments)

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

@@ -16,11 +16,6 @@
 
 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;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,6 +31,11 @@
 import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
 import com.firebase.uidemo.storage.ImageActivity;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

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

@@ -1,15 +1,10 @@
 package com.firebase.uidemo;
 
-import android.support.multidex.MultiDexApplication;
-import android.support.v7.app.AppCompatDelegate;
-
 import com.squareup.leakcanary.LeakCanary;
 
-public class FirebaseUIDemo extends MultiDexApplication {
-    static {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
-    }
+import androidx.multidex.MultiDexApplication;
 
+public class FirebaseUIDemo extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();

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

@@ -2,9 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Button;
@@ -25,6 +22,9 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

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

@@ -17,14 +17,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
@@ -44,13 +36,21 @@
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.firebase.auth.ActionCodeSettings;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -346,7 +346,7 @@ private void startSignedInActivity(@Nullable IdpResponse response) {
     @OnClick({R.id.default_theme, R.id.purple_theme, R.id.green_theme, R.id.dark_theme})
     public void toggleDarkTheme() {
         int mode = mDarkTheme.isChecked() ?
-                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_AUTO;
+                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO;
         AppCompatDelegate.setDefaultNightMode(mode);
         getDelegate().setLocalNightMode(mode);
     }

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

@@ -18,12 +18,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -37,6 +31,7 @@
 import com.firebase.uidemo.storage.GlideApp;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
@@ -50,6 +45,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

app/src/main/java/com/firebase/uidemo/database/AbstractChat.java

@@ -1,7 +1,7 @@
 package com.firebase.uidemo.database;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Common interface for chat messages, helps share code between RTDB and Firestore examples.

app/src/main/java/com/firebase/uidemo/database/ChatHolder.java

@@ -3,10 +3,6 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.RotateDrawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -18,6 +14,11 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class ChatHolder extends RecyclerView.ViewHolder {
     private final TextView mNameField;
     private final TextView mTextField;