meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

MVVM-ify logic to display app intro (#2748)

Browse source
This commit is contained in:
Phil Oliver 2025-08-16 14:58:21 -04:00 • committed by GitHub
parent acc3e3f636
commit 8429f35c1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -20,6 +20,7 @@ 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
@ -39,12 +40,10 @@ import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalView
import androidx.core.content.edit
import androidx.core.net.toUri
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.model.BluetoothViewModel
@ -71,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
private var showAppIntro by mutableStateOf(false)
@Inject internal lateinit var uiPrefs: SharedPreferences
override fun onCreate(savedInstanceState: Bundle?) {
installSplashScreen()
@ -85,15 +84,13 @@ class MainActivity :
}
super.onCreate(savedInstanceState)
val prefs = UIViewModel.getPreferences(this)
if (savedInstanceState == null) {
val lang = prefs.getString("lang", LanguageUtils.SYSTEM_DEFAULT)
if (lang != LanguageUtils.SYSTEM_MANAGED) LanguageUtils.migrateLanguagePrefs(prefs)
val lang = uiPrefs.getString("lang", LanguageUtils.SYSTEM_DEFAULT)
if (lang != LanguageUtils.SYSTEM_MANAGED) LanguageUtils.migrateLanguagePrefs(uiPrefs)
info("in-app language is ${LanguageUtils.getLocale()}")
if (!prefs.getBoolean("app_intro_completed", false)) {
showAppIntro = true
} else {
if (uiPrefs.getBoolean("app_intro_completed", false)) {
(application as GeeksvilleApplication).askToRate(this)
}
}
@ -115,11 +112,11 @@ class MainActivity :
SideEffect { AppCompatDelegate.setDefaultNightMode(theme) }
}
val showAppIntro by model.showAppIntro.collectAsStateWithLifecycle()
if (showAppIntro) {
AppIntroductionScreen(
onDone = {
prefs.edit { putBoolean("app_intro_completed", true) }
showAppIntro = false
model.onAppIntroCompleted()
(application as GeeksvilleApplication).askToRate(this@MainActivity)
},
)
@ -246,11 +243,7 @@ class MainActivity :
chooseLangDialog()
}
MainMenuAction.SHOW_INTRO -> {
showAppIntro = true
}
else -> {}
else -> warn("Unexpected action: $action")
}
}
@ -273,8 +266,7 @@ class MainActivity :
getString(R.string.theme_system) to AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
)
val prefs = UIViewModel.getPreferences(this)
val theme = prefs.getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
val theme = uiPrefs.getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
debug("Theme from prefs: $theme")
model.showAlert(
title = getString(R.string.choose_theme),