feat: settings design updates v60

AGENTS.md

@@ -192,8 +192,9 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - NEVER hardcode strings and always preserve string resources
 - ALWAYS localize in ViewModels using injected `@ApplicationContext`, e.g. `context.getString()`
 - ALWAYS use `remember` for expensive Compose computations
-- ALWAYS add modifiers to the last place in the argument list when calling composable functions
-- NEVER add parameters with default values BEFORE the `modifier` parameter in composable functions - modifier must be the FIRST optional parameter
+- ALWAYS declare `modifier: Modifier = Modifier,` as the FIRST optional parameter in composable declarations
+- ALWAYS pass `modifier = ...` as the LAST argument in composable calls
+- ALWAYS add trailing commas in multi-line declarations; NEVER add a trailing comma to `modifier = ...` at call sites
 - ALWAYS use `navController.navigateTo(route)` for simple navigation; NEVER use raw `navController.navigate(route)` — `navigateTo` prevents duplicate destinations
 - ALWAYS prefer `VerticalSpacer`, `HorizontalSpacer`, `FillHeight` and `FillWidth` over `Spacer` when applicable
 - PREFER declaring small dependant classes, constants, interfaces or top-level functions in the same file with the core class where these are used

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

@@ -1,35 +1,38 @@
 package to.bitkit.models
 
+import androidx.annotation.StringRes
 import kotlinx.serialization.Serializable
+import to.bitkit.R
 import java.util.Locale
 
 @Serializable
 enum class Language(
-    val displayName: String,
+    @StringRes val displayNameResId: Int? = null,
+    val nativeName: String? = null,
     val languageCode: String,
     val countryCode: String? = null,
     val isSystemDefault: Boolean = false,
 ) {
     SYSTEM_DEFAULT(
-        displayName = "System Default",
+        displayNameResId = R.string.settings__language_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");
+    ARABIC(nativeName = "العربية", languageCode = "ar"),
+    CATALAN(nativeName = "Català", languageCode = "ca"),
+    CZECH(nativeName = "Čeština", languageCode = "cs"),
+    DUTCH(nativeName = "Nederlands", languageCode = "nl"),
+    ENGLISH(nativeName = "English", languageCode = "en", countryCode = "US"),
+    FRENCH(nativeName = "Français", languageCode = "fr", countryCode = "FR"),
+    GERMAN(nativeName = "Deutsch", languageCode = "de"),
+    GREEK(nativeName = "Ελληνικά", languageCode = "el"),
+    ITALIAN(nativeName = "Italiano", languageCode = "it"),
+    POLISH(nativeName = "Polski", languageCode = "pl"),
+    PORTUGUESE(nativeName = "Português", languageCode = "pt", countryCode = "BR"),
+    RUSSIAN(nativeName = "Русский", languageCode = "ru"),
+    SPANISH(nativeName = "Español", languageCode = "es", countryCode = "ES"),
+    SPANISH_LATIN_AMERICA(nativeName = "Español (Latinoamérica)", languageCode = "es", countryCode = "419");
 
     companion object {
         fun fromLanguageCode(languageCode: String, countryCode: String? = null): Language? {

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

@@ -122,8 +122,6 @@ import to.bitkit.ui.screens.widgets.suggestions.SuggestionsViewModel
 import to.bitkit.ui.screens.widgets.weather.WeatherEditScreen
 import to.bitkit.ui.screens.widgets.weather.WeatherPreviewScreen
 import to.bitkit.ui.screens.widgets.weather.WeatherViewModel
-import to.bitkit.ui.settings.AboutScreen
-import to.bitkit.ui.settings.AdvancedSettingsScreen
 import to.bitkit.ui.settings.BackupSettingsScreen
 import to.bitkit.ui.settings.BlocktankRegtestScreen
 import to.bitkit.ui.settings.CJitDetailScreen
@@ -132,7 +130,6 @@ import to.bitkit.ui.settings.LanguageSettingsScreen
 import to.bitkit.ui.settings.LogDetailScreen
 import to.bitkit.ui.settings.LogsScreen
 import to.bitkit.ui.settings.OrderDetailScreen
-import to.bitkit.ui.settings.SecuritySettingsScreen
 import to.bitkit.ui.settings.SettingsScreen
 import to.bitkit.ui.settings.advanced.AddressTypePreferenceScreen
 import to.bitkit.ui.settings.advanced.AddressViewerScreen
@@ -144,19 +141,14 @@ import to.bitkit.ui.settings.backgroundPayments.BackgroundPaymentsIntroScreen
 import to.bitkit.ui.settings.backgroundPayments.BackgroundPaymentsSettings
 import to.bitkit.ui.settings.backups.ResetAndRestoreScreen
 import to.bitkit.ui.settings.general.DefaultUnitSettingsScreen
-import to.bitkit.ui.settings.general.GeneralSettingsScreen
 import to.bitkit.ui.settings.general.LocalCurrencySettingsScreen
 import to.bitkit.ui.settings.general.TagsSettingsScreen
 import to.bitkit.ui.settings.general.WidgetsSettingsScreen
 import to.bitkit.ui.settings.lightning.ChannelDetailScreen
 import to.bitkit.ui.settings.lightning.CloseConnectionScreen
 import to.bitkit.ui.settings.lightning.LightningConnectionsScreen
 import to.bitkit.ui.settings.lightning.LightningConnectionsViewModel
-import to.bitkit.ui.settings.pin.ChangePinConfirmScreen
-import to.bitkit.ui.settings.pin.ChangePinNewScreen
-import to.bitkit.ui.settings.pin.ChangePinResultScreen
-import to.bitkit.ui.settings.pin.ChangePinScreen
-import to.bitkit.ui.settings.pin.DisablePinScreen
+import to.bitkit.ui.settings.pin.PinManagementScreen
 import to.bitkit.ui.settings.quickPay.QuickPayIntroScreen
 import to.bitkit.ui.settings.quickPay.QuickPaySettingsScreen
 import to.bitkit.ui.settings.support.ReportIssueResultScreen
@@ -167,7 +159,9 @@ import to.bitkit.ui.settings.transactionSpeed.TransactionSpeedSettingsScreen
 import to.bitkit.ui.sheets.BackgroundPaymentsIntroSheet
 import to.bitkit.ui.sheets.BackupRoute
 import to.bitkit.ui.sheets.BackupSheet
+import to.bitkit.ui.sheets.ChangePinSheet
 import to.bitkit.ui.sheets.ConnectionClosedSheet
+import to.bitkit.ui.sheets.DisablePinSheet
 import to.bitkit.ui.sheets.ForceTransferSheet
 import to.bitkit.ui.sheets.GiftSheet
 import to.bitkit.ui.sheets.HighBalanceWarningSheet
@@ -398,6 +392,8 @@ fun ContentView(
                         is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
                         is Sheet.ActivityTagSelector -> TagSelectorSheet()
                         is Sheet.Pin -> PinSheet(sheet, appViewModel)
+                        Sheet.ChangePin -> ChangePinSheet(appViewModel)
+                        Sheet.DisablePin -> DisablePinSheet(appViewModel)
                         is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
                         is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
                         Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
@@ -491,7 +487,7 @@ fun ContentView(
                 rootNavController = navController,
                 hasSeenWidgetsIntro = hasSeenWidgetsIntro,
                 hasSeenShopIntro = hasSeenShopIntro,
-                modifier = Modifier.align(Alignment.TopEnd),
+                modifier = Modifier.align(Alignment.TopEnd)
             )
         }
     }
@@ -527,16 +523,10 @@ private fun RootNavHost(
         comingSoon(navController)
         profile(navController, settingsViewModel)
         shop(navController, settingsViewModel, appViewModel)
-        generalSettings(navController)
-        advancedSettings(navController)
-        aboutSettings(navController)
+        generalSettingsSubScreens(navController)
+        advancedSettingsSubScreens(navController)
         transactionSpeedSettings(navController)
-        securitySettings(navController)
-        disablePin(navController)
-        changePin(navController)
-        changePinNew(navController)
-        changePinConfirm(navController)
-        changePinResult(navController)
+        pinManagement(navController)
         defaultUnitSettings(currencyViewModel, navController)
         localCurrencySettings(currencyViewModel, navController)
         backupSettings(navController)
@@ -972,11 +962,7 @@ private fun NavGraphBuilder.shop(
     }
 }
 
-private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.GeneralSettings> {
-        GeneralSettingsScreen(navController)
-    }
-
+private fun NavGraphBuilder.generalSettingsSubScreens(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.WidgetsSettings> {
         WidgetsSettingsScreen(navController)
     }
@@ -1000,10 +986,7 @@ private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
     }
 }
 
-private fun NavGraphBuilder.advancedSettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.AdvancedSettings> {
-        AdvancedSettingsScreen(navController)
-    }
+private fun NavGraphBuilder.advancedSettingsSubScreens(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.CoinSelectPreference> {
         CoinSelectPreferenceScreen(navController)
     }
@@ -1024,16 +1007,6 @@ private fun NavGraphBuilder.advancedSettings(navController: NavHostController) {
     }
 }
 
-private fun NavGraphBuilder.aboutSettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.AboutSettings> {
-        AboutScreen(
-            onBack = {
-                navController.popBackStack()
-            }
-        )
-    }
-}
-
 private fun NavGraphBuilder.transactionSpeedSettings(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.TransactionSpeedSettings> {
         TransactionSpeedSettingsScreen(navController)
@@ -1043,43 +1016,9 @@ private fun NavGraphBuilder.transactionSpeedSettings(navController: NavHostContr
     }
 }
 
-private fun NavGraphBuilder.securitySettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.SecuritySettings> {
-        SecuritySettingsScreen(navController = navController)
-    }
-}
-
-private fun NavGraphBuilder.disablePin(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.DisablePin> {
-        DisablePinScreen(navController)
-    }
-}
-
-private fun NavGraphBuilder.changePin(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.ChangePin> {
-        ChangePinScreen(navController)
-    }
-}
-
-private fun NavGraphBuilder.changePinNew(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.ChangePinNew> {
-        ChangePinNewScreen(navController)
-    }
-}
-
-private fun NavGraphBuilder.changePinConfirm(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.ChangePinConfirm> {
-        val route = it.toRoute<Routes.ChangePinConfirm>()
-        ChangePinConfirmScreen(
-            newPin = route.newPin,
-            navController = navController,
-        )
-    }
-}
-
-private fun NavGraphBuilder.changePinResult(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.ChangePinResult> {
-        ChangePinResultScreen(navController)
+private fun NavGraphBuilder.pinManagement(navController: NavHostController) {
+    composableWithDefaultTransitions<Routes.PinManagement> {
+        PinManagementScreen(navController)
     }
 }
 
@@ -1517,21 +1456,7 @@ inline fun <reified T : Any> NavController.navigateTo(
     }
 }
 
-fun NavController.navigateToGeneralSettings() = navigateTo(Routes.GeneralSettings)
-
-fun NavController.navigateToSecuritySettings() = navigateTo(Routes.SecuritySettings)
-
-fun NavController.navigateToDisablePin() = navigateTo(Routes.DisablePin)
-
-fun NavController.navigateToChangePin() = navigateTo(Routes.ChangePin)
-
-fun NavController.navigateToChangePinNew() = navigateTo(Routes.ChangePinNew)
-
-fun NavController.navigateToChangePinConfirm(newPin: String) = navigateTo(
-    Routes.ChangePinConfirm(newPin),
-)
-
-fun NavController.navigateToChangePinResult() = navigateTo(Routes.ChangePinResult)
+fun NavController.navigateToPinManagement() = navigateTo(Routes.PinManagement)
 
 fun NavController.navigateToAuthCheck(
     showLogoOnPin: Boolean = false,
@@ -1592,9 +1517,6 @@ fun NavController.navigateToTagsSettings() = navigateTo(Routes.TagsSettings)
 
 fun NavController.navigateToLanguageSettings() = navigateTo(Routes.LanguageSettings)
 
-fun NavController.navigateToAdvancedSettings() = navigateTo(Routes.AdvancedSettings)
-
-fun NavController.navigateToAboutSettings() = navigateTo(Routes.AboutSettings)
 // endregion
 
 @Stable
@@ -1614,9 +1536,6 @@ sealed interface Routes {
     @Serializable
     data object NodeInfo : Routes
 
-    @Serializable
-    data object GeneralSettings : Routes
-
     @Serializable
     data object TransactionSpeedSettings : Routes
 
@@ -1626,9 +1545,6 @@ sealed interface Routes {
     @Serializable
     data object TagsSettings : Routes
 
-    @Serializable
-    data object AdvancedSettings : Routes
-
     @Serializable
     data object CoinSelectPreference : Routes
 
@@ -1644,29 +1560,11 @@ sealed interface Routes {
     @Serializable
     data object AddressViewer : Routes
 
-    @Serializable
-    data object AboutSettings : Routes
-
     @Serializable
     data object CustomFeeSettings : Routes
 
     @Serializable
-    data object SecuritySettings : Routes
-
-    @Serializable
-    data object DisablePin : Routes
-
-    @Serializable
-    data object ChangePin : Routes
-
-    @Serializable
-    data object ChangePinNew : Routes
-
-    @Serializable
-    data class ChangePinConfirm(val newPin: String) : Routes
-
-    @Serializable
-    data object ChangePinResult : Routes
+    data object PinManagement : Routes
 
     @Serializable
     data class AuthCheck(

app/src/main/java/to/bitkit/ui/components/AuthCheckScreen.kt

@@ -6,7 +6,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
-import to.bitkit.ui.navigateTo
 import to.bitkit.ui.settingsViewModel
 
 @Composable
@@ -43,10 +42,9 @@ fun AuthCheckScreen(
                     navController.popBackStack()
                 }
 
-                AuthCheckAction.NAV_TO_RESET -> {
-                    navController.navigateTo(Routes.ResetAndRestoreSettings) {
-                        popUpTo(Routes.BackupSettings)
-                    }
+                AuthCheckAction.SHOW_BACKUP_SHEET -> {
+                    navController.popBackStack()
+                    app.showSheet(Sheet.Backup())
                 }
             }
         },
@@ -58,5 +56,5 @@ object AuthCheckAction {
     const val TOGGLE_BIOMETRICS = "TOGGLE_BIOMETRICS"
     const val TOGGLE_PIN_FOR_PAYMENTS = "TOGGLE_PIN_FOR_PAYMENTS"
     const val DISABLE_PIN = "DISABLE_PIN"
-    const val NAV_TO_RESET = "NAV_TO_RESET"
+    const val SHOW_BACKUP_SHEET = "SHOW_BACKUP_SHEET"
 }

app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt

@@ -199,6 +199,16 @@ private fun Menu(
             modifier = Modifier.testTag("DrawerShop")
         )
 
+        DrawerItem(
+            label = stringResource(R.string.wallet__drawer__support),
+            iconRes = R.drawable.ic_chats_circle,
+            onClick = {
+                rootNavController.navigateIfNotCurrent(Routes.Support)
+                scope.launch { drawerState.close() }
+            },
+            modifier = Modifier.testTag("DrawerSupport")
+        )
+
         DrawerItem(
             label = stringResource(R.string.wallet__drawer__settings),
             iconRes = R.drawable.ic_settings,
@@ -256,7 +266,7 @@ private fun DrawerItem(
     label: String,
     @DrawableRes iconRes: Int,
     modifier: Modifier = Modifier,
-    onClick: (() -> Unit)? = null,
+    onClick: (() -> Unit)? = null
 ) {
     Column(
         modifier = modifier
@@ -306,7 +316,7 @@ private fun Preview() {
                 drawerState = rememberDrawerState(initialValue = DrawerValue.Open),
                 hasSeenWidgetsIntro = false,
                 hasSeenShopIntro = false,
-                modifier = Modifier.align(Alignment.TopEnd),
+                modifier = Modifier.align(Alignment.TopEnd)
             )
         }
     }

app/src/main/java/to/bitkit/ui/components/SheetHost.kt

@@ -39,6 +39,8 @@ sealed interface Sheet {
     data class Send(val route: SendRoute = SendRoute.Recipient) : Sheet
     data object Receive : Sheet
     data class Pin(val route: PinRoute = PinRoute.Prompt()) : Sheet
+    data object ChangePin : Sheet
+    data object DisablePin : Sheet
     data class Backup(val route: BackupRoute = BackupRoute.ShowMnemonic) : Sheet
     data object ActivityDateRangeSelector : Sheet
     data object ActivityTagSelector : Sheet