[Reader IA] Integrate Top Bar Filter UI to Filter functionality

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java

@@ -55,6 +55,7 @@ public class ReaderConstants {
     static final String ARG_VIDEO_URL = "video_url";
     static final String ARG_IS_TOP_LEVEL = "is_top_level";
     static final String ARG_SUBS_TAB_POSITION = "subs_tab_position";
+    static final String ARG_IS_FILTERABLE = "is_filterable";
 
     static final String KEY_POST_SLUGS_RESOLUTION_UNDERWAY = "post_slugs_resolution_underway";
     static final String KEY_ALREADY_UPDATED = "already_updated";

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFragment.kt

@@ -33,9 +33,12 @@ import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragmen
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask.FOLLOWED_BLOGS
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask.TAGS
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter
+import org.wordpress.android.ui.reader.subfilter.SubFilterViewModel
+import org.wordpress.android.ui.reader.subfilter.SubfilterCategory
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel.ReaderUiState.ContentUiState
 import org.wordpress.android.ui.reader.views.compose.ReaderTopAppBar
+import org.wordpress.android.ui.reader.views.compose.filter.ReaderFilterType
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.JetpackBrandingUtils
@@ -72,7 +75,7 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
     private var settingsMenuItemFocusPoint: QuickStartFocusPoint? = null
 
     private var binding: ReaderFragmentLayoutBinding? = null
-    
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         requireActivity().addMenuProvider(this, viewLifecycleOwner)
         binding = ReaderFragmentLayoutBinding.bind(view).apply {
@@ -120,10 +123,12 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
             viewModel.onSearchActionClicked()
             true
         }
+
         R.id.menu_settings -> {
             viewModel.onSettingsActionClicked()
             true
         }
+
         else -> false
     }
 
@@ -138,8 +143,8 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
                     ReaderTopAppBar(
                         topBarUiState = state,
                         onMenuItemClick = viewModel::onTopBarMenuItemClick,
-                        onFilterClick = viewModel::onTopBarFilterClick,
-                        onClearFilterClick = viewModel::onTopBarClearFilterClick,
+                        onFilterClick = ::tryOpenFilterList,
+                        onClearFilterClick = ::clearFilter,
                         onSearchClick = {}
                     )
                 }
@@ -149,10 +154,10 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
 
     private fun ReaderFragmentLayoutBinding.initViewModel(savedInstanceState: Bundle?) {
         viewModel = ViewModelProvider(this@ReaderFragment, viewModelFactory).get(ReaderViewModel::class.java)
-        startObserving(savedInstanceState)
+        startReaderViewModel(savedInstanceState)
     }
 
-    private fun ReaderFragmentLayoutBinding.startObserving(savedInstanceState: Bundle?) {
+    private fun ReaderFragmentLayoutBinding.startReaderViewModel(savedInstanceState: Bundle?) {
         viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             uiState?.let { updateUiState(it) }
         }
@@ -234,6 +239,7 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
                     uiState.selectedReaderTag,
                     ReaderTypes.ReaderPostListType.TAG_FOLLOWED,
                     true,
+                    uiState.selectedReaderTag.isFilterable
                 )
             }
             replace(R.id.container, fragment)
@@ -347,4 +353,37 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), MenuProvider,
         viewModel.onQuickStartEventReceived(event)
         EventBus.getDefault().removeStickyEvent(event)
     }
+
+    private fun getCurrentFeedFragment(): Fragment? {
+        return childFragmentManager.findFragmentById(R.id.container)
+    }
+
+    // The view model is started by the ReaderPostListFragment for feeds that support filtering
+    private fun getSubFilterViewModel(): SubFilterViewModel? {
+        val currentFragment = getCurrentFeedFragment()
+        val selectedTag = (viewModel.uiState.value as? ContentUiState)?.selectedReaderTag
+
+        if (currentFragment == null || selectedTag == null) return null
+
+        return ViewModelProvider(currentFragment, viewModelFactory).get(
+            SubFilterViewModel.getViewModelKeyForTag(selectedTag),
+            SubFilterViewModel::class.java
+        )
+    }
+
+    private fun tryOpenFilterList(type: ReaderFilterType) {
+        val viewModel = getSubFilterViewModel() ?: return
+
+        val category = when (type) {
+            ReaderFilterType.BLOG -> SubfilterCategory.SITES
+            ReaderFilterType.TAG -> SubfilterCategory.TAGS
+        }
+
+        viewModel.onSubFiltersListButtonClicked(category)
+    }
+
+    private fun clearFilter() {
+        val viewModel = getSubFilterViewModel() ?: return
+        viewModel.setDefaultSubfilter()
+    }
 }