mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-13 03:17:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Migrate 'MainActivity' prefs to repo pattern (#2770)

Browse Source
This commit is contained in:
Phil Oliver
2025-08-18 14:20:23 -04:00
committed by GitHub
parent 05e19a4740
commit d574ba738d
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -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),

9
app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
View File

@@ -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)
}