[Woo POS] M2: Update UI based on design for success screen #12165
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| package com.woocommerce.android.ui.woopos.home.totals.payment.success | ||
|
|
||
| import androidx.compose.foundation.background | ||
| 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 | ||
|
|
@@ -13,18 +11,15 @@ import androidx.compose.foundation.layout.padding | |
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material.ButtonDefaults | ||
| import androidx.compose.material.Icon | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.OutlinedButton | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
|
|
@@ -43,33 +38,17 @@ fun WooPosPaymentSuccessScreen( | |
| onNewTransactionClicked: () -> Unit, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .background(Color(0xFF98F179)), | ||
|
Contributor
There was a problem hiding this comment. @backwardstruck I think we should not use hardcoded colors at this stage as it won't work in the dark mode
Contributor
Author
There was a problem hiding this comment. Agreed. I'll start adding them to the xml file instead. |
||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(24.dp.toAdaptivePadding()) | ||
| .weight(1f) | ||
| .fillMaxWidth() | ||
| .verticalScroll(rememberScrollState()), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center, | ||
|
|
@@ -81,18 +60,22 @@ fun WooPosPaymentSuccessScreen( | |
| tint = Color.Unspecified, | ||
| contentDescription = null, | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp.toAdaptivePadding())) | ||
| Text( | ||
| text = stringResource(R.string.woopos_payment_successful_label), | ||
| style = MaterialTheme.typography.h4, | ||
| fontWeight = FontWeight.Bold, | ||
| textAlign = TextAlign.Center, | ||
| color = MaterialTheme.colors.onSurface | ||
| ) | ||
|
|
||
| Text( | ||
| text = stringResource(R.string.woopos_success_screen_total, state.orderTotalText), | ||
| style = MaterialTheme.typography.subtitle1, | ||
| textAlign = TextAlign.Center, | ||
| color = MaterialTheme.colors.onSurface, | ||
| modifier = Modifier.padding(24.dp.toAdaptivePadding()) | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.weight(1f)) | ||
| } | ||
|
|
@@ -101,109 +84,26 @@ fun WooPosPaymentSuccessScreen( | |
|
|
||
| OutlinedButton( | ||
| modifier = Modifier | ||
| .padding(24.dp.toAdaptivePadding()) | ||
| .height(80.dp.toAdaptivePadding()) | ||
| .width(600.dp.toAdaptivePadding()), | ||
| colors = ButtonDefaults.outlinedButtonColors( | ||
| contentColor = MaterialTheme.colors.onSurface | ||
| ), | ||
| onClick = onNewTransactionClicked | ||
| ) { | ||
| Icon( | ||
| modifier = Modifier.size(20.dp.toAdaptivePadding()), | ||
| painter = painterResource(id = R.drawable.woo_pos_ic_return_home), | ||
| contentDescription = null | ||
| ) | ||
| Spacer(modifier = Modifier.width(8.dp.toAdaptivePadding())) | ||
| Text( | ||
| text = stringResource(R.string.woopos_new_order_button), | ||
| style = MaterialTheme.typography.h6, | ||
| fontWeight = FontWeight.SemiBold, | ||
| color = MaterialTheme.colors.onSurface, | ||
| textAlign = TextAlign.Center | ||
| ) | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was added here but as far as I can tell, we don't need it anymore. If that's not the case I will put it back. FYI @kidinov