fix: apply app language to window dialogs

Author: whalechoi

app/src/main/kotlin/app/App.kt

@@ -26,6 +26,7 @@ import features.proxy.server.usecase.ProxyServerImportFileUseCase
 import features.proxy.server.usecase.ProxyServiceUseCase
 import features.resources.ResourceFileUseCase
 import features.settings.locale.ProvideAppLanguage
+import features.settings.locale.RecreateActivityOnAppLanguageChange
 import features.settings.usecase.SwitchRunModeUseCase
 import features.settings.usecase.TproxyBootScriptUseCase
 import features.subscription.runtime.AndroidSubscriptionFetcher
@@ -151,6 +152,7 @@ fun App(
         { transform -> stateStore.update(transform) }
     }
     val keyColor = keyColorFor(chromeState.seedIndex)
+    RecreateActivityOnAppLanguageChange(languageMode = chromeState.languageMode)
     ProxyStatusSynchronizer(
         stateStore = stateStore,
         proxyEngine = proxyEngine,

app/src/main/kotlin/app/MainActivity.kt

@@ -4,6 +4,7 @@
 package app
 
 import android.Manifest
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@@ -19,10 +20,12 @@ import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.union
 import com.journeyapps.barcodescanner.ScanContract
 import data.AndroidAppStateStore
+import data.AppSettingsPreferences
 import engine.vpn.AndroidVpnPermissionRequester
 import features.logs.AndroidLogFileCreator
 import features.proxy.server.qr.AndroidQrCodeScanRequester
 import features.resources.runtime.AndroidResourceFilePicker
+import features.settings.locale.localizedAppContext
 import features.subscription.SubscriptionInstallConfigUseCase
 import features.subscription.isSubscriptionInstallConfigUri
 import features.subscription.runtime.AndroidSubscriptionFetcher
@@ -100,6 +103,11 @@ class MainActivity : ComponentActivity() {
         logFileCreator.complete(uri)
     }
 
+    override fun attachBaseContext(newBase: Context) {
+        val languageMode = AppSettingsPreferences(newBase).load().languageMode
+        super.attachBaseContext(newBase.localizedAppContext(languageMode))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         vpnPermissionRequester.registerLauncher { intent ->

app/src/main/kotlin/features/logs/CoreLogRepository.kt

@@ -3,7 +3,7 @@
 
 package features.logs
 
-import java.time.LocalDateTime
+import java.util.Calendar
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -85,19 +85,19 @@ private fun String.normalizedLogLevel(): String {
 }
 
 fun currentLogTime(): String {
-    val dateTime = LocalDateTime.now()
+    val calendar = Calendar.getInstance()
     return buildString {
-        append(dateTime.year)
+        append(calendar.get(Calendar.YEAR))
         append('-')
-        append(dateTime.monthValue.twoDigits())
+        append((calendar.get(Calendar.MONTH) + 1).twoDigits())
         append('-')
-        append(dateTime.dayOfMonth.twoDigits())
+        append(calendar.get(Calendar.DAY_OF_MONTH).twoDigits())
         append(' ')
-        append(dateTime.hour.twoDigits())
+        append(calendar.get(Calendar.HOUR_OF_DAY).twoDigits())
         append(':')
-        append(dateTime.minute.twoDigits())
+        append(calendar.get(Calendar.MINUTE).twoDigits())
         append(':')
-        append(dateTime.second.twoDigits())
+        append(calendar.get(Calendar.SECOND).twoDigits())
     }
 }
 

app/src/main/kotlin/features/settings/locale/AppLocale.kt

@@ -3,13 +3,19 @@
 
 package features.settings.locale
 
+import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.os.LocaleList
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import app.modes.LanguageModeEnglish
@@ -49,6 +55,20 @@ fun ProvideAppLanguage(
     )
 }
 
+@Composable
+fun RecreateActivityOnAppLanguageChange(languageMode: Int) {
+    val activity = LocalContext.current.findActivity()
+    var previousLanguageMode by remember { mutableIntStateOf(languageMode) }
+
+    LaunchedEffect(activity, languageMode) {
+        if (previousLanguageMode == languageMode) {
+            return@LaunchedEffect
+        }
+        previousLanguageMode = languageMode
+        activity?.recreate()
+    }
+}
+
 private fun String?.toAppLocale(systemLocale: Locale): Locale {
     return this?.let(Locale::forLanguageTag) ?: systemLocale
 }
@@ -68,3 +88,11 @@ private fun Context.localizedConfiguration(locale: Locale): Configuration {
         setLayoutDirection(locale)
     }
 }
+
+private tailrec fun Context.findActivity(): Activity? {
+    return when (this) {
+        is Activity -> this
+        is ContextWrapper -> baseContext.findActivity()
+        else -> null
+    }
+}

buildSrc/src/main/kotlin/BuildConfig.kt

@@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction
 object ProjectConfig {
     const val JVM_VERSION = 25
     const val PROJECT_NAME = "AsteriskNG"
-    const val VERSION_NAME = "1.1.1"
+    const val VERSION_NAME = "1.2.0-dev"
     const val PACKAGE_NAME = "org.asterisk.zcc.ang"
     const val XRAY_CORE_VERSION = "v26.5.9"
     const val ANDROID_LIB_XRAY_LITE_VERSION = "v26.5.19"