Updated on 2026-08-14

This commit is contained in:
Tangem 2023-04-14 14:08:53 +03:00
parent 49f14d1115
commit e7557659d3
4 changed files with 16 additions and 25 deletions

View file

@ -12,17 +12,14 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.tangem.core.ui.components.SecondaryButton
import com.tangem.core.ui.components.SpacerH32
import com.tangem.core.ui.components.SpacerW8
@ -62,10 +59,7 @@ fun AboutSeedPhraseScreen(
ReadMoreBlock(state)
}
}
Box(
modifier = Modifier.wrapContentSize(),
) {
Box {
OnboardingActionBlock(
firstActionContent = {
SecondaryButton(
@ -105,13 +99,15 @@ private fun EditIconBlock() {
modifier = Modifier
.size(TangemTheme.dimens.size44),
painter = painterResource(id = R.drawable.ic_onboarding_text_edit_56),
contentDescription = "Edit icon",
contentDescription = null,
)
SpacerH32()
Box(
modifier = Modifier
.clip(RoundedCornerShape(TangemTheme.dimens.radius8))
.background(TangemTheme.colors.icon.warning.copy(alpha = 0.12f)),
.background(
color = TangemTheme.colors.icon.warning.copy(alpha = 0.12f),
shape = RoundedCornerShape(TangemTheme.dimens.radius8),
),
) {
Text(
modifier = Modifier
@ -141,8 +137,8 @@ private fun ReadMoreBlock(state: AboutState) {
.align(Alignment.Center)
.clip(shape)
.border(
width = 1.dp,
color = Color.Gray,
width = TangemTheme.dimens.size1,
color = TangemTheme.colors.stroke.primary,
shape = shape,
)
.clickable(onClick = state.buttonReadMoreAboutSeedPhrase.onClick)
@ -153,7 +149,7 @@ private fun ReadMoreBlock(state: AboutState) {
) {
Image(
painter = painterResource(id = R.drawable.ic_arrow_top_right_24),
contentDescription = "Go away icon",
contentDescription = null,
)
SpacerW8()
Text(

View file

@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Text
@ -60,9 +59,7 @@ fun ImportSeedPhraseScreen(
)
}
}
Box(
modifier = Modifier.wrapContentSize(),
) {
Box {
OnboardingActionBlock(
firstActionContent = {
PrimaryButtonIconLeft(

View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@ -51,9 +50,7 @@ fun IntroScreen(
)
}
}
Box(
modifier = Modifier.wrapContentSize(),
) {
Box {
OnboardingActionBlock(
firstActionContent = {
PrimaryButtonIconLeft(
@ -98,7 +95,7 @@ private fun CardImageBlock(
.build(),
loading = { CardPlaceHolder(cardImageModifier) },
error = { CardPlaceHolder(cardImageModifier) },
contentDescription = "Tangem Card",
contentDescription = null,
)
}
}
@ -108,7 +105,7 @@ private fun CardPlaceHolder(modifier: Modifier) {
Image(
modifier = modifier,
painter = painterResource(id = R.drawable.card_placeholder_black),
contentDescription = "Tangem Card placeholder",
contentScale = ContentScale.Fit,
contentDescription = null,
)
}

View file

@ -10,6 +10,7 @@ import com.tangem.feature.onboarding.presentation.wallet2.model.OnboardingSeedPh
import com.tangem.feature.onboarding.presentation.wallet2.model.TextFieldState
import com.tangem.feature.onboarding.presentation.wallet2.model.UiActions
import com.tangem.feature.onboarding.presentation.wallet2.model.YourSeedPhraseState
import kotlinx.collections.immutable.ImmutableList
/**
[REDACTED_AUTHOR]
@ -110,7 +111,7 @@ class StateBuilder(
fun mnemonicGenerated(
uiState: OnboardingSeedPhraseState,
mnemonicComponents: List<String>,
mnemonicComponents: ImmutableList<String>,
): OnboardingSeedPhraseState {
return updateMnemonicComponents(uiState, mnemonicComponents)
.copy(
@ -128,7 +129,7 @@ class StateBuilder(
fun updateMnemonicComponents(
uiState: OnboardingSeedPhraseState,
phraseList: List<String>,
phraseList: ImmutableList<String>,
): OnboardingSeedPhraseState = uiState.copy(
yourSeedPhraseState = uiState.yourSeedPhraseState.copy(
mnemonicComponents = phraseList,