Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug] Text hidden behind checkbox in the "change due calculator" screen #12808

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

[Bug] Text hidden behind checkbox in the "change due calculator" screen #12808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17f5ea4
Fix checkbox row horizontal alignment
samiuelson Oct 22, 2024
e26d253
Preview more screen sizes
samiuelson Oct 22, 2024
b98ed73
Update RELEASE-NOTES.txt
samiuelson Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
20.9
-----

- [*][Payments]Fixed UI glitch in change due calculation screen [https://github.com/woocommerce/woocommerce-android/pull/12808]

20.8
-----
Expand Down
6 changes: 5 additions & 1 deletion ...tlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.tooling.preview.PreviewScreenSizes
import androidx.compose.ui.unit.dp
import com.woocommerce.android.R
import com.woocommerce.android.ui.compose.component.NullableCurrencyTextFieldValueMapper
Expand Down Expand Up @@ -178,10 +179,10 @@ fun RecordTransactionDetailsNote(
modifier = modifier
.fillMaxWidth()
.clickable { onCheckedChange(!checked) },
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
modifier = Modifier.weight(1f),
text = stringResource(R.string.cash_payments_record_transaction_details),
style = MaterialTheme.typography.body1
)
Expand Down Expand Up @@ -217,6 +218,7 @@ fun MarkOrderAsCompleteButton(

@Composable
@PreviewLightDark
@PreviewScreenSizes
fun ChangeDueCalculatorScreenSuccessPreviewUnchecked() {
ChangeDueCalculatorScreen(
uiState = ChangeDueCalculatorViewModel.UiState(
Expand All @@ -240,6 +242,7 @@ fun ChangeDueCalculatorScreenSuccessPreviewUnchecked() {

@Composable
@PreviewLightDark
@PreviewScreenSizes
fun ChangeDueCalculatorScreenSuccessPreviewChecked() {
ChangeDueCalculatorScreen(
uiState = ChangeDueCalculatorViewModel.UiState(
Expand All @@ -263,6 +266,7 @@ fun ChangeDueCalculatorScreenSuccessPreviewChecked() {

@Composable
@PreviewLightDark
@PreviewScreenSizes
fun ChangeDueCalculatorScreenSuccessPreviewDisabled() {
ChangeDueCalculatorScreen(
uiState = ChangeDueCalculatorViewModel.UiState(
Expand Down
Loading