From a5a029989736af30cdf63a733fe958d14f1ffab5 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 11:25:42 -0300 Subject: [PATCH 01/10] fix: disable FillHeight when the keyboard is visible and restructure the screen --- .../calculator/CalculatorPreviewScreen.kt | 95 +++++++++++-------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index 0a9678b65..6b3064eb1 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -1,11 +1,15 @@ package to.bitkit.ui.screens.widgets.calculator +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -26,16 +30,18 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import to.bitkit.R import to.bitkit.ui.components.BodyM +import to.bitkit.ui.components.FillHeight import to.bitkit.ui.components.Headline import to.bitkit.ui.components.PrimaryButton import to.bitkit.ui.components.SecondaryButton import to.bitkit.ui.components.Text13Up import to.bitkit.ui.scaffold.AppTopBar import to.bitkit.ui.scaffold.DrawerNavIcon -import to.bitkit.ui.scaffold.ScreenColumn import to.bitkit.ui.screens.widgets.calculator.components.CalculatorCard +import to.bitkit.ui.shared.util.screen import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors +import to.bitkit.ui.utils.keyboardAsState import to.bitkit.viewmodels.CurrencyViewModel @Composable @@ -73,8 +79,12 @@ fun CalculatorPreviewContent( currencyViewModel: CurrencyViewModel?, isCalculatorWidgetEnabled: Boolean, ) { - ScreenColumn( - modifier = Modifier.testTag("facts_preview_screen") + val isKeyboardVisible by keyboardAsState() + + Column( + modifier = Modifier + .screen() + .testTag("facts_preview_screen") ) { AppTopBar( titleText = stringResource(R.string.widgets__widget__nav_title), @@ -84,47 +94,58 @@ fun CalculatorPreviewContent( Column( modifier = Modifier + .imePadding() .padding(horizontal = 16.dp) .testTag("main_content") ) { - Spacer(modifier = Modifier.height(26.dp)) - - Row( - modifier = Modifier - .fillMaxWidth() - .testTag("header_row"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween + AnimatedVisibility( + visible = !isKeyboardVisible, + enter = fadeIn(), + exit = fadeOut(), ) { - Headline( - text = AnnotatedString(stringResource(R.string.widgets__calculator__name)), - modifier = Modifier - .width(200.dp) - .testTag("widget_title") - ) - Icon( - painter = painterResource(R.drawable.widget_math_operation), - contentDescription = null, - tint = Color.Unspecified, - modifier = Modifier - .size(64.dp) - .testTag("widget_icon") - ) - } + Column { + Spacer(modifier = Modifier.height(26.dp)) - BodyM( - text = stringResource(R.string.widgets__facts__description), - color = Colors.White64, - modifier = Modifier - .padding(vertical = 16.dp) - .testTag("widget_description") - ) + Row( + modifier = Modifier + .fillMaxWidth() + .testTag("header_row"), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Headline( + text = AnnotatedString(stringResource(R.string.widgets__calculator__name)), + modifier = Modifier + .width(200.dp) + .testTag("widget_title") + ) + Icon( + painter = painterResource(R.drawable.widget_math_operation), + contentDescription = null, + tint = Color.Unspecified, + modifier = Modifier + .size(64.dp) + .testTag("widget_icon") + ) + } - HorizontalDivider( - modifier = Modifier.testTag("divider") - ) + BodyM( + text = stringResource(R.string.widgets__facts__description), + color = Colors.White64, + modifier = Modifier + .padding(vertical = 16.dp) + .testTag("widget_description") + ) - Spacer(modifier = Modifier.weight(1f)) + HorizontalDivider( + modifier = Modifier.testTag("divider") + ) + } + } + + if (!isKeyboardVisible) { + FillHeight() + } Text13Up( stringResource(R.string.common__preview), From c06d95802c8bc8074a9b04cb4568f3d0f533b0b1 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 11:35:20 -0300 Subject: [PATCH 02/10] fix: shrink animation --- .../screens/widgets/calculator/CalculatorPreviewScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index 6b3064eb1..c3374782a 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -1,8 +1,8 @@ package to.bitkit.ui.screens.widgets.calculator import androidx.compose.animation.AnimatedVisibility -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut +import androidx.compose.animation.expandVertically +import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -100,8 +100,8 @@ fun CalculatorPreviewContent( ) { AnimatedVisibility( visible = !isKeyboardVisible, - enter = fadeIn(), - exit = fadeOut(), + enter = expandVertically(), + exit = shrinkVertically(), ) { Column { Spacer(modifier = Modifier.height(26.dp)) From 36f54a3a3b843b805c95473b0a360576f7bdd5d6 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 11:36:10 -0300 Subject: [PATCH 03/10] refactor: vertical spacer --- .../ui/screens/widgets/calculator/CalculatorPreviewScreen.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index c3374782a..0f7068535 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -35,6 +35,7 @@ import to.bitkit.ui.components.Headline import to.bitkit.ui.components.PrimaryButton import to.bitkit.ui.components.SecondaryButton import to.bitkit.ui.components.Text13Up +import to.bitkit.ui.components.VerticalSpacer import to.bitkit.ui.scaffold.AppTopBar import to.bitkit.ui.scaffold.DrawerNavIcon import to.bitkit.ui.screens.widgets.calculator.components.CalculatorCard @@ -104,7 +105,7 @@ fun CalculatorPreviewContent( exit = shrinkVertically(), ) { Column { - Spacer(modifier = Modifier.height(26.dp)) + VerticalSpacer(26.dp) Row( modifier = Modifier From f2cb0305b5a5eaa0164dd056470f8e7676caa544 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 11:57:32 -0300 Subject: [PATCH 04/10] chore: implement new style --- .../main/java/to/bitkit/ui/components/TextInput.kt | 6 ++++-- .../widgets/calculator/components/CalculatorCard.kt | 2 +- .../calculator/components/CalculatorInput.kt | 13 ++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/components/TextInput.kt b/app/src/main/java/to/bitkit/ui/components/TextInput.kt index 390f2ae7a..111704ee9 100644 --- a/app/src/main/java/to/bitkit/ui/components/TextInput.kt +++ b/app/src/main/java/to/bitkit/ui/components/TextInput.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldColors import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -46,7 +47,8 @@ fun TextInput( supportingText: @Composable (() -> Unit)? = null, visualTransformation: VisualTransformation = VisualTransformation.None, textStyle: TextStyle = AppTextStyles.BodySSB, -) { + colors: TextFieldColors = AppTextFieldDefaults.semiTransparent, + ) { var textFieldValue by remember { mutableStateOf(TextFieldValue(value)) } // Sync external changes @@ -75,7 +77,7 @@ fun TextInput( maxLines = maxLines, minLines = minLines, singleLine = singleLine, - colors = AppTextFieldDefaults.semiTransparent, + colors = colors, shape = AppShapes.small, keyboardOptions = keyboardOptions, keyboardActions = keyboardActions, diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt index 7888d6000..4ca434a84 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt @@ -101,7 +101,7 @@ fun CalculatorCardContent( Box( modifier = modifier .clip(shape = MaterialTheme.shapes.medium) - .background(Colors.White10) + .background(Colors.Gray6) ) { Column( modifier = Modifier diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt index dbc43b51c..17e19fd87 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt @@ -20,6 +20,7 @@ import androidx.compose.ui.unit.dp import to.bitkit.ui.components.BodyMSB import to.bitkit.ui.components.CaptionB import to.bitkit.ui.components.TextInput +import to.bitkit.ui.theme.AppTextFieldDefaults import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors @@ -30,7 +31,7 @@ fun CalculatorInput( currencySymbol: String, currencyName: String, modifier: Modifier = Modifier, - visualTransformation: VisualTransformation = VisualTransformation.None + visualTransformation: VisualTransformation = VisualTransformation.None, ) { TextInput( value = value, @@ -39,7 +40,7 @@ fun CalculatorInput( leadingIcon = { Box( modifier = Modifier - .background(color = Colors.White10, shape = CircleShape) + .background(color = Colors.Gray6, shape = CircleShape) .size(32.dp), contentAlignment = Alignment.Center ) { @@ -50,6 +51,10 @@ fun CalculatorInput( keyboardType = KeyboardType.Number ), suffix = { CaptionB(currencyName.uppercase(), color = Colors.Gray1) }, + colors = AppTextFieldDefaults.noIndicatorColors.copy( + focusedContainerColor = Colors.Black, + unfocusedContainerColor = Colors.Black + ), modifier = modifier, visualTransformation = visualTransformation ) @@ -60,7 +65,9 @@ fun CalculatorInput( private fun Preview() { AppThemeSurface { Column( - modifier = Modifier.fillMaxSize().padding(16.dp), + modifier = Modifier + .fillMaxSize() + .padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { CalculatorInput( From 72521aaa4762a971c834a6cf6e067d0971fa42f3 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 12:05:34 -0300 Subject: [PATCH 05/10] chore: lint --- app/src/main/java/to/bitkit/ui/components/TextInput.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/components/TextInput.kt b/app/src/main/java/to/bitkit/ui/components/TextInput.kt index 111704ee9..ed89f9542 100644 --- a/app/src/main/java/to/bitkit/ui/components/TextInput.kt +++ b/app/src/main/java/to/bitkit/ui/components/TextInput.kt @@ -48,7 +48,7 @@ fun TextInput( visualTransformation: VisualTransformation = VisualTransformation.None, textStyle: TextStyle = AppTextStyles.BodySSB, colors: TextFieldColors = AppTextFieldDefaults.semiTransparent, - ) { +) { var textFieldValue by remember { mutableStateOf(TextFieldValue(value)) } // Sync external changes From ae39f1313f3c89729cfb503b65633848deae163a Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 13:07:34 -0300 Subject: [PATCH 06/10] chore: modifier order --- .../screens/widgets/calculator/components/CalculatorInput.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt index 17e19fd87..b80fcdb5b 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt @@ -65,10 +65,10 @@ fun CalculatorInput( private fun Preview() { AppThemeSurface { Column( + verticalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier .fillMaxSize() - .padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + .padding(16.dp) ) { CalculatorInput( modifier = Modifier.fillMaxWidth(), From 1edfcc62d561843836af91d4af866d3fc8c47355 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 15:13:07 -0300 Subject: [PATCH 07/10] chore: lint --- .../calculator/components/CalculatorCard.kt | 8 ++++---- .../calculator/components/CalculatorInput.kt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt index 4ca434a84..85797afff 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt @@ -129,14 +129,14 @@ fun CalculatorCardContent( // Fiat input with decimal transformation CalculatorInput( - modifier = Modifier - .fillMaxWidth() - .onFocusChanged { focusState -> if (focusState.hasFocus) onFiatChange("") }, value = fiatValue, onValueChange = onFiatChange, currencySymbol = fiatSymbol, currencyName = fiatName, - visualTransformation = MonetaryVisualTransformation(decimalPlaces = 2) + visualTransformation = MonetaryVisualTransformation(decimalPlaces = 2), + modifier = Modifier + .fillMaxWidth() + .onFocusChanged { focusState -> if (focusState.hasFocus) onFiatChange("") } ) } } diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt index b80fcdb5b..182cd5c72 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorInput.kt @@ -39,10 +39,10 @@ fun CalculatorInput( onValueChange = onValueChange, leadingIcon = { Box( + contentAlignment = Alignment.Center, modifier = Modifier .background(color = Colors.Gray6, shape = CircleShape) - .size(32.dp), - contentAlignment = Alignment.Center + .size(32.dp) ) { BodyMSB(currencySymbol, color = Colors.Brand) } @@ -55,8 +55,8 @@ fun CalculatorInput( focusedContainerColor = Colors.Black, unfocusedContainerColor = Colors.Black ), - modifier = modifier, - visualTransformation = visualTransformation + visualTransformation = visualTransformation, + modifier = modifier ) } @@ -71,18 +71,18 @@ private fun Preview() { .padding(16.dp) ) { CalculatorInput( - modifier = Modifier.fillMaxWidth(), value = "100000", onValueChange = {}, currencySymbol = "₿", - currencyName = "BITCOIN" + currencyName = "BITCOIN", + modifier = Modifier.fillMaxWidth() ) CalculatorInput( - modifier = Modifier.fillMaxWidth(), value = "4.55", onValueChange = {}, currencySymbol = "$", - currencyName = "USD" + currencyName = "USD", + modifier = Modifier.fillMaxWidth() ) } } From 160cbf8ce448807d3760ca1a9554dfd62f6fdde9 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 15:15:56 -0300 Subject: [PATCH 08/10] chore: lint --- .../calculator/CalculatorPreviewScreen.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index 0f7068535..93c6ad07e 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -6,9 +6,7 @@ import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -108,11 +106,11 @@ fun CalculatorPreviewContent( VerticalSpacer(26.dp) Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier .fillMaxWidth() .testTag("header_row"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween ) { Headline( text = AnnotatedString(stringResource(R.string.widgets__calculator__name)), @@ -158,37 +156,37 @@ fun CalculatorPreviewContent( currencyViewModel?.let { CalculatorCard( - modifier = Modifier.fillMaxWidth(), showWidgetTitle = showWidgetTitles, - currencyViewModel = it + currencyViewModel = it, + modifier = Modifier.fillMaxWidth() ) } Row( + horizontalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier .padding(vertical = 21.dp) .fillMaxWidth() .testTag("buttons_row"), - horizontalArrangement = Arrangement.spacedBy(16.dp) ) { if (isCalculatorWidgetEnabled) { SecondaryButton( text = stringResource(R.string.common__delete), + fullWidth = false, + onClick = onClickDelete, modifier = Modifier .weight(1f) .testTag("WidgetDelete"), - fullWidth = false, - onClick = onClickDelete ) } PrimaryButton( text = stringResource(R.string.common__save), + fullWidth = false, + onClick = onClickSave, modifier = Modifier .weight(1f) .testTag("WidgetSave"), - fullWidth = false, - onClick = onClickSave ) } } From a17bdda3d90cb00965a4f0a1270cc553732c16ad Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 15:15:56 -0300 Subject: [PATCH 09/10] chore: lint --- .../calculator/CalculatorPreviewScreen.kt | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index 0f7068535..1a542baa6 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -6,9 +6,7 @@ import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -108,11 +106,11 @@ fun CalculatorPreviewContent( VerticalSpacer(26.dp) Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier .fillMaxWidth() - .testTag("header_row"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween + .testTag("header_row") ) { Headline( text = AnnotatedString(stringResource(R.string.widgets__calculator__name)), @@ -158,37 +156,37 @@ fun CalculatorPreviewContent( currencyViewModel?.let { CalculatorCard( - modifier = Modifier.fillMaxWidth(), showWidgetTitle = showWidgetTitles, - currencyViewModel = it + currencyViewModel = it, + modifier = Modifier.fillMaxWidth() ) } Row( + horizontalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier .padding(vertical = 21.dp) .fillMaxWidth() - .testTag("buttons_row"), - horizontalArrangement = Arrangement.spacedBy(16.dp) + .testTag("buttons_row") ) { if (isCalculatorWidgetEnabled) { SecondaryButton( text = stringResource(R.string.common__delete), + fullWidth = false, + onClick = onClickDelete, modifier = Modifier .weight(1f) - .testTag("WidgetDelete"), - fullWidth = false, - onClick = onClickDelete + .testTag("WidgetDelete") ) } PrimaryButton( text = stringResource(R.string.common__save), + fullWidth = false, + onClick = onClickSave, modifier = Modifier .weight(1f) - .testTag("WidgetSave"), - fullWidth = false, - onClick = onClickSave + .testTag("WidgetSave") ) } } From a4832cb7738182a3237362a02262f5be8836097d Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 22 Jan 2026 15:18:49 -0300 Subject: [PATCH 10/10] chore: lint --- .../screens/widgets/calculator/CalculatorPreviewScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt index 93c6ad07e..1a542baa6 100644 --- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt @@ -110,7 +110,7 @@ fun CalculatorPreviewContent( horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier .fillMaxWidth() - .testTag("header_row"), + .testTag("header_row") ) { Headline( text = AnnotatedString(stringResource(R.string.widgets__calculator__name)), @@ -167,7 +167,7 @@ fun CalculatorPreviewContent( modifier = Modifier .padding(vertical = 21.dp) .fillMaxWidth() - .testTag("buttons_row"), + .testTag("buttons_row") ) { if (isCalculatorWidgetEnabled) { SecondaryButton( @@ -176,7 +176,7 @@ fun CalculatorPreviewContent( onClick = onClickDelete, modifier = Modifier .weight(1f) - .testTag("WidgetDelete"), + .testTag("WidgetDelete") ) } @@ -186,7 +186,7 @@ fun CalculatorPreviewContent( onClick = onClickSave, modifier = Modifier .weight(1f) - .testTag("WidgetSave"), + .testTag("WidgetSave") ) } }