Skip to content

Refund by items: Various refactorings - Step 3#1623

Merged
anitaa1990 merged 25 commits intofeature/refund-by-items-masterfrom
0nko/items-refactoring
Dec 12, 2019
Merged

Refund by items: Various refactorings - Step 3#1623
anitaa1990 merged 25 commits intofeature/refund-by-items-masterfrom
0nko/items-refactoring

Conversation

@0nko
Copy link
Copy Markdown
Contributor

@0nko 0nko commented Dec 2, 2019 •
edited
Loading

This PR is a mix of different things:

  • The refund items layout is moved into a separate file so it can be reused in the refund details screen
  • The number-picker dialog is refactored so that the navigation component is used to display it
  • The View.expand() function is updated to fix the smoothness of the animation
  • The Shipping refund section stub is added (I've enabled it just for this PR to test the expand/collapse functionality; the shipping refund has been postponed until it's supported by the API)

To test:

  1. Go to order detail and issue a refund
  2. Notice there is a shipping refund toggle
  3. Tap on the toggle and enjoy the beautiful expanding animation (no data is filled out)
  4. Tap the toggle button again and watch the collapse animation

Note: #1622 must be merged before this!

0nko added 15 commits November 21, 2019 00:50
@0nko
Move product section of refund by items into a separate layout
8c2ce63
@0nko
Add a shipping section layout
7bd728a
@0nko
Add string and drawable resources
3d6f4ab
@0nko
Add shipping section into the refund by items layout and add a bottom…
d6f9afc 
… padding
@0nko
Update product list item text size
46c2655
@0nko
Fix the expand animation
0853ea7
@0nko
Tie the switch to the shipping block collapse/expansion animation
1a74511
@0nko
Merge branch 'develop' into issue/1241-refund-by-items
8e3536a 
# Conflicts:
#	build.gradle
@0nko
Update Kotlin to version 1.3.60
2f393b8
@0nko
Hide the shipping section
c6c4504
@0nko
Modify the number picker dialog to use the navigation component
3e4bd72
@0nko
Add an earlier injectino to prevent a crash when restoring the backstack
1cee3a1
@0nko
Rename refund items picker module file
28aaab7
@0nko
Merge branch '0nko/refund-items-list' into 0nko/items-refactoring
28c7ad1 
# Conflicts:
#	build.gradle
@0nko
Optimize imports
37dd959
@0nko 0nko added status: do not merge Dependent on another PR, ready for review but not ready for merge. feature: refunds Related to order refunds. labels Dec 2, 2019
@0nko 0nko added this to the 3.3 milestone Dec 2, 2019
@peril-woocommerce
Copy link
Copy Markdown

peril-woocommerce bot commented Dec 2, 2019 •
edited
Loading

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
Messages
📖

This PR contains changes to Tracks-related logic. Please ensure the following are completed:
PR Author

  • The PR must be assigned the Tracks label
    PR Reviewer
  • The tracks events must be validated in the Tracks system.
  • Verify the internal tracks spreadsheet has also been updated.

Generated by 🚫 dangerJS

@peril-woocommerce
Copy link
Copy Markdown

peril-woocommerce bot commented Dec 2, 2019 •
edited
Loading

You can test the changes on this Pull Request by downloading the APK here.

@0nko 0nko mentioned this pull request Dec 3, 2019
Merged
0nko added 6 commits December 3, 2019 20:25
@0nko
Show the shipping refund section
82d603a
@0nko
Merge branch '0nko/refund-items-list' into 0nko/items-refactoring
8bed049 
# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/NumberPickerDialog.kt
#	build.gradle
@0nko
Fix the build
e81ef17
@0nko
Fix ktlint
8103f5b
@0nko
Merge branch '0nko/refund-items-list' into 0nko/items-refactoring
a069f11 
# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/refunds/IssueRefundViewModel.kt
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/refunds/RefundByItemsFragment.kt
#	WooCommerce/src/main/res/layout/fragment_refund_by_amount.xml
#	WooCommerce/src/main/res/layout/fragment_refund_by_items.xml
#	WooCommerce/src/main/res/values/strings.xml
#	build.gradle
@0nko
Replace fragment instance reference with viewLifecycleOwner to fix li…
8df5681 
…nt errors
@0nko 0nko mentioned this pull request Dec 11, 2019
Merged
@0nko
Merge branch '0nko/refund-items-list' into 0nko/items-refactoring
5ca99fa 
# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/refunds/IssueRefundViewModel.kt
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/refunds/RefundByItemsFragment.kt
#	WooCommerce/src/main/res/layout/fragment_refund_by_items.xml
@0nko 0nko changed the base branch from 0nko/refund-items-list to feature/refund-by-items-master December 11, 2019 23:23
@0nko 0nko removed the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Dec 11, 2019
@0nko 0nko requested a review from anitaa1990 December 11, 2019 23:32
@AmandaRiu AmandaRiu assigned AmandaRiu and unassigned AmandaRiu Dec 12, 2019
@anitaa1990 anitaa1990 self-assigned this Dec 12, 2019
anitaa1990
anitaa1990 approved these changes Dec 12, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@anitaa1990 anitaa1990 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

@anitaa1990 anitaa1990 merged commit c424855 into feature/refund-by-items-master Dec 12, 2019
@anitaa1990 anitaa1990 deleted the 0nko/items-refactoring branch June 17, 2021 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@anitaa1990 anitaa1990 anitaa1990 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@anitaa1990 anitaa1990

Labels

feature: refunds Related to order refunds.

Projects

None yet

Milestone

3.3

Development

Successfully merging this pull request may close these issues.

3 participants

@0nko @anitaa1990 @AmandaRiu