Feature/merge non native updates to master #568
Merged
Conversation
This file contains 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
Updated dependencies and migration to androidx
(cherry picked from commit 779b084)
(cherry picked from commit 47684c6)
(cherry picked from commit 5c37c47)
(cherry picked from commit 005a019)
(cherry picked from commit ef97e61)
… navigation color filter (cherry picked from commit 5b388eb)
…al_design Feature/non native apply material design
…_parallel Execute AsyncTask in a parallel manner
…es_to_master # Conflicts: # build.gradle # gradle.properties # gradle/wrapper/gradle-wrapper.properties # sample/build.gradle # ucrop/build.gradle # ucrop/src/main/java/com/yalantis/ucrop/UCropActivity.java # ucrop/src/main/java/com/yalantis/ucrop/UCropFragment.java # ucrop/src/main/res/drawable/ucrop_ic_crop.xml # ucrop/src/main/res/drawable/ucrop_ic_crop_unselected.xml # ucrop/src/main/res/drawable/ucrop_ic_rotate.xml # ucrop/src/main/res/drawable/ucrop_ic_rotate_unselected.xml # ucrop/src/main/res/drawable/ucrop_ic_scale.xml # ucrop/src/main/res/drawable/ucrop_ic_scale_unselected.xml # ucrop/src/main/res/layout/ucrop_controls.xml # ucrop/src/main/res/layout/ucrop_layout_rotate_wheel.xml # ucrop/src/main/res/values/colors.xml # ucrop/src/main/res/values/styles.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.