M57andhy4ri
b3765bd106
Add a Language selector to Settings → Appearance that overrides the app display language independent of the device locale. Persists a BCP-47 code in ServerStoreState.appLanguage; MainActivity.attachBaseContext applies it via a ContextWrapper (works on minSdk 26, no AppCompat dependency needed since the Activity is a plain ComponentActivity). Selecting a language recreates the activity so resources re-resolve immediately. Includes System default / English / 한국어 options, plus a unit test for the locale-code resolver. Note: the new string keys (settings_item_language, language_system, language_english, language_korean) should be backfilled into values-ko once PR #602 lands. Co-authored-by: hy4ri <hy4ri@users.noreply.github.com>
73 lines
3.0 KiB
Kotlin
73 lines
3.0 KiB
Kotlin
package com.m57.hermescontrol
|
|
|
|
import android.content.Context
|
|
import android.content.Intent
|
|
import android.os.Bundle
|
|
import androidx.activity.ComponentActivity
|
|
import androidx.activity.compose.setContent
|
|
import androidx.activity.enableEdgeToEdge
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.material3.Surface
|
|
import androidx.compose.runtime.collectAsState
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.mutableStateOf
|
|
import androidx.compose.runtime.setValue
|
|
import androidx.compose.ui.Modifier
|
|
import com.m57.hermescontrol.data.local.AuthManager
|
|
import com.m57.hermescontrol.notification.NotificationReplyReceiver
|
|
import com.m57.hermescontrol.theme.HermesControlTheme
|
|
import com.m57.hermescontrol.util.LocaleContextWrapper
|
|
|
|
class MainActivity : ComponentActivity() {
|
|
// Observable state so both onCreate and onNewIntent updates flow to Compose
|
|
private var notificationSessionId by mutableStateOf<String?>(null)
|
|
|
|
/**
|
|
* Apply the user-selected display language before any view is inflated.
|
|
* Reads the persisted code from [AuthManager]; an uninitialized store
|
|
* (shouldn't happen here, but guarded) falls back to the device locale.
|
|
*/
|
|
override fun attachBaseContext(base: Context) {
|
|
val code =
|
|
runCatching { AuthManager.getAppLanguage() }
|
|
.getOrDefault(LocaleContextWrapper.SYSTEM_LANGUAGE)
|
|
super.attachBaseContext(LocaleContextWrapper.wrapWithCode(base, code))
|
|
}
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
super.onCreate(savedInstanceState)
|
|
|
|
// Read notification tap sessionId (if any) from the intent that launched us
|
|
notificationSessionId = intent?.getStringExtra(NotificationReplyReceiver.EXTRA_SESSION_ID)
|
|
|
|
enableEdgeToEdge()
|
|
setContent {
|
|
val themePreference by AuthManager.themePreferenceFlow.collectAsState()
|
|
val useDynamicColors by AuthManager.useDynamicColorsFlow.collectAsState()
|
|
val themePreset by AuthManager.themePresetFlow.collectAsState()
|
|
HermesControlTheme(
|
|
themePreference = themePreference,
|
|
useDynamicColors = useDynamicColors,
|
|
themePreset = themePreset,
|
|
) {
|
|
Surface(
|
|
modifier = Modifier.fillMaxSize(),
|
|
color = MaterialTheme.colorScheme.background,
|
|
) {
|
|
MainNavigation(sessionId = notificationSessionId)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
override fun onNewIntent(intent: Intent) {
|
|
super.onNewIntent(intent)
|
|
// When a notification tap arrives while the app is already running
|
|
// (task exists in background), Android delivers the intent here instead
|
|
// of onCreate. Update the observable state so Compose recomposes
|
|
// and ChatScreen's LaunchedEffect switches to the correct session.
|
|
notificationSessionId = intent.getStringExtra(NotificationReplyReceiver.EXTRA_SESSION_ID)
|
|
}
|
|
}
|