Updated on 2026-08-14

2023-09-07 10:51:42 +03:00 · 2023-09-07 10:51:42 +03:00 · 93b0b05e69
commit 93b0b05e69
parent f289bbab97
25 changed files with 494 additions and 132 deletions
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@ -23,6 +23,7 @@ import com.tangem.datasource.config.FeaturesLocalLoader
 import com.tangem.datasource.config.models.Config
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.domain.apptheme.repository.AppThemeModeRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.tokens.repository.CurrenciesRepository
@ -173,6 +174,9 @@ class TapApplication : Application(), ImageLoaderFactory {
    @Inject
    lateinit var currenciesRepository: CurrenciesRepository

+    @Inject
+    lateinit var appThemeModeRepository: AppThemeModeRepository
+
    override fun onCreate() {
        super.onCreate()

@ -195,6 +199,7 @@ class TapApplication : Application(), ImageLoaderFactory {
                    walletManagersFacade = walletManagersFacade,
                    appStateHolder = appStateHolder,
                    currenciesRepository = currenciesRepository,
+                    appThemeModeRepository = appThemeModeRepository,
                ),
            ),
        )
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
@ -6,6 +6,7 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemError
 import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.config.models.ChatConfig
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.common.analytics.topup.TopUpController
@ -103,4 +104,5 @@ sealed class GlobalAction : Action {
    }

    data class UpdateUserWalletsListManager(val manager: UserWalletsListManager) : GlobalAction()
+    data class ChangeAppThemeMode(val appThemeMode: AppThemeMode) : GlobalAction()
 }
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@ -91,6 +91,9 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
                userWalletsListManager = action.manager,
            )
        }
+        is GlobalAction.ChangeAppThemeMode -> globalState.copy(
+            appThemeMode = action.appThemeMode,
+        )
        else -> globalState
    }
 }
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
@ -1,6 +1,7 @@
 package com.tangem.tap.common.redux.global

 import com.tangem.datasource.config.ConfigManager
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.common.analytics.topup.TopUpController
@ -29,6 +30,7 @@ data class GlobalState(
    val userCountryCode: String? = null,
    val userWalletsListManager: UserWalletsListManager? = null,
    val topUpController: TopUpController? = null,
+    val appThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
 ) : StateType

 typealias CryptoCurrencyName = String
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.redux

+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
@ -68,6 +69,10 @@ sealed class DetailsAction : Action {
        data class BiometricsStatusChanged(
            val needEnrollBiometrics: Boolean,
        ) : AppSettings()
+
+        data class ChangeAppThemeMode(
+            val appThemeMode: AppThemeMode,
+        ) : AppSettings()
    }

    data class ChangeAppCurrency(val fiatCurrency: FiatCurrency) : DetailsAction()
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@ -9,6 +9,7 @@ import com.tangem.common.flatMap
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
@ -221,6 +222,9 @@ class DetailsMiddleware {
                is DetailsAction.AppSettings.EnrollBiometrics -> {
                    enrollBiometrics()
                }
+                is DetailsAction.AppSettings.ChangeAppThemeMode -> {
+                    changeAppThemeMode(action.appThemeMode)
+                }
                is DetailsAction.AppSettings.SwitchPrivacySetting.Success,
                is DetailsAction.AppSettings.SwitchPrivacySetting.Failure,
                is DetailsAction.AppSettings.BiometricsStatusChanged,
@ -252,6 +256,14 @@ class DetailsMiddleware {
            store.dispatchOnMain(NavigationAction.OpenBiometricsSettings)
        }

+        private fun changeAppThemeMode(appThemeMode: AppThemeMode) {
+            val repository = store.state.daggerGraphState.get(DaggerGraphState::appThemeModeRepository)
+
+            scope.launch {
+                repository.changeAppThemeMode(appThemeMode)
+            }
+        }
+
        private fun toggleSaveWallets(state: DetailsState, enable: Boolean) = scope.launch {
            // Nothing to change
            if (preferencesStorage.shouldSaveUserWallets == enable) {
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@ -58,6 +58,7 @@ private fun handlePrepareScreen(action: DetailsAction.PrepareScreen): DetailsSta
            saveWallets = preferencesStorage.shouldSaveUserWallets,
            saveAccessCodes = preferencesStorage.shouldSaveAccessCodes,
            selectedFiatCurrency = store.state.globalState.appCurrency,
+            selectedThemeMode = store.state.globalState.appThemeMode,
        ),
    )
 }
@ -196,6 +197,11 @@ private fun handlePrivacyAction(action: DetailsAction.AppSettings, state: Detail
                needEnrollBiometrics = action.needEnrollBiometrics,
            ),
        )
+        is DetailsAction.AppSettings.ChangeAppThemeMode -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                selectedThemeMode = action.appThemeMode,
+            ),
+        )
        is DetailsAction.AppSettings.EnrollBiometrics,
        is DetailsAction.AppSettings.CheckBiometricsStatus,
        -> state
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.redux

+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.common.entities.Button
@ -55,6 +56,7 @@ data class AppSettingsState(
    val needEnrollBiometrics: Boolean = false,
    val isInProgress: Boolean = false,
    val selectedFiatCurrency: FiatCurrency = FiatCurrency.Default,
+    val selectedThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
 )

 enum class SecurityOption { LongTap, PassCode, AccessCode }
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsAlertsFactory.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsAlertsFactory.kt
@ -1,28 +0,0 @@
-package com.tangem.tap.features.details.ui.appsettings
-
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Alert
-import com.tangem.wallet.R
-
-internal class AppSettingsAlertsFactory {
-
-    fun createDeleteSavedWalletsAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Alert {
-        return Alert(
-            title = resourceReference(R.string.common_attention),
-            description = resourceReference(R.string.app_settings_off_saved_wallet_alert_message),
-            confirmText = resourceReference(R.string.common_delete),
-            onConfirm = onDelete,
-            onDismiss = onDismiss,
-        )
-    }
-
-    fun createDeleteSavedAccessCodesAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Alert {
-        return Alert(
-            title = resourceReference(R.string.common_attention),
-            description = resourceReference(R.string.app_settings_off_saved_access_code_alert_message),
-            confirmText = resourceReference(R.string.common_delete),
-            onConfirm = onDelete,
-            onDismiss = onDismiss,
-        )
-    }
-}
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsDialogsFactory.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsDialogsFactory.kt
@ -0,0 +1,58 @@
+package com.tangem.tap.features.details.ui.appsettings
+
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
+import com.tangem.wallet.R
+import kotlinx.collections.immutable.toImmutableList
+
+internal class AppSettingsDialogsFactory {
+
+    fun createDeleteSavedWalletsAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Dialog.Alert {
+        return Dialog.Alert(
+            title = resourceReference(R.string.common_attention),
+            description = resourceReference(R.string.app_settings_off_saved_wallet_alert_message),
+            confirmText = resourceReference(R.string.common_delete),
+            onConfirm = onDelete,
+            onDismiss = onDismiss,
+        )
+    }
+
+    fun createDeleteSavedAccessCodesAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Dialog.Alert {
+        return Dialog.Alert(
+            title = resourceReference(R.string.common_attention),
+            description = resourceReference(R.string.app_settings_off_saved_access_code_alert_message),
+            confirmText = resourceReference(R.string.common_delete),
+            onConfirm = onDelete,
+            onDismiss = onDismiss,
+        )
+    }
+
+    fun createThemeModeSelectorDialog(
+        selectedModeIndex: Int,
+        onSelect: (AppThemeMode) -> Unit,
+        onDismiss: () -> Unit,
+    ): Dialog.Selector {
+        val modes = AppThemeMode.available
+
+        return Dialog.Selector(
+            title = resourceReference(R.string.app_settings_theme_selector_title),
+            selectedItemIndex = selectedModeIndex,
+            items = modes.map { mode ->
+                resourceReference(
+                    id = when (mode) {
+                        AppThemeMode.FORCE_DARK -> R.string.app_settings_theme_mode_dark
+                        AppThemeMode.FORCE_LIGHT -> R.string.app_settings_theme_mode_light
+                        AppThemeMode.FOLLOW_SYSTEM -> R.string.app_settings_theme_mode_system
+                    },
+                )
+            }.toImmutableList(),
+            onSelect = { index ->
+                val mode = AppThemeMode.available[index]
+
+                onSelect(mode)
+            },
+            onDismiss = onDismiss,
+        )
+    }
+}
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsItemsFactory.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsItemsFactory.kt
@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.appsettings

 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 import com.tangem.wallet.R

@ -56,4 +57,20 @@ internal class AppSettingsItemsFactory {
            onClick = onClick,
        )
    }
+
+    fun createSelectThemeModeButton(currentThemeMode: AppThemeMode, onClick: () -> Unit): Item.Button {
+        return Item.Button(
+            id = "select_theme_mode_button",
+            title = resourceReference(R.string.app_settings_theme_selector_title),
+            description = resourceReference(
+                id = when (currentThemeMode) {
+                    AppThemeMode.FORCE_DARK -> R.string.app_settings_theme_mode_dark
+                    AppThemeMode.FORCE_LIGHT -> R.string.app_settings_theme_mode_light
+                    AppThemeMode.FOLLOW_SYSTEM -> R.string.app_settings_theme_mode_system
+                },
+            ),
+            isEnabled = true,
+            onClick = onClick,
+        )
+    }
 }
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
@ -11,11 +11,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
-import com.tangem.tap.features.details.ui.appsettings.components.ButtonItem
-import com.tangem.tap.features.details.ui.appsettings.components.CardItem
-import com.tangem.tap.features.details.ui.appsettings.components.SettingsAlertDialog
-import com.tangem.tap.features.details.ui.appsettings.components.SwitchItem
+import com.tangem.tap.features.details.ui.appsettings.components.*
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 import kotlinx.collections.immutable.persistentListOf
@ -37,9 +35,11 @@ internal fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () ->

@Composable
 private fun AppSettings(state: AppSettingsScreenState.Content) {
-    val alert by rememberUpdatedState(newValue = state.alert)
-    alert?.let { safeAlert ->
-        SettingsAlertDialog(alert = safeAlert)
+    val dialog by rememberUpdatedState(newValue = state.dialog)
+    when (val safeDialog = dialog) {
+        is AppSettingsScreenState.Dialog.Alert -> SettingsAlertDialog(dialog = safeDialog)
+        is AppSettingsScreenState.Dialog.Selector -> SettingsSelectorDialog(dialog = safeDialog)
+        null -> Unit
    }

    LazyColumn {
@ -48,15 +48,15 @@ private fun AppSettings(state: AppSettingsScreenState.Content) {
            key = Item::id,
        ) { item ->
            when (item) {
-                is Item.Card -> CardItem(
+                is Item.Card -> SettingsCardItem(
                    modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
                    item = item,
                )
-                is Item.Button -> ButtonItem(
+                is Item.Button -> SettingsButtonItem(
                    modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8),
                    item = item,
                )
-                is Item.Switch -> SwitchItem(
+                is Item.Switch -> SettingsSwitchItem(
                    modifier = Modifier.padding(
                        vertical = TangemTheme.dimens.spacing16,
                        horizontal = TangemTheme.dimens.spacing20,
@ -92,27 +92,17 @@ private fun AppSettingsScreenPreview_Dark(
 private class AppSettingsScreenStateProvider : CollectionPreviewParameterProvider<AppSettingsScreenState>(
    collection = buildList {
        val itemsFactory = AppSettingsItemsFactory()
-        val dialogsFactory = AppSettingsAlertsFactory()
        val items = persistentListOf(
            itemsFactory.createEnrollBiometricsCard {},
            itemsFactory.createSelectAppCurrencyButton(currentAppCurrencyName = "US Dollar") {},
            itemsFactory.createSaveWalletsSwitch(isChecked = true, isEnabled = true, { _ -> }),
            itemsFactory.createSaveAccessCodeSwitch(isChecked = false, isEnabled = true) { _ -> },
+            itemsFactory.createSelectThemeModeButton(AppThemeMode.DEFAULT, {}),
        )

        AppSettingsScreenState.Content(
            items = items,
-            alert = null,
-        ).let(::add)
-
-        AppSettingsScreenState.Content(
-            items = items,
-            alert = dialogsFactory.createDeleteSavedWalletsAlert({}, {}),
-        ).let(::add)
-
-        AppSettingsScreenState.Content(
-            items = items,
-            alert = dialogsFactory.createDeleteSavedAccessCodesAlert({}, {}),
+            dialog = null,
        ).let(::add)
    },
 )
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
@ -12,7 +12,7 @@ internal sealed class AppSettingsScreenState {

    data class Content(
        val items: ImmutableList<Item>,
-        val alert: Alert?,
+        val dialog: Dialog?,
    ) : AppSettingsScreenState()

    @Immutable
@ -46,11 +46,25 @@ internal sealed class AppSettingsScreenState {
        ) : Item()
    }

-    data class Alert(
-        val title: TextReference,
-        val description: TextReference,
-        val confirmText: TextReference,
-        val onConfirm: () -> Unit,
-        val onDismiss: () -> Unit,
-    )
+    @Immutable
+    sealed class Dialog {
+
+        abstract val onDismiss: () -> Unit
+
+        data class Alert(
+            val title: TextReference,
+            val description: TextReference,
+            val confirmText: TextReference,
+            val onConfirm: () -> Unit,
+            override val onDismiss: () -> Unit,
+        ) : Dialog()
+
+        data class Selector(
+            val title: TextReference,
+            val selectedItemIndex: Int,
+            val items: ImmutableList<TextReference>,
+            val onSelect: (Int) -> Unit,
+            override val onDismiss: () -> Unit,
+        ) : Dialog()
+    }
 }
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
@ -3,6 +3,7 @@ package com.tangem.tap.features.details.ui.appsettings
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.details.redux.AppSetting
@ -17,7 +18,7 @@ import org.rekotlin.Store
 internal class AppSettingsViewModel(private val store: Store<AppState>) {

    private val itemsFactory = AppSettingsItemsFactory()
-    private val alertsFactory = AppSettingsAlertsFactory()
+    private val dialogsFactory = AppSettingsDialogsFactory()

    var uiState: AppSettingsScreenState by mutableStateOf(AppSettingsScreenState.Loading)
        private set
@ -25,7 +26,7 @@ internal class AppSettingsViewModel(private val store: Store<AppState>) {
    fun updateState(state: DetailsState) {
        uiState = AppSettingsScreenState.Content(
            items = buildItems(state.appSettingsState),
-            alert = (uiState as? AppSettingsScreenState.Content)?.alert,
+            dialog = (uiState as? AppSettingsScreenState.Content)?.dialog,
        )
    }

@ -63,6 +64,10 @@ internal class AppSettingsViewModel(private val store: Store<AppState>) {
                    onCheckedChange = ::onSaveAccessCodesToggled,
                ).let(::add)
            }
+
+            itemsFactory.createSelectThemeModeButton(state.selectedThemeMode) {
+                showThemeModeSelector(state.selectedThemeMode)
+            }.let(::add)
        }

        return items.toImmutableList()
@ -76,13 +81,28 @@ internal class AppSettingsViewModel(private val store: Store<AppState>) {
        store.dispatchOnMain(WalletAction.AppCurrencyAction.ChooseAppCurrency)
    }

+    private fun showThemeModeSelector(selectedMode: AppThemeMode) {
+        updateContentState {
+            copy(
+                dialog = dialogsFactory.createThemeModeSelectorDialog(
+                    selectedModeIndex = selectedMode.ordinal,
+                    onSelect = { mode ->
+                        store.dispatchOnMain(DetailsAction.AppSettings.ChangeAppThemeMode(mode))
+                        dismissDialog()
+                    },
+                    onDismiss = ::dismissDialog,
+                ),
+            )
+        }
+    }
+
    private fun onSaveWalletsToggled(isChecked: Boolean) {
        if (isChecked) {
            onSettingsToggled(AppSetting.SaveWallets, enable = true)
        } else {
            updateContentState {
                copy(
-                    alert = alertsFactory.createDeleteSavedWalletsAlert(
+                    dialog = dialogsFactory.createDeleteSavedWalletsAlert(
                        onDelete = {
                            onSettingsToggled(AppSetting.SaveWallets, enable = false)
                            dismissDialog()
@ -100,7 +120,7 @@ internal class AppSettingsViewModel(private val store: Store<AppState>) {
        } else {
            updateContentState {
                copy(
-                    alert = alertsFactory.createDeleteSavedAccessCodesAlert(
+                    dialog = dialogsFactory.createDeleteSavedAccessCodesAlert(
                        onDelete = {
                            onSettingsToggled(AppSetting.SaveAccessCode, enable = false)
                            dismissDialog()
@ -117,7 +137,7 @@ internal class AppSettingsViewModel(private val store: Store<AppState>) {
    }

    private fun dismissDialog() {
-        updateContentState { copy(alert = null) }
+        updateContentState { copy(dialog = null) }
    }

    private fun updateContentState(block: AppSettingsScreenState.Content.() -> AppSettingsScreenState.Content) {
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
@ -9,52 +9,52 @@ import com.tangem.core.ui.components.BasicDialog
 import com.tangem.core.ui.components.DialogButton
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.features.details.ui.appsettings.AppSettingsAlertsFactory
-import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Alert
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsDialogsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
 import com.tangem.wallet.R

@Composable
-internal fun SettingsAlertDialog(alert: Alert) {
+internal fun SettingsAlertDialog(dialog: Dialog.Alert) {
    BasicDialog(
-        title = alert.title.resolveReference(),
-        message = alert.description.resolveReference(),
+        title = dialog.title.resolveReference(),
+        message = dialog.description.resolveReference(),
        isDismissable = false,
        confirmButton = DialogButton(
-            title = alert.confirmText.resolveReference(),
+            title = dialog.confirmText.resolveReference(),
            warning = true,
-            onClick = alert.onConfirm,
+            onClick = dialog.onConfirm,
        ),
        dismissButton = DialogButton(
            title = stringResource(id = R.string.common_cancel),
-            onClick = alert.onDismiss,
+            onClick = dialog.onDismiss,
        ),
-        onDismissDialog = alert.onDismiss,
+        onDismissDialog = dialog.onDismiss,
    )
 }

 // region Preview
@Preview(showBackground = true, widthDp = 360)
@Composable
-private fun AlertDialogPreview_Light(@PreviewParameter(AlertDialogProvider::class) dialog: Alert) {
+private fun AlertDialogPreview_Light(@PreviewParameter(AlertDialogProvider::class) dialog: Dialog.Alert) {
    TangemTheme {
-        SettingsAlertDialog(alert = dialog)
+        SettingsAlertDialog(dialog = dialog)
    }
 }

@Preview(showBackground = true, widthDp = 360)
@Composable
-private fun AlertDialogPreview_Dark(@PreviewParameter(AlertDialogProvider::class) dialog: Alert) {
+private fun AlertDialogPreview_Dark(@PreviewParameter(AlertDialogProvider::class) dialog: Dialog.Alert) {
    TangemTheme(isDark = true) {
-        SettingsAlertDialog(alert = dialog)
+        SettingsAlertDialog(dialog = dialog)
    }
 }

-private class AlertDialogProvider : CollectionPreviewParameterProvider<Alert>(
+private class AlertDialogProvider : CollectionPreviewParameterProvider<Dialog.Alert>(
    collection = buildList {
-        val alertsFactory = AppSettingsAlertsFactory()
+        val dialogsFactory = AppSettingsDialogsFactory()

-        alertsFactory.createDeleteSavedAccessCodesAlert({}, {}).let(::add)
-        alertsFactory.createDeleteSavedWalletsAlert({}, {}).let(::add)
+        dialogsFactory.createDeleteSavedAccessCodesAlert({}, {}).let(::add)
+        dialogsFactory.createDeleteSavedWalletsAlert({}, {}).let(::add)
    },
 )
 // endregion Preview
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
@ -20,7 +20,7 @@ import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Ite

@OptIn(ExperimentalMaterialApi::class)
@Composable
-internal fun ButtonItem(item: Item.Button, modifier: Modifier = Modifier) {
+internal fun SettingsButtonItem(item: Item.Button, modifier: Modifier = Modifier) {
    Surface(
        modifier = modifier.fillMaxWidth(),
        color = TangemTheme.colors.background.secondary,
@ -55,7 +55,7 @@ internal fun ButtonItem(item: Item.Button, modifier: Modifier = Modifier) {
@Composable
 private fun ButtonItemPreview_Light(@PreviewParameter(ButtonItemProvider::class) item: Item.Button) {
    TangemTheme {
-        ButtonItem(item = item)
+        SettingsButtonItem(item = item)
    }
 }

@ -63,7 +63,7 @@ private fun ButtonItemPreview_Light(@PreviewParameter(ButtonItemProvider::class)
@Composable
 private fun ButtonItemPreview_Dark(@PreviewParameter(ButtonItemProvider::class) item: Item.Button) {
    TangemTheme(isDark = true) {
-        ButtonItem(item = item)
+        SettingsButtonItem(item = item)
    }
 }

--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
@ -22,7 +22,7 @@ import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Ite

@OptIn(ExperimentalMaterialApi::class)
@Composable
-internal fun CardItem(item: Item.Card, modifier: Modifier = Modifier) {
+internal fun SettingsCardItem(item: Item.Card, modifier: Modifier = Modifier) {
    Surface(
        modifier = modifier.fillMaxWidth(),
        color = TangemTheme.colors.button.disabled,
@ -62,7 +62,7 @@ internal fun CardItem(item: Item.Card, modifier: Modifier = Modifier) {
@Composable
 private fun CardItemPreview_Light(@PreviewParameter(CardItemProvider::class) item: Item.Card) {
    TangemTheme {
-        CardItem(item = item)
+        SettingsCardItem(item = item)
    }
 }

@ -70,7 +70,7 @@ private fun CardItemPreview_Light(@PreviewParameter(CardItemProvider::class) ite
@Composable
 private fun CardItemPreview_Dark(@PreviewParameter(CardItemProvider::class) item: Item.Card) {
    TangemTheme(isDark = true) {
-        CardItem(item = item)
+        SettingsCardItem(item = item)
    }
 }

--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSelectorDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSelectorDialog.kt
@ -0,0 +1,58 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.components.SelectorDialog
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsDialogsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
+import com.tangem.wallet.R
+import kotlinx.collections.immutable.toImmutableList
+
+@Composable
+internal fun SettingsSelectorDialog(dialog: Dialog.Selector) {
+    SelectorDialog(
+        title = dialog.title.resolveReference(),
+        selectedItemIndex = dialog.selectedItemIndex,
+        items = dialog.items.map { it.resolveReference() }.toImmutableList(),
+        confirmButton = DialogButton(
+            title = stringResource(R.string.common_cancel),
+            onClick = dialog.onDismiss,
+        ),
+        onSelect = dialog.onSelect,
+        onDismissDialog = dialog.onDismiss,
+    )
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsSelectorDialogPreview_Light(@PreviewParameter(DialogProvider::class) param: Dialog.Selector) {
+    TangemTheme(isDark = false) {
+        SettingsSelectorDialog(param)
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsSelectorDialogPreview_Dark(@PreviewParameter(DialogProvider::class) param: Dialog.Selector) {
+    TangemTheme(isDark = true) {
+        SettingsSelectorDialog(param)
+    }
+}
+
+private class DialogProvider : CollectionPreviewParameterProvider<Dialog.Selector>(
+    collection = listOf(
+        AppSettingsDialogsFactory().createThemeModeSelectorDialog(
+            selectedModeIndex = 0,
+            onSelect = {},
+            onDismiss = {},
+        ),
+    ),
+)
+// endregion Preview
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
@ -21,7 +21,7 @@ import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Ite
 import com.tangem.tap.features.details.ui.common.TangemSwitch

@Composable
-internal fun SwitchItem(item: Item.Switch, modifier: Modifier = Modifier) {
+internal fun SettingsSwitchItem(item: Item.Switch, modifier: Modifier = Modifier) {
    val titleTextColor by rememberUpdatedState(
        newValue = if (item.isEnabled) {
            TangemTheme.colors.text.primary1
@ -72,7 +72,7 @@ internal fun SwitchItem(item: Item.Switch, modifier: Modifier = Modifier) {
@Composable
 private fun SwitchItemPreview_Light(@PreviewParameter(SwitchItemProvider::class) item: Item.Switch) {
    TangemTheme {
-        SwitchItem(item = item)
+        SettingsSwitchItem(item = item)
    }
 }

@ -80,7 +80,7 @@ private fun SwitchItemPreview_Light(@PreviewParameter(SwitchItemProvider::class)
@Composable
 private fun SwitchItemPreview_Dark(@PreviewParameter(SwitchItemProvider::class) item: Item.Switch) {
    TangemTheme(isDark = true) {
-        SwitchItem(item = item)
+        SettingsSwitchItem(item = item)
    }
 }

--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt
@ -15,7 +15,7 @@ object ResetBackupCardDialog {
            setPositiveButton(R.string.common_cancel) { _, _ ->
                /* no-op */
            }
-            setNegativeButton(R.string.common_reset) { _, _ ->
+            setNegativeButton(R.string.card_settings_action_sheet_reset) { _, _ ->
                store.dispatch(BackupAction.ResetBackupCard(cardId))
            }
            setOnDismissListener {
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@ -3,6 +3,7 @@ package com.tangem.tap.proxy.redux
 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.domain.apptheme.repository.AppThemeModeRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
@ -38,6 +39,7 @@ data class DaggerGraphState(
    val appCurrencyRepository: AppCurrencyRepository? = null,
    val walletManagersFacade: WalletManagersFacade? = null,
    val appStateHolder: AppStateHolder? = null,
+    val appThemeModeRepository: AppThemeModeRepository? = null,

    // FIXME: It is used only for TokensList screen. Remove after refactoring of TokensList
    val currenciesRepository: CurrenciesRepository? = null,