diff --git a/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/CoroutineScopeComponent.kt b/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/CoroutineScopeComponent.kt index 89b373db0..a10a19c69 100644 --- a/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/CoroutineScopeComponent.kt +++ b/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/CoroutineScopeComponent.kt @@ -31,7 +31,7 @@ annotation class ApplicationScope @Component abstract class CoroutineScopeComponent( - @Component val dispatchersComponent: DispatchersComponent + @Component val dispatchersComponent: DispatchersComponent, ) { @DefaultDispatcher abstract val defaultDispatcher: CoroutineDispatcher diff --git a/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/DispatcherQualifier.kt b/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/DispatcherQualifier.kt index d51c0277a..23cb66353 100644 --- a/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/DispatcherQualifier.kt +++ b/core/common/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/di/DispatcherQualifier.kt @@ -24,7 +24,7 @@ import me.tatarka.inject.annotations.Qualifier AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE, - AnnotationTarget.PROPERTY + AnnotationTarget.PROPERTY, ) annotation class IoDispatcher @@ -34,7 +34,7 @@ annotation class IoDispatcher AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE, - AnnotationTarget.PROPERTY + AnnotationTarget.PROPERTY, ) annotation class MainDispatcher @@ -44,6 +44,6 @@ annotation class MainDispatcher AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE, - AnnotationTarget.PROPERTY + AnnotationTarget.PROPERTY, ) annotation class DefaultDispatcher diff --git a/core/common/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/di/JvmDispatchersComponent.kt b/core/common/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/di/JvmDispatchersComponent.kt index 1afab8067..c6df8a244 100644 --- a/core/common/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/di/JvmDispatchersComponent.kt +++ b/core/common/src/jvmMain/kotlin/com/google/samples/apps/nowinandroid/core/di/JvmDispatchersComponent.kt @@ -22,7 +22,7 @@ import me.tatarka.inject.annotations.Component import me.tatarka.inject.annotations.Provides @Component -abstract class JvmDispatchersComponent: DispatchersComponent() { +abstract class JvmDispatchersComponent : DispatchersComponent() { @Provides override fun providesIODispatcher(): @IoDispatcher CoroutineDispatcher = Dispatchers.IO diff --git a/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/AndroidPlatformDependentDataModule.kt b/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/AndroidPlatformDependentDataModule.kt index c7830b28c..b42830ae0 100644 --- a/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/AndroidPlatformDependentDataModule.kt +++ b/core/data/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/AndroidPlatformDependentDataModule.kt @@ -22,7 +22,6 @@ 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 com.google.samples.apps.nowinandroid.core.di.AndroidApplicationComponent -import com.google.samples.apps.nowinandroid.core.di.ApplicationScope import com.google.samples.apps.nowinandroid.core.di.CoroutineScopeComponent import com.google.samples.apps.nowinandroid.core.di.DispatchersComponent import com.google.samples.apps.nowinandroid.core.di.IoDispatcher @@ -38,6 +37,7 @@ abstract class AndroidPlatformDependentDataModule( @Component val coroutineScopeComponent: CoroutineScopeComponent, ) : PlatformDependentDataModule() { abstract val application: Application + @IoDispatcher abstract val ioDispatcher: CoroutineDispatcher abstract val coroutineScope: CoroutineScope diff --git a/core/data/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/PlatformDependentDataModule.kt b/core/data/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/PlatformDependentDataModule.kt index 3228f38eb..3ffa58ecb 100644 --- a/core/data/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/PlatformDependentDataModule.kt +++ b/core/data/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/di/PlatformDependentDataModule.kt @@ -18,10 +18,8 @@ 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.di.ApplicationScope import me.tatarka.inject.annotations.Provides - abstract class PlatformDependentDataModule { @Provides abstract fun bindsNetworkMonitor(): NetworkMonitor 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 ba733a146..d202e5229 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 @@ -38,7 +38,7 @@ abstract class DatabaseModule(@Component val dispatchersComponent: DispatchersCo @Provides fun providesTopicsDao( - database: NiaDatabase + database: NiaDatabase, ): TopicDao = TopicDao(database, dispatcher) @Provides diff --git a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 0b867dc20..c43351862 100644 --- a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -59,15 +59,11 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalContext -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.layout.layout import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -91,14 +87,12 @@ import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider import com.google.samples.apps.nowinandroid.core.ui.collectAsStateWithLifecycle -import com.google.samples.apps.nowinandroid.core.ui.launchCustomChromeTab import com.google.samples.apps.nowinandroid.core.ui.newsFeed import nowinandroid.feature.foryou.generated.resources.Res import nowinandroid.feature.foryou.generated.resources.feature_foryou_done import nowinandroid.feature.foryou.generated.resources.feature_foryou_loading import nowinandroid.feature.foryou.generated.resources.feature_foryou_onboarding_guidance_subtitle import nowinandroid.feature.foryou.generated.resources.feature_foryou_onboarding_guidance_title -import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.PreviewParameter @@ -442,9 +436,9 @@ fun TopicIcon( ) } -//@Composable -//@OptIn(ExperimentalPermissionsApi::class) -//private fun NotificationPermissionEffect() { +// @Composable +// @OptIn(ExperimentalPermissionsApi::class) +// private fun NotificationPermissionEffect() { // // Permission requests should only be made from an Activity Context, which is not present // // in previews // if (LocalInspectionMode.current) return @@ -458,7 +452,7 @@ fun TopicIcon( // notificationsPermissionState.launchPermissionRequest() // } // } -//} +// } @Composable private fun DeepLinkEffect( diff --git a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt index b39b9d93f..5f77351f8 100644 --- a/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt +++ b/feature/foryou/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt @@ -22,7 +22,6 @@ import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.google.samples.apps.nowinandroid.feature.foryou.ForYouRoute const val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId" const val FOR_YOU_ROUTE = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"