chore(shared-preferences): filter logic migrated to dataSelector (#309)

Author: srtvprateek

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/BaseFragment.kt

@@ -0,0 +1,5 @@
+package com.pluto.plugins.preferences
+
+import androidx.fragment.app.Fragment
+
+internal class BaseFragment : Fragment(R.layout.pluto_pref___fragment_base)

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/PlutoSharePreferencesPlugin.kt

@@ -17,7 +17,7 @@ class PlutoSharePreferencesPlugin() : Plugin(ID) {
         version = BuildConfig.VERSION_NAME
     )
 
-    override fun getView(): Fragment = SharedPrefFragment()
+    override fun getView(): Fragment = BaseFragment()
 
     override fun getDeveloperDetails(): DeveloperDetails {
         return DeveloperDetails(
@@ -28,7 +28,6 @@ class PlutoSharePreferencesPlugin() : Plugin(ID) {
     }
 
     override fun onPluginInstalled() {
-        SharedPrefRepo.init(context)
     }
 
     override fun onPluginDataCleared() {

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/SharedPrefFragment.kt

@@ -2,18 +2,17 @@ package com.pluto.plugins.preferences.ui
 
 import androidx.annotation.Keep
 import com.pluto.utilities.list.ListItem
+import com.pluto.utilities.selector.SelectorOption
 import com.pluto.utilities.views.keyvalue.KeyValuePairEditMetaData
 import com.squareup.moshi.JsonClass
 
 @Keep
 @JsonClass(generateAdapter = true)
 internal data class SharedPrefFile(
-    val label: String,
+    val label: CharSequence,
     val isDefault: Boolean
-) : ListItem() {
-    override fun isSame(other: Any): Boolean {
-        return other is SharedPrefFile && other.label == this.label
-    }
+) : SelectorOption() {
+    override fun displayText(): CharSequence = label
 }
 
 internal data class SharedPrefKeyValuePair(

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/DataModel.kt

@@ -7,15 +7,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
 import com.pluto.plugin.share.Shareable
 import com.pluto.plugin.share.lazyContentSharer
 import com.pluto.plugins.preferences.R
 import com.pluto.plugins.preferences.Session
-import com.pluto.plugins.preferences.SharedPrefRepo
 import com.pluto.plugins.preferences.databinding.PlutoPrefFragmentListBinding
-import com.pluto.plugins.preferences.ui.EditProcessor.Companion.fromEditorData
-import com.pluto.plugins.preferences.ui.EditProcessor.Companion.toEditorData
+import com.pluto.plugins.preferences.utils.fromEditorData
+import com.pluto.plugins.preferences.utils.toEditorData
 import com.pluto.utilities.autoClearInitializer
 import com.pluto.utilities.extensions.hideKeyboard
 import com.pluto.utilities.extensions.linearLayoutManager
@@ -25,6 +23,7 @@ import com.pluto.utilities.list.CustomItemDecorator
 import com.pluto.utilities.list.DiffAwareAdapter
 import com.pluto.utilities.list.DiffAwareHolder
 import com.pluto.utilities.list.ListItem
+import com.pluto.utilities.selector.lazyDataSelector
 import com.pluto.utilities.setOnDebounceClickListener
 import com.pluto.utilities.viewBinding
 import com.pluto.utilities.views.keyvalue.KeyValuePairEditResult
@@ -37,6 +36,7 @@ internal class ListFragment : Fragment(R.layout.pluto_pref___fragment_list) {
     private val keyValuePairEditor: KeyValuePairEditor by lazyKeyValuePairEditor()
     private val prefAdapter: BaseAdapter by autoClearInitializer { SharedPrefAdapter(onActionListener) }
     private val contentSharer by lazyContentSharer()
+    private val dataSelector by lazyDataSelector()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -60,14 +60,14 @@ internal class ListFragment : Fragment(R.layout.pluto_pref___fragment_list) {
         binding.options.setOnDebounceClickListener {
             context?.showMoreOptions(it, R.menu.pluto_pref___menu_more_options) { item ->
                 when (item.itemId) {
-                    R.id.filter -> findNavController().navigate(R.id.openFilterSettings)
+                    R.id.filter -> openFilterView()
                 }
             }
         }
-        binding.filter.setOnDebounceClickListener { findNavController().navigate(R.id.openFilterSettings) }
+        binding.filter.setOnDebounceClickListener { openFilterView() }
         binding.search.setText(Session.searchText)
-        viewModel.preferences.removeObserver(sharedPrefObserver)
-        viewModel.preferences.observe(viewLifecycleOwner, sharedPrefObserver)
+        viewModel.preferenceList.removeObserver(sharedPrefObserver)
+        viewModel.preferenceList.observe(viewLifecycleOwner, sharedPrefObserver)
         keyValuePairEditor.result.removeObserver(keyValuePairEditObserver)
         keyValuePairEditor.result.observe(viewLifecycleOwner, keyValuePairEditObserver)
 
@@ -76,9 +76,25 @@ internal class ListFragment : Fragment(R.layout.pluto_pref___fragment_list) {
         }
     }
 
+    private fun openFilterView() {
+        dataSelector.selectMultiple(
+            title = getString(R.string.pluto_pref___shared_pref_filter),
+            list = viewModel.getPrefFiles(),
+            preSelected = viewModel.getSelectedPrefFiles()
+        ).observe(viewLifecycleOwner) {
+            val listOfSharePrefFiles = arrayListOf<SharedPrefFile>()
+            it.forEach { option ->
+                if (option is SharedPrefFile) {
+                    listOfSharePrefFiles.add(option)
+                }
+            }
+            viewModel.setSelectedPrefFiles(listOfSharePrefFiles)
+        }
+    }
+
     private fun filteredPrefs(search: String): List<SharedPrefKeyValuePair> {
         var list = emptyList<SharedPrefKeyValuePair>()
-        viewModel.preferences.value?.let {
+        viewModel.preferenceList.value?.let {
             list = it.filter { pref ->
                 pref.key.contains(search, true)
             }
@@ -91,8 +107,7 @@ internal class ListFragment : Fragment(R.layout.pluto_pref___fragment_list) {
         it.value?.let { value ->
             if (it.metaData is SharedPrefKeyValuePair) {
                 val pref: SharedPrefKeyValuePair = it.metaData as SharedPrefKeyValuePair
-                SharedPrefRepo.set(requireContext(), pref, pref.fromEditorData(value))
-                viewModel.refresh()
+                viewModel.setPrefData(pref, pref.fromEditorData(value))
             }
         }
     }

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/EditProcessor.kt

@@ -1,7 +1,6 @@
 package com.pluto.plugins.preferences.ui
 
 import android.view.ViewGroup
-import com.pluto.plugins.preferences.ui.filter.FilterItemHolder
 import com.pluto.utilities.list.BaseAdapter
 import com.pluto.utilities.list.DiffAwareHolder
 import com.pluto.utilities.list.ListItem
@@ -11,21 +10,18 @@ internal class SharedPrefAdapter(private val listener: OnActionListener) : BaseA
     override fun getItemViewType(item: ListItem): Int? {
         return when (item) {
             is SharedPrefKeyValuePair -> ITEM_TYPE_PAIR
-            is SharedPrefFile -> ITEM_TYPE_FILTER
             else -> null
         }
     }
 
     override fun onViewHolderCreated(parent: ViewGroup, viewType: Int): DiffAwareHolder? {
         return when (viewType) {
             ITEM_TYPE_PAIR -> KeyValueItemHolder(parent, listener)
-            ITEM_TYPE_FILTER -> FilterItemHolder(parent, listener)
             else -> null
         }
     }
 
     companion object {
         const val ITEM_TYPE_PAIR = 1001
-        const val ITEM_TYPE_FILTER = 1002
     }
 }

pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/ListFragment.kt

@@ -4,15 +4,31 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.pluto.plugins.preferences.SharedPrefRepo
+import com.pluto.plugins.preferences.utils.SharedPrefUtils
 
 internal class SharedPrefViewModel(application: Application) : AndroidViewModel(application) {
 
-    val preferences: LiveData<List<SharedPrefKeyValuePair>>
+    val preferenceList: LiveData<List<SharedPrefKeyValuePair>>
         get() = _preferences
     private val _preferences = MutableLiveData<List<SharedPrefKeyValuePair>>()
 
+    private val sharePrefUtils = SharedPrefUtils(application.applicationContext)
+
     fun refresh() {
-        _preferences.postValue(SharedPrefRepo.get(getApplication()))
+        _preferences.postValue(sharePrefUtils.get())
+    }
+
+    fun getPrefFiles(): List<SharedPrefFile> = sharePrefUtils.allPreferenceFiles
+
+    fun getSelectedPrefFiles(): List<SharedPrefFile> = sharePrefUtils.selectedPreferenceFiles
+
+    fun setSelectedPrefFiles(files: List<SharedPrefFile>) {
+        sharePrefUtils.selectedPreferenceFiles = files
+        refresh()
+    }
+
+    fun setPrefData(pair: SharedPrefKeyValuePair, data: Any) {
+        sharePrefUtils.set(pair, data)
+        refresh()
     }
 }