From d574ba738d8ed0fc53d82bb2a633a27155fd3146 Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Mon, 18 Aug 2025 14:20:23 -0400
Subject: [PATCH] Migrate 'MainActivity' prefs to repo pattern (#2770)

---
 app/src/main/java/com/geeksville/mesh/MainActivity.kt  | 10 +++++-----
 .../java/com/geeksville/mesh/util/LanguageUtils.kt     |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 128579072..eb585a807 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -20,7 +20,6 @@ package com.geeksville.mesh
 import android.app.PendingIntent
 import android.app.TaskStackBuilder
 import android.content.Intent
-import android.content.SharedPreferences
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.Color
@@ -46,6 +45,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.android.GeeksvilleApplication
 import com.geeksville.mesh.android.Logging
+import com.geeksville.mesh.android.prefs.UiPrefs
 import com.geeksville.mesh.model.BluetoothViewModel
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.navigation.DEEP_LINK_BASE_URI
@@ -70,7 +70,7 @@ class MainActivity :
     // This is aware of the Activity lifecycle and handles binding to the mesh service.
     @Inject internal lateinit var meshServiceClient: MeshServiceClient
 
-    @Inject internal lateinit var uiPrefs: SharedPreferences
+    @Inject internal lateinit var uiPrefs: UiPrefs
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
@@ -86,11 +86,11 @@ class MainActivity :
         super.onCreate(savedInstanceState)
 
         if (savedInstanceState == null) {
-            val lang = uiPrefs.getString("lang", LanguageUtils.SYSTEM_DEFAULT)
+            val lang = uiPrefs.lang
             if (lang != LanguageUtils.SYSTEM_MANAGED) LanguageUtils.migrateLanguagePrefs(uiPrefs)
             info("in-app language is ${LanguageUtils.getLocale()}")
 
-            if (uiPrefs.getBoolean("app_intro_completed", false)) {
+            if (uiPrefs.appIntroCompleted) {
                 (application as GeeksvilleApplication).askToRate(this)
             }
         }
@@ -266,7 +266,7 @@ class MainActivity :
                 getString(R.string.theme_system) to AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
             )
 
-        val theme = uiPrefs.getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+        val theme = uiPrefs.theme
         debug("Theme from prefs: $theme")
         model.showAlert(
             title = getString(R.string.choose_theme),
diff --git a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
index d2309d02a..4aeb1af74 100644
--- a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
@@ -18,12 +18,11 @@
 package com.geeksville.mesh.util
 
 import android.content.Context
-import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
 import com.geeksville.mesh.R
 import com.geeksville.mesh.android.Logging
+import com.geeksville.mesh.android.prefs.UiPrefs
 import org.xmlpull.v1.XmlPullParser
 import java.util.Locale
 
@@ -44,10 +43,10 @@ object LanguageUtils : Logging {
         )
     }
 
-    fun migrateLanguagePrefs(prefs: SharedPreferences) {
-        val currentLang = prefs.getString("lang", SYSTEM_DEFAULT) ?: SYSTEM_DEFAULT
+    fun migrateLanguagePrefs(uiPrefs: UiPrefs) {
+        val currentLang = uiPrefs.lang
         debug("Migrating in-app language prefs: $currentLang")
-        prefs.edit { putString("lang", SYSTEM_MANAGED) }
+        uiPrefs.lang = SYSTEM_MANAGED
         setLocale(currentLang)
     }