Merge pull request #408 from synonymdev/feat/language-settings

Language Settings

Author: jvsena42

app/build.gradle.kts

@@ -129,6 +129,8 @@ android {
     androidResources {
         @Suppress("UnstableApiUsage")
         localeFilters.addAll(listOf("en", "ar", "ca", "cs", "de", "el", "es", "fr", "it", "nl", "pl", "pt", "ru"))
+        @Suppress("UnstableApiUsage")
+        generateLocaleConfig = true
     }
     packaging {
         resources {

app/src/main/AndroidManifest.xml

@@ -35,6 +35,15 @@
             android:enabled="true"
             android:exported="false"/>
 
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"

app/src/main/java/to/bitkit/data/dto/AppUpdaterDTO.kt

@@ -8,15 +8,12 @@ import kotlinx.serialization.Serializable
  */
 @Serializable
 data class ReleaseInfoDTO(
-    @SerialName("platforms")
     val platforms: Platforms,
 )
 
 @Serializable
 data class Platforms(
-    @SerialName("android")
     val android: PlatformDetails,
-    @SerialName("ios")
     val ios: PlatformDetails?,
 )
 
@@ -25,19 +22,15 @@ data class Platforms(
  */
 @Serializable
 data class PlatformDetails(
-    @SerialName("version")
     val version: String,
 
-    @SerialName("buildNumber")
     val buildNumber: Int,
 
-    @SerialName("notes")
     val notes: String,
 
     @SerialName("pub_date")
     val pubDate: String,
 
-    @SerialName("url")
     val url: String,
 
     @SerialName("critical")

app/src/main/java/to/bitkit/models/Language.kt

@@ -0,0 +1,62 @@
+package to.bitkit.models
+
+import kotlinx.serialization.Serializable
+import java.util.Locale
+
+@Serializable
+enum class Language(
+    val displayName: String,
+    val languageCode: String,
+    val countryCode: String? = null,
+    val isSystemDefault: Boolean = false,
+) {
+    SYSTEM_DEFAULT(
+        displayName = "System Default",
+        languageCode = "system",
+        countryCode = null,
+        isSystemDefault = true
+    ),
+    ARABIC("العربية", "ar"),
+    CATALAN("Català", "ca"),
+    CZECH("Čeština", "cs"),
+    DUTCH("Nederlands", "nl"),
+    ENGLISH("English", "en", "US"),
+    FRENCH("Français", "fr", "FR"),
+    GERMAN("Deutsch", "de"),
+    GREEK("Ελληνικά", "el"),
+    ITALIAN("Italiano", "it"),
+    POLISH("Polski", "pl"),
+    PORTUGUESE("Português", "pt", "BR"),
+    RUSSIAN("Русский", "ru"),
+    SPANISH("Español", "es", "ES"),
+    SPANISH_LATIN_AMERICA("Español (Latinoamérica)", "es", "419");
+
+    companion object {
+        fun fromLanguageCode(languageCode: String, countryCode: String? = null): Language? {
+            return entries.find { language ->
+                language.languageCode == languageCode &&
+                    (countryCode == null || language.countryCode == countryCode)
+            }
+        }
+
+        fun fromLocale(locale: Locale): Language? {
+            return fromLanguageCode(locale.language, locale.country.ifEmpty { null })
+        }
+    }
+}
+
+fun Language.getLanguageTag(): String {
+    return if (isSystemDefault) {
+        ""
+    } else {
+        if (countryCode != null) {
+            "$languageCode-$countryCode"
+        } else {
+            languageCode
+        }
+    }
+}
+
+fun Locale.toLanguage(): Language? {
+    return Language.fromLocale(this)
+}

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -101,6 +101,7 @@ import to.bitkit.ui.settings.BackupSettingsScreen
 import to.bitkit.ui.settings.BlocktankRegtestScreen
 import to.bitkit.ui.settings.CJitDetailScreen
 import to.bitkit.ui.settings.ChannelOrdersScreen
+import to.bitkit.ui.settings.LanguageSettingsScreen
 import to.bitkit.ui.settings.LogDetailScreen
 import to.bitkit.ui.settings.LogsScreen
 import to.bitkit.ui.settings.OrderDetailScreen
@@ -677,6 +678,12 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.RegtestSettings> {
         BlocktankRegtestScreen(navController)
     }
+    composableWithDefaultTransitions<Routes.LanguageSettings> {
+        LanguageSettingsScreen(
+            onBackClick = { navController.popBackStack() },
+            onCloseClick = { navController.navigateToHome() },
+        )
+    }
 }
 
 private fun NavGraphBuilder.profile(
@@ -1374,6 +1381,10 @@ fun NavController.navigateToTagsSettings() = navigate(
     route = Routes.TagsSettings,
 )
 
+fun NavController.navigateToLanguageSettings() = navigate(
+    route = Routes.LanguageSettings,
+)
+
 fun NavController.navigateToAdvancedSettings() = navigate(
     route = Routes.AdvancedSettings,
 )
@@ -1596,6 +1607,9 @@ sealed interface Routes {
     @Serializable
     data object QuickPaySettings : Routes
 
+    @Serializable
+    data object LanguageSettings : Routes
+
     @Serializable
     data object ProfileIntro : Routes
 

app/src/main/java/to/bitkit/ui/screens/CriticalUpdateScreen.kt

@@ -4,10 +4,8 @@ import android.content.Intent
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -23,6 +21,7 @@ import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
+import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -33,9 +32,8 @@ fun CriticalUpdateScreen() {
 
     Column(
         modifier = Modifier
-            .fillMaxSize()
+            .screen()
             .padding(horizontal = 32.dp)
-            .systemBarsPadding()
     ) {
         AppTopBar(
             titleText = stringResource(R.string.other__update_critical_nav_title),

app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt

@@ -0,0 +1,97 @@
+package to.bitkit.ui.settings
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import to.bitkit.models.Language
+import to.bitkit.ui.components.Text13Up
+import to.bitkit.ui.components.settings.SettingsButtonRow
+import to.bitkit.ui.components.settings.SettingsButtonValue
+import to.bitkit.ui.scaffold.AppTopBar
+import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.shared.util.screen
+import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.ui.theme.Colors
+import to.bitkit.viewmodels.LanguageUiState
+import to.bitkit.viewmodels.LanguageViewModel
+
+@Composable
+fun LanguageSettingsScreen(
+    onBackClick: () -> Unit,
+    onCloseClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewmodel: LanguageViewModel = hiltViewModel(),
+) {
+    val uiState by viewmodel.uiState.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) { viewmodel.fetchLanguageInfo() }
+
+    Content(
+        uiState = uiState,
+        onCloseClick = onCloseClick,
+        onBackClick = onBackClick,
+        onClickLanguage = { selectedLanguage -> viewmodel.selectLanguage(selectedLanguage) },
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun Content(
+    uiState: LanguageUiState,
+    onBackClick: () -> Unit,
+    onCloseClick: () -> Unit,
+    onClickLanguage: (Language) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.screen()
+    ) {
+        AppTopBar(
+            titleText = "Language", // TODO Transifex
+            onBackClick = onBackClick,
+            actions = { CloseNavIcon(onClick = onCloseClick) }
+        )
+
+        Column(
+            modifier = Modifier
+                .padding(horizontal = 16.dp)
+        ) {
+            Text13Up("Interface Language", color = Colors.White64, modifier = Modifier.padding(vertical = 16.dp))
+
+            LazyColumn {
+                items(uiState.languages, { item -> item.displayName }) { item ->
+                    SettingsButtonRow(
+                        title = item.displayName,
+                        value = SettingsButtonValue.BooleanValue(item == uiState.selectedLanguage),
+                        onClick = { onClickLanguage(item) }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    AppThemeSurface {
+        Content(
+            uiState = LanguageUiState(
+                selectedLanguage = Language.SPANISH,
+                languages = Language.entries
+            ),
+            onBackClick = {},
+            onCloseClick = {},
+            onClickLanguage = {},
+        )
+    }
+}

app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt

@@ -5,15 +5,18 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.R
+import to.bitkit.models.Language
 import to.bitkit.models.PrimaryDisplay
 import to.bitkit.models.TransactionSpeed
 import to.bitkit.models.transactionSpeedUiText
@@ -22,6 +25,7 @@ import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.navigateToDefaultUnitSettings
 import to.bitkit.ui.navigateToHome
+import to.bitkit.ui.navigateToLanguageSettings
 import to.bitkit.ui.navigateToLocalCurrencySettings
 import to.bitkit.ui.navigateToQuickPaySettings
 import to.bitkit.ui.navigateToTagsSettings
@@ -32,16 +36,21 @@ import to.bitkit.ui.scaffold.CloseNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.viewmodels.LanguageViewModel
 
 @Composable
 fun GeneralSettingsScreen(
     navController: NavController,
+    languageViewModel: LanguageViewModel = hiltViewModel(),
 ) {
     val settings = settingsViewModel ?: return
     val currencies = LocalCurrencies.current
     val defaultTransactionSpeed by settings.defaultTransactionSpeed.collectAsStateWithLifecycle()
     val lastUsedTags by settings.lastUsedTags.collectAsStateWithLifecycle()
     val quickPayIntroSeen by settings.quickPayIntroSeen.collectAsStateWithLifecycle()
+    val languageUiState by languageViewModel.uiState.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) { languageViewModel.fetchLanguageInfo() }
 
     GeneralSettingsContent(
         selectedCurrency = currencies.selectedCurrency,
@@ -56,6 +65,8 @@ fun GeneralSettingsScreen(
         onWidgetsClick = { navController.navigateToWidgetsSettings() },
         onQuickPayClick = { navController.navigateToQuickPaySettings(quickPayIntroSeen) },
         onTagsClick = { navController.navigateToTagsSettings() },
+        onLanguageSettingsClick = { navController.navigateToLanguageSettings() },
+        selectedLanguage = languageUiState.selectedLanguage.displayName
     )
 }
 
@@ -65,13 +76,15 @@ private fun GeneralSettingsContent(
     primaryDisplay: PrimaryDisplay,
     defaultTransactionSpeed: TransactionSpeed,
     showTagsButton: Boolean = false,
+    selectedLanguage: String,
     onBackClick: () -> Unit = {},
     onCloseClick: () -> Unit = {},
     onLocalCurrencyClick: () -> Unit = {},
     onDefaultUnitClick: () -> Unit = {},
     onTransactionSpeedClick: () -> Unit = {},
     onWidgetsClick: () -> Unit = {},
     onQuickPayClick: () -> Unit = {},
+    onLanguageSettingsClick: () -> Unit = {},
     onTagsClick: () -> Unit = {},
 ) {
     ScreenColumn {
@@ -85,6 +98,12 @@ private fun GeneralSettingsContent(
                 .padding(horizontal = 16.dp)
                 .verticalScroll(rememberScrollState())
         ) {
+            SettingsButtonRow(
+                title = "Language",
+                value = SettingsButtonValue.StringValue(selectedLanguage),
+                onClick = onLanguageSettingsClick,
+                modifier = Modifier.testTag("LanguageSettings")
+            )
             SettingsButtonRow(
                 title = stringResource(R.string.settings__general__currency_local),
                 value = SettingsButtonValue.StringValue(selectedCurrency),
@@ -138,6 +157,7 @@ private fun Preview() {
             primaryDisplay = PrimaryDisplay.BITCOIN,
             defaultTransactionSpeed = TransactionSpeed.Medium,
             showTagsButton = true,
+            selectedLanguage = Language.SYSTEM_DEFAULT.displayName
         )
     }
 }