Updated on 2026-08-14

This commit is contained in:
Tangem 2023-01-19 20:27:59 +08:00
parent 6d69a5706a
commit 9c1931f7d7
81 changed files with 686 additions and 981 deletions

View file

@ -88,10 +88,11 @@ fun SwapPermissionBottomSheetContent(
SecondaryButton(
text = stringResource(id = R.string.common_cancel),
modifier = Modifier.fillMaxWidth(),
) {
data?.cancelButton?.onClick?.invoke()
onCancel()
}
onClick = {
data?.cancelButton?.onClick?.invoke()
onCancel()
},
)
SpacerH32()
@ -195,7 +196,7 @@ private fun FeeItem(fee: String) {
@Preview
@Composable
fun Preview_AgreementBottomSheet_InLightTheme() {
private fun Preview_AgreementBottomSheet_InLightTheme() {
TangemTheme(isDark = false) {
SwapPermissionBottomSheetContent(data = previewData) {}
}
@ -203,7 +204,7 @@ fun Preview_AgreementBottomSheet_InLightTheme() {
@Preview
@Composable
fun Preview_AgreementBottomSheet_InDarkTheme() {
private fun Preview_AgreementBottomSheet_InDarkTheme() {
TangemTheme(isDark = true) {
SwapPermissionBottomSheetContent(data = previewData) {}
}

View file

@ -51,11 +51,7 @@ import com.tangem.feature.swap.presentation.R
@Suppress("LongMethod")
@Composable
internal fun SwapScreenContent(
modifier: Modifier = Modifier,
state: SwapStateHolder,
onPermissionWarningClick: () -> Unit,
) {
internal fun SwapScreenContent(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) {
val keyboard by keyboardAsState()
Box(
@ -65,7 +61,7 @@ internal fun SwapScreenContent(
) {
Column(
modifier = modifier
modifier = Modifier
.fillMaxWidth()
.background(color = TangemTheme.colors.background.primary)
.verticalScroll(rememberScrollState())
@ -308,7 +304,7 @@ private val state = SwapStateHolder(
@Preview
@Composable
fun SwapScreenContentPreview() {
private fun SwapScreenContentPreview() {
TangemTheme(isDark = false) {
SwapScreenContent(state = state) {}
}

View file

@ -49,8 +49,8 @@ fun SwapSelectTokenScreen(state: SwapSelectTokenStateHolder, onBack: () -> Unit)
title = stringResource(R.string.swapping_token_list_your_title),
onBackClick = onBack,
placeholderSearchText = stringResource(id = R.string.search_tokens_title),
onSearchChanged = state.onSearchEntered,
onSearchDisplayClosed = { state.onSearchEntered("") },
onSearchChange = state.onSearchEntered,
onSearchDisplayClose = { state.onSearchEntered("") },
)
},
)
@ -85,7 +85,7 @@ private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier =
}
@Composable
private fun TokenItem(token: TokenToSelect, onTokenClick: (String) -> Unit) {
private fun TokenItem(token: TokenToSelect, onTokenClick: () -> Unit) {
Row(
modifier = Modifier
.fillMaxWidth()
@ -94,7 +94,7 @@ private fun TokenItem(token: TokenToSelect, onTokenClick: (String) -> Unit) {
bottom = TangemTheme.dimens.spacing14,
end = TangemTheme.dimens.spacing16,
)
.clickable { onTokenClick(token.id) },
.clickable(onClick = onTokenClick),
verticalAlignment = Alignment.CenterVertically,
) {
TokenIcon(token = token)
@ -209,7 +209,7 @@ private val tokenNotAvailable = token.copy(available = false)
@Preview
@Composable
fun TokenScreenPreview() {
private fun TokenScreenPreview() {
SwapSelectTokenScreen(
state = SwapSelectTokenStateHolder(
listOf(token, tokenNotAvailable, token), {}, {},

View file

@ -48,7 +48,7 @@ private val state = SwapSuccessStateHolder(
@Preview(showBackground = true)
@Composable
fun Preview_Success_InLightTheme() {
private fun Preview_Success_InLightTheme() {
TangemTheme(isDark = false) {
SwapSuccessScreen(state) {}
}
@ -56,7 +56,7 @@ fun Preview_Success_InLightTheme() {
@Preview(showBackground = true)
@Composable
fun Preview_Success_InDarkTheme() {
private fun Preview_Success_InDarkTheme() {
TangemTheme(isDark = true) {
SwapSuccessScreen(state) {}
}

View file

@ -63,7 +63,6 @@ import com.valentinilk.shimmer.shimmer
@Suppress("LongParameterList")
@Composable
fun TransactionCard(
modifier: Modifier = Modifier,
type: TransactionCardType,
balance: String,
amount: String?,
@ -74,7 +73,6 @@ fun TransactionCard(
onChangeTokenClick: (() -> Unit)? = null,
) {
Card(
modifier = modifier,
shape = RoundedCornerShape(TangemTheme.dimens.radius12),
backgroundColor = TangemTheme.colors.background.primary,
elevation = TangemTheme.dimens.elevation2,
@ -211,7 +209,7 @@ private fun Content(
is TransactionCardType.SendCard -> {
AutoSizeTextField(
amount = amount ?: "1",
onAmoutChanged = { type.onAmountChanged(it) },
onAmountChange = { type.onAmountChanged(it) },
)
}
}
@ -247,10 +245,7 @@ private fun Content(
@Suppress("MagicNumber")
@Composable
private fun AutoSizeTextField(
amount: String,
onAmoutChanged: (String) -> Unit,
) {
private fun AutoSizeTextField(amount: String, onAmountChange: (String) -> Unit) {
val focusManager = LocalFocusManager.current
val textFieldFocusRequester = remember { FocusRequester() }
@ -281,7 +276,7 @@ private fun AutoSizeTextField(
BasicTextField(
value = amount,
onValueChange = {
onAmoutChanged(it)
onAmountChange(it)
},
singleLine = true,
modifier = Modifier
@ -338,7 +333,7 @@ fun Token(
.crossfade(true)
.build(),
loading = { TokenImageShimmer(modifier = tokenImageModifier) },
error = { CurrencyPlaceholderIcon(modifier = tokenImageModifier, tokenCurrency) },
error = { CurrencyPlaceholderIcon(modifier = tokenImageModifier, id = tokenCurrency) },
contentDescription = null,
)
@ -412,7 +407,7 @@ private fun TokenImageShimmer(
@Preview(widthDp = 328, heightDp = 116, showBackground = true)
@Composable
fun Preview_SwapMainCard_InLightTheme() {
private fun Preview_SwapMainCard_InLightTheme() {
TangemTheme(isDark = false) {
TransactionCardPreview()
}
@ -420,7 +415,7 @@ fun Preview_SwapMainCard_InLightTheme() {
@Preview(widthDp = 328, heightDp = 116, showBackground = true)
@Composable
fun Preview_SwapMainCard_InDarkTheme() {
private fun Preview_SwapMainCard_InDarkTheme() {
TangemTheme(isDark = true) {
TransactionCardPreview()
}