issue/62-simple post search

RELEASE-NOTES.txt

@@ -1,5 +1,6 @@
 12.7
 -----
+* Added Post search
 * Show upload in progress notification when retrying
 * Fix issue where two identical drafts were created
 * Fixed issue where text appeared behind list of themes on the theme screen

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt

@@ -1,6 +1,8 @@
 package org.wordpress.android.ui.posts
 
 import android.os.Bundle
+import android.os.Handler
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +19,7 @@ import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActionableEmptyView
+import org.wordpress.android.ui.posts.PostListType.SEARCH
 import org.wordpress.android.ui.posts.PostListViewLayoutType.COMPACT
 import org.wordpress.android.ui.posts.PostListViewLayoutType.STANDARD
 import org.wordpress.android.ui.posts.adapters.PostListAdapter
@@ -40,12 +43,15 @@ import javax.inject.Inject
 private const val EXTRA_POST_LIST_AUTHOR_FILTER = "post_list_author_filter"
 private const val EXTRA_POST_LIST_TYPE = "post_list_type"
 private const val MAX_INDEX_FOR_VISIBLE_ITEM_TO_KEEP_SCROLL_POSITION = 2
+private const val SEARCH_DELAY_MS = 500L
+private const val SEARCH_PROGRESS_INDICATOR_DELAY_MS = 1000L
 
 class PostListFragment : Fragment() {
     @Inject internal lateinit var imageManager: ImageManager
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
     private lateinit var viewModel: PostListViewModel
+    private lateinit var mainViewModel: PostListMainViewModel
 
     private var swipeToRefreshHelper: SwipeToRefreshHelper? = null
 
@@ -57,9 +63,13 @@ class PostListFragment : Fragment() {
     private lateinit var itemDecorationCompactLayout: RecyclerItemDecoration
     private lateinit var itemDecorationStandardLayout: RecyclerItemDecoration
 
+    private lateinit var postListType: PostListType
+
     private lateinit var nonNullActivity: FragmentActivity
     private lateinit var site: SiteModel
 
+    private val searchHandler = Handler()
+
     private val postViewHolderConfig: PostViewHolderConfig by lazy {
         val displayWidth = DisplayUtils.getDisplayPixelWidth(context)
         val contentSpacing = nonNullActivity.resources.getDimensionPixelSize(R.dimen.content_margin)
@@ -101,13 +111,10 @@ class PostListFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        postListType = requireNotNull(arguments).getSerializable(EXTRA_POST_LIST_TYPE) as PostListType
 
-        val authorFilter: AuthorFilterSelection = requireNotNull(arguments)
-                .getSerializable(EXTRA_POST_LIST_AUTHOR_FILTER) as AuthorFilterSelection
-        val postListType = requireNotNull(arguments).getSerializable(EXTRA_POST_LIST_TYPE) as PostListType
-        val mainViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        mainViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
                 .get(PostListMainViewModel::class.java)
-
         mainViewModel.viewLayoutType.observe(this, Observer { optionaLayoutType ->
             optionaLayoutType?.let { layoutType ->
                 when (layoutType) {
@@ -125,18 +132,54 @@ class PostListFragment : Fragment() {
                 postListAdapter.updateItemLayoutType(layoutType)
             }
         })
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
-                .get<PostListViewModel>(PostListViewModel::class.java)
-        viewModel.start(mainViewModel.getPostListViewModelConnector(authorFilter, postListType))
-        viewModel.pagedListData.observe(this, Observer {
-            it?.let { pagedListData -> updatePagedListData(pagedListData) }
-        })
+
+        val authorFilter: AuthorFilterSelection = requireNotNull(arguments)
+                .getSerializable(EXTRA_POST_LIST_AUTHOR_FILTER) as AuthorFilterSelection
+        val postListViewModelConnector = mainViewModel.getPostListViewModelConnector(authorFilter, postListType)
+
+        viewModel = ViewModelProviders.of(this, viewModelFactory).get<PostListViewModel>(PostListViewModel::class.java)
+        viewModel.start(postListViewModelConnector)
+
+        initObservers()
+    }
+
+    private fun initObservers() {
+        if (postListType == SEARCH) {
+            mainViewModel.searchQuery.observe(this, Observer {
+                if (TextUtils.isEmpty(it)) {
+                    postListAdapter.submitList(null)
+                }
+
+                searchHandler.removeCallbacksAndMessages(null)
+                searchHandler.postDelayed({
+                    viewModel.search(it)
+                }, SEARCH_DELAY_MS)
+            })
+        }
+
         viewModel.emptyViewState.observe(this, Observer {
             it?.let { emptyViewState -> updateEmptyViewForState(emptyViewState) }
         })
+
         viewModel.isFetchingFirstPage.observe(this, Observer {
-            swipeRefreshLayout?.isRefreshing = it == true
+            if (postListType != SEARCH) {
+                swipeRefreshLayout?.isRefreshing = it == true
+            } else {
+                // most of the time search is pretty fast, so we don't need to show any progress indication
+                // we delay progress indicator in case request takes longer then expected
+                if (it == true) {
+                    searchHandler.postDelayed(searchProgressRunnable, SEARCH_PROGRESS_INDICATOR_DELAY_MS)
+                } else {
+                    searchHandler.removeCallbacks(searchProgressRunnable)
+                    swipeRefreshLayout?.isRefreshing = false
+                }
+            }
         })
+
+        viewModel.pagedListData.observe(this, Observer {
+            it?.let { pagedListData -> updatePagedListData(pagedListData) }
+        })
+
         viewModel.isLoadingMore.observe(this, Observer {
             progressLoadMore?.visibility = if (it == true) View.VISIBLE else View.GONE
         })
@@ -147,6 +190,10 @@ class PostListFragment : Fragment() {
         })
     }
 
+    private val searchProgressRunnable = Runnable {
+        swipeRefreshLayout?.isRefreshing = true
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putSerializable(WordPress.SITE, site)

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.POST_LIST_AUTHOR_FILTER_CHANGED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.POST_LIST_SEARCH_ACCESSED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.POST_LIST_TAB_CHANGED
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.ListActionBuilder
@@ -40,6 +41,7 @@ import org.wordpress.android.ui.posts.PostListViewLayoutTypeMenuUiState.Standard
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.uploads.LocalDraftUploadStarter
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.SiteUtils
 import org.wordpress.android.util.ToastUtils.Duration
 import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.viewmodel.SingleLiveEvent
@@ -53,6 +55,7 @@ import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
 private const val SCROLL_TO_DELAY = 50L
+private const val SEARCH_COLLAPSE_DELAY = 500L
 private val FAB_VISIBLE_POST_LIST_PAGES = listOf(PUBLISHED, DRAFTS)
 val POST_LIST_PAGES = listOf(PUBLISHED, DRAFTS, SCHEDULED, TRASHED)
 private const val TRACKS_SELECTED_TAB = "selected_tab"
@@ -113,6 +116,15 @@ class PostListMainViewModel @Inject constructor(
     private val _viewLayoutTypeMenuUiState = MutableLiveData<PostListViewLayoutTypeMenuUiState>()
     val viewLayoutTypeMenuUiState: LiveData<PostListViewLayoutTypeMenuUiState> = _viewLayoutTypeMenuUiState
 
+    private val _isSearchExpanded = MutableLiveData<Boolean>()
+    val isSearchExpanded: LiveData<Boolean> = _isSearchExpanded
+
+    private val _isSearchAvailable = MutableLiveData<Boolean>()
+    val isSearchAvailable: LiveData<Boolean> = _isSearchAvailable
+
+    private val _searchQuery = MutableLiveData<String>()
+    val searchQuery: LiveData<String> = _searchQuery
+
     private val uploadStatusTracker = PostListUploadStatusTracker(uploadStore = uploadStore)
     private val featuredImageTracker = PostListFeaturedImageTracker(dispatcher = dispatcher, mediaStore = mediaStore)
 
@@ -205,9 +217,11 @@ class PostListMainViewModel @Inject constructor(
                 }
         )
 
+        _isSearchAvailable.value = SiteUtils.isAccessedViaWPComRest(site)
         _updatePostsPager.value = authorFilterSelection
         _viewState.value = PostListMainViewState(
-                isFabVisible = FAB_VISIBLE_POST_LIST_PAGES.contains(POST_LIST_PAGES.first()),
+                isFabVisible = FAB_VISIBLE_POST_LIST_PAGES.contains(POST_LIST_PAGES.first()) &&
+                        isSearchExpanded.value != true,
                 isAuthorFilterVisible = isFilteringByAuthorSupported,
                 authorFilterSelection = authorFilterSelection,
                 authorFilterItems = getAuthorFilterItems(authorFilterSelection, accountStore.account?.avatarUrl)
@@ -239,10 +253,42 @@ class PostListMainViewModel @Inject constructor(
                 getUploadStatus = uploadStatusTracker::getUploadStatus,
                 doesPostHaveUnhandledConflict = postConflictResolver::doesPostHaveUnhandledConflict,
                 postFetcher = postFetcher,
+                searchQuery = searchQuery.value,
                 getFeaturedImageUrl = featuredImageTracker::getFeaturedImageUrl
         )
     }
 
+    fun onSearchExpanded(restorePreviousSearch: Boolean) {
+        if (isSearchExpanded.value != true) {
+            AnalyticsUtils.trackWithSiteDetails(POST_LIST_SEARCH_ACCESSED, site)
+
+            if (!restorePreviousSearch) {
+                clearSearch()
+            }
+
+            _isSearchExpanded.value = true
+            _viewState.value = _viewState.value?.copy(isFabVisible = false)
+        }
+    }
+
+    fun onSearchCollapsed(delay: Long = SEARCH_COLLAPSE_DELAY) {
+        _isSearchExpanded.value = false
+        clearSearch()
+
+        launch {
+            delay(delay)
+        }
+        _viewState.value = _viewState.value?.copy(isFabVisible = true)
+    }
+
+    fun onSearch(searchQuery: String) {
+        _searchQuery.value = searchQuery
+    }
+
+    private fun clearSearch() {
+        _searchQuery.value = null
+    }
+
     fun newPost() {
         postActionHandler.newPost()
     }

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewState.kt

@@ -8,7 +8,7 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 
-class PostListMainViewState(
+data class PostListMainViewState(
     val isFabVisible: Boolean,
     val isAuthorFilterVisible: Boolean,
     val authorFilterSelection: AuthorFilterSelection,

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListType.kt

@@ -5,17 +5,19 @@ import org.wordpress.android.fluxc.model.post.PostStatus
 import org.wordpress.android.fluxc.model.post.PostStatus.PRIVATE
 
 enum class PostListType(val postStatuses: List<PostStatus>) {
-    PUBLISHED(listOf(PostStatus.PUBLISHED, PostStatus.PRIVATE)),
+    PUBLISHED(listOf(PostStatus.PUBLISHED, PRIVATE)),
     DRAFTS(listOf(PostStatus.DRAFT, PostStatus.PENDING)),
     SCHEDULED(listOf(PostStatus.SCHEDULED)),
-    TRASHED(listOf(PostStatus.TRASHED));
+    TRASHED(listOf(PostStatus.TRASHED)),
+    SEARCH(listOf(PostStatus.PUBLISHED, PRIVATE));
 
     val titleResId: Int
         get() = when (this) {
             PUBLISHED -> R.string.post_list_published
             DRAFTS -> R.string.post_list_drafts
             SCHEDULED -> R.string.post_list_scheduled
             TRASHED -> R.string.post_list_trashed
+            SEARCH -> 0 // we don't have title for search list
         }
 
     companion object {