[Shipping Labels] Make selected hazmat box tappable #14576
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
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,6 +1,7 @@ | ||||||
| package com.woocommerce.android.ui.orders.wooshippinglabels.hazmat | ||||||
|
|
||||||
| import androidx.compose.foundation.background | ||||||
| import androidx.compose.foundation.clickable | ||||||
| import androidx.compose.foundation.layout.Box | ||||||
| import androidx.compose.foundation.layout.Spacer | ||||||
| import androidx.compose.foundation.layout.fillMaxWidth | ||||||
|
|
@@ -11,6 +12,7 @@ import androidx.compose.material3.MaterialTheme | |||||
| import androidx.compose.material3.Text | ||||||
| import androidx.compose.runtime.Composable | ||||||
| import androidx.compose.ui.Modifier | ||||||
| import androidx.compose.ui.draw.clip | ||||||
| import androidx.compose.ui.res.colorResource | ||||||
| import androidx.compose.ui.res.dimensionResource | ||||||
| import androidx.compose.ui.res.stringResource | ||||||
|
|
@@ -21,17 +23,17 @@ import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHa | |||||
| @Composable | ||||||
| fun HazmatSelectionCard( | ||||||
| selectedCategory: ShippingLabelHazmatCategory, | ||||||
| modifier: Modifier = Modifier, | ||||||
| onClick: OnClick? = null, | ||||||
| ) { | ||||||
| Spacer(modifier = Modifier.height(4.dp)) | ||||||
| Box(modifier = modifier) { | ||||||
| Box( | ||||||
| modifier = Modifier | ||||||
| .fillMaxWidth() | ||||||
| .clip(RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large))) | ||||||
| .then(if (onClick == null) Modifier else Modifier.clickable { onClick() }) | ||||||
|
Member
There was a problem hiding this comment. np, I would suggest changing the modifiers a bit to improve the click ripple effect, the following patch achieves a better effect: patchIndex: WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt (revision 95f3732633abe38fc6ec987e84d512a469a741a8)
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt (date 1757341157252)
@@ -12,6 +12,7 @@
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
@@ -30,11 +31,9 @@
Box(
modifier = Modifier
.fillMaxWidth()
+ .clip(RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large)))
.then(if (onClick == null) Modifier else Modifier.clickable { onClick() })
- .background(
- color = colorResource(R.color.light_colored_button_background),
- shape = RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large))
- )
+ .background(color = colorResource(R.color.light_colored_button_background))
.padding(16.dp)
) {
Text(
Contributor
Author
There was a problem hiding this comment. Nice catch, thank you! Applied your patch: 30982e1 |
||||||
| .background(color = colorResource(R.color.light_colored_button_background)) | ||||||
| .padding(16.dp) | ||||||
| ) { | ||||||
| Text( | ||||||
|
|
||||||
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.
@irfano it seems we both missed this and the release note was included in
23.2(as noted by Huong here p1757419135627609/1757414420.859729-slack-C03L1NF1EA3).Can you create a small PR to fix the release notes?
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.
Oh yes 🤦🏻♂️. I've opened a PR.