From ed9a53ed5b063cd5da878cf299e2f0e399532b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 3 Sep 2025 15:59:25 +0300 Subject: [PATCH 1/4] Update text of Add Package button on Custom screen The text of the "Add Package" button in the custom package creation screen is updated to "Add Package Details" when the button is disabled. This change provides users with more context on why the button is disabled, indicating that package details are missing. --- .../packages/ui/WooShippingCustomPackageScreen.kt | 10 +++++++++- WooCommerce/src/main/res/values/strings.xml | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt index 1d608df6f4f4..c59094f28d78 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt @@ -238,7 +238,15 @@ fun WooShippingCustomPackageCreationScreen( enabled = isAddPackageEnabled, onClick = { onAddPackageClick(isSaveAsTemplateChecked) } ) { - Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package)) + Text( + stringResource( + id = if (isAddPackageEnabled) { + R.string.woo_shipping_labels_package_creation_add_package + } else { + R.string.woo_shipping_labels_package_creation_add_package_details + } + ) + ) } } } diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml index 8ca143083550..56c4273de2ac 100644 --- a/WooCommerce/src/main/res/values/strings.xml +++ b/WooCommerce/src/main/res/values/strings.xml @@ -4651,6 +4651,7 @@ Package dimensions should all be larger than 0. Save this as a new package template Add Package + Add Package Details Create a custom package No carrier information found No saved packages yet From 92ba88318bc5dbf3cc2570f83ea53a2bd7548dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 3 Sep 2025 16:03:44 +0300 Subject: [PATCH 2/4] Update text of Add Package button on the Carrier screen The text of the "Add Package" button in the `WooShippingCarrierPackageScreen` now changes based on whether it's enabled or disabled. If the button is disabled, its text changes to "Select a Package". --- .../packages/ui/WooShippingCarrierPackageScreen.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt index 73159cfe61dc..f7f9dea4381b 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt @@ -120,7 +120,15 @@ fun WooShippingCarrierPackageScreen( enabled = isAddPackageEnabled, onClick = onAddPackageClick ) { - Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package)) + Text( + stringResource( + id = if (isAddPackageEnabled) { + R.string.woo_shipping_labels_package_creation_add_package + } else { + R.string.shipping_label_select_package_button + } + ) + ) } } } From 0217a563f43fade75fd430195c82d842f3767252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 3 Sep 2025 16:04:30 +0300 Subject: [PATCH 3/4] Update "Add package" button text on the Saved screen The text on the "Add package" button in the `WooShippingSavedPackageScreen` is updated to display "Select a Package" when the button is disabled. --- .../packages/ui/WooShippingSavedPackageScreen.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt index 83c8347853b9..49bb0293b027 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt @@ -103,7 +103,15 @@ fun WooShippingSavedPackageScreen( enabled = isAddPackageEnabled, onClick = onAddPackageClick ) { - Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package)) + Text( + stringResource( + id = if (isAddPackageEnabled) { + R.string.woo_shipping_labels_package_creation_add_package + } else { + R.string.shipping_label_select_package_button + } + ) + ) } } } From 10438617290294128e45cb80bded9ca7b1658016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 3 Sep 2025 16:16:41 +0300 Subject: [PATCH 4/4] Update release notes for package selection screen The release notes are updated to reflect the change in the disabled button text on the package selection screen for shipping labels. --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index bfd229f6dc52..d876c673d82f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -13,6 +13,7 @@ - [***] POS: A new settings to customize the POS [https://github.com/woocommerce/woocommerce-android/pull/14527] - [*] [Login] Improved the detection of WooCommerce API version during login flow [https://github.com/woocommerce/woocommerce-android/pull/14524] - [*] Automatically populate the weight field in the create shipment flow [https://github.com/woocommerce/woocommerce-android/pull/14525] +- [*] Shipping Labels: Updated the disabled button text on the package selection screen [https://github.com/woocommerce/woocommerce-android/pull/14558] 23.1 -----