split change category params ito sealed class, improve shared transitions

Author: Razeeman

feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/adapter/CategoriesAdapter.kt

@@ -7,12 +7,12 @@ import com.example.util.simpletimetracker.core.adapter.loader.LoaderAdapterDeleg
 import com.example.util.simpletimetracker.core.viewData.CategoryViewData
 
 class CategoriesAdapter(
-    onLongClick: ((CategoryViewData, Map<Any, String>) -> Unit),
+    onClick: ((CategoryViewData, Map<Any, String>) -> Unit),
     onAddClick: (() -> Unit)
 ) : BaseRecyclerAdapter() {
 
     init {
-        delegates[ViewHolderType.CATEGORY] = CategoryAdapterDelegate(onLongClick)
+        delegates[ViewHolderType.CATEGORY] = CategoryAdapterDelegate(onClick)
         delegates[ViewHolderType.LOADER] = LoaderAdapterDelegate()
         delegates[ViewHolderType.EMPTY] = EmptyAdapterDelegate()
         delegates[ViewHolderType.FOOTER] = CategoryAddAdapterDelegate(onAddClick)

feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/adapter/CategoryAdapterDelegate.kt

@@ -5,11 +5,11 @@ import androidx.core.view.ViewCompat
 import com.example.util.simpletimetracker.core.adapter.BaseRecyclerAdapterDelegate
 import com.example.util.simpletimetracker.core.adapter.BaseRecyclerViewHolder
 import com.example.util.simpletimetracker.core.adapter.ViewHolderType
-import com.example.util.simpletimetracker.core.extension.setOnLongClick
+import com.example.util.simpletimetracker.core.extension.setOnClick
 import com.example.util.simpletimetracker.core.view.TransitionNames
-import com.example.util.simpletimetracker.feature_categories.R
 import com.example.util.simpletimetracker.core.viewData.CategoryViewData
-import kotlinx.android.synthetic.main.item_category_layout.view.*
+import com.example.util.simpletimetracker.feature_categories.R
+import kotlinx.android.synthetic.main.item_category_layout.view.viewCategoryItem
 
 class CategoryAdapterDelegate(
     private val onItemLongClick: ((CategoryViewData, Map<Any, String>) -> Unit)
@@ -30,7 +30,7 @@ class CategoryAdapterDelegate(
 
             itemColor = item.color
             itemName = item.name
-            setOnLongClick { onItemLongClick(item, mapOf(this to transitionName)) }
+            setOnClick { onItemLongClick(item, mapOf(this to transitionName)) }
             ViewCompat.setTransitionName(this, transitionName)
         }
     }

feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/view/CategoriesFragment.kt

@@ -26,7 +26,7 @@ class CategoriesFragment : BaseFragment(R.layout.categories_fragment) {
 
     private val categoriesAdapter: CategoriesAdapter by lazy {
         CategoriesAdapter(
-            viewModel::onCategoryLongClick,
+            viewModel::onCategoryClick,
             viewModel::onAddCategoryClick
         )
     }

feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/viewModel/CategoriesViewModel.kt

@@ -23,19 +23,22 @@ class CategoriesViewModel @Inject constructor(
         MutableLiveData(listOf(LoaderViewData() as ViewHolderType))
     }
 
-    fun onCategoryLongClick(item: CategoryViewData, sharedElements: Map<Any, String>) {
-        // TODO change to dialog?
+    fun onCategoryClick(item: CategoryViewData, sharedElements: Map<Any, String>) {
         router.navigate(
             screen = Screen.CHANGE_CATEGORY,
-            data = ChangeCategoryParams(item.id),
+            data = ChangeCategoryParams.Change(
+                id = item.id,
+                name = item.name,
+                color = item.color
+            ),
             sharedElements = sharedElements
         )
     }
 
     fun onAddCategoryClick() {
         router.navigate(
             screen = Screen.CHANGE_CATEGORY,
-            data = ChangeCategoryParams(0)
+            data = ChangeCategoryParams.New
         )
     }
 

feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/extra/ChangeCategoryExtra.kt

@@ -22,14 +22,22 @@ import com.example.util.simpletimetracker.feature_change_category.R
 import com.example.util.simpletimetracker.feature_change_category.adapter.ChangeCategoryColorAdapter
 import com.example.util.simpletimetracker.feature_change_category.adapter.ChangeCategoryTypeAdapter
 import com.example.util.simpletimetracker.feature_change_category.di.ChangeCategoryComponentProvider
-import com.example.util.simpletimetracker.feature_change_category.extra.ChangeCategoryExtra
 import com.example.util.simpletimetracker.feature_change_category.viewModel.ChangeCategoryViewModel
 import com.example.util.simpletimetracker.navigation.params.ChangeCategoryParams
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
-import kotlinx.android.synthetic.main.change_category_fragment.*
+import kotlinx.android.synthetic.main.change_category_fragment.arrowChangeCategoryColor
+import kotlinx.android.synthetic.main.change_category_fragment.arrowChangeCategoryType
+import kotlinx.android.synthetic.main.change_category_fragment.btnChangeCategoryDelete
+import kotlinx.android.synthetic.main.change_category_fragment.btnChangeCategorySave
+import kotlinx.android.synthetic.main.change_category_fragment.etChangeCategoryName
+import kotlinx.android.synthetic.main.change_category_fragment.fieldChangeCategoryColor
+import kotlinx.android.synthetic.main.change_category_fragment.fieldChangeCategoryType
+import kotlinx.android.synthetic.main.change_category_fragment.previewChangeCategory
+import kotlinx.android.synthetic.main.change_category_fragment.rvChangeCategoryColor
+import kotlinx.android.synthetic.main.change_category_fragment.rvChangeCategoryType
 import javax.inject.Inject
 
 class ChangeCategoryFragment : BaseFragment(R.layout.change_category_fragment) {
@@ -46,8 +54,9 @@ class ChangeCategoryFragment : BaseFragment(R.layout.change_category_fragment) {
     private val typesAdapter: ChangeCategoryTypeAdapter by lazy {
         ChangeCategoryTypeAdapter(viewModel::onTypeClick)
     }
+    // TODO by delegate?
     private val params: ChangeCategoryParams by lazy {
-        arguments?.getParcelable(ARGS_PARAMS) ?: ChangeCategoryParams()
+        arguments?.getParcelable<ChangeCategoryParams>(ARGS_PARAMS) ?: ChangeCategoryParams.New
     }
 
     override fun initDi() {
@@ -57,6 +66,9 @@ class ChangeCategoryFragment : BaseFragment(R.layout.change_category_fragment) {
     }
 
     override fun initUi() {
+        setPreview()
+
+        // TODO move to utils
         if (BuildVersions.isLollipopOrHigher()) {
             sharedElementEnterTransition = TransitionInflater.from(context)
                 .inflateTransition(android.R.transition.move)
@@ -95,7 +107,7 @@ class ChangeCategoryFragment : BaseFragment(R.layout.change_category_fragment) {
     }
 
     override fun initViewModel(): Unit = with(viewModel) {
-        extra = ChangeCategoryExtra(params.id)
+        extra = params
         deleteIconVisibility.observeOnce(viewLifecycleOwner, btnChangeCategoryDelete::visible::set)
         saveButtonEnabled.observe(viewLifecycleOwner, btnChangeCategorySave::setEnabled)
         deleteButtonEnabled.observe(viewLifecycleOwner, btnChangeCategoryDelete::setEnabled)
@@ -125,6 +137,15 @@ class ChangeCategoryFragment : BaseFragment(R.layout.change_category_fragment) {
         etChangeCategoryName.setSelection(item.name.length)
     }
 
+    private fun setPreview() {
+        (params as? ChangeCategoryParams.Change)?.let { item ->
+            with(previewChangeCategory) {
+                itemName = item.name
+                itemColor = item.color
+            }
+        }
+    }
+
     private fun updatePreview(item: CategoryViewData) {
         with(previewChangeCategory) {
             itemName = item.name

feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt

@@ -18,10 +18,10 @@ import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeCategoryInteractor
 import com.example.util.simpletimetracker.domain.model.Category
 import com.example.util.simpletimetracker.feature_change_category.R
-import com.example.util.simpletimetracker.feature_change_category.extra.ChangeCategoryExtra
 import com.example.util.simpletimetracker.feature_change_category.interactor.ChangeCategoryViewDataInteractor
 import com.example.util.simpletimetracker.navigation.Notification
 import com.example.util.simpletimetracker.navigation.Router
+import com.example.util.simpletimetracker.navigation.params.ChangeCategoryParams
 import com.example.util.simpletimetracker.navigation.params.ToastParams
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -36,7 +36,7 @@ class ChangeCategoryViewModel @Inject constructor(
     private val resourceRepo: ResourceRepo
 ) : ViewModel() {
 
-    lateinit var extra: ChangeCategoryExtra
+    lateinit var extra: ChangeCategoryParams
 
     val categoryPreview: LiveData<CategoryViewData> by lazy {
         return@lazy MutableLiveData<CategoryViewData>().let { initial ->

feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt

@@ -1,11 +1,21 @@
 package com.example.util.simpletimetracker.navigation.params
 
 import android.os.Parcelable
+import androidx.annotation.ColorInt
 import kotlinx.android.parcel.Parcelize
 
-@Parcelize
-data class ChangeCategoryParams(
-    // id of the Category to change, if no id - creating new one.
-    val id: Long = 0
-    // TODO send size also
-) : Parcelable
+sealed class ChangeCategoryParams : Parcelable {
+    abstract val id: Long
+
+    @Parcelize
+    data class Change(
+        override val id: Long,
+        val name: String,
+        @ColorInt val color: Int
+    ) : ChangeCategoryParams()
+
+    @Parcelize
+    object New : ChangeCategoryParams() {
+        override val id: Long get() = 0
+    }
+}