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 5ca7c262e..d9989d2ce 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 @@ -36,8 +36,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import nowinandroid.shared.generated.resources.Res -import nowinandroid.shared.generated.resources.app_name import nowinandroid.feature.bookmarks.generated.resources.feature_bookmarks_title import nowinandroid.feature.foryou.generated.resources.feature_foryou_navigate_up import nowinandroid.feature.foryou.generated.resources.feature_foryou_title @@ -45,6 +43,8 @@ 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 nowinandroid.shared.generated.resources.Res +import nowinandroid.shared.generated.resources.app_name import org.junit.Rule import org.junit.Test import javax.inject.Inject diff --git a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt index 0fa3e2eae..d6bf34d4e 100644 --- a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt +++ b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt @@ -21,11 +21,11 @@ import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute -import nowinandroid.shared.generated.resources.Res -import nowinandroid.shared.generated.resources.app_name import nowinandroid.feature.bookmarks.generated.resources.feature_bookmarks_title import nowinandroid.feature.foryou.generated.resources.feature_foryou_title import nowinandroid.feature.search.generated.resources.feature_search_interests +import nowinandroid.shared.generated.resources.Res +import nowinandroid.shared.generated.resources.app_name import org.jetbrains.compose.resources.StringResource import kotlin.reflect.KClass import nowinandroid.feature.bookmarks.generated.resources.Res as bookmarksR diff --git a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 80781b232..13bb2ea3d 100644 --- a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -35,7 +35,6 @@ import androidx.compose.material3.SnackbarDuration.Short import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult.ActionPerformed -import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo @@ -69,10 +68,10 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradien import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog import com.google.samples.apps.nowinandroid.navigation.NiaNavHost import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination -import nowinandroid.shared.generated.resources.Res -import nowinandroid.shared.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 nowinandroid.shared.generated.resources.Res +import nowinandroid.shared.generated.resources.not_connected import org.jetbrains.compose.resources.stringResource import kotlin.reflect.KClass import nowinandroid.feature.settings.generated.resources.Res as settingsR diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/DatabaseModule.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/DatabaseModule.kt index f92ae2852..15194e18e 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/DatabaseModule.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/DatabaseModule.kt @@ -17,7 +17,6 @@ package com.google.samples.apps.nowinandroid.core.database.di import app.cash.sqldelight.db.QueryResult -import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.db.SqlSchema import com.google.samples.apps.nowinandroid.core.database.NiaDatabase import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao @@ -32,7 +31,6 @@ import com.google.samples.apps.nowinandroid.core.database.dao.TopicFtsDao import com.google.samples.apps.nowinandroid.core.database.dao.TopicFtsDaoInterface import com.google.samples.apps.nowinandroid.core.di.coroutineDispatcherModule import org.koin.core.module.Module -import org.koin.core.module.dsl.factoryOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module @@ -63,4 +61,4 @@ val databaseModule: Module get() = module { dbModule, daoModule, ) -} \ No newline at end of file +} diff --git a/core/database/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.jvm.kt b/core/database/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.jvm.kt index e18b482a5..e967435a0 100644 --- a/core/database/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.jvm.kt +++ b/core/database/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.jvm.kt @@ -19,10 +19,8 @@ package com.google.samples.apps.nowinandroid.core.database.di import app.cash.sqldelight.db.QueryResult.AsyncValue import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.db.SqlSchema - import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver import kotlinx.coroutines.runBlocking - import org.koin.dsl.module import java.util.Properties diff --git a/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.native.kt b/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.native.kt index 97f8195b1..52e1a7246 100644 --- a/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.native.kt +++ b/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/di/Database.native.kt @@ -37,4 +37,4 @@ internal actual val driverModule = module { }, ) } -} \ No newline at end of file +} diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt index 46fa2f41b..37200d204 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt @@ -23,7 +23,6 @@ import com.google.samples.apps.nowinandroid.core.domain.TopicSortField.NONE import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine -import org.koin.core.annotation.Factory /** * A use case which obtains a list of topics with their followed state. diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt index 680a98637..45f8f3ba7 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt @@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.core.domain import com.google.samples.apps.nowinandroid.core.data.model.RecentSearchQuery import com.google.samples.apps.nowinandroid.core.data.repository.RecentSearchRepository import kotlinx.coroutines.flow.Flow -import org.koin.core.annotation.Factory /** * A use case which returns the recent search queries. diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt index 0d544a902..3e867fafc 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt @@ -26,4 +26,4 @@ val domainModule = module { factoryOf(::GetFollowableTopicsUseCase) factoryOf(::GetRecentSearchQueriesUseCase) factoryOf(::GetSearchContentsUseCase) -} \ No newline at end of file +} diff --git a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/di/ForYouModule.kt b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/di/ForYouModule.kt index f2510d59f..75b308c55 100644 --- a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/di/ForYouModule.kt +++ b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/di/ForYouModule.kt @@ -17,7 +17,6 @@ package com.google.samples.apps.nowinandroid.feature.foryou.di import com.google.samples.apps.nowinandroid.feature.foryou.ForYouViewModel -import org.koin.core.module.dsl.viewModel import org.koin.core.module.dsl.viewModelOf import org.koin.dsl.module diff --git a/sync/work/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt b/sync/work/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt index 4822d3eb5..77c2d2f7b 100644 --- a/sync/work/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt +++ b/sync/work/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt @@ -28,7 +28,7 @@ import org.junit.Rule import org.junit.Test import kotlin.test.assertEquals -//@HiltAndroidTest +// @HiltAndroidTest class SyncWorkerTest { @get:Rule(order = 0) diff --git a/sync/work/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/sync/workers/DelegatingWorker.kt b/sync/work/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/sync/workers/DelegatingWorker.kt index b9842f397..52db79479 100644 --- a/sync/work/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/sync/workers/DelegatingWorker.kt +++ b/sync/work/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/sync/workers/DelegatingWorker.kt @@ -23,14 +23,14 @@ import androidx.work.ForegroundInfo import androidx.work.WorkerParameters import kotlin.reflect.KClass -///** +// /** // * An entry point to retrieve the [HiltWorkerFactory] at runtime // */ -//@EntryPoint -//@InstallIn(SingletonComponent::class) -//interface HiltWorkerFactoryEntryPoint { +// @EntryPoint +// @InstallIn(SingletonComponent::class) +// interface HiltWorkerFactoryEntryPoint { // fun hiltWorkerFactory(): HiltWorkerFactory -//} +// } private const val WORKER_CLASS_NAME = "RouterWorkerDelegateClassName"