From a3c55d4f5fcfd676704a0821b1f78fcc03866c80 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:34:28 -0500
Subject: [PATCH 01/20] Introduce new classes to manage the searching
 functionality

---
 .../ui/pages/PageParentSearchAdapter.kt       |  57 ++++++++++
 .../ui/pages/PageParentSearchFragment.kt      | 104 ++++++++++++++++++
 .../ui/pages/PageParentSearchViewModel.kt     |  65 +++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchAdapter.kt
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchAdapter.kt
new file mode 100644
index 000000000000..24d53c297dfc
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchAdapter.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.ui.pages
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.wordpress.android.R.layout
+import org.wordpress.android.ui.pages.PageItem.ParentPage
+import org.wordpress.android.ui.pages.PageItemViewHolder.EmptyViewHolder
+import org.wordpress.android.ui.pages.PageItemViewHolder.PageDividerViewHolder
+import org.wordpress.android.ui.pages.PageItemViewHolder.PageParentViewHolder
+
+class PageParentSearchAdapter(
+    private val onParentSelected: (ParentPage) -> Unit,
+    private val uiScope: CoroutineScope
+) : Adapter<PageItemViewHolder>() {
+    private val items = mutableListOf<PageItem>()
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PageItemViewHolder {
+        return when (viewType) {
+            PageItem.Type.PARENT.viewType -> PageParentViewHolder(parent,
+                    this::selectParent,
+                    layout.page_parent_list_item)
+            PageItem.Type.TOP_LEVEL_PARENT.viewType -> PageParentViewHolder(parent,
+                    this::selectParent,
+                    layout.page_parent_top_level_item)
+            PageItem.Type.DIVIDER.viewType -> PageDividerViewHolder(parent)
+            PageItem.Type.EMPTY.viewType -> EmptyViewHolder(parent) { }
+            else -> throw Throwable("Unexpected view type")
+        }
+    }
+
+    private fun selectParent(parent: ParentPage) {
+        onParentSelected(parent)
+        uiScope.launch {
+            delay(200) // let the selection animation play out before refreshing the list
+            notifyDataSetChanged()
+        }
+    }
+    override fun getItemCount(): Int = items.size
+
+    override fun getItemViewType(position: Int): Int {
+        return items[position].type.viewType
+    }
+
+    override fun onBindViewHolder(holder: PageItemViewHolder, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    fun update(result: List<PageItem>) {
+        val diffResult = DiffUtil.calculateDiff(PageItemDiffUtil(items.toList(), result))
+        items.clear()
+        items.addAll(result)
+        diffResult.dispatchUpdatesTo(this)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
new file mode 100644
index 000000000000..8493d3896f34
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.ui.pages
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.pages_list_fragment.*
+import kotlinx.coroutines.CoroutineScope
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.util.DisplayUtils
+import org.wordpress.android.viewmodel.pages.PageParentSearchViewModel
+import org.wordpress.android.viewmodel.pages.PageParentViewModel
+import org.wordpress.android.widgets.RecyclerItemDecoration
+import javax.inject.Inject
+import javax.inject.Named
+
+class PageParentSearchFragment : Fragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: PageParentSearchViewModel
+    @field:[Inject Named(UI_SCOPE)] lateinit var uiScope: CoroutineScope
+    private var linearLayoutManager: LinearLayoutManager? = null
+
+    private val listStateKey = "list_state"
+
+    companion object {
+        fun newInstance(): PageParentSearchFragment {
+            return PageParentSearchFragment()
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.pages_list_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val nonNullActivity = checkNotNull(activity)
+        (nonNullActivity.application as? WordPress)?.component()?.inject(this)
+
+        initializeViews(savedInstanceState)
+        initializeViewModels(nonNullActivity)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        linearLayoutManager?.let {
+            outState.putParcelable(listStateKey, it.onSaveInstanceState())
+        }
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun initializeViewModels(activity: FragmentActivity) {
+        val pageParentViewModel = ViewModelProviders.of(activity, viewModelFactory)
+                .get(PageParentViewModel::class.java)
+
+        viewModel = ViewModelProviders.of(this, viewModelFactory)
+                .get(PageParentSearchViewModel::class.java)
+        viewModel.start(pageParentViewModel)
+
+        setupObservers()
+    }
+
+    private fun initializeViews(savedInstanceState: Bundle?) {
+        val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
+        savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
+            layoutManager.onRestoreInstanceState(it)
+        }
+
+        linearLayoutManager = layoutManager
+        recyclerView.layoutManager = linearLayoutManager
+        recyclerView.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
+    }
+
+    private fun setupObservers() {
+        viewModel.searchResult.observe(this, Observer { data ->
+            data?.let { setSearchResult(data) }
+        })
+    }
+
+    private fun setSearchResult(pages: List<PageItem>) {
+        val adapter: PageParentSearchAdapter
+        if (recyclerView.adapter == null) {
+            adapter = PageParentSearchAdapter(
+                    { page -> viewModel.onParentSelected(page) }, uiScope )
+            recyclerView.adapter = adapter
+        } else {
+            adapter = recyclerView.adapter as PageParentSearchAdapter
+        }
+        adapter.update(pages)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
new file mode 100644
index 000000000000..efdbfb447301
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.viewmodel.pages
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.wordpress.android.R
+import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.ui.pages.PageItem
+import org.wordpress.android.ui.pages.PageItem.Empty
+import org.wordpress.android.ui.pages.PageItem.ParentPage
+import javax.inject.Inject
+import javax.inject.Named
+
+class PageParentSearchViewModel
+@Inject constructor(
+    @Named(UI_SCOPE) private val uiScope: CoroutineScope
+) : ViewModel() {
+    private val _searchResult: MutableLiveData<List<PageItem>> = MutableLiveData()
+    val searchResult: LiveData<List<PageItem>> = _searchResult
+
+    private var isStarted: Boolean = false
+    private lateinit var pageParentViewModel: PageParentViewModel
+
+    fun start(pageParentViewModel: PageParentViewModel) {
+        this.pageParentViewModel = pageParentViewModel
+
+        if (!isStarted) {
+            isStarted = true
+
+            /** TODO Implement the method in pageParentView Model
+            pageParentViewModel.searchPages.observeForever(searchObserver)
+            */
+        }
+    }
+
+    override fun onCleared() {
+    /** TODO Implement the method in pageParentView Model
+        pageParentViewModel.searchPages.removeObserver(searchObserver)
+    */
+    }
+
+    private val searchObserver = Observer<List<PageItem>> { pageItems ->
+        if (pageItems != null) {
+            loadFoundPages(pageItems)
+        } else {
+            _searchResult.value = listOf(Empty(R.string.pages_search_suggestion, true))
+        }
+    }
+
+
+    fun onParentSelected(page: ParentPage) {
+        pageParentViewModel.onParentSelected(page)
+    }
+
+    private fun loadFoundPages(pageItems: List<PageItem>) = uiScope.launch {
+        if (pageItems.isNotEmpty()) {
+            _searchResult.value = pageItems
+        } else {
+            _searchResult.value = listOf(Empty(R.string.pages_empty_search_result, true))
+        }
+    }
+}

From 57cfc44c41af630375bb676f27ab546dec4187c4 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:36:06 -0500
Subject: [PATCH 02/20] Update AppComponent to inject PageParentSearchFragment

---
 .../main/java/org/wordpress/android/modules/AppComponent.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 6c3498117247..8899bbbf8ac3 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -65,6 +65,7 @@
 import org.wordpress.android.ui.notifications.receivers.NotificationsPendingDraftsReceiver;
 import org.wordpress.android.ui.pages.PageListFragment;
 import org.wordpress.android.ui.pages.PageParentFragment;
+import org.wordpress.android.ui.pages.PageParentSearchFragment;
 import org.wordpress.android.ui.pages.PagesFragment;
 import org.wordpress.android.ui.pages.SearchListFragment;
 import org.wordpress.android.ui.people.PeopleInviteFragment;
@@ -490,6 +491,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(AddContentAdapter object);
 
+    void inject(PageParentSearchFragment object);
+
     // Allows us to inject the application without having to instantiate any modules, and provides the Application
     // in the app graph
     @Component.Builder

From 163de5425c14a1010d9fc7df9ad685fa0351489a Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:37:32 -0500
Subject: [PATCH 03/20] Update ViewModelModule to for PageParentSearchViewModel

---
 .../java/org/wordpress/android/modules/ViewModelModule.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 31ffa0bb456d..0827e28d0e90 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -42,6 +42,7 @@
 import org.wordpress.android.viewmodel.history.HistoryViewModel;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
 import org.wordpress.android.viewmodel.pages.PageListViewModel;
+import org.wordpress.android.viewmodel.pages.PageParentSearchViewModel;
 import org.wordpress.android.viewmodel.pages.PageParentViewModel;
 import org.wordpress.android.viewmodel.pages.PagesViewModel;
 import org.wordpress.android.viewmodel.pages.SearchListViewModel;
@@ -276,6 +277,11 @@ abstract class ViewModelModule {
     @ViewModelKey(PostSignupInterstitialViewModel.class)
     abstract ViewModel postSignupInterstitialViewModel(PostSignupInterstitialViewModel viewModel);
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(PageParentSearchViewModel.class)
+    abstract ViewModel pageParentSearchViewModel(PageParentSearchViewModel viewModel);
+
     @Binds
     abstract ViewModelProvider.Factory provideViewModelFactory(ViewModelFactory viewModelFactory);
 }

From 00f594b57c765162b37392858a54e71bebf6b2bc Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:43:37 -0500
Subject: [PATCH 04/20] Set up the search on the menu

---
 .idea/codeStyles/Project.xml                  | 67 ++++---------------
 .../src/main/res/menu/page_parent_menu.xml    |  7 ++
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3bf04816d9bb..f50f4769139a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
@@ -83,6 +86,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -93,6 +97,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -104,6 +109,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -114,6 +120,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -124,6 +131,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -134,6 +142,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -144,74 +153,23 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
           </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
           <section>
             <rule>
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-              <order>BY_NAME</order>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
             </rule>
           </section>
           <section>
@@ -219,6 +177,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
diff --git a/WordPress/src/main/res/menu/page_parent_menu.xml b/WordPress/src/main/res/menu/page_parent_menu.xml
index 24f1ad3173fe..6d1a5481ff51 100644
--- a/WordPress/src/main/res/menu/page_parent_menu.xml
+++ b/WordPress/src/main/res/menu/page_parent_menu.xml
@@ -2,6 +2,13 @@
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        app:showAsAction="ifRoom|collapseActionView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        android:title="@string/search"
+        />
     <item
         android:id="@+id/save_parent"
         android:title="@string/save"

From b567f8fabb0fe7d8a088c3f2e0c6c0791314c86f Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:46:09 -0500
Subject: [PATCH 05/20] Switch in a new xml file for PageParentFragment so it
 can be adjusted to handle search

---
 .../main/res/layout/page_parent_fragment.xml  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 WordPress/src/main/res/layout/page_parent_fragment.xml

diff --git a/WordPress/src/main/res/layout/page_parent_fragment.xml b/WordPress/src/main/res/layout/page_parent_fragment.xml
new file mode 100644
index 000000000000..c25ea7036c28
--- /dev/null
+++ b/WordPress/src/main/res/layout/page_parent_fragment.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/frameSearch"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical" />
+
+</FrameLayout>

From 5a483ff459f9be82987514a651c7b8a1323fe0ae Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:48:09 -0500
Subject: [PATCH 06/20] updated to include liveData searchPages

---
 .../ui/pages/PageParentSearchViewModel.kt     |   4 -
 .../viewmodel/pages/PageParentViewModel.kt    | 108 ++++++++++++++++--
 2 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
index efdbfb447301..1bf80ff2fb2b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
@@ -30,16 +30,12 @@ class PageParentSearchViewModel
         if (!isStarted) {
             isStarted = true
 
-            /** TODO Implement the method in pageParentView Model
             pageParentViewModel.searchPages.observeForever(searchObserver)
-            */
         }
     }
 
     override fun onCleared() {
-    /** TODO Implement the method in pageParentView Model
         pageParentViewModel.searchPages.removeObserver(searchObserver)
-    */
     }
 
     private val searchObserver = Observer<List<PageItem>> { pageItems ->
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
index 2f63ff17c240..16e53ffc02a7 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
@@ -2,9 +2,12 @@ package org.wordpress.android.viewmodel.pages
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.PAGES_SET_PARENT_CHANGES_SAVED
@@ -12,7 +15,8 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus.PUBLISHED
 import org.wordpress.android.fluxc.store.PageStore
-import org.wordpress.android.modules.DEFAULT_SCOPE
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Divider
 import org.wordpress.android.ui.pages.PageItem.Empty
@@ -21,16 +25,22 @@ import org.wordpress.android.ui.pages.PageItem.Type.PARENT
 import org.wordpress.android.ui.pages.PageItem.Type.TOP_LEVEL_PARENT
 import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.viewmodel.ResourceProvider
+import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Named
 
+private const val SEARCH_DELAY = 200L
+private const val SEARCH_COLLAPSE_DELAY = 500L
+
 class PageParentViewModel
 @Inject constructor(
     private val pageStore: PageStore,
     private val resourceProvider: ResourceProvider,
-    @param:Named(DEFAULT_SCOPE) private val defaultScope: CoroutineScope
-) : ViewModel() {
+    @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) private val defaultDispatcher: CoroutineDispatcher
+) : ScopedViewModel(uiDispatcher) {
     private val _pages: MutableLiveData<List<PageItem>> = MutableLiveData()
     val pages: LiveData<List<PageItem>> = _pages
 
@@ -44,8 +54,21 @@ class PageParentViewModel
     private val _saveParent = SingleLiveEvent<Unit>()
     val saveParent: LiveData<Unit> = _saveParent
 
+    private val _searchPages: MutableLiveData<List<PageItem>> = MutableLiveData()
+    val searchPages: LiveData<List<PageItem>> = _searchPages
+
+    private var _lastSearchQuery = ""
+    val lastSearchQuery: String
+        get() = _lastSearchQuery
+
+    private var searchJob: Job? = null
+
+    private val _isSearchExpanded = MutableLiveData<Boolean>()
+    val isSearchExpanded: LiveData<Boolean> = _isSearchExpanded
+
     private lateinit var site: SiteModel
     private var isStarted: Boolean = false
+
     private var page: PageModel? = null
 
     fun start(site: SiteModel, pageId: Long) {
@@ -61,7 +84,7 @@ class PageParentViewModel
         }
     }
 
-    private fun loadPages(pageId: Long) = defaultScope.launch {
+    private fun loadPages(pageId: Long) = launch(defaultDispatcher) {
         page = if (pageId < 0) {
             // negative local page ID used as a temp remote post ID for local-only pages (assigned by the PageStore)
             pageStore.getPageByLocalId(-pageId.toInt(), site)
@@ -78,7 +101,8 @@ class PageParentViewModel
         )
 
         if (page != null) {
-            val choices = pageStore.getPagesFromDb(site).filter { it.remoteId != pageId && it.status == PUBLISHED }
+            val choices = pageStore.getPagesFromDb(site)
+                    .filter { it.remoteId != pageId && it.status == PUBLISHED }
             val parentChoices = choices.filter { isNotChild(it, choices) }
             if (parentChoices.isNotEmpty()) {
                 parents.add(Divider(resourceProvider.getString(R.string.pages)))
@@ -128,4 +152,74 @@ class PageParentViewModel
         }
         return children + grandchildren
     }
+
+    fun onSearchExpanded(restorePreviousSearch: Boolean) {
+        if (isSearchExpanded.value != true) {
+            if (!restorePreviousSearch) {
+                clearSearch()
+            }
+            _isSearchExpanded.value = true
+        }
+    }
+
+    fun onSearchCollapsed() {
+        _isSearchExpanded.value = false
+        clearSearch()
+
+        launch {
+            delay(SEARCH_COLLAPSE_DELAY)
+        }
+    }
+
+    private fun clearSearch() {
+        _lastSearchQuery = ""
+        _searchPages.postValue(null)
+        _isSaveButtonVisible.postOnUi(false)
+        _currentParent.isSelected = false
+    }
+
+    fun onSearch(searchQuery: String, delay: Long = SEARCH_DELAY) {
+        searchJob?.cancel()
+        if (searchQuery.isNotEmpty()) {
+            searchJob = launch {
+                delay(delay)
+                searchJob = null
+                if (isActive) {
+                    _lastSearchQuery = searchQuery
+                    val result = search(searchQuery)
+                    _searchPages.postValue(result)
+                }
+            }
+        } else {
+            clearSearch()
+        }
+    }
+
+    private suspend fun search(
+        searchQuery: String
+    ): List<PageItem> = withContext(defaultDispatcher) {
+        val tempPages = _pages.value
+        if (tempPages != null) {
+            if (tempPages.isNotEmpty()) {
+                return@withContext tempPages
+                        .filterIsInstance(ParentPage::class.java)
+                        .filter { it.id != 0L }
+                        .filter {
+                            it.title.toLowerCase(Locale.ROOT).contains(
+                                    searchQuery.toLowerCase(
+                                            Locale.ROOT
+                                    )
+                            )
+                        }
+            }
+        }
+        return@withContext mutableListOf<PageItem>()
+    }
+
+    private fun <T> MutableLiveData<T>.postOnUi(value: T) {
+        val liveData = this
+        launch {
+            liveData.value = value
+        }
+    }
 }

From 75c606f6436e6468328743f6b06da6c42623c420 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:49:35 -0500
Subject: [PATCH 07/20] Tie the search all together in the PageParentFragment
 (initializing, menu hook ups)

---
 .../android/ui/pages/PageParentFragment.kt    | 108 ++++++++++++++++--
 1 file changed, 100 insertions(+), 8 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 1144c4cdaa2e..66be4fc53ce6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -4,19 +4,25 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.MenuItem.OnActionExpandListener
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.pages_list_fragment.*
+import kotlinx.android.synthetic.main.page_parent_fragment.*
+import kotlinx.android.synthetic.main.pages_list_fragment.recyclerView
 import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
@@ -37,8 +43,10 @@ class PageParentFragment : Fragment() {
 
     private var linearLayoutManager: LinearLayoutManager? = null
     private var saveButton: MenuItem? = null
+    private lateinit var searchAction: MenuItem
 
     private var pageId: Long? = null
+    private var restorePreviousSearch = false
 
     companion object {
         fun newInstance(): PageParentFragment {
@@ -53,7 +61,10 @@ class PageParentFragment : Fragment() {
         } else if (item.itemId == R.id.save_parent) {
             viewModel.onSaveButtonTapped()
             return true
+        } else if (item.itemId == R.id.action_search) {
+            return true
         }
+
         return super.onOptionsItemSelected(item)
     }
 
@@ -70,16 +81,70 @@ class PageParentFragment : Fragment() {
         setHasOptionsMenu(true)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.page_parent_menu, menu)
 
         saveButton = menu.findItem(R.id.save_parent)
         viewModel.isSaveButtonVisible.value?.let { saveButton?.isVisible = it }
+        searchAction = checkNotNull(menu.findItem(R.id.action_search)) {
+            "Menu does not contain mandatory search item"
+        }
+
+        initializeSearchView()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.pages_list_fragment, container, false)
+    private fun initializeSearchView() {
+        searchAction.setOnActionExpandListener(object : OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                viewModel.onSearchExpanded(restorePreviousSearch)
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                viewModel.onSearchCollapsed()
+                return true
+            }
+        })
+
+        val searchView = searchAction.actionView as SearchView
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String): Boolean {
+                viewModel.onSearch(query)
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String): Boolean {
+                if (restorePreviousSearch) {
+                    restorePreviousSearch = false
+                    searchView.setQuery(viewModel.lastSearchQuery, false)
+                } else {
+                    viewModel.onSearch(newText)
+                }
+                return true
+            }
+        })
+
+        val searchEditFrame = searchAction?.actionView.findViewById<LinearLayout>(R.id.search_edit_frame)
+        (searchEditFrame.layoutParams as LinearLayout.LayoutParams)
+                .apply { this.leftMargin = DisplayUtils.dpToPx(activity, -8) }
+
+        viewModel.isSearchExpanded.observe(this, Observer {
+            if (it == true) {
+                showSearchList(searchAction)
+            } else {
+                hideSearchList(searchAction)
+            }
+        })
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.page_parent_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -92,11 +157,11 @@ class PageParentFragment : Fragment() {
 
         (nonNullActivity.application as? WordPress)?.component()?.inject(this)
 
-        initializeViews(savedInstanceState)
-        initializeViewModels(nonNullPageId, savedInstanceState == null)
+        initializeViews(nonNullActivity, savedInstanceState)
+        initializeViewModels(nonNullActivity, nonNullPageId, savedInstanceState == null)
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+    private fun initializeViews(activity: FragmentActivity, savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
             layoutManager.onRestoreInstanceState(it)
@@ -105,10 +170,17 @@ class PageParentFragment : Fragment() {
         linearLayoutManager = layoutManager
         recyclerView.layoutManager = linearLayoutManager
         recyclerView.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
+
+        val searchFragment = PageParentSearchFragment.newInstance()
+        activity.supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.frameSearch, searchFragment)
+                .commit()
     }
 
-    private fun initializeViewModels(pageId: Long, isFirstStart: Boolean) {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(PageParentViewModel::class.java)
+    private fun initializeViewModels(activity: FragmentActivity, pageId: Long, isFirstStart: Boolean) {
+        viewModel = ViewModelProviders.of(activity, viewModelFactory)
+                .get(PageParentViewModel::class.java)
 
         setupObservers()
 
@@ -148,4 +220,24 @@ class PageParentFragment : Fragment() {
         }
         adapter.update(pages)
     }
+
+    private fun hideSearchList(myActionMenuItem: MenuItem) {
+        Log.i(javaClass.simpleName, "***=> hide search list")
+        recyclerView.visibility = View.VISIBLE
+        frameSearch.visibility = View.GONE
+        if (saveButton?.isVisible == true) {
+            saveButton?.isVisible = false
+        }
+        if (myActionMenuItem.isActionViewExpanded) {
+            myActionMenuItem.collapseActionView()
+        }
+    }
+
+    private fun showSearchList(myActionMenuItem: MenuItem) {
+        frameSearch.visibility = View.VISIBLE
+        recyclerView.visibility = View.GONE
+        if (!myActionMenuItem.isActionViewExpanded) {
+            myActionMenuItem.expandActionView()
+        }
+    }
 }

From fb3a4144e86403083633eba9697a8d22d2a163a9 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:51:45 -0500
Subject: [PATCH 08/20] Added view model test for pageparentSearch

---
 .../pages/PageParentSearchViewModelTest.kt    | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt

diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
new file mode 100644
index 000000000000..dd20f0618e11
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.viewmodel.pages
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R.string
+import org.wordpress.android.TEST_SCOPE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.page.PageModel
+import org.wordpress.android.fluxc.model.page.PageStatus.PUBLISHED
+import org.wordpress.android.ui.pages.PageItem
+import org.wordpress.android.ui.pages.PageItem.Empty
+import org.wordpress.android.viewmodel.ResourceProvider
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class PageParentSearchViewModelTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var pageParentViewModel: PageParentViewModel
+
+    private lateinit var searchPages: MutableLiveData<List<PageItem>>
+    private lateinit var viewModel: PageParentSearchViewModel
+
+    private lateinit var page: PageModel
+
+    @Before
+    fun setUp() {
+        page = PageModel(site, 1, "title", PUBLISHED, Date(), false, 11L, null, 0)
+        viewModel = PageParentSearchViewModel(TEST_SCOPE)
+        searchPages = MutableLiveData()
+        whenever(pageParentViewModel.searchPages).thenReturn(searchPages)
+        viewModel.start(pageParentViewModel)
+    }
+
+    @Test
+    fun `show empty item on start`() {
+        searchPages.value = null
+
+        assertThat(viewModel.searchResult.value).containsOnly(Empty(string.pages_search_suggestion, true))
+    }
+
+    @Test
+    fun `show no matches on empty search results`() {
+        searchPages.value = mutableListOf(Empty(string.pages_empty_search_result, false))
+
+        assertThat(viewModel.searchResult.value).containsOnly(Empty(string.pages_empty_search_result, false))
+    }
+
+    @Test
+    fun `passes page to page view model on parent radio button selected`() {
+        val clickedPage = PageItem.ParentPage(id = 1, title ="title", isSelected = true, type = PageItem.Type.PARENT)
+
+        viewModel.onParentSelected(clickedPage)
+
+        verify(pageParentViewModel).onParentSelected(clickedPage)
+    }
+}

From 049978c49ad36017f48deff033c60a0c70b0d4a2 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 15:59:47 -0500
Subject: [PATCH 09/20] remove log line from hideSearchList fun

---
 .../java/org/wordpress/android/ui/pages/PageParentFragment.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 66be4fc53ce6..60d4d4c6bc52 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -222,7 +221,6 @@ class PageParentFragment : Fragment() {
     }
 
     private fun hideSearchList(myActionMenuItem: MenuItem) {
-        Log.i(javaClass.simpleName, "***=> hide search list")
         recyclerView.visibility = View.VISIBLE
         frameSearch.visibility = View.GONE
         if (saveButton?.isVisible == true) {

From 7af821150c3c7518a8b92c28a3af750c283b9946 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 16:13:22 -0500
Subject: [PATCH 10/20] Make sure the search icon shows on back tap

---
 WordPress/src/main/res/menu/page_parent_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/menu/page_parent_menu.xml b/WordPress/src/main/res/menu/page_parent_menu.xml
index 6d1a5481ff51..15c88ddee8a3 100644
--- a/WordPress/src/main/res/menu/page_parent_menu.xml
+++ b/WordPress/src/main/res/menu/page_parent_menu.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search_white_24dp"
-        app:showAsAction="ifRoom|collapseActionView"
+        app:showAsAction="always|collapseActionView"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search"
         />

From 33aff7cca0a93def9c33d85780caa1b7238ee8e0 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Sun, 9 Feb 2020 19:51:02 -0500
Subject: [PATCH 11/20] Fixed klint style errors

---
 .../java/org/wordpress/android/ui/pages/PageParentFragment.kt   | 1 -
 .../org/wordpress/android/ui/pages/PageParentSearchFragment.kt  | 2 +-
 .../org/wordpress/android/ui/pages/PageParentSearchViewModel.kt | 1 -
 .../android/viewmodel/pages/PageParentSearchViewModelTest.kt    | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 60d4d4c6bc52..8bf680365bde 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -80,7 +80,6 @@ class PageParentFragment : Fragment() {
         setHasOptionsMenu(true)
     }
 
-
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.page_parent_menu, menu)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
index 8493d3896f34..fb5428f980e6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
@@ -94,7 +94,7 @@ class PageParentSearchFragment : Fragment() {
         val adapter: PageParentSearchAdapter
         if (recyclerView.adapter == null) {
             adapter = PageParentSearchAdapter(
-                    { page -> viewModel.onParentSelected(page) }, uiScope )
+                    { page -> viewModel.onParentSelected(page) }, uiScope)
             recyclerView.adapter = adapter
         } else {
             adapter = recyclerView.adapter as PageParentSearchAdapter
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
index 1bf80ff2fb2b..42613572df06 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
@@ -46,7 +46,6 @@ class PageParentSearchViewModel
         }
     }
 
-
     fun onParentSelected(page: ParentPage) {
         pageParentViewModel.onParentSelected(page)
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
index dd20f0618e11..d615a378f0b7 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
@@ -60,7 +60,7 @@ class PageParentSearchViewModelTest {
 
     @Test
     fun `passes page to page view model on parent radio button selected`() {
-        val clickedPage = PageItem.ParentPage(id = 1, title ="title", isSelected = true, type = PageItem.Type.PARENT)
+        val clickedPage = PageItem.ParentPage(id = 1, title = "title", isSelected = true, type = PageItem.Type.PARENT)
 
         viewModel.onParentSelected(clickedPage)
 

From 5f5832bda36396895c2f2d2d6f962aca99b0595f Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 11:06:37 -0500
Subject: [PATCH 12/20] removed unused variables

---
 .../viewmodel/pages/PageParentSearchViewModelTest.kt   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
index d615a378f0b7..fa094ee6e98a 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
@@ -13,31 +13,21 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R.string
 import org.wordpress.android.TEST_SCOPE
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.page.PageModel
-import org.wordpress.android.fluxc.model.page.PageStatus.PUBLISHED
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Empty
-import org.wordpress.android.viewmodel.ResourceProvider
-import java.util.Date
 
 @RunWith(MockitoJUnitRunner::class)
 class PageParentSearchViewModelTest {
     @Rule
     @JvmField val rule = InstantTaskExecutorRule()
 
-    @Mock lateinit var resourceProvider: ResourceProvider
-    @Mock lateinit var site: SiteModel
     @Mock lateinit var pageParentViewModel: PageParentViewModel
 
     private lateinit var searchPages: MutableLiveData<List<PageItem>>
     private lateinit var viewModel: PageParentSearchViewModel
 
-    private lateinit var page: PageModel
-
     @Before
     fun setUp() {
-        page = PageModel(site, 1, "title", PUBLISHED, Date(), false, 11L, null, 0)
         viewModel = PageParentSearchViewModel(TEST_SCOPE)
         searchPages = MutableLiveData()
         whenever(pageParentViewModel.searchPages).thenReturn(searchPages)

From 13a52688beacf58ff57692a413565122afbc333a Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 11:09:29 -0500
Subject: [PATCH 13/20] Moved pageParentSearchViewModel to the correct package
 to align with other view models

---
 .../android/{ui => viewmodel}/pages/PageParentSearchViewModel.kt  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename WordPress/src/main/java/org/wordpress/android/{ui => viewmodel}/pages/PageParentSearchViewModel.kt (100%)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt
similarity index 100%
rename from WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchViewModel.kt
rename to WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt

From 39aff7c866a9e27172a5270273a05cb1c9f2fa62 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 12:53:31 -0500
Subject: [PATCH 14/20] remove the search tap from the onOptionsItemSelected
 fun

---
 .../java/org/wordpress/android/ui/pages/PageParentFragment.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 8bf680365bde..2604d81dafed 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -60,8 +60,6 @@ class PageParentFragment : Fragment() {
         } else if (item.itemId == R.id.save_parent) {
             viewModel.onSaveButtonTapped()
             return true
-        } else if (item.itemId == R.id.action_search) {
-            return true
         }
 
         return super.onOptionsItemSelected(item)

From 8f30c21e9ba8e0757a1361e75d124b38860b42c2 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 13:04:01 -0500
Subject: [PATCH 15/20] guard null check with ?.let instead of separate
 statements

---
 .../viewmodel/pages/PageParentViewModel.kt    | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
index 16e53ffc02a7..93127f324037 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
@@ -198,20 +198,17 @@ class PageParentViewModel
     private suspend fun search(
         searchQuery: String
     ): List<PageItem> = withContext(defaultDispatcher) {
-        val tempPages = _pages.value
-        if (tempPages != null) {
-            if (tempPages.isNotEmpty()) {
-                return@withContext tempPages
-                        .filterIsInstance(ParentPage::class.java)
-                        .filter { it.id != 0L }
-                        .filter {
-                            it.title.toLowerCase(Locale.ROOT).contains(
-                                    searchQuery.toLowerCase(
-                                            Locale.ROOT
-                                    )
-                            )
-                        }
-            }
+        _pages.value?.let {
+            if (it.isNotEmpty()) return@withContext it
+                    .filterIsInstance(ParentPage::class.java)
+                    .filter { parentPage -> parentPage.id != 0L }
+                    .filter { parentPage ->
+                        parentPage.title.toLowerCase(Locale.ROOT).contains(
+                                searchQuery.toLowerCase(
+                                        Locale.ROOT
+                                )
+                        )
+                    }
         }
         return@withContext mutableListOf<PageItem>()
     }

From 39bd891597ae64a63168913bc520004129574637 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 15:30:28 -0500
Subject: [PATCH 16/20] Maintain search text across configuration change

---
 .../java/org/wordpress/android/ui/pages/PageParentFragment.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 2604d81dafed..876b33c18c86 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -184,6 +184,8 @@ class PageParentFragment : Fragment() {
             val site = activity?.intent?.getSerializableExtra(WordPress.SITE) as SiteModel?
             val nonNullSite = checkNotNull(site)
             viewModel.start(nonNullSite, pageId)
+        } else {
+            restorePreviousSearch = true
         }
     }
 

From eb0a0af160ea5894f05d96a53b886e5f81b343d0 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Mon, 10 Feb 2020 16:48:24 -0500
Subject: [PATCH 17/20] Removes the conversion to lowercase and uses contains
 with ignoreCase = true for filtering on query text

---
 .../android/viewmodel/pages/PageParentViewModel.kt         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
index 93127f324037..d70591ede612 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
@@ -27,7 +27,6 @@ import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
-import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -203,11 +202,7 @@ class PageParentViewModel
                     .filterIsInstance(ParentPage::class.java)
                     .filter { parentPage -> parentPage.id != 0L }
                     .filter { parentPage ->
-                        parentPage.title.toLowerCase(Locale.ROOT).contains(
-                                searchQuery.toLowerCase(
-                                        Locale.ROOT
-                                )
-                        )
+                        parentPage.title.contains(searchQuery, true)
                     }
         }
         return@withContext mutableListOf<PageItem>()

From e9b499103c4abc9d450a6688c734c61f42212567 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Thu, 13 Feb 2020 14:35:58 -0500
Subject: [PATCH 18/20] adjusted save button and parent selected functionality

---
 .../android/ui/pages/PageParentFragment.kt    | 15 ++++++++----
 .../viewmodel/pages/PageParentViewModel.kt    | 23 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index 876b33c18c86..c519716bb81d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -174,14 +174,18 @@ class PageParentFragment : Fragment() {
                 .commit()
     }
 
-    private fun initializeViewModels(activity: FragmentActivity, pageId: Long, isFirstStart: Boolean) {
+    private fun initializeViewModels(
+        activity: FragmentActivity,
+        pageId: Long,
+        isFirstStart: Boolean
+    ) {
         viewModel = ViewModelProviders.of(activity, viewModelFactory)
                 .get(PageParentViewModel::class.java)
 
         setupObservers()
 
         if (isFirstStart) {
-            val site = activity?.intent?.getSerializableExtra(WordPress.SITE) as SiteModel?
+            val site = activity.intent?.getSerializableExtra(WordPress.SITE) as SiteModel?
             val nonNullSite = checkNotNull(site)
             viewModel.start(nonNullSite, pageId)
         } else {
@@ -222,12 +226,13 @@ class PageParentFragment : Fragment() {
     private fun hideSearchList(myActionMenuItem: MenuItem) {
         recyclerView.visibility = View.VISIBLE
         frameSearch.visibility = View.GONE
-        if (saveButton?.isVisible == true) {
-            saveButton?.isVisible = false
-        }
         if (myActionMenuItem.isActionViewExpanded) {
             myActionMenuItem.collapseActionView()
         }
+        /**Force the recyclerview to redraw if selection has changed while in search mode*/
+        if (viewModel.currentParent != viewModel.initialParent) {
+            recyclerView.adapter?.notifyDataSetChanged()
+        }
     }
 
     private fun showSearchList(myActionMenuItem: MenuItem) {
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
index d70591ede612..e3e82b498377 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt
@@ -47,6 +47,10 @@ class PageParentViewModel
     val currentParent: ParentPage
         get() = _currentParent
 
+    private lateinit var _initialParent: ParentPage
+    val initialParent: ParentPage
+        get() = _initialParent
+
     private val _isSaveButtonVisible = MutableLiveData<Boolean>()
     val isSaveButtonVisible: LiveData<Boolean> = _isSaveButtonVisible
 
@@ -114,6 +118,8 @@ class PageParentViewModel
         _currentParent = parents.firstOrNull { it is ParentPage && it.isSelected } as? ParentPage
                 ?: parents.first() as ParentPage
 
+        _initialParent = _currentParent
+
         _pages.postValue(parents)
     }
 
@@ -121,8 +127,7 @@ class PageParentViewModel
         _currentParent.isSelected = false
         _currentParent = page
         _currentParent.isSelected = true
-
-        _isSaveButtonVisible.postValue(true)
+        setSaveButton()
     }
 
     fun onSaveButtonTapped() {
@@ -158,12 +163,14 @@ class PageParentViewModel
                 clearSearch()
             }
             _isSearchExpanded.value = true
+            _isSaveButtonVisible.postValue(false)
         }
     }
 
     fun onSearchCollapsed() {
         _isSearchExpanded.value = false
         clearSearch()
+        setSaveButton()
 
         launch {
             delay(SEARCH_COLLAPSE_DELAY)
@@ -173,8 +180,6 @@ class PageParentViewModel
     private fun clearSearch() {
         _lastSearchQuery = ""
         _searchPages.postValue(null)
-        _isSaveButtonVisible.postOnUi(false)
-        _currentParent.isSelected = false
     }
 
     fun onSearch(searchQuery: String, delay: Long = SEARCH_DELAY) {
@@ -190,6 +195,7 @@ class PageParentViewModel
                 }
             }
         } else {
+            _isSaveButtonVisible.postValue(false)
             clearSearch()
         }
     }
@@ -208,10 +214,11 @@ class PageParentViewModel
         return@withContext mutableListOf<PageItem>()
     }
 
-    private fun <T> MutableLiveData<T>.postOnUi(value: T) {
-        val liveData = this
-        launch {
-            liveData.value = value
+    private fun setSaveButton() {
+        if (_currentParent == _initialParent) {
+            _isSaveButtonVisible.postValue(false)
+        } else {
+            _isSaveButtonVisible.postValue(true)
         }
     }
 }

From d4000c0b24de40ee4d77129c37f192aee80a2fa4 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@teamsnap.com>
Date: Fri, 14 Feb 2020 09:58:10 -0500
Subject: [PATCH 19/20] reverting idea-codingStyles-project.xml back to the
 commit right before mine

---
 .idea/codeStyles/Project.xml | 67 +++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f50f4769139a..3bf04816d9bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
@@ -86,7 +83,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -97,7 +93,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -109,7 +104,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -120,7 +114,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -131,7 +124,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -142,7 +134,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -153,23 +144,74 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
           </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_width</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:width</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
           <section>
             <rule>
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
+              <order>BY_NAME</order>
             </rule>
           </section>
           <section>
@@ -177,7 +219,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

From bc517cf314df3ad13bde75f62b1ed70b89d4fe03 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Fri, 14 Feb 2020 16:18:00 +0100
Subject: [PATCH 20/20] Update release notes

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index dcc373a67016..22d1da740088 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+14.3
+-----
+* Added search to set page parent screen
+
 14.2
 -----
 * Block editor: Long-press Inserter icon to show options to add before/after