A fully functional Android app built entirely with Kotlin and Jetpack Compose
Add top level application scope, use IO dispatcher for DataStore
Don Turner4cdb5963a0af
diff --git a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.ktindex b73c63568..c265394a8 100644--- a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.kt+++ b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.kt@@ -17,7 +17,7 @@package com.google.samples.apps.nowinandroid.core.network.diimport com.google.samples.apps.nowinandroid.core.network.Dispatcher-import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO+import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.Defaultimport dagger.Moduleimport dagger.Providesimport dagger.hilt.InstallIn@@ -25,15 +25,20 @@ import dagger.hilt.components.SingletonComponentimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.SupervisorJob+import javax.inject.Qualifierimport javax.inject.Singleton+@Retention(AnnotationRetention.RUNTIME)+@Qualifier+annotation class ApplicationScope+@Module@InstallIn(SingletonComponent::class)object CoroutineScopesModule {@Provides@Singleton- @Dispatcher(IO)- fun providesIOCoroutineScope(- @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,- ): CoroutineScope = CoroutineScope(SupervisorJob() + ioDispatcher)+ @ApplicationScope+ fun providesCoroutineScope(+ @Dispatcher(Default) dispatcher: CoroutineDispatcher,+ ): CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher)}diff --git a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.ktindex 89a6eb734..ac9eaf767 100644--- a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt+++ b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt@@ -25,11 +25,13 @@ import com.google.samples.apps.nowinandroid.core.datastore.UserPreferencesimport com.google.samples.apps.nowinandroid.core.datastore.UserPreferencesSerializerimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO+import com.google.samples.apps.nowinandroid.core.network.di.ApplicationScopeimport dagger.Moduleimport dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.components.SingletonComponent+import kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.CoroutineScopeimport javax.inject.Singleton@@ -41,12 +43,13 @@ object DataStoreModule {@Singletonfun providesUserPreferencesDataStore(@ApplicationContext context: Context,- @Dispatcher(IO) ioScope: CoroutineScope,+ @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,+ @ApplicationScope scope: CoroutineScope,userPreferencesSerializer: UserPreferencesSerializer,): DataStore<UserPreferences> =DataStoreFactory.create(serializer = userPreferencesSerializer,- scope = ioScope,+ scope = CoroutineScope(scope.coroutineContext + ioDispatcher),migrations = listOf(IntToStringIdsMigration,),