Migrate (mostly) maps prefs to repo (meshtastic#2776)

Author: poliver

app/src/fdroid/java/com/geeksville/mesh/ui/map/MapViewModel.kt

@@ -17,8 +17,7 @@
 
 package com.geeksville.mesh.ui.map
 
-import android.content.SharedPreferences
-import androidx.core.content.edit
+import com.geeksville.mesh.android.prefs.UiPrefs
 import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -28,12 +27,14 @@ import javax.inject.Inject
 class MapViewModel
 @Inject
 constructor(
-    preferences: SharedPreferences,
+    uiPrefs: UiPrefs,
     packetRepository: PacketRepository,
     nodeRepository: NodeRepository,
-) : BaseMapViewModel(preferences, nodeRepository, packetRepository) {
+) : BaseMapViewModel(uiPrefs, nodeRepository, packetRepository) {
 
     var mapStyleId: Int
-        get() = preferences.getInt(MAP_STYLE_ID, 0)
-        set(value) = preferences.edit { putInt(MAP_STYLE_ID, value) }
+        get() = uiPrefs.mapStyle
+        set(value) {
+            uiPrefs.mapStyle = value
+        }
 }

app/src/google/java/com/geeksville/mesh/ui/map/MapViewModel.kt

@@ -24,6 +24,7 @@ import androidx.core.content.edit
 import androidx.lifecycle.viewModelScope
 import com.geeksville.mesh.ConfigProtos
 import com.geeksville.mesh.android.BuildUtils.debug
+import com.geeksville.mesh.android.prefs.UiPrefs
 import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
@@ -72,18 +73,19 @@ data class MapCameraPosition(
     val bearing: Float,
 )
 
-@Suppress("TooManyFunctions")
+@Suppress("TooManyFunctions", "LongParameterList")
 @HiltViewModel
 class MapViewModel
 @Inject
 constructor(
     private val application: Application,
-    preferences: SharedPreferences,
+    uiPrefs: UiPrefs,
+    private val preferences: SharedPreferences,
     nodeRepository: NodeRepository,
     packetRepository: PacketRepository,
     radioConfigRepository: RadioConfigRepository,
     private val customTileProviderRepository: CustomTileProviderRepository,
-) : BaseMapViewModel(preferences, nodeRepository, packetRepository) {
+) : BaseMapViewModel(uiPrefs, nodeRepository, packetRepository) {
 
     private val _errorFlow = MutableSharedFlow<String>()
     val errorFlow: SharedFlow<String> = _errorFlow.asSharedFlow()

app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt

@@ -18,7 +18,6 @@
 package com.geeksville.mesh.model
 
 import android.app.Application
-import android.content.SharedPreferences
 import android.net.Uri
 import androidx.annotation.StringRes
 import androidx.compose.ui.unit.Dp
@@ -38,6 +37,7 @@ import com.geeksville.mesh.Portnums.PortNum
 import com.geeksville.mesh.R
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.android.Logging
+import com.geeksville.mesh.android.prefs.UiPrefs
 import com.geeksville.mesh.database.MeshLogRepository
 import com.geeksville.mesh.database.entity.FirmwareRelease
 import com.geeksville.mesh.database.entity.MeshLog
@@ -47,7 +47,6 @@ import com.geeksville.mesh.repository.api.DeviceHardwareRepository
 import com.geeksville.mesh.repository.api.FirmwareReleaseRepository
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import com.geeksville.mesh.service.ServiceAction
-import com.geeksville.mesh.ui.map.MAP_STYLE_ID
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -204,7 +203,7 @@ constructor(
     private val radioConfigRepository: RadioConfigRepository,
     private val deviceHardwareRepository: DeviceHardwareRepository,
     private val firmwareReleaseRepository: FirmwareReleaseRepository,
-    private val preferences: SharedPreferences,
+    private val uiPrefs: UiPrefs,
 ) : ViewModel(),
     Logging {
     private val destNum = savedStateHandle.toRoute<NodesRoutes.NodeDetailGraph>().destNum
@@ -234,7 +233,7 @@ constructor(
     fun getUser(nodeNum: Int) = radioConfigRepository.getUser(nodeNum)
 
     val tileSource
-        get() = CustomTileSource.getTileSource(preferences.getInt(MAP_STYLE_ID, 0))
+        get() = CustomTileSource.getTileSource(uiPrefs.mapStyle)
 
     fun deleteLog(uuid: String) = viewModelScope.launch(dispatchers.io) { meshLogRepository.deleteLog(uuid) }
 

app/src/main/java/com/geeksville/mesh/ui/map/BaseMapViewModel.kt

@@ -17,10 +17,9 @@
 
 package com.geeksville.mesh.ui.map
 
-import android.content.SharedPreferences
-import androidx.core.content.edit
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.geeksville.mesh.android.prefs.UiPrefs
 import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
 import com.geeksville.mesh.database.entity.Packet
@@ -35,7 +34,7 @@ import kotlinx.coroutines.flow.stateIn
 
 @Suppress("TooManyFunctions")
 abstract class BaseMapViewModel(
-    protected val preferences: SharedPreferences,
+    protected val uiPrefs: UiPrefs,
     nodeRepository: NodeRepository,
     packetRepository: PacketRepository,
 ) : ViewModel() {
@@ -62,28 +61,27 @@ abstract class BaseMapViewModel(
             }
             .stateIn(scope = viewModelScope, started = SharingStarted.WhileSubscribed(5_000), initialValue = emptyMap())
 
-    private val showOnlyFavorites = MutableStateFlow(preferences.getBoolean("only-favorites", false))
+    private val showOnlyFavorites = MutableStateFlow(uiPrefs.showOnlyFavorites)
 
-    private val showWaypointsOnMap = MutableStateFlow(preferences.getBoolean("show-waypoints-on-map", true))
+    private val showWaypointsOnMap = MutableStateFlow(uiPrefs.showWaypointsOnMap)
 
-    private val showPrecisionCircleOnMap =
-        MutableStateFlow(preferences.getBoolean("show-precision-circle-on-map", true))
+    private val showPrecisionCircleOnMap = MutableStateFlow(uiPrefs.showPrecisionCircleOnMap)
 
     fun toggleOnlyFavorites() {
         val current = showOnlyFavorites.value
-        preferences.edit { putBoolean("only-favorites", !current) }
+        uiPrefs.showOnlyFavorites = !current
         showOnlyFavorites.value = !current
     }
 
     fun toggleShowWaypointsOnMap() {
         val current = showWaypointsOnMap.value
-        preferences.edit { putBoolean("show-waypoints-on-map", !current) }
+        uiPrefs.showWaypointsOnMap = !current
         showWaypointsOnMap.value = !current
     }
 
     fun toggleShowPrecisionCircleOnMap() {
         val current = showPrecisionCircleOnMap.value
-        preferences.edit { putBoolean("show-precision-circle-on-map", !current) }
+        uiPrefs.showPrecisionCircleOnMap = !current
         showPrecisionCircleOnMap.value = !current
     }