From 508d40ece407967ed274c971dbc266b3250f98c6 Mon Sep 17 00:00:00 2001 From: bakyt Date: Mon, 1 Apr 2024 13:59:09 +0600 Subject: [PATCH] Show dividers in swap confirm fields --- .../modules/multiswap/QuoteInfoRow.kt | 3 ++- .../modules/multiswap/SwapConfirmFragment.kt | 2 +- .../modules/multiswap/SwapFragment.kt | 2 +- .../modules/multiswap/ui/SwapDataField.kt | 2 +- .../multiswap/ui/SwapDataFieldAllowance.kt | 3 ++- .../modules/multiswap/ui/SwapDataFieldFee.kt | 27 ------------------- .../multiswap/ui/SwapDataFieldRecipient.kt | 3 ++- .../ui/SwapDataFieldRecipientExtended.kt | 6 +++-- .../multiswap/ui/SwapDataFieldSlippage.kt | 3 ++- 9 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldFee.kt diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/QuoteInfoRow.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/QuoteInfoRow.kt index a8ffc715b77..f6f8554c0db 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/QuoteInfoRow.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/QuoteInfoRow.kt @@ -18,10 +18,11 @@ import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_leah @Composable fun QuoteInfoRow( + borderTop: Boolean = false, title: @Composable() (RowScope.() -> Unit), value: @Composable() (RowScope.() -> Unit), ) { - CellUniversal(borderTop = false) { + CellUniversal(borderTop = borderTop) { title.invoke(this) HSpacer(width = 16.dp) Row(modifier = Modifier.weight(1f), horizontalArrangement = Arrangement.End) { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapConfirmFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapConfirmFragment.kt index 21c70845766..5f611d9eba7 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapConfirmFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapConfirmFragment.kt @@ -218,7 +218,7 @@ fun SwapConfirmScreen(navController: NavController) { ) } uiState.fields.forEach { - it.GetContent(navController) + it.GetContent(navController, true) } } } diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapFragment.kt index ed099ae0525..f9f5d000dfe 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/SwapFragment.kt @@ -335,7 +335,7 @@ private fun SwapScreenInner( PriceField(quote.tokenIn, quote.tokenOut, quote.amountIn, quote.amountOut) PriceImpactField(uiState.priceImpact, uiState.priceImpactLevel, navController) quote.fields.forEach { - it.GetContent(navController) + it.GetContent(navController, false) } } } else { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataField.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataField.kt index c60bc446226..76ca844cd55 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataField.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataField.kt @@ -5,5 +5,5 @@ import androidx.navigation.NavController interface SwapDataField { @Composable - fun GetContent(navController: NavController) + fun GetContent(navController: NavController, borderTop: Boolean) } diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldAllowance.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldAllowance.kt index eaa54996738..f1596a3c68e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldAllowance.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldAllowance.kt @@ -23,11 +23,12 @@ import java.math.BigDecimal data class SwapDataFieldAllowance(val allowance: BigDecimal, val token: Token) : SwapDataField { @Composable - override fun GetContent(navController: NavController) { + override fun GetContent(navController: NavController, borderTop: Boolean) { val infoTitle = stringResource(id = R.string.SwapInfo_AllowanceTitle) val infoText = stringResource(id = R.string.SwapInfo_AllowanceDescription) QuoteInfoRow( + borderTop = borderTop, title = { subhead2_grey(text = stringResource(R.string.Swap_Allowance)) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldFee.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldFee.kt deleted file mode 100644 index 0a6dbef7ddb..00000000000 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldFee.kt +++ /dev/null @@ -1,27 +0,0 @@ -package io.horizontalsystems.bankwallet.modules.multiswap.ui - -import androidx.compose.runtime.Composable -import androidx.compose.ui.res.stringResource -import androidx.navigation.NavController -import io.horizontalsystems.bankwallet.R -import io.horizontalsystems.bankwallet.modules.multiswap.QuoteInfoRow -import io.horizontalsystems.bankwallet.modules.send.SendModule -import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_grey -import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_leah - -// todo: remove this class if it's unused -data class SwapDataFieldFee(val feeAmountData: SendModule.AmountData) : SwapDataField { - @Composable - override fun GetContent(navController: NavController) { - QuoteInfoRow( - title = { - subhead2_grey(text = stringResource(R.string.Swap_Fee)) - }, - value = { - val text = - feeAmountData.secondary?.getFormatted() ?: feeAmountData.primary.getFormatted() - subhead2_leah(text = text) - } - ) - } -} diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipient.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipient.kt index e7c741b47ea..68337bbf49b 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipient.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipient.kt @@ -12,8 +12,9 @@ import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_leah data class SwapDataFieldRecipient(val address: Address) : SwapDataField { @Composable - override fun GetContent(navController: NavController) { + override fun GetContent(navController: NavController, borderTop: Boolean) { QuoteInfoRow( + borderTop = borderTop, title = { subhead2_grey(text = stringResource(R.string.Swap_Recipient)) }, diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipientExtended.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipientExtended.kt index 10894f9aa79..6f17e03264c 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipientExtended.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldRecipientExtended.kt @@ -27,8 +27,9 @@ data class SwapDataFieldRecipientExtended( val blockchainType: BlockchainType ) : SwapDataField { @Composable - override fun GetContent(navController: NavController) { + override fun GetContent(navController: NavController, borderTop: Boolean) { QuoteInfoRow( + borderTop = borderTop, title = { subhead2_grey(text = stringResource(R.string.Swap_Recipient)) }, @@ -58,6 +59,7 @@ data class SwapDataFieldRecipientExtended( contact?.name?.let { name -> QuoteInfoRow( + borderTop = borderTop, title = { subhead2_grey(text = stringResource(R.string.TransactionInfo_ContactName)) }, @@ -80,6 +82,6 @@ fun SwapDataFieldRecipientExtendedPreview() { SwapDataFieldRecipientExtended( Address("0x1234567890abcdef1234567890abcdef12345678"), BlockchainType.Bitcoin - ).GetContent(navController = navController) + ).GetContent(navController = navController, borderTop = true) } } diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldSlippage.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldSlippage.kt index af5b2880a3e..d2bc4a2916a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldSlippage.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ui/SwapDataFieldSlippage.kt @@ -12,8 +12,9 @@ import java.math.BigDecimal data class SwapDataFieldSlippage(val slippage: BigDecimal) : SwapDataField { @Composable - override fun GetContent(navController: NavController) { + override fun GetContent(navController: NavController, borderTop: Boolean) { QuoteInfoRow( + borderTop = borderTop, title = { subhead2_grey(text = stringResource(R.string.Swap_Slippage)) },