From 7512f3d347d81a7d00bcf0882f98cf7665cb5b7f Mon Sep 17 00:00:00 2001
From: lihenggui <solo8web@gmail.com>
Date: Wed, 23 Oct 2024 14:18:22 -0700
Subject: [PATCH] SoptlessApply

---
 .../google/samples/apps/nowinandroid/di/JankStatsModule.kt  | 4 ++--
 .../samples/apps/nowinandroid/util/ProfileVerifierLogger.kt | 1 -
 .../com/google/samples/apps/nowinandroid/ui/NiaAppState.kt  | 6 +++---
 .../ui/interests2pane/InterestsListDetailScreen.kt          | 2 +-
 .../apps/nowinandroid/core/data/test/TestDataModule.kt      | 1 -
 .../apps/nowinandroid/core/data/di/DataModule.android.kt    | 6 +++---
 .../apps/nowinandroid/core/database/di/DatabaseModule.kt    | 1 -
 .../apps/nowinandroid/core/datastore/di/DataStoreModule.kt  | 1 -
 8 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt
index 71c9db760..07fc90e6b 100644
--- a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt
+++ b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt
@@ -26,7 +26,7 @@ import org.koin.dsl.module
 
 val jankStatsModule = module {
     singleOf(::ProfileVerifierLogger)
-    factory { (activity : Activity) -> JankStats.createAndTrack(activity.window, providesOnFrameListener()) }
+    factory { (activity: Activity) -> JankStats.createAndTrack(activity.window, providesOnFrameListener()) }
 }
 
 fun providesOnFrameListener(): OnFrameListener = OnFrameListener { frameData ->
@@ -35,4 +35,4 @@ fun providesOnFrameListener(): OnFrameListener = OnFrameListener { frameData ->
         // We're currently logging this but would better report it to a backend.
         Log.v("NiA Jank", frameData.toString())
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt
index 6afb35a04..b4bdcd3ac 100644
--- a/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt
+++ b/app/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt
@@ -22,7 +22,6 @@ import com.google.samples.apps.nowinandroid.core.di.ApplicationScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
-import org.koin.core.annotation.Single
 
 /**
  * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
diff --git a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
index be612d531..3a29fe2fb 100644
--- a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
+++ b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
@@ -167,8 +167,8 @@ class NiaAppState(
 /**
  * Stores information about navigation events to be used with JankStats
  */
-//@Composable
-//private fun NavigationTrackingSideEffect(navController: NavHostController) {
+// @Composable
+// private fun NavigationTrackingSideEffect(navController: NavHostController) {
 //    TrackDisposableJank(navController) { metricsHolder ->
 //        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
 //            metricsHolder.state?.putState("Navigation", destination.route.toString())
@@ -180,4 +180,4 @@ class NiaAppState(
 //            navController.removeOnDestinationChangedListener(listener)
 //        }
 //    }
-//}
+// }
diff --git a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
index 02e51b6d2..256e35e1e 100644
--- a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
+++ b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
@@ -54,7 +54,7 @@ import kotlin.uuid.Uuid
 @Serializable internal object TopicPlaceholderRoute
 
 // TODO: Remove @Keep when https://issuetracker.google.com/353898971 is fixed
-//@Keep
+// @Keep
 @Serializable internal object DetailPaneNavHostRoute
 
 fun NavGraphBuilder.interestsListDetailScreen() {
diff --git a/core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt b/core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
index b7ce0aef4..e1aea1861 100644
--- a/core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
+++ b/core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
@@ -28,7 +28,6 @@ import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeTopics
 import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeUserDataRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val testDataModule = module {
diff --git a/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/DataModule.android.kt b/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/DataModule.android.kt
index 1d55732fd..813654101 100644
--- a/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/DataModule.android.kt
+++ b/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/DataModule.android.kt
@@ -16,10 +16,10 @@
 
 package com.google.samples.apps.nowinandroid.core.data.di
 
-import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
-import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.ConnectivityManagerNetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneBroadcastMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -30,4 +30,4 @@ internal actual val networkMonitorModule = module {
 
 internal actual val timeZoneMonitorModule = module {
     singleOf(::TimeZoneBroadcastMonitor) bind TimeZoneMonitor::class
-}
\ No newline at end of file
+}
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 efc359097..859f004bb 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
@@ -26,7 +26,6 @@ import com.google.samples.apps.nowinandroid.core.database.dao.TopicFtsDao
 import kotlinx.coroutines.runBlocking
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.koin.ksp.generated.module
 
diff --git a/core/datastore/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt b/core/datastore/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt
index 63165de82..30c852f3d 100644
--- a/core/datastore/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt
+++ b/core/datastore/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt
@@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.core.datastore.di
 
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSource
 import com.russhwolf.settings.Settings
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 fun dataStoreModule() = module {