improve change record type shared transitions

Author: Razeeman

feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/extra/ChangeRecordTypeExtra.kt

@@ -25,7 +25,6 @@ import com.example.util.simpletimetracker.feature_change_record_type.R
 import com.example.util.simpletimetracker.feature_change_record_type.adapter.ChangeRecordTypeAdapter
 import com.example.util.simpletimetracker.feature_change_record_type.adapter.ChangeRecordTypeCategoriesAdapter
 import com.example.util.simpletimetracker.feature_change_record_type.di.ChangeRecordTypeComponentProvider
-import com.example.util.simpletimetracker.feature_change_record_type.extra.ChangeRecordTypeExtra
 import com.example.util.simpletimetracker.feature_change_record_type.viewModel.ChangeRecordTypeViewModel
 import com.example.util.simpletimetracker.navigation.params.ChangeRecordTypeParams
 import com.google.android.flexbox.FlexDirection
@@ -54,7 +53,8 @@ class ChangeRecordTypeFragment : BaseFragment(R.layout.change_record_type_fragme
         ChangeRecordTypeCategoriesAdapter(viewModel::onCategoryClick)
     }
     private val params: ChangeRecordTypeParams by lazy {
-        arguments?.getParcelable(ARGS_PARAMS) ?: ChangeRecordTypeParams()
+        arguments?.getParcelable<ChangeRecordTypeParams>(ARGS_PARAMS)
+            ?: ChangeRecordTypeParams.New(ChangeRecordTypeParams.SizePreview())
     }
 
     override fun initDi() {
@@ -64,7 +64,7 @@ class ChangeRecordTypeFragment : BaseFragment(R.layout.change_record_type_fragme
     }
 
     override fun initUi() {
-        updatePreviewSize()
+        setPreview()
 
         if (BuildVersions.isLollipopOrHigher()) {
             sharedElementEnterTransition = TransitionInflater.from(context)
@@ -115,7 +115,7 @@ class ChangeRecordTypeFragment : BaseFragment(R.layout.change_record_type_fragme
     }
 
     override fun initViewModel(): Unit = with(viewModel) {
-        extra = ChangeRecordTypeExtra(params.id, params.width, params.height, params.asRow)
+        extra = params
         deleteIconVisibility.observeOnce(
             viewLifecycleOwner,
             btnChangeRecordTypeDelete::visible::set
@@ -172,14 +172,20 @@ class ChangeRecordTypeFragment : BaseFragment(R.layout.change_record_type_fragme
         }
     }
 
-    private fun updatePreviewSize() {
+    private fun setPreview() {
         val maxWidth = resources.displayMetrics.widthPixels.pxToDp() - DELETE_BUTTON_SIZE
 
         with(previewChangeRecordType) {
-            itemIsRow = params.asRow
+            itemIsRow = params.sizePreview.asRow
             layoutParams = layoutParams.also { layoutParams ->
-                params.width?.coerceAtMost(maxWidth)?.dpToPx()?.let { layoutParams.width = it }
-                params.height?.dpToPx()?.let { layoutParams.height = it }
+                params.sizePreview.width?.coerceAtMost(maxWidth)?.dpToPx()?.let { layoutParams.width = it }
+                params.sizePreview.height?.dpToPx()?.let { layoutParams.height = it }
+            }
+
+            (params as? ChangeRecordTypeParams.Change)?.preview?.let {
+                itemName = it.name
+                itemIcon = it.iconId
+                itemColor = it.color
             }
         }
     }

feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt

@@ -25,13 +25,13 @@ import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.domain.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.model.RecordType
 import com.example.util.simpletimetracker.feature_change_record_type.R
-import com.example.util.simpletimetracker.feature_change_record_type.extra.ChangeRecordTypeExtra
 import com.example.util.simpletimetracker.feature_change_record_type.interactor.ChangeRecordTypeViewDataInteractor
 import com.example.util.simpletimetracker.feature_change_record_type.mapper.ChangeRecordTypeMapper
 import com.example.util.simpletimetracker.feature_change_record_type.viewData.ChangeRecordTypeIconViewData
 import com.example.util.simpletimetracker.navigation.Notification
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.Screen
+import com.example.util.simpletimetracker.navigation.params.ChangeRecordTypeParams
 import com.example.util.simpletimetracker.navigation.params.DurationDialogParams
 import com.example.util.simpletimetracker.navigation.params.ToastParams
 import kotlinx.coroutines.launch
@@ -56,7 +56,7 @@ class ChangeRecordTypeViewModel @Inject constructor(
     private val iconMapper: IconMapper
 ) : ViewModel() {
 
-    lateinit var extra: ChangeRecordTypeExtra
+    lateinit var extra: ChangeRecordTypeParams
 
     val recordType: LiveData<RecordTypeViewData> by lazy {
         return@lazy MutableLiveData<RecordTypeViewData>().let { initial ->

feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt

@@ -59,15 +59,33 @@ class RunningRecordsViewModel @Inject constructor(
     fun onRecordTypeLongClick(item: RecordTypeViewData, sharedElements: Map<Any, String>) {
         router.navigate(
             screen = Screen.CHANGE_RECORD_TYPE,
-            data = ChangeRecordTypeParams(item.id, item.width, item.height, item.asRow),
+            data = ChangeRecordTypeParams.Change(
+                id = item.id,
+                sizePreview = ChangeRecordTypeParams.SizePreview(
+                    width = item.width,
+                    height = item.height,
+                    asRow = item.asRow
+                ),
+                preview = ChangeRecordTypeParams.Change.Preview(
+                    name = item.name,
+                    iconId = item.iconId,
+                    color = item.color
+                )
+            ),
             sharedElements = sharedElements
         )
     }
 
     fun onAddRecordTypeClick(item: RunningRecordTypeAddViewData) {
         router.navigate(
             screen = Screen.CHANGE_RECORD_TYPE,
-            data = ChangeRecordTypeParams(0, item.width, item.height, item.asRow)
+            data = ChangeRecordTypeParams.New(
+                sizePreview = ChangeRecordTypeParams.SizePreview(
+                    width = item.width,
+                    height = item.height,
+                    asRow = item.asRow
+                )
+            )
         )
     }
 

feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt

@@ -1,13 +1,40 @@
 package com.example.util.simpletimetracker.navigation.params
 
 import android.os.Parcelable
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
 import kotlinx.android.parcel.Parcelize
 
-@Parcelize
-data class ChangeRecordTypeParams(
-    // id of the RecordType to change, if no id - creating new one.
-    val id: Long = 0,
-    val width: Int? = null,
-    val height: Int? = null,
-    val asRow: Boolean = false
-) : Parcelable
+sealed class ChangeRecordTypeParams : Parcelable {
+    abstract val id: Long
+    abstract val sizePreview: SizePreview
+
+    @Parcelize
+    data class Change(
+        override val id: Long,
+        override val sizePreview: SizePreview,
+        val preview: Preview
+    ) : ChangeRecordTypeParams() {
+
+        @Parcelize
+        data class Preview(
+            val name: String,
+            @DrawableRes val iconId: Int,
+            @ColorInt val color: Int
+        ) : Parcelable
+    }
+
+    @Parcelize
+    data class New(
+        override val sizePreview: SizePreview
+    ) : ChangeRecordTypeParams() {
+        override val id: Long get() = 0
+    }
+
+    @Parcelize
+    data class SizePreview(
+        val width: Int? = null,
+        val height: Int? = null,
+        val asRow: Boolean = false
+    ) : Parcelable
+}