feat: add support for API 35 EdgeToEdge

.github/workflows/android.yml

@@ -8,13 +8,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Gradle
-      run: ./scripts/build.sh
-    - name: Print Logs
-      if: failure()
-      run: ./scripts/print_build_logs.sh
+      - uses: actions/checkout@v2
+      - name: set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Build with Gradle
+        run: ./scripts/build.sh
+      - name: Print Logs
+        if: failure()
+        run: ./scripts/print_build_logs.sh

app/build.gradle.kts

@@ -7,6 +7,8 @@ plugins {
 android {
     compileSdk = Config.SdkVersions.compile
 
+    namespace = "com.firebase.uidemo"
+
     defaultConfig {
         minSdk = Config.SdkVersions.min
         targetSdk = Config.SdkVersions.target
@@ -60,8 +62,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -95,9 +97,6 @@ dependencies {
     implementation(Config.Libs.Misc.permissions)
     implementation(Config.Libs.Androidx.constraint)
     debugImplementation(Config.Libs.Misc.leakCanary)
-    debugImplementation(Config.Libs.Misc.leakCanaryFragments)
-    releaseImplementation(Config.Libs.Misc.leakCanaryNoop)
-    testImplementation(Config.Libs.Misc.leakCanaryNoop)
 }
 
 apply(plugin = "com.google.gms.google-services")

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.firebase.uidemo">
+>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -41,7 +41,7 @@
             android:label="@string/title_auth_activity" />
         <activity
             android:name=".auth.AnonymousUpgradeActivity"
-            android:label="@string/title_anonymous_upgrade"/>
+            android:label="@string/title_anonymous_upgrade" />
 
         <!-- Firestore demo -->
         <activity
@@ -74,4 +74,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -0,0 +1,16 @@
+package com.firebase.uidemo;
+
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
+
+public class BaseActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Enable edge-to-edge for all activities
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+    }
+} 

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

@@ -20,6 +20,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.util.ExtraConstants;
@@ -38,7 +43,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-public class ChooserActivity extends AppCompatActivity {
+public class ChooserActivity extends BaseActivity {
     private ActivityChooserBinding mBinding;
 
     @Override
@@ -56,6 +61,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mBinding = ActivityChooserBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
 
+        // Set up toolbar
+        setSupportActionBar(mBinding.toolbar);
+        getSupportActionBar().setTitle(R.string.app_name);
+
+        // Handle the navigation bar padding
+        ViewCompat.setOnApplyWindowInsetsListener(mBinding.activities, (view, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
+            view.setPadding(
+                view.getPaddingLeft(),
+                view.getPaddingTop(),
+                view.getPaddingRight(),
+                insets.bottom
+            );
+            return WindowInsetsCompat.CONSUMED;
+        });
+
         mBinding.activities.setLayoutManager(new LinearLayoutManager(this));
         mBinding.activities.setAdapter(new ActivityChooserAdapter());
         mBinding.activities.setHasFixedSize(true);

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

@@ -1,23 +1,10 @@
 package com.firebase.uidemo;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
 
 public class FirebaseUIDemo extends MultiDexApplication {
     static {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
     }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        LeakCanary.install(this);
-    }
 }

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

@@ -12,6 +12,7 @@
 import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.databinding.ActivityAnonymousUpgradeBinding;
 import com.firebase.uidemo.util.ConfigurationUtils;
@@ -28,9 +29,8 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
-public class AnonymousUpgradeActivity extends AppCompatActivity
+public class AnonymousUpgradeActivity extends BaseActivity
         implements ActivityResultCallback<FirebaseAuthUIAuthenticationResult> {
 
     private static final String TAG = "AccountLink";

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

@@ -31,6 +31,7 @@
 import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.uidemo.R;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.databinding.AuthUiLayoutBinding;
 import com.firebase.uidemo.util.ConfigurationUtils;
 import com.google.android.gms.common.Scopes;
@@ -54,7 +55,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 
-public class AuthUiActivity extends AppCompatActivity
+public class AuthUiActivity extends BaseActivity
         implements ActivityResultCallback<FirebaseAuthUIAuthenticationResult> {
     private static final String TAG = "AuthUiActivity";
 
@@ -141,8 +142,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
         mBinding.signIn.setOnClickListener(view -> signIn());
 
-        mBinding.signInSilent.setOnClickListener(view -> silentSignIn());
-
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)) {
             showSnackbar(R.string.configuration_required);
@@ -196,8 +195,7 @@ private Intent getSignInIntent(@Nullable String link) {
                 .setTheme(getSelectedTheme())
                 .setLogo(getSelectedLogo())
                 .setAvailableProviders(getSelectedProviders())
-                .setIsSmartLockEnabled(mBinding.credentialSelectorEnabled.isChecked(),
-                        mBinding.hintSelectorEnabled.isChecked());
+                .setCredentialManagerEnabled(mBinding.credentialSelectorEnabled.isChecked());
 
         if (mBinding.customLayout.isChecked()) {
             AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
@@ -226,18 +224,9 @@ private Intent getSignInIntent(@Nullable String link) {
         if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
             builder.enableAnonymousUsersAutoUpgrade();
         }
-        return builder.build();
-    }
 
-    public void silentSignIn() {
-        getAuthUI().silentSignIn(this, getSelectedProviders())
-                .addOnCompleteListener(this, task -> {
-                    if (task.isSuccessful()) {
-                        startSignedInActivity(null);
-                    } else {
-                        showSnackbar(R.string.sign_in_failed);
-                    }
-                });
+        builder.setAlwaysShowSignInMethodScreen(true);
+        return builder.build();
     }
 
     @Override

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

@@ -26,6 +26,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.databinding.SignedInLayoutBinding;
 import com.firebase.uidemo.storage.GlideApp;
@@ -49,11 +50,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.AppCompatActivity;
 
 import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
 
-public class SignedInActivity extends AppCompatActivity {
+public class SignedInActivity extends BaseActivity {
     private static final String TAG = "SignedInActivity";
 
     private SignedInLayoutBinding mBinding;

app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

@@ -11,6 +11,7 @@
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
 import com.firebase.ui.firestore.FirestoreRecyclerOptions;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
 import com.firebase.uidemo.databinding.ActivityChatBinding;
@@ -23,7 +24,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -36,7 +36,7 @@
  * Lists</a>.
  */
 @SuppressLint("RestrictedApi")
-public class FirestoreChatActivity extends AppCompatActivity
+public class FirestoreChatActivity extends BaseActivity
         implements FirebaseAuth.AuthStateListener {
     private static final String TAG = "FirestoreChatActivity";
 

app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java

@@ -11,6 +11,7 @@
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
 import com.firebase.ui.database.FirebaseRecyclerOptions;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
 import com.firebase.uidemo.databinding.ActivityChatBinding;
@@ -23,7 +24,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -36,7 +36,7 @@
  * Lists</a>.
  */
 @SuppressLint("RestrictedApi")
-public class RealtimeDbChatActivity extends AppCompatActivity
+public class RealtimeDbChatActivity extends BaseActivity
         implements FirebaseAuth.AuthStateListener {
     private static final String TAG = "RealtimeDatabaseDemo";
 

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -10,6 +10,7 @@
 import android.widget.Toast;
 
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.firebase.uidemo.BaseActivity;
 import com.firebase.uidemo.BuildConfig;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.databinding.ActivityImageBinding;
@@ -27,12 +28,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.AppSettingsDialog;
 import pub.devrel.easypermissions.EasyPermissions;
 
-public class ImageActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+public class ImageActivity extends BaseActivity implements EasyPermissions.PermissionCallbacks {
 
     private static final String TAG = "ImageDemo";
     private static final int RC_CHOOSE_PHOTO = 101;