Merged
Conversation
…plus removing for now unused _showPopupMenu logic.
…ature/add-wp-media-source-to-media-picker
…icker # Conflicts: # WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt
…ature/add-wp-media-source-to-media-picker
…d-refresh-to-media-picker Add paging and refresh to media picker
…icker # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt # WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt
…casting Use viewModelScope instead of casting ViewModel to CoroutineScope
…tenor-feature-config Remove Tenor feature configuration
…l-crash-media-loader-fix Hotfix - Consolidated Media Picker : Resolve issue where site is null during the avatar picker flow
The 'NotificationsListFragmentPage' class is the only class which during the reorder the whole 'super.onDestroyView()' call was move on top of everything else. However, this was tested and everything works as expected.
wzieba
force-pushed
the
issue/3_copy_mediapicker_from_wpandroid
branch
from
265dbe9 to
2e77e49
Compare
…cker_from_wpandroid
wzieba
force-pushed
the
issue/3_copy_mediapicker_from_wpandroid
branch
from
2e77e49 to
285d2c2
Compare
Contributor
Author
|
☝️ Those force pushes has been discussed internally, we should now be good to go! |
anitaa1990
approved these changes
Jul 19, 2021
Contributor
anitaa1990
left a comment
anitaa1990
left a comment
There was a problem hiding this comment.
Thank you @wzieba 
I'll merge this PR as discussed!
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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 contains all files about
MediaPickerfrom WordPress Android repository with their git history.How to approach code alignment?
Raw
MediaPickerfrom WordPress Android is itself not compiling. There are a few things we have to do (in any order):List of child issues:
WPAndroiddependencies from layout files #17WPAndroidandFluxCdependencies fromMediaPickerActivity#18insertpackage #19I think good idea will be to keep this branch not-merged until the code here will compile. I'll set a branch protection rule for it and we should target our PRs for this branch. Feel free to comment if you have other ideas!We decided to merge this PR to
develop.