diff --git a/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt index 59b031f7a..23f3f04fc 100644 --- a/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt +++ b/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt @@ -44,7 +44,6 @@ import nowinandroid.feature.search.generated.resources.feature_search_interests import nowinandroid.feature.settings.generated.resources.feature_settings_brand_android import nowinandroid.feature.settings.generated.resources.feature_settings_dismiss_dialog_button_text import nowinandroid.feature.settings.generated.resources.feature_settings_top_app_bar_action_icon_description -import org.junit.Before import org.junit.Rule import org.junit.Test import javax.inject.Inject diff --git a/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/UiTestExtensions.kt b/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/UiTestExtensions.kt index 4e45c237a..2e88d6a3e 100644 --- a/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/UiTestExtensions.kt +++ b/app/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/ui/UiTestExtensions.kt @@ -30,4 +30,3 @@ fun AndroidComposeTestRule<*, *>.stringResource( org.jetbrains.compose.resources.getString(resId) } } - diff --git a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt index f055a8894..aaa968483 100644 --- a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt +++ b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt @@ -59,4 +59,4 @@ val appModules = module { ) includes(featureModules) includes(JankStatsModule().module, AppModule().module) -} \ No newline at end of file +} diff --git a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt index 5313c4d92..00def0b5b 100644 --- a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt +++ b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.navigation - import androidx.compose.ui.graphics.vector.ImageVector import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute diff --git a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 2f74c7760..da24fe015 100644 --- a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -74,9 +74,9 @@ import nowinandroid.app.generated.resources.Res import nowinandroid.app.generated.resources.not_connected import nowinandroid.feature.settings.generated.resources.feature_settings_top_app_bar_action_icon_description import nowinandroid.feature.settings.generated.resources.feature_settings_top_app_bar_navigation_icon_description +import org.jetbrains.compose.resources.stringResource import kotlin.reflect.KClass import nowinandroid.feature.settings.generated.resources.Res as settingsR -import org.jetbrains.compose.resources.stringResource @Composable fun NiaApp( diff --git a/core/analytics/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/analytics/di/AnalyticsModule.kt b/core/analytics/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/analytics/di/AnalyticsModule.kt index c8bba7d0f..48205ed65 100644 --- a/core/analytics/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/analytics/di/AnalyticsModule.kt +++ b/core/analytics/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/analytics/di/AnalyticsModule.kt @@ -21,7 +21,6 @@ import com.google.samples.apps.nowinandroid.core.analytics.StubAnalyticsHelper import org.koin.core.annotation.Module import org.koin.core.annotation.Single - @Module class AnalyticsModule { @Single diff --git a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt index 60be62688..4a2099dc6 100644 --- a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt @@ -28,10 +28,8 @@ import androidx.compose.material3.NavigationRail import androidx.compose.material3.NavigationRailItem import androidx.compose.material3.NavigationRailItemDefaults import androidx.compose.material3.Text -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo -import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold diff --git a/feature/bookmarks/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/di/BookmarksModule.kt b/feature/bookmarks/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/di/BookmarksModule.kt index cffa93ce5..ede0f0bb0 100644 --- a/feature/bookmarks/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/di/BookmarksModule.kt +++ b/feature/bookmarks/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/di/BookmarksModule.kt @@ -18,10 +18,8 @@ package com.google.samples.apps.nowinandroid.feature.bookmarks.di import com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksViewModel import org.koin.core.module.dsl.viewModel -import org.koin.core.module.dsl.viewModelOf import org.koin.dsl.module val bookmarksModule = module { viewModel { BookmarksViewModel(get(), get()) } } -