Updated on 2026-08-14
This commit is contained in:
parent
9f026215c1
commit
8255831701
150 changed files with 609 additions and 611 deletions
|
|
@ -1,6 +1,5 @@
|
|||
package com.tangem.feature.walletsettings.model
|
||||
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import arrow.core.getOrElse
|
||||
import com.arkivanov.decompose.router.slot.SlotNavigation
|
||||
import com.arkivanov.decompose.router.slot.activate
|
||||
|
|
@ -15,6 +14,7 @@ import com.tangem.core.decompose.ui.UiMessageSender
|
|||
import com.tangem.core.ui.components.BasicDialog
|
||||
import com.tangem.core.ui.components.DialogButtonUM
|
||||
import com.tangem.core.ui.extensions.resourceReference
|
||||
import com.tangem.core.ui.extensions.stringResourceSafe
|
||||
import com.tangem.core.ui.message.ContentMessage
|
||||
import com.tangem.core.ui.message.SnackbarMessage
|
||||
import com.tangem.domain.common.util.cardTypesResolver
|
||||
|
|
@ -96,10 +96,10 @@ internal class WalletSettingsModel @Inject constructor(
|
|||
messageSender.send(
|
||||
ContentMessage { onDismiss ->
|
||||
BasicDialog(
|
||||
message = stringResource(R.string.user_wallet_list_delete_prompt),
|
||||
message = stringResourceSafe(R.string.user_wallet_list_delete_prompt),
|
||||
onDismissDialog = onDismiss,
|
||||
confirmButton = DialogButtonUM(
|
||||
title = stringResource(R.string.common_delete),
|
||||
title = stringResourceSafe(R.string.common_delete),
|
||||
warning = true,
|
||||
onClick = {
|
||||
forgetWallet()
|
||||
|
|
@ -107,7 +107,7 @@ internal class WalletSettingsModel @Inject constructor(
|
|||
},
|
||||
),
|
||||
dismissButton = DialogButtonUM(
|
||||
title = stringResource(R.string.common_cancel),
|
||||
title = stringResourceSafe(R.string.common_cancel),
|
||||
onClick = onDismiss,
|
||||
),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ import android.content.res.Configuration
|
|||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.rememberUpdatedState
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import com.tangem.core.ui.components.AdditionalTextInputDialogUM
|
||||
import com.tangem.core.ui.components.DialogButtonUM
|
||||
import com.tangem.core.ui.components.TextInputDialog
|
||||
import com.tangem.core.ui.extensions.stringResourceSafe
|
||||
import com.tangem.core.ui.res.TangemThemePreview
|
||||
import com.tangem.feature.walletsettings.component.preview.PreviewRenameWalletComponent
|
||||
import com.tangem.feature.walletsettings.entity.RenameWalletUM
|
||||
|
|
@ -19,21 +19,21 @@ internal fun RenameWalletDialog(model: RenameWalletUM, onDismiss: () -> Unit) {
|
|||
val value by rememberUpdatedState(newValue = model.walletNameValue)
|
||||
|
||||
TextInputDialog(
|
||||
title = stringResource(id = R.string.user_wallet_list_rename_popup_title),
|
||||
title = stringResourceSafe(id = R.string.user_wallet_list_rename_popup_title),
|
||||
fieldValue = value,
|
||||
confirmButton = DialogButtonUM(
|
||||
title = stringResource(id = R.string.common_ok),
|
||||
title = stringResourceSafe(id = R.string.common_ok),
|
||||
enabled = model.isConfirmEnabled,
|
||||
onClick = model.onConfirm,
|
||||
),
|
||||
dismissButton = DialogButtonUM(
|
||||
title = stringResource(id = R.string.common_cancel),
|
||||
title = stringResourceSafe(id = R.string.common_cancel),
|
||||
onClick = onDismiss,
|
||||
),
|
||||
onDismissDialog = onDismiss,
|
||||
onValueChange = model.updateValue,
|
||||
textFieldParams = AdditionalTextInputDialogUM(
|
||||
label = stringResource(id = R.string.user_wallet_list_rename_popup_placeholder),
|
||||
label = stringResourceSafe(id = R.string.user_wallet_list_rename_popup_placeholder),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import androidx.compose.runtime.Composable
|
|||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import com.tangem.core.ui.components.appbar.TangemTopAppBar
|
||||
|
|
@ -21,6 +20,7 @@ import com.tangem.core.ui.components.block.BlockCard
|
|||
import com.tangem.core.ui.components.block.BlockItem
|
||||
import com.tangem.core.ui.components.snackbar.TangemSnackbarHost
|
||||
import com.tangem.core.ui.extensions.resolveReference
|
||||
import com.tangem.core.ui.extensions.stringResourceSafe
|
||||
import com.tangem.core.ui.res.LocalSnackbarHostState
|
||||
import com.tangem.core.ui.res.TangemTheme
|
||||
import com.tangem.core.ui.res.TangemThemePreview
|
||||
|
|
@ -57,7 +57,9 @@ internal fun WalletSettingsScreen(
|
|||
},
|
||||
content = { paddingValues ->
|
||||
Content(
|
||||
modifier = Modifier.padding(paddingValues).testTag(TestTags.WALLET_SETTINGS_SCREEN),
|
||||
modifier = Modifier
|
||||
.padding(paddingValues)
|
||||
.testTag(TestTags.WALLET_SETTINGS_SCREEN),
|
||||
state = state,
|
||||
)
|
||||
|
||||
|
|
@ -79,7 +81,7 @@ private fun Content(state: WalletSettingsUM, modifier: Modifier = Modifier) {
|
|||
item {
|
||||
Text(
|
||||
modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
|
||||
text = stringResource(id = R.string.wallet_settings_title),
|
||||
text = stringResourceSafe(id = R.string.wallet_settings_title),
|
||||
style = TangemTheme.typography.h1,
|
||||
color = TangemTheme.colors.text.primary1,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue