-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #115 from VictorKabata/develop
Develop -> Main
- Loading branch information
Showing
47 changed files
with
349 additions
and
499 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| package com.vickbt.shared.di | ||
|
|
||
| import com.vickbt.shared.utils.DatabaseDriverFactory | ||
| import com.vickbt.shared.utils.MultiplatformSettingsWrapper | ||
| import com.vickbt.shared.utils.DatastoreFactory | ||
| import org.koin.core.module.Module | ||
| import org.koin.dsl.module | ||
|
|
||
| actual fun platformModule(): Module = module { | ||
| single { DatabaseDriverFactory(context = get()) } | ||
| single { MultiplatformSettingsWrapper().createSettings() } | ||
| single { DatastoreFactory(context = get()).createDatastore() } | ||
| } |
33 changes: 0 additions & 33 deletions
33
shared/src/androidMain/kotlin/com/vickbt/shared/utils/CustomImageLoader.kt
This file was deleted.
Oops, something went wrong.
14 changes: 14 additions & 0 deletions
14
shared/src/androidMain/kotlin/com/vickbt/shared/utils/DatastoreFactory.android.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.vickbt.shared.utils | ||
|
|
||
| import android.content.Context | ||
| import androidx.datastore.core.DataStore | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import com.vickbt.shared.domain.utils.Constants | ||
|
|
||
| actual class DatastoreFactory(private val context: Context) { | ||
| actual fun createDatastore(): DataStore<Preferences> { | ||
| return initDataStore { | ||
| context.filesDir.resolve(Constants.dataStoreFileName).absolutePath | ||
| } | ||
| } | ||
| } |
15 changes: 0 additions & 15 deletions
15
shared/src/androidMain/kotlin/com/vickbt/shared/utils/MultiplatformSettingsWrapper.kt
This file was deleted.
Oops, something went wrong.
29 changes: 19 additions & 10 deletions
29
shared/src/commonMain/kotlin/com/vickbt/shared/data/datasources/SettingsRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,34 @@ | ||
| package com.vickbt.shared.data.datasources | ||
|
|
||
| import com.russhwolf.settings.ExperimentalSettingsApi | ||
| import com.russhwolf.settings.ObservableSettings | ||
| import com.russhwolf.settings.coroutines.getIntFlow | ||
| import androidx.datastore.core.DataStore | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.core.intPreferencesKey | ||
| import com.vickbt.shared.domain.repositories.SettingsRepository | ||
| import com.vickbt.shared.domain.utils.Constants.KEY_IMAGE_QUALITY | ||
| import com.vickbt.shared.domain.utils.Constants.KEY_THEME | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.map | ||
|
|
||
| @ExperimentalSettingsApi | ||
| class SettingsRepositoryImpl(private val observableSettings: ObservableSettings) : | ||
| SettingsRepository { | ||
| class SettingsRepositoryImpl( | ||
| private val dataStore: DataStore<Preferences> | ||
| ) : SettingsRepository { | ||
|
|
||
| override suspend fun savePreferenceSelection(key: String, selection: Int) = | ||
| observableSettings.putInt(key = key, value = selection) | ||
| override suspend fun savePreferenceSelection(key: String, selection: Int) { | ||
| dataStore.edit { preferences -> | ||
| preferences[intPreferencesKey(key)] = selection | ||
| } | ||
| } | ||
|
|
||
| override suspend fun getThemePreference(): Flow<Int> { | ||
| return observableSettings.getIntFlow(key = KEY_THEME, defaultValue = 2) | ||
| return dataStore.data.map { preferences -> | ||
| preferences[intPreferencesKey(KEY_THEME)] ?: 2 | ||
| } | ||
| } | ||
|
|
||
| override suspend fun getImageQualityPreference(): Flow<Int> { | ||
| return observableSettings.getIntFlow(key = KEY_IMAGE_QUALITY, defaultValue = 1) | ||
| return dataStore.data.map { preferences -> | ||
| preferences[intPreferencesKey(KEY_IMAGE_QUALITY)] ?: 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.