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

[Woo POS][Design system] Center vertically the input fields in cash and receipts screens #13627

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+78 −90
Open

[Woo POS][Design system] Center vertically the input fields in cash and receipts screens #13627

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
bedf957
Refactor Collecting composable to use Column layout and improve spacing
kidinov Feb 26, 2025
aaa5aad
Refactor Collecting composable to use Column layout and improve spacing
kidinov Feb 26, 2025
dcf0f2a
Suppress spacing usage rule warning in WooPosCashPaymentScreen
kidinov Feb 26, 2025
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
125 changes: 61 additions & 64 deletions .../src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package com.woocommerce.android.ui.woopos.cashpayment

import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
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.text.KeyboardOptions
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
Expand All @@ -13,6 +18,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
Expand All @@ -21,8 +27,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import androidx.hilt.navigation.compose.hiltViewModel
import com.woocommerce.android.R
import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
Expand All @@ -34,7 +38,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosToolba
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
import org.wordpress.android.fluxc.model.WCSettingsModel
import java.math.BigDecimal
Expand Down Expand Up @@ -87,7 +90,6 @@ fun WooPosCashPaymentScreen(
}
}

@Suppress("DestructuringDeclarationWithTooManyEntries")
@Composable
private fun Collecting(
state: WooPosCashPaymentState.Collecting,
Expand All @@ -102,78 +104,74 @@ private fun Collecting(
keyboardController?.show()
}

ConstraintLayout(
Column(
modifier = Modifier
.fillMaxSize()
.imePadding()
.imePadding(),
verticalArrangement = Arrangement.SpaceBetween
) {
val (input, total, error, changeDue, button) = createRefs()
val standardMargin = WooPosSpacing.Medium.value.toAdaptivePadding()
val smallMargin = WooPosSpacing.Small.value.toAdaptivePadding()

@Suppress("WooPosDesignSystemSpacingUsageRule")
WooPosText(
text = state.totalText,
style = WooPosTypography.BodyLarge,
modifier = Modifier
.constrainAs(total) {
top.linkTo(parent.top, margin = WooPosSpacing.XSmall.value)
start.linkTo(parent.start, margin = 64.dp)
}
.padding(
top = WooPosSpacing.XSmall.value,
start = 64.dp
)
)

var inputText by remember { mutableStateOf(state.enteredAmount) }
Spacer(modifier = Modifier.weight(1f))

val marginBetweenTotalAndInput = 48.dp.toAdaptivePadding()
WooPosMoneyInputField(
modifier = Modifier
.focusRequester(focusRequester)
.constrainAs(input) {
top.linkTo(total.bottom, margin = marginBetweenTotalAndInput)
start.linkTo(parent.start, margin = standardMargin)
end.linkTo(parent.end, margin = standardMargin)
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
) {
var inputText by remember { mutableStateOf(state.enteredAmount) }

WooPosMoneyInputField(
modifier = Modifier
.focusRequester(focusRequester),
value = inputText,
onValueChange = {
onAmountChanged(it)
inputText = it
},
value = inputText,
onValueChange = {
onAmountChanged(it)
inputText = it
},
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Decimal
),
textStyle = WooPosTypography.Heading,
textColor = MaterialTheme.colorScheme.onSurface,
currencySymbol = state.currencySymbol,
currencyPosition = state.currencyPosition,
decimalSeparator = state.decimalSeparator,
numberOfDecimals = state.numberOfDecimals,
)
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Decimal
),
textStyle = WooPosTypography.Heading,
textColor = MaterialTheme.colorScheme.onSurface,
currencySymbol = state.currencySymbol,
currencyPosition = state.currencyPosition,
decimalSeparator = state.decimalSeparator,
numberOfDecimals = state.numberOfDecimals,
)

WooPosText(
text = state.changeDueText,
style = WooPosTypography.BodySmall,
color = WooPosTheme.colors.onSurfaceVariantLowest,
modifier = Modifier
.constrainAs(changeDue) {
top.linkTo(input.bottom, margin = smallMargin)
start.linkTo(parent.start, margin = standardMargin)
end.linkTo(parent.end, margin = standardMargin)
}
)
Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

if (state.errorMessage != null) {
WooPosText(
text = state.errorMessage,
color = MaterialTheme.colorScheme.error,
text = state.changeDueText,
style = WooPosTypography.BodySmall,
textAlign = TextAlign.Center,
modifier = Modifier.constrainAs(error) {
top.linkTo(changeDue.bottom, margin = smallMargin)
start.linkTo(parent.start, margin = standardMargin)
end.linkTo(parent.end, margin = standardMargin)
}
color = WooPosTheme.colors.onSurfaceVariantLowest,
modifier = Modifier.padding(horizontal = WooPosSpacing.Medium.value)
)

if (state.errorMessage != null) {
Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

WooPosText(
text = state.errorMessage,
color = MaterialTheme.colorScheme.error,
style = WooPosTypography.BodySmall,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = WooPosSpacing.Medium.value)
)
}
}

Spacer(modifier = Modifier.weight(1f))

WooPosButton(
text = state.button.text,
onClick = onCompleteOrderClicked,
Expand All @@ -183,12 +181,11 @@ private fun Collecting(
WooPosCashPaymentState.Collecting.Button.Status.LOADING -> WooPosButtonState.LOADING
},
modifier = Modifier
.constrainAs(button) {
bottom.linkTo(parent.bottom, margin = WooPosSpacing.Medium.value)
end.linkTo(parent.end, margin = standardMargin)
start.linkTo(parent.start, margin = standardMargin)
width = Dimension.fillToConstraints
}
.fillMaxWidth()
.padding(
horizontal = WooPosSpacing.Medium.value,
vertical = WooPosSpacing.Medium.value
)
)
}
}
Expand Down
43 changes: 17 additions & 26 deletions ...rc/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.woocommerce.android.ui.woopos.emailreceipt

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
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.text.KeyboardOptions
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
Expand All @@ -17,9 +21,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import androidx.hilt.navigation.compose.hiltViewModel
import com.woocommerce.android.R
import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
Expand All @@ -31,7 +32,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosToolba
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent

@Composable
Expand Down Expand Up @@ -88,14 +88,13 @@ private fun EmailState(
keyboardController?.show()
}

ConstraintLayout(
Column(
modifier = Modifier
.fillMaxSize()
.imePadding()
.imePadding(),
horizontalAlignment = Alignment.CenterHorizontally
) {
val (email, error, button) = createRefs()
val standardMargin = WooPosSpacing.Medium.value.toAdaptivePadding()
val topMargin = 72.dp.toAdaptivePadding()
Spacer(modifier = Modifier.weight(1f))

WooPosInputField(
value = state.email,
Expand All @@ -109,28 +108,23 @@ private fun EmailState(
keyboardType = KeyboardType.Email
),
modifier = Modifier
.constrainAs(email) {
top.linkTo(parent.top, margin = topMargin)
start.linkTo(parent.start)
end.linkTo(parent.end)
}
.focusRequester(focusRequester),
.focusRequester(focusRequester)
.padding(horizontal = WooPosSpacing.Medium.value)
)

if (state.errorMessage != null) {
Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

WooPosText(
text = state.errorMessage,
color = MaterialTheme.colorScheme.error,
style = WooPosTypography.BodyLarge,
textAlign = TextAlign.Center,
modifier = Modifier.constrainAs(error) {
top.linkTo(email.bottom, margin = WooPosSpacing.Small.value)
start.linkTo(parent.start)
end.linkTo(parent.end)
}
)
}

Spacer(modifier = Modifier.weight(1f))

WooPosButton(
text = state.button.text,
onClick = onSendReceiptClicked,
Expand All @@ -139,12 +133,9 @@ private fun EmailState(
WooPosEmailReceiptState.Email.Button.Status.DISABLED -> WooPosButtonState.DISABLED
WooPosEmailReceiptState.Email.Button.Status.LOADING -> WooPosButtonState.LOADING
},
modifier = Modifier.constrainAs(button) {
bottom.linkTo(parent.bottom, margin = WooPosSpacing.Medium.value)
start.linkTo(parent.start, margin = standardMargin)
end.linkTo(parent.end, margin = standardMargin)
width = Dimension.fillToConstraints
},
modifier = Modifier
.fillMaxWidth()
.padding(WooPosSpacing.Medium.value)
)
}
}
Expand Down
Loading