This repository was archived by the owner on Feb 6, 2025. It is now read-only.
Merge WooCommerce Dark Mode changes#37
Merged
renanferrari merged 24 commits intodevelopfrom Jun 5, 2020
Merged
Conversation
Merge in latest changes from login library
…list # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/refunds/RefundSummaryFragment.kt # build.gradle
# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/di/WooCommerceGlideModule.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailFragment.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailRepository.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailViewModel.kt # WooCommerce/src/main/res/navigation/nav_graph_main.xml # WooCommerce/src/main/res/values/strings.xml # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/ProductDetailViewModelTest.kt # build.gradle
…android into feature/refund-by-items-master
# Conflicts: # WooCommerce/build.gradle # WooCommerce/src/main/res/values/strings.xml
This is to prevent a rare NPE crash
Release/merge 3.3 into Develop
…ogin-lib-with-password-toggle-fix
…ogin_lib_with_signup_sheet_nav_bar_buttons_visibility_fix
Contributor
|
I've tested this changes with WPAndroid and everything seems to be working fine. |
wzieba
pushed a commit
that referenced
this pull request
Oct 15, 2024
…d/dark-mode Merge WooCommerce Dark Mode changes
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
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.
This PR merges in the changes from the WooCommerce dark mode project contained in these two PRs:
As well as this older unrelated PR that must've been missed for merging back to this repo:
To Test
I've opened a PR in WPAndroid to ensure these changes doe not conflict with that app. Please visit that PR to test.
** Only one developer required to review and approve this PR