Issue/11508 coupons card 2 #11543

hichamboushaba · 2024-05-19T09:48:35Z

Part of: #11508

Description

This PR adds the following to the coupons Card:

Loading UI.
Empty View.
Coupons List UI.
Navigation to the coupons list.
Navigation to the coupon details when a coupon is clicked.

Testing instructions

Prepare some test data: create some coupons, and add them to some orders (you can do it from wp-admin even for old orders).
Open the app.
Switch to different date ranges, and confirm the coupons are loaded, and that the empty view is shown when needed.
Click on "View all coupons"
Confirm the coupons list is shown.
Go back, and click on one of the coupons.
Confirm the coupon details screen is shown.

Images/gif

Screen_recording_20240519_123512.webm

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

dangermattic · 2024-05-19T09:49:04Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2024-05-19T10:16:39Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`a06914b`
	Direct Download	`woocommerce-prototype-build-pr11543-a06914b.apk`

codecov-commenter · 2024-05-19T10:42:37Z

Codecov Report

Attention: Patch coverage is 0% with 171 lines in your changes are missing coverage. Please review.

Project coverage is 40.23%. Comparing base (dd01fde) to head (a06914b).
Report is 188 commits behind head on trunk.

Files	Patch %	Lines
...droid/ui/dashboard/coupons/DashboardCouponsCard.kt	0.00%	153 Missing ⚠️
.../ui/dashboard/coupons/DashboardCouponsViewModel.kt	0.00%	18 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #11543      +/-   ##
============================================
- Coverage     40.33%   40.23%   -0.10%     
  Complexity     5200     5200              
============================================
  Files          1087     1087              
  Lines         63224    63371     +147     
  Branches       8667     8685      +18     
============================================
  Hits          25499    25499              
- Misses        35430    35577     +147     
  Partials       2295     2295

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

hichamboushaba · 2024-05-19T11:47:59Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsScreen.kt

-                        tint = colorResource(id = R.color.action_menu_fg_selector)
+                        tint = MaterialTheme.colors.primary


Just an inconsistency that I noticed, we were using the wrong color for the menu button here.

hichamboushaba · 2024-05-19T11:48:39Z

...ommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt

+                    navController.navigateSafely(
+                        DashboardFragmentDirections.actionDashboardToCouponListFragment()
+                    )
+                    navController.navigateSafely(
+                        directions = CouponListFragmentDirections.actionCouponListFragmentToCouponDetailsFragment(
+                            couponId = event.couponId
+                        ),
+                        skipThrottling = true,
+                        navOptions = navOptions {
+                            popUpTo(R.id.dashboard)
+                            anim {
+                                enter = R.anim.default_enter_anim
+                                exit = R.anim.default_exit_anim
+                                popEnter = R.anim.default_pop_enter_anim
+                                popExit = R.anim.default_pop_exit_anim
+                            }
+                        }


Instead of duplicating the couponDetailsFragment destination, I decided to just perform two navigation actions to show the details.

I noticed that when I tap on a coupon and go back, the list isn't shown like for the reviews, but I'm back at the dashboard screen.

Yes, that's intentional, since we don't have to handle the undo behavior like in the reviews.

hichamboushaba · 2024-05-19T11:53:41Z

...ommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt

                    WidgetError(
-                        onContactSupportClicked = { /*TODO*/ },
-                        onRetryClicked = { /*TODO*/ }
+                        onContactSupportClicked = onContactSupportClick,
+                        onRetryClicked = onRetryClick
                    )
                }


Here, we will need to differentiate between the two types of errors: a generic error, or when WCAdmin is disabled, this differentiation will be added during the work on #11544

0nko

I noticed a weird behavior when I deleted a coupon:

I tapped on one of the coupons
Deleted it from the coupon details menu
When the app navigates back to the dashboard, the card shows the error screen and it's not possible to reload it

0nko · 2024-05-28T13:56:00Z

...ommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt

+                    navController.navigateSafely(
+                        DashboardFragmentDirections.actionDashboardToCouponListFragment()
+                    )
+                    navController.navigateSafely(
+                        directions = CouponListFragmentDirections.actionCouponListFragmentToCouponDetailsFragment(
+                            couponId = event.couponId
+                        ),
+                        skipThrottling = true,
+                        navOptions = navOptions {
+                            popUpTo(R.id.dashboard)
+                            anim {
+                                enter = R.anim.default_enter_anim
+                                exit = R.anim.default_exit_anim
+                                popEnter = R.anim.default_pop_enter_anim
+                                popExit = R.anim.default_pop_exit_anim
+                            }
+                        }


I noticed that when I tap on a coupon and go back, the list isn't shown like for the reviews, but I'm back at the dashboard screen.

This updates the logic to load 6 coupons instead of 3, then exclude deleted coupons, and map only the rest.

hichamboushaba · 2024-05-28T17:30:24Z

Thanks @0nko for the review, and thanks for catching the mentioned issue, it should be fixed now, please check p1716911641960219/1716911637.747699-slack-C03L1NF1EA3 for an internal discussion around the solution.

0nko

Thanks for addressing the issue, nice job!

hichamboushaba added 5 commits May 17, 2024 18:31

Update UI model with needed properties

0032f14

Add a loading UI

53bf4b1

Add UI for the coupon items

6a829ac

Handle navigation to coupons and add menu

f0307ae

Error handling

1829783

hichamboushaba added type: enhancement A request for an enhancement. status: do not merge Dependent on another PR, ready for review but not ready for merge. feature: My Store screen Related to home screen project labels May 19, 2024

Handle navigation to coupon details

2fdb924

hichamboushaba added 2 commits May 19, 2024 11:17

Update paddings

33d44d9

Fix tint of the more icon in the coupon details

2904a60

Add an empty view to the coupons card

890ce2e

hichamboushaba added this to the 18.8 milestone May 19, 2024

hichamboushaba commented May 19, 2024

View reviewed changes

Fix detekt issues

35d1b10

hichamboushaba marked this pull request as ready for review May 19, 2024 11:51

hichamboushaba requested a review from 0nko May 19, 2024 11:51

hichamboushaba commented May 19, 2024

View reviewed changes

0nko self-assigned this May 20, 2024

Base automatically changed from issue/11508-coupons-card to trunk May 21, 2024 12:45

hichamboushaba removed the status: do not merge Dependent on another PR, ready for review but not ready for merge. label May 21, 2024

Merge branch 'trunk' into issue/11508-coupons-card-2

d291cc0

backwardstruck modified the milestones: 18.8, 18.9 May 24, 2024

0nko reviewed May 28, 2024

View reviewed changes

Improve logic to account for coupon deletion

a06914b

This updates the logic to load 6 coupons instead of 3, then exclude deleted coupons, and map only the rest.

hichamboushaba requested a review from 0nko May 28, 2024 17:30

0nko approved these changes May 29, 2024

View reviewed changes

0nko merged commit 4d92f63 into trunk May 29, 2024
14 checks passed

0nko deleted the issue/11508-coupons-card-2 branch May 29, 2024 12:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue/11508 coupons card 2 #11543

Issue/11508 coupons card 2 #11543

hichamboushaba commented May 19, 2024 •

edited

Loading

dangermattic commented May 19, 2024 •

edited

Loading

wpmobilebot commented May 19, 2024 •

edited

Loading

codecov-commenter commented May 19, 2024 •

edited

Loading

hichamboushaba May 19, 2024

hichamboushaba May 19, 2024

0nko May 28, 2024

hichamboushaba May 28, 2024

hichamboushaba May 19, 2024

0nko left a comment

0nko May 28, 2024

hichamboushaba commented May 28, 2024

0nko left a comment

		tint = colorResource(id = R.color.action_menu_fg_selector)
		tint = MaterialTheme.colors.primary

Issue/11508 coupons card 2 #11543

Issue/11508 coupons card 2 #11543

Conversation

hichamboushaba commented May 19, 2024 • edited Loading

Description

Testing instructions

Images/gif

dangermattic commented May 19, 2024 • edited Loading

wpmobilebot commented May 19, 2024 • edited Loading

codecov-commenter commented May 19, 2024 • edited Loading

Codecov Report

hichamboushaba May 19, 2024

Choose a reason for hiding this comment

hichamboushaba May 19, 2024

Choose a reason for hiding this comment

0nko May 28, 2024

Choose a reason for hiding this comment

hichamboushaba May 28, 2024

Choose a reason for hiding this comment

hichamboushaba May 19, 2024

Choose a reason for hiding this comment

0nko left a comment

Choose a reason for hiding this comment

0nko May 28, 2024

Choose a reason for hiding this comment

hichamboushaba commented May 28, 2024

0nko left a comment

Choose a reason for hiding this comment

hichamboushaba commented May 19, 2024 •

edited

Loading

dangermattic commented May 19, 2024 •

edited

Loading

wpmobilebot commented May 19, 2024 •

edited

Loading

codecov-commenter commented May 19, 2024 •

edited

Loading