A fully functional Android app built entirely with Kotlin and Jetpack Compose
Switch to new Activity.enableEdgeToEdge
Alex Vanyo2b218b97d959
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 38cb7efe2..df5cfa296 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -106,7 +106,6 @@ dependencies {debugImplementation(libs.androidx.compose.ui.testManifest)debugImplementation(project(":ui-test-hilt-manifest"))- implementation(libs.accompanist.systemuicontroller)implementation(libs.androidx.activity.compose)implementation(libs.androidx.appcompat)implementation(libs.androidx.core.ktx)diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.ktindex e107fd88c..7fe1bc674 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -19,7 +19,9 @@ package com.google.samples.apps.nowinandroidimport android.os.Bundleimport android.util.Logimport androidx.activity.ComponentActivity+import androidx.activity.SystemBarStyleimport androidx.activity.compose.setContent+import androidx.activity.enableEdgeToEdgeimport androidx.activity.viewModelsimport androidx.compose.foundation.isSystemInDarkThemeimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi@@ -31,13 +33,11 @@ import androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.setValueimport androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen-import androidx.core.view.WindowCompatimport androidx.lifecycle.Lifecycleimport androidx.lifecycle.lifecycleScopeimport androidx.lifecycle.repeatOnLifecycleimport androidx.metrics.performance.JankStatsimport androidx.profileinstaller.ProfileVerifier-import com.google.accompanist.systemuicontroller.rememberSystemUiControllerimport com.google.samples.apps.nowinandroid.MainActivityUiState.Loadingimport com.google.samples.apps.nowinandroid.MainActivityUiState.Successimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper@@ -108,16 +108,28 @@ class MainActivity : ComponentActivity() {}// Turn off the decor fitting system windows, which allows us to handle insets,- // including IME animations- WindowCompat.setDecorFitsSystemWindows(window, false)+ // including IME animations, and go edge-to-edge+ // This also sets up the initial system bar style based on the platform theme+ enableEdgeToEdge()setContent {- val systemUiController = rememberSystemUiController()val darkTheme = shouldUseDarkTheme(uiState)- // Update the dark content of the system bars to match the theme- DisposableEffect(systemUiController, darkTheme) {- systemUiController.systemBarsDarkContentEnabled = !darkTheme+ // Update the edge to edge configuration to match the theme+ // This is the same parameters as the default enableEdgeToEdge call, but we manually+ // resolve whether or not to show dark theme using uiState, since it can be different+ // than the configuration's dark theme value based on the user preference.+ DisposableEffect(darkTheme) {+ enableEdgeToEdge(+ statusBarStyle = SystemBarStyle.auto(+ android.graphics.Color.TRANSPARENT,+ android.graphics.Color.TRANSPARENT,+ ) { darkTheme },+ navigationBarStyle = SystemBarStyle.auto(+ lightScrim,+ darkScrim,+ ) { darkTheme },+ )onDispose {}}@@ -224,3 +236,15 @@ private fun shouldUseDarkTheme(DarkThemeConfig.DARK -> true}}++/**+ * The default light scrim, as defined by androidx and the platform:+ * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=35-38;drc=27e7d52e8604a080133e8b842db10c89b4482598+ */+private val lightScrim = android.graphics.Color.argb(0xe6, 0xFF, 0xFF, 0xFF)++/**+ * The default dark scrim, as defined by androidx and the platform:+ * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=40-44;drc=27e7d52e8604a080133e8b842db10c89b4482598+ */+private val darkScrim = android.graphics.Color.argb(0x80, 0x1b, 0x1b, 0x1b)diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xmlindex b014ff647..2cf4177e6 100644--- a/app/src/main/res/values-night/themes.xml+++ b/app/src/main/res/values-night/themes.xml@@ -16,10 +16,7 @@--><resources xmlns:tools="http://schemas.android.com/tools">- <style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.NoActionBar">- <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>- <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>- </style>+ <style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.NoActionBar" /><style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen"><item name="android:windowLightStatusBar" tools:targetApi="23">false</item>diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xmldeleted file mode 100644index b637b1413..000000000--- a/app/src/main/res/values-v23/themes.xml+++ /dev/null@@ -1,22 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2021 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<resources>-- <style name="PlatformAdjusted.Theme.Nia" parent="NightAdjusted.Theme.Nia">- <item name="android:statusBarColor">@android:color/transparent</item>- </style>-</resources>diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xmldeleted file mode 100644index 969e51914..000000000--- a/app/src/main/res/values-v27/themes.xml+++ /dev/null@@ -1,23 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2021 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<resources>-- <style name="PlatformAdjusted.Theme.Nia" parent="NightAdjusted.Theme.Nia">- <item name="android:statusBarColor">@android:color/transparent</item>- <item name="android:navigationBarColor">@android:color/transparent</item>- </style>-</resources>diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xmlindex 82456f53a..7cdd25527 100644--- a/app/src/main/res/values/themes.xml+++ b/app/src/main/res/values/themes.xml@@ -18,19 +18,10 @@<!-- Allows us to override night specific attributes in thevalues-night folder. -->- <style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.Light.NoActionBar">- <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>- <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>- </style>-- <!-- Allows us to override platform level specific attributes in their- respective values-vXX folder. -->- <style name="PlatformAdjusted.Theme.Nia" parent="NightAdjusted.Theme.Nia">- <item name="android:statusBarColor">@color/black30</item>- </style>+ <style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.Light.NoActionBar" /><!-- The final theme we use -->- <style name="Theme.Nia" parent="PlatformAdjusted.Theme.Nia" />+ <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia" /><style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen"><item name="android:windowLightStatusBar" tools:targetApi="23">true</item>diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex cd18da117..a6e49c0f7 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -2,7 +2,7 @@accompanist = "0.28.0"androidDesugarJdkLibs = "2.0.3"androidGradlePlugin = "8.1.0"-androidxActivity = "1.7.0"+androidxActivity = "1.8.0-alpha06"androidxAppCompat = "1.5.1"androidxBrowser = "1.4.0"androidxComposeBom = "2023.06.01"@@ -55,7 +55,6 @@ turbine = "0.12.1"[libraries]accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }accompanist-testharness = { group = "com.google.accompanist", name = "accompanist-testharness", version.ref = "accompanist" }android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }