A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove redundant annotations
gibachan2190258ef939
diff --git 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.ktindex 640b22e83..f27b90cbe 100644--- 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@@ -37,7 +37,6 @@ import androidx.compose.material3.SnackbarHostStateimport androidx.compose.material3.SnackbarResult.ActionPerformedimport androidx.compose.material3.Textimport androidx.compose.material3.TopAppBarDefaults-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.material3.adaptive.currentWindowAdaptiveInfoimport androidx.compose.runtime.Composable@@ -76,7 +75,6 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationimport kotlin.reflect.KClassimport com.google.samples.apps.nowinandroid.feature.settings.R as settingsR-@OptIn(ExperimentalMaterial3AdaptiveApi::class)@Composablefun NiaApp(appState: NiaAppState,@@ -126,7 +124,6 @@ fun NiaApp(@OptIn(ExperimentalMaterial3Api::class,ExperimentalComposeUiApi::class,- ExperimentalMaterial3AdaptiveApi::class,)internal fun NiaApp(appState: NiaAppState,diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.ktindex e84b96b73..9c9488fde 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt@@ -16,7 +16,6 @@package com.google.samples.apps.nowinandroid.ui-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.Postureimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.runtime.CompositionLocalProvider@@ -113,7 +112,6 @@ class NiaAppScreenSizesScreenshotTests {TimeZone.setDefault(TimeZone.getTimeZone("UTC"))}- @OptIn(ExperimentalMaterial3AdaptiveApi::class)private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) {composeTestRule.setContent {CompositionLocalProvider(diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.ktindex 2ef0d3e4f..78f568e03 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt@@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.windowInsetsStartWidthimport androidx.compose.foundation.layout.windowInsetsTopHeightimport androidx.compose.material3.SnackbarDuration.Indefiniteimport androidx.compose.material3.SnackbarHostState-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.Postureimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.runtime.Composable@@ -209,7 +208,6 @@ class SnackbarInsetsScreenshotTests {}}- @OptIn(ExperimentalMaterial3AdaptiveApi::class)private fun testSnackbarScreenshotWithSize(snackbarHostState: SnackbarHostState,width: Dp,diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.ktindex fe2e98452..b9b1047c1 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.uiimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.material3.SnackbarDuration.Indefiniteimport androidx.compose.material3.SnackbarHostState-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.Postureimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.runtime.CompositionLocalProvider@@ -182,7 +181,6 @@ class SnackbarScreenshotTests {}}- @OptIn(ExperimentalMaterial3AdaptiveApi::class)private fun testSnackbarScreenshotWithSize(snackbarHostState: SnackbarHostState,width: Dp,diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.ktindex 4ac19b482..4a2099dc6 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt@@ -28,10 +28,8 @@ import androidx.compose.material3.NavigationRailimport androidx.compose.material3.NavigationRailItemimport androidx.compose.material3.NavigationRailItemDefaultsimport androidx.compose.material3.Text-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.material3.adaptive.currentWindowAdaptiveInfo-import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApiimport androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaultsimport androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColorsimport androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold@@ -184,10 +182,6 @@ fun NiaNavigationRail(* @param windowAdaptiveInfo The window adaptive info.* @param content The app content inside the scaffold.*/-@OptIn(- ExperimentalMaterial3AdaptiveNavigationSuiteApi::class,- ExperimentalMaterial3AdaptiveApi::class,-)@Composablefun NiaNavigationSuiteScaffold(navigationSuiteItems: NiaNavigationSuiteScope.() -> Unit,@@ -242,7 +236,6 @@ fun NiaNavigationSuiteScaffold(/*** A wrapper around [NavigationSuiteScope] to declare navigation items.*/-@OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class)class NiaNavigationSuiteScope internal constructor(private val navigationSuiteScope: NavigationSuiteScope,private val navigationSuiteItemColors: NavigationSuiteItemColors,diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.ktindex c22a02fa1..0b7b9f570 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt@@ -21,7 +21,6 @@ import android.net.Uriimport androidx.annotation.ColorIntimport androidx.browser.customtabs.CustomTabColorSchemeParamsimport androidx.browser.customtabs.CustomTabsIntent-import androidx.compose.foundation.ExperimentalFoundationApiimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyListScopeimport androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope@@ -45,7 +44,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource* An extension on [LazyListScope] defining a feed with news resources.* Depending on the [feedState], this might emit no items.*/-@OptIn(ExperimentalFoundationApi::class)fun LazyStaggeredGridScope.newsFeed(feedState: NewsFeedUiState,onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,