Polish

w2sv · w2sv · commit e64091e3af88 · 2023-04-19T18:07:49.000+02:00
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/DataStoreRepositoryHoldingViewModel.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/DataStoreRepositoryHoldingViewModel.kt
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/NonAppliedState.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/NonAppliedState.kt
@@ -3,8 +3,8 @@ package com.w2sv.wifiwidget.ui
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import com.w2sv.common.extensions.getDeflowedMap
 import com.w2sv.common.extensions.getValueSynchronously
-import com.w2sv.common.preferences.DataStoreProperty
-import com.w2sv.common.preferences.DataStoreRepository
+import com.w2sv.common.datastore.DataStoreProperty
+import com.w2sv.common.datastore.DataStoreRepository
 import com.w2sv.wifiwidget.extensions.getMutableStateMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/HomeScreenViewModel.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/HomeScreenViewModel.kt
@@ -9,12 +9,12 @@ import com.w2sv.androidutils.extensions.getLong
 import com.w2sv.androidutils.extensions.locationServicesEnabled
 import com.w2sv.androidutils.extensions.showToast
 import com.w2sv.common.WifiProperty
+import com.w2sv.common.datastore.DataStoreRepository
+import com.w2sv.common.datastore.DataStoreRepositoryInterfacingViewModel
+import com.w2sv.common.datastore.PreferencesKey
 import com.w2sv.common.extensions.getValueSynchronously
 import com.w2sv.common.extensions.hasPermission
-import com.w2sv.common.preferences.DataStoreRepository
-import com.w2sv.common.preferences.PreferencesKey
 import com.w2sv.widget.WidgetProvider
-import com.w2sv.wifiwidget.DataStoreRepositoryHoldingViewModel
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.NonAppliedStateFlow
 import com.w2sv.wifiwidget.ui.screens.home.locationaccesspermission.BACKGROUND_LOCATION_ACCESS_GRANT_REQUIRED
@@ -32,7 +32,7 @@ import javax.inject.Inject
 class HomeScreenViewModel @Inject constructor(
     dataStoreRepository: DataStoreRepository,
     @ApplicationContext context: Context
-) : DataStoreRepositoryHoldingViewModel(dataStoreRepository) {
+) : DataStoreRepositoryInterfacingViewModel(dataStoreRepository) {
 
     val nonAppliedInAppTheme = NonAppliedStateFlow(
         viewModelScope,
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/locationaccesspermission/LocationAccessPermissionRational.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/locationaccesspermission/LocationAccessPermissionRational.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.w2sv.androidutils.extensions.reset
-import com.w2sv.common.preferences.PreferencesKey
+import com.w2sv.common.datastore.PreferencesKey
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.screens.home.HomeScreenViewModel
 import com.w2sv.wifiwidget.ui.shared.DialogButton
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/locationaccesspermission/LocationAccessPermissionRequest.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/locationaccesspermission/LocationAccessPermissionRequest.kt
@@ -14,7 +14,7 @@ import com.w2sv.androidutils.extensions.reset
 import com.w2sv.androidutils.extensions.showToast
 import com.w2sv.common.WifiProperty
 import com.w2sv.common.extensions.launchingSuppressed
-import com.w2sv.common.preferences.PreferencesKey
+import com.w2sv.common.datastore.PreferencesKey
 import com.w2sv.widget.WidgetProvider
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.screens.home.HomeScreenViewModel
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/widgetconfiguration/WidgetConfigurationViewModel.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/widgetconfiguration/WidgetConfigurationViewModel.kt
@@ -6,10 +6,10 @@ import com.w2sv.androidutils.extensions.reset
 import com.w2sv.common.Theme
 import com.w2sv.common.WidgetColorSection
 import com.w2sv.common.WifiProperty
-import com.w2sv.common.preferences.DataStoreRepository
-import com.w2sv.common.preferences.PreferencesKey
+import com.w2sv.common.datastore.DataStoreRepository
+import com.w2sv.common.datastore.DataStoreRepositoryInterfacingViewModel
+import com.w2sv.common.datastore.PreferencesKey
 import com.w2sv.widget.WidgetProvider
-import com.w2sv.wifiwidget.DataStoreRepositoryHoldingViewModel
 import com.w2sv.wifiwidget.ui.CoherentNonAppliedStates
 import com.w2sv.wifiwidget.ui.NonAppliedSnapshotStateMap
 import com.w2sv.wifiwidget.ui.NonAppliedStateFlow
@@ -24,7 +24,7 @@ import javax.inject.Inject
 class WidgetConfigurationViewModel @Inject constructor(
     dataStoreRepository: DataStoreRepository,
     private val savedStateHandle: SavedStateHandle
-) : DataStoreRepositoryHoldingViewModel(dataStoreRepository) {
+) : DataStoreRepositoryInterfacingViewModel(dataStoreRepository) {
 
     // ===================================
     // onSplashScreenAnimationFinished
diff --git a/common/build.gradle b/common/build.gradle
@@ -14,6 +14,7 @@ android {
 dependencies {
     implementation libs.androidx.core
     implementation libs.androidx.appcompat
+    implementation libs.androidx.compose.viewmodel
     implementation libs.accompanist.permissions
     api libs.androidx.datastore.preferences
 
diff --git a/common/src/main/kotlin/com/w2sv/common/WidgetColorSection.kt b/common/src/main/kotlin/com/w2sv/common/WidgetColorSection.kt
@@ -3,7 +3,7 @@ package com.w2sv.common
 import android.graphics.Color
 import androidx.annotation.StringRes
 import androidx.datastore.preferences.core.intPreferencesKey
-import com.w2sv.common.preferences.DataStoreProperty
+import com.w2sv.common.datastore.DataStoreProperty
 
 enum class WidgetColorSection(@StringRes val labelRes: Int, override val defaultValue: Int) :
     DataStoreProperty<Int> {
diff --git a/common/src/main/kotlin/com/w2sv/common/WidgetRefreshingParameter.kt b/common/src/main/kotlin/com/w2sv/common/WidgetRefreshingParameter.kt
@@ -2,7 +2,7 @@ package com.w2sv.common
 
 import androidx.annotation.StringRes
 import androidx.datastore.preferences.core.booleanPreferencesKey
-import com.w2sv.common.preferences.DataStoreProperty
+import com.w2sv.common.datastore.DataStoreProperty
 
 enum class WidgetRefreshingParameter(
     override val defaultValue: Boolean,
diff --git a/common/src/main/kotlin/com/w2sv/common/WifiProperty.kt b/common/src/main/kotlin/com/w2sv/common/WifiProperty.kt
@@ -4,7 +4,7 @@ import androidx.annotation.ArrayRes
 import androidx.annotation.StringRes
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
-import com.w2sv.common.preferences.DataStoreProperty
+import com.w2sv.common.datastore.DataStoreProperty
 
 enum class WifiProperty(
     @StringRes val labelRes: Int,
diff --git a/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreProperty.kt b/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreProperty.kt
@@ -1,4 +1,4 @@
-package com.w2sv.common.preferences
+package com.w2sv.common.datastore
 
 import androidx.datastore.preferences.core.Preferences
 
diff --git a/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreRepository.kt b/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreRepository.kt
@@ -1,4 +1,4 @@
-package com.w2sv.common.preferences
+package com.w2sv.common.datastore
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
@@ -8,8 +8,10 @@ import com.w2sv.common.WidgetColorSection
 import com.w2sv.common.WidgetRefreshingParameter
 import com.w2sv.common.WifiProperty
 import com.w2sv.kotlinutils.extensions.getByOrdinal
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class DataStoreRepository @Inject constructor(
@@ -80,4 +82,24 @@ class DataStoreRepository @Inject constructor(
             }
         }
     }
+
+    interface Interface {
+
+        val dataStoreRepository: DataStoreRepository
+        val coroutineScope: CoroutineScope
+
+        fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+            coroutineScope.launch {
+                dataStoreRepository.save(key, value)
+            }
+        }
+
+        fun <T, P : DataStoreProperty<T>> saveMapToDataStore(
+            map: Map<P, T>
+        ) {
+            coroutineScope.launch {
+                dataStoreRepository.saveMap(map)
+            }
+        }
+    }
 }
diff --git a/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreRepositoryInterfacingViewModel.kt b/common/src/main/kotlin/com/w2sv/common/datastore/DataStoreRepositoryInterfacingViewModel.kt
@@ -0,0 +1,11 @@
+package com.w2sv.common.datastore
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineScope
+
+abstract class DataStoreRepositoryInterfacingViewModel(override val dataStoreRepository: DataStoreRepository) :
+    ViewModel(),
+    DataStoreRepository.Interface {
+    override val coroutineScope: CoroutineScope get() = viewModelScope
+}
diff --git a/common/src/main/kotlin/com/w2sv/common/datastore/PreferencesKey.kt b/common/src/main/kotlin/com/w2sv/common/datastore/PreferencesKey.kt
@@ -1,4 +1,4 @@
-package com.w2sv.common.preferences
+package com.w2sv.common.datastore
 
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.floatPreferencesKey
diff --git a/common/src/main/kotlin/com/w2sv/common/datastore/PreferencesModule.kt b/common/src/main/kotlin/com/w2sv/common/datastore/PreferencesModule.kt
@@ -1,4 +1,4 @@
-package com.w2sv.common.preferences
+package com.w2sv.common.datastore
 
 import android.content.Context
 import androidx.datastore.core.DataStore
diff --git a/widget/src/main/kotlin/com/w2sv/widget/WidgetDataRefreshWorker.kt b/widget/src/main/kotlin/com/w2sv/widget/WidgetDataRefreshWorker.kt
@@ -10,7 +10,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.w2sv.common.WidgetRefreshingParameter
 import com.w2sv.common.extensions.getDeflowedMap
-import com.w2sv.common.preferences.DataStoreRepository
+import com.w2sv.common.datastore.DataStoreRepository
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
diff --git a/widget/src/main/kotlin/com/w2sv/widget/WidgetPopulator.kt b/widget/src/main/kotlin/com/w2sv/widget/WidgetPopulator.kt
@@ -11,7 +11,7 @@ import android.widget.RemoteViews
 import com.w2sv.androidutils.extensions.crossVisualize
 import com.w2sv.common.extensions.getDeflowedMap
 import com.w2sv.common.extensions.getValueSynchronously
-import com.w2sv.common.preferences.DataStoreRepository
+import com.w2sv.common.datastore.DataStoreRepository
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
