Merge pull request #109 from code-payments/fix/amount-area-sizing

Fix/amount area sizing

Author: bmc08gt

app/src/main/java/com/getcode/view/components/CodeButton.kt

@@ -47,7 +47,6 @@ fun CodeButton(
     isTextSuccess: Boolean = false,
     enabled: Boolean = true,
     buttonState: ButtonState = ButtonState.Bordered,
-    isPaddedVertical: Boolean = true,
     textColor: Color = Color.Unspecified,
     shape: Shape = CodeTheme.shapes.small,
 ) {
@@ -80,8 +79,8 @@ fun CodeButton(
             ),
             shape = shape,
             contentPadding = ButtonDefaults.ContentPadding.plus(
-                top = if (isPaddedVertical) CodeTheme.dimens.grid.x3 else 0.dp,
-                bottom = if (isPaddedVertical) CodeTheme.dimens.grid.x3 else 0.dp,
+                top = CodeTheme.dimens.grid.x3,
+                bottom = CodeTheme.dimens.grid.x3,
             )
         ) {
             when {

app/src/main/java/com/getcode/view/login/AccessKey.kt

@@ -190,7 +190,6 @@ fun AccessKey(
                         text = stringResource(R.string.action_wroteThemDownInstead),
                         buttonState = ButtonState.Subtle,
                         enabled = dataState.isEnabled,
-                        isPaddedVertical = false,
                     )
                 }
             }

app/src/main/java/com/getcode/view/login/NotificationPermission.kt

@@ -97,7 +97,6 @@ fun NotificationPermission(navigator: CodeNavigator = LocalCodeNavigator.current
             },
             text = stringResource(R.string.action_notNow),
             buttonState = ButtonState.Subtle,
-            isPaddedVertical = false,
         )
     }
 }

app/src/main/java/com/getcode/view/main/balance/BalanceSheet.kt

@@ -285,7 +285,7 @@ fun BalanceTop(
         isLoading = state.historicalTransactionsLoading,
         currencyResId = state.currencyFlag,
         isClickable = isClickable,
-        onClick = onClick
+        onClick = onClick,
     )
 }
 

app/src/main/java/com/getcode/view/main/getKin/BuyAndSellKin.kt

@@ -120,7 +120,6 @@ fun BuyAndSellKin(
                     },
                     text = stringResource(id = R.string.action_shareVideo),
                     buttonState = ButtonState.Subtle,
-                    isPaddedVertical = false,
                 )
             }
         }

app/src/main/java/com/getcode/view/main/giveKin/AmountArea.kt

@@ -15,8 +15,10 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.TextUnit
 import com.getcode.LocalNetworkObserver
 import com.getcode.R
 import com.getcode.theme.Alert
@@ -42,6 +44,7 @@ fun AmountArea(
     isClickable: Boolean = true,
     isLoading: Boolean = false,
     isAnimated: Boolean = false,
+    textStyle: TextStyle = CodeTheme.typography.h1,
     uiModel: AmountAnimatedInputUiModel? = null,
     networkState: NetworkState = LocalNetworkObserver.current.state.value,
     onClick: () -> Unit = {}
@@ -59,14 +62,16 @@ fun AmountArea(
                 if (!isAnimated) {
                     AmountText(
                         currencyResId = currencyResId,
-                        "${amountPrefix.orEmpty()}$amountText${amountSuffix.orEmpty()}"
+                        amountText = "${amountPrefix.orEmpty()}$amountText${amountSuffix.orEmpty()}",
+                        textStyle = textStyle,
                     )
                 } else {
                     AmountTextAnimated(
                         uiModel = uiModel,
                         currencyResId = currencyResId,
                         amountPrefix = amountPrefix.orEmpty(),
-                        amountSuffix = amountSuffix.orEmpty()
+                        amountSuffix = amountSuffix.orEmpty(),
+                        textStyle = textStyle,
                     )
                 }
             }

app/src/main/java/com/getcode/view/main/giveKin/AmountText.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.White
@@ -19,9 +20,10 @@ import com.getcode.theme.displayLarge
 @Composable
 fun AmountText(
     currencyResId: Int?,
-    amountText: String
+    amountText: String,
+    textStyle: TextStyle = CodeTheme.typography.h1,
 ) {
-    val displayLarge = CodeTheme.typography.displayLarge.copy(textAlign = TextAlign.Center)
+    val displayLarge = textStyle.copy(textAlign = TextAlign.Center)
     var scaledTextStyle by remember { mutableStateOf(displayLarge) }
     var isReadyToDraw by remember { mutableStateOf(false) }
 

app/src/main/java/com/getcode/view/main/giveKin/AmountTextAnimated.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
@@ -132,11 +133,12 @@ fun AnimatedPlaceholderDigit(
 
 @ExperimentalAnimationApi
 @Composable
-fun AmountTextAnimated(
+internal fun AmountTextAnimated(
     currencyResId: Int?,
     amountPrefix: String,
     amountSuffix: String,
     uiModel: AmountAnimatedInputUiModel?,
+    textStyle: TextStyle,
 ) {
     uiModel ?: return
 
@@ -157,10 +159,9 @@ fun AmountTextAnimated(
     var firstDigit by remember { mutableStateOf("") }
 
     //Font states
-    val displayLarge = CodeTheme.typography.displayLarge
-    var textSize by remember { mutableStateOf(displayLarge.fontSize) }
+    var textSize by remember { mutableStateOf(textStyle.fontSize) }
     val fontDecreasePoints = remember { HashMap<Int, Float>() }
-    val maxFontSize = displayLarge.fontSize
+    val maxFontSize = textStyle.fontSize
 
     val commaVisibility = uiModel.amountData.commaVisibility
     val amountSplit = uiModel.amountData.amount.split(DECIMAL_SEPARATOR)

app/src/main/java/com/getcode/view/main/giveKin/GiveKinSheet.kt

@@ -24,6 +24,7 @@ import com.getcode.navigation.screens.HomeResult
 import com.getcode.theme.Alert
 import com.getcode.theme.BrandLight
 import com.getcode.theme.CodeTheme
+import com.getcode.theme.displayLarge
 import com.getcode.util.showNetworkError
 import com.getcode.utils.ErrorUtils
 import com.getcode.view.components.ButtonState
@@ -65,6 +66,7 @@ fun GiveKinSheet(
                 uiModel = dataState.amountAnimatedModel,
                 isAnimated = true,
                 networkState = networkState,
+                textStyle = CodeTheme.typography.displayLarge,
                 modifier = Modifier
                     .align(Alignment.Center)
             ) {

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -82,6 +82,7 @@ import com.getcode.view.main.home.components.BillManagementOptions
 import com.getcode.view.main.home.components.HomeBill
 import com.getcode.view.main.home.components.PaymentConfirmation
 import com.getcode.view.main.home.components.PermissionsBlockingView
+import com.getcode.view.main.home.components.ReceivedKinConfirmation
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -480,46 +481,10 @@ private fun BillContainer(
                 Box(
                     contentAlignment = BottomCenter
                 ) {
-                    Column(
-                        modifier = Modifier
-                            .clip(
-                                CodeTheme.shapes.medium.copy(
-                                    bottomStart = ZeroCornerSize,
-                                    bottomEnd = ZeroCornerSize
-                                )
-                            )
-                            .background(Brand)
-                            .padding(
-                                horizontal = CodeTheme.dimens.inset,
-                                vertical = CodeTheme.dimens.grid.x3
-                            )
-                            .windowInsetsPadding(WindowInsets.navigationBars),
-                        horizontalAlignment = CenterHorizontally
-                    ) {
-                        Text(
-                            modifier = Modifier.padding(top = CodeTheme.dimens.grid.x3),
-                            style = CodeTheme.typography.subtitle1.copy(
-                                fontWeight = FontWeight.Bold
-                            ),
-                            text = stringResource(id = R.string.subtitle_youReceived)
-                        )
-
-                        Row {
-                            val bill = updatedState.billState.bill as Bill.Cash
-                            AmountArea(
-                                amountText = bill.amount.formatted(),
-                                currencyResId = bill.amount.rate.currency.flagResId,
-                                isClickable = false
-                            )
-
-                        }
-                        CodeButton(
-                            modifier = Modifier.fillMaxWidth(),
-                            onClick = { homeViewModel.cancelSend() },
-                            buttonState = ButtonState.Filled,
-                            text = stringResource(id = R.string.action_putInWallet)
-                        )
-                    }
+                    ReceivedKinConfirmation(
+                        bill = updatedState.billState.bill as Bill.Cash,
+                        onClaim = { homeViewModel.cancelSend() }
+                    )
                 }
             }
         }