Refactored PreferenceHelper

openMF · Jan 13, 2025 · c7bc4e4 · c7bc4e4
1 parent f4d75b6
commit c7bc4e4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/PreferenceHelper.kt b/core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/PreferenceHelper.kt
@@ -20,7 +20,8 @@ import org.mifos.mobile.core.datastore.model.AppTheme
 import org.mifos.mobile.core.datastore.model.UserData
 
 class PreferenceHelper(
-    private val preferenceManager: UserPreferenceDataSource,
+    private val preferenceManager: UserPreferencesDataSource,
+    private val ioDispatcher: CoroutineDispatcher,
     unconfinedDispatcher: CoroutineDispatcher,
 ) : UserPreferencesRepository {
     private val unconfinedScope = CoroutineScope(unconfinedDispatcher)

diff --git a/...ore/datastore/UserPreferenceDataSource.kt → ...re/datastore/UserPreferencesDataSource.kt b/...ore/datastore/UserPreferenceDataSource.kt → ...re/datastore/UserPreferencesDataSource.kt
@@ -28,7 +28,7 @@ import org.mifos.mobile.core.datastore.model.UserData
 private const val USER_DATA = "userData"
 private const val APP_SETTINGS = "appSettings"
 
-class UserPreferenceDataSource(
+class UserPreferencesDataSource(
     private val settings: Settings,
     private val dispatcher: CoroutineDispatcher,
 ) {

diff --git a/core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/di/PreferenceModule.kt b/core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/di/PreferenceModule.kt
@@ -10,10 +10,35 @@
 package org.mifos.mobile.core.datastore.di
 
 import com.russhwolf.settings.Settings
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
-import org.mifos.mobile.core.datastore.PreferencesHelper
+import org.mifos.mobile.core.datastore.PreferenceHelper
+import org.mifos.mobile.core.datastore.UserPreferencesDataSource
+import org.mifos.mobile.core.datastore.UserPreferencesRepository
+
 
 val PreferencesModule = module {
-    single<Settings> { Settings() }
-    single { PreferencesHelper(settings = get()) }
+    factory<Settings> { Settings() }
+
+    factory {
+        UserPreferencesDataSource(
+            settings = get(),
+            dispatcher = get(named(MifosDispatchers.IO.name))
+        )
+    }
+
+    single<UserPreferencesRepository> {
+        PreferenceHelper(
+            preferenceManager = get(),
+            ioDispatcher = get(named(MifosDispatchers.IO.name)),
+            unconfinedDispatcher = get(named(MifosDispatchers.Unconfined.name)),
+        )
+    }
 }
+
+// Should be removed after common module conversion
+enum class MifosDispatchers {
+    Default,
+    IO,
+    Unconfined
+}