fix icon category selection not working for tags

Razeeman · Nov 9, 2024 · fd5295e · fd5295e
1 parent 30cb044
commit fd5295e
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 103 deletions.
diff --git a/.../simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt b/.../simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt
@@ -8,13 +8,16 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.core.widget.doAfterTextChanged
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.viewbinding.ViewBinding
 import com.example.util.simpletimetracker.core.R
+import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.databinding.IconSelectionLayoutBinding
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionCategoryInfoViewData
+import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionScrollViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionSelectorStateViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionStateViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionSwitchViewData
+import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.repo.DeviceRepo
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.model.IconEmojiType
@@ -91,6 +94,66 @@ object IconSelectionViewDelegate {
         )
     }
 
+    fun <T : ViewBinding> initViewModel(
+        fragment: BaseFragment<T>,
+        viewModel: IconSelectionViewModelDelegate,
+        layout: IconSelectionLayoutBinding,
+        iconsAdapter: BaseRecyclerAdapter,
+        iconCategoriesAdapter: BaseRecyclerAdapter,
+        iconsLayoutManager: GridLayoutManager?,
+    ) {
+        fragment.initIconSelectionViewModel(
+            viewModel = viewModel,
+            layout = layout,
+            iconsAdapter = iconsAdapter,
+            iconCategoriesAdapter = iconCategoriesAdapter,
+            iconsLayoutManager = iconsLayoutManager,
+        )
+    }
+
+    private fun <T : ViewBinding> BaseFragment<T>.initIconSelectionViewModel(
+        viewModel: IconSelectionViewModelDelegate,
+        layout: IconSelectionLayoutBinding,
+        iconsAdapter: BaseRecyclerAdapter,
+        iconCategoriesAdapter: BaseRecyclerAdapter,
+        iconsLayoutManager: GridLayoutManager?,
+    ) = with(viewModel) {
+        icons.observe {
+            updateIconsState(
+                state = it,
+                layout = layout,
+                iconsAdapter = iconsAdapter,
+            )
+        }
+        iconCategories.observe {
+            updateIconCategories(
+                data = it,
+                iconCategoriesAdapter = iconCategoriesAdapter,
+            )
+        }
+        iconsTypeViewData.observe {
+            updateIconsTypeViewData(
+                data = it,
+                layout = layout,
+            )
+        }
+        iconSelectorViewData.observe {
+            updateIconSelectorViewData(
+                data = it,
+                layout = layout,
+            )
+        }
+        expandIconTypeSwitch.observe {
+            updateBarExpanded(layout)
+        }
+        iconsScrollPosition.observe {
+            if (it is IconSelectionScrollViewData.ScrollTo) {
+                iconsLayoutManager?.scrollToPositionWithOffset(it.position, 0)
+                onScrolled()
+            }
+        }
+    }
+
     fun onDestroyView(
         textWatcher: TextWatcher?,
         layout: IconSelectionLayoutBinding,
@@ -112,20 +175,20 @@ object IconSelectionViewDelegate {
         etIconSelectionText.doAfterTextChanged { viewModel.onIconTextChange(it.toString()) }
     }
 
-    fun updateBarExpanded(
+    private fun updateBarExpanded(
         layout: IconSelectionLayoutBinding,
     ) = with(layout) {
         appBarIconSelection.setExpanded(true)
     }
 
-    fun updateIconsTypeViewData(
+    private fun updateIconsTypeViewData(
         data: List<ViewHolderType>,
         layout: IconSelectionLayoutBinding,
     ) = with(layout) {
         btnIconSelectionSwitch.adapter.replace(data)
     }
 
-    fun updateIconsState(
+    private fun updateIconsState(
         state: IconSelectionStateViewData,
         layout: IconSelectionLayoutBinding,
         iconsAdapter: BaseRecyclerAdapter,
@@ -143,7 +206,7 @@ object IconSelectionViewDelegate {
         }
     }
 
-    fun updateIconCategories(
+    private fun updateIconCategories(
         data: List<ViewHolderType>,
         iconCategoriesAdapter: BaseRecyclerAdapter,
     ) {
@@ -199,7 +262,7 @@ object IconSelectionViewDelegate {
             ?.scrollFlags = scrollFlags
     }
 
-    fun updateIconSelectorViewData(
+    private fun updateIconSelectorViewData(
         data: IconSelectionSelectorStateViewData,
         layout: IconSelectionLayoutBinding,
     ) = with(layout) {

diff --git a/.../example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt b/.../example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt
@@ -14,8 +14,6 @@ import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionAdapterDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionCategoryAdapterDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionCategoryInfoAdapterDelegate
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionSelectorStateViewData
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionStateViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewDelegate.IconSelectionViewDelegate
 import com.example.util.simpletimetracker.core.dialog.ColorSelectionDialogListener
 import com.example.util.simpletimetracker.core.dialog.EmojiSelectionDialogListener
@@ -34,7 +32,6 @@ import com.example.util.simpletimetracker.core.view.ViewChooserStateDelegate
 import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
-import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData
 import com.example.util.simpletimetracker.feature_base_adapter.color.createColorAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.color.createColorFavouriteAdapterDelegate
@@ -219,11 +216,6 @@ class ChangeRecordTagFragment :
             preview.observeOnce(viewLifecycleOwner, ::updateUi)
             preview.observe(::updatePreview)
             colors.observe(colorsAdapter::replace)
-            icons.observe(::updateIconsState)
-            iconCategories.observe(::updateIconCategories)
-            iconsTypeViewData.observe(::updateIconsTypeViewData)
-            iconSelectorViewData.observe(::updateIconSelectorViewData)
-            expandIconTypeSwitch.observe { updateBarExpanded() }
             types.observe(::updateTypes)
             defaultTypes.observe(::updateDefaultTypes)
             chooserState.observe(::updateChooserState)
@@ -232,6 +224,14 @@ class ChangeRecordTagFragment :
             keyboardVisibility.observe { visible ->
                 if (visible) showKeyboard(etChangeRecordTagName) else hideKeyboard()
             }
+            IconSelectionViewDelegate.initViewModel(
+                fragment = this@ChangeRecordTagFragment,
+                viewModel = viewModel,
+                layout = containerChangeRecordTypeIcon,
+                iconsAdapter = iconsAdapter,
+                iconCategoriesAdapter = iconCategoriesAdapter,
+                iconsLayoutManager = iconsLayoutManager,
+            )
         }
     }
 
@@ -399,43 +399,6 @@ class ChangeRecordTagFragment :
         tvChangeRecordTagDefaultTypePreview.text = data.selectedCount.toString()
     }
 
-    private fun updateBarExpanded() {
-        IconSelectionViewDelegate.updateBarExpanded(
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
-    private fun updateIconsState(state: IconSelectionStateViewData) {
-        IconSelectionViewDelegate.updateIconsState(
-            state = state,
-            layout = binding.containerChangeRecordTypeIcon,
-            iconsAdapter = iconsAdapter,
-        )
-    }
-
-    private fun updateIconCategories(data: List<ViewHolderType>) {
-        IconSelectionViewDelegate.updateIconCategories(
-            data = data,
-            iconCategoriesAdapter = iconCategoriesAdapter,
-        )
-    }
-
-    private fun updateIconSelectorViewData(
-        data: IconSelectionSelectorStateViewData,
-    ) {
-        IconSelectionViewDelegate.updateIconSelectorViewData(
-            data = data,
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
-    private fun updateIconsTypeViewData(data: List<ViewHolderType>) {
-        IconSelectionViewDelegate.updateIconsTypeViewData(
-            data = data,
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
     private fun updateNameErrorMessage(error: String) = with(binding) {
         inputChangeRecordTagName.error = error
         inputChangeRecordTagName.isErrorEnabled = error.isNotEmpty()

diff --git a/...xample/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt b/...xample/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
@@ -14,9 +14,6 @@ import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionAdapterDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionCategoryAdapterDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.adapter.createIconSelectionCategoryInfoAdapterDelegate
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionScrollViewData
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionSelectorStateViewData
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionStateViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewDelegate.IconSelectionViewDelegate
 import com.example.util.simpletimetracker.core.dialog.ColorSelectionDialogListener
 import com.example.util.simpletimetracker.core.dialog.DurationDialogListener
@@ -34,7 +31,6 @@ import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.ViewChooserStateDelegate
 import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
-import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAddAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.color.createColorAdapterDelegate
@@ -233,11 +229,6 @@ class ChangeRecordTypeFragment :
             recordType.observeOnce(viewLifecycleOwner, ::updateUi)
             recordType.observe(::updatePreview)
             colors.observe(colorsAdapter::replace)
-            icons.observe(::updateIconsState)
-            iconCategories.observe(::updateIconCategories)
-            iconsTypeViewData.observe(::updateIconsTypeViewData)
-            iconSelectorViewData.observe(::updateIconSelectorViewData)
-            expandIconTypeSwitch.observe { updateBarExpanded() }
             categories.observe(::updateCategories)
             goalsViewData.observe(::updateGoalsState)
             nameErrorMessage.observe(::updateNameErrorMessage)
@@ -253,12 +244,14 @@ class ChangeRecordTypeFragment :
             keyboardVisibility.observe { visible ->
                 if (visible) showKeyboard(etChangeRecordTypeName) else hideKeyboard()
             }
-            iconsScrollPosition.observe {
-                if (it is IconSelectionScrollViewData.ScrollTo) {
-                    iconsLayoutManager?.scrollToPositionWithOffset(it.position, 0)
-                    onScrolled()
-                }
-            }
+            IconSelectionViewDelegate.initViewModel(
+                fragment = this@ChangeRecordTypeFragment,
+                viewModel = viewModel,
+                layout = containerChangeRecordTypeIcon,
+                iconsAdapter = iconsAdapter,
+                iconCategoriesAdapter = iconCategoriesAdapter,
+                iconsLayoutManager = iconsLayoutManager,
+            )
         }
     }
 
@@ -441,43 +434,6 @@ class ChangeRecordTypeFragment :
         tvChangeRecordTypeCategoryPreview.text = data.selectedCount.toString()
     }
 
-    private fun updateBarExpanded() {
-        IconSelectionViewDelegate.updateBarExpanded(
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
-    private fun updateIconsState(state: IconSelectionStateViewData) {
-        IconSelectionViewDelegate.updateIconsState(
-            state = state,
-            layout = binding.containerChangeRecordTypeIcon,
-            iconsAdapter = iconsAdapter,
-        )
-    }
-
-    private fun updateIconCategories(data: List<ViewHolderType>) {
-        IconSelectionViewDelegate.updateIconCategories(
-            data = data,
-            iconCategoriesAdapter = iconCategoriesAdapter,
-        )
-    }
-
-    private fun updateIconSelectorViewData(
-        data: IconSelectionSelectorStateViewData,
-    ) {
-        IconSelectionViewDelegate.updateIconSelectorViewData(
-            data = data,
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
-    private fun updateIconsTypeViewData(data: List<ViewHolderType>) {
-        IconSelectionViewDelegate.updateIconsTypeViewData(
-            data = data,
-            layout = binding.containerChangeRecordTypeIcon,
-        )
-    }
-
     private fun updateNameErrorMessage(error: String) = with(binding) {
         inputChangeRecordTypeName.error = error
         inputChangeRecordTypeName.isErrorEnabled = error.isNotEmpty()