Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into replace-testharness

Don Turner61cce4bf1973
diff --cc app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
index 4658e3609,51c98cec6..8cbabc247
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@@@ -75,12 -75,8 +75,8 @@@ import com.google.samples.apps.nowinand
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
- @OptIn(
- ExperimentalMaterial3Api::class,
- ExperimentalComposeUiApi::class,
- )
@Composable
-fun NiaApp(appState: NiaAppState) {
+fun NiaApp(appState: NiaAppState, modifier: Modifier = Modifier) {
val shouldShowGradientBackground =
appState.currentTopLevelDestination == TopLevelDestination.FOR_YOU
var showSettingsDialog by rememberSaveable { mutableStateOf(false) }
diff --cc gradle/libs.versions.toml
index 29daf9a70,0aff27c8c..e39a6d7fb
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -9,8 -9,7 +9,8 @@@ androidxAppCompat = "1.6.1
androidxBrowser = "1.8.0"
androidxComposeBom = "2024.02.02"
androidxComposeCompiler = "1.5.8"
+androidxComposeUiTest = "1.7.0-alpha05"
- androidxComposeMaterial3Adaptive = "1.0.0-alpha08"
+ androidxComposeMaterial3Adaptive = "1.0.0-alpha10"
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxCore = "1.12.0"
androidxCoreSplashscreen = "1.0.1"