Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/master search in set parent page #11313

Merged
merged 23 commits into from
Feb 17, 2020
Merged

Feature/master search in set parent page #11313

merged 23 commits into from
Feb 17, 2020

Conversation

malinajirka
Copy link
Contributor

@malinajirka malinajirka commented Feb 14, 2020 •
edited
Loading

This #11269 PR was merged into this branch. Since the branch doesn't contain any other changes and all the code has already been review, we can just merge it.
Unfortunately, I can't approve my own PR. Could you please approve it @jd-alexander. Thanks!

Annmarie Ziegler and others added 21 commits February 9, 2020 15:34
Introduce new classes to manage the searching functionality
a3c55d4
Update AppComponent to inject PageParentSearchFragment
57cfc44
Update ViewModelModule to for PageParentSearchViewModel
163de54
Set up the search on the menu
00f594b
Switch in a new xml file for PageParentFragment so it can be adjusted…
b567f8f 
… to handle search
updated to include liveData searchPages
5a483ff
Tie the search all together in the PageParentFragment (initializing, …
75c606f 
…menu hook ups)
Added view model test for pageparentSearch
fb3a414
remove log line from hideSearchList fun
049978c
Make sure the search icon shows on back tap
7af8211
Fixed klint style errors
33aff7c
Merge branch 'feature/master-search-in-set-parent-page' into issue/11…
26a5c89 
…119-search-in-set-parent-page

Merged with upstream feature/master-search-in-set-parent-page
removed unused variables
5f5832b
Moved pageParentSearchViewModel to the correct package to align with …
13a5268 
…other view models
remove the search tap from the onOptionsItemSelected fun
39aff7c
guard null check with ?.let instead of separate statements
8f30c21
Maintain search text across configuration change
39bd891
Removes the conversion to lowercase and uses contains with ignoreCase…
eb0a0af 
… = true for filtering on query text
adjusted save button and parent selected functionality
e9b4991
reverting idea-codingStyles-project.xml back to the commit right befo…
d4000c0 
…re mine
@malinajirka
Merge pull request #11269 from zwarm/issue/11119-search-in-set-parent…
401a294 
…-page

Issue/11119 search in set parent page
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 14, 2020 •
edited
Loading

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

Generated by 🚫 dangerJS

@malinajirka malinajirka added this to the 14.3 milestone Feb 14, 2020
@peril-wordpress-mobile
Copy link

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

jd-alexander
jd-alexander approved these changes Feb 17, 2020
View reviewed changes
Copy link
Contributor

@jd-alexander jd-alexander left a comment

Choose a reason for hiding this comment

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

LGTM 🚢

@jd-alexander jd-alexander merged commit e616de8 into develop Feb 17, 2020
@jd-alexander jd-alexander deleted the feature/master-search-in-set-parent-page branch February 17, 2020 16:25
@designsimply designsimply mentioned this pull request Feb 19, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jd-alexander jd-alexander jd-alexander approved these changes

Assignees
No one assigned
Labels
Posts + Pages [Type] Enhancement
Projects
None yet
Milestone
14.3
Development

Successfully merging this pull request may close these issues.
2 participants
@malinajirka @jd-alexander