improve detailed statistics shared transitions

Author: Razeeman

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

@@ -28,8 +28,10 @@ class CategoriesViewModel @Inject constructor(
             screen = Screen.CHANGE_CATEGORY,
             data = ChangeCategoryParams.Change(
                 id = item.id,
-                name = item.name,
-                color = item.color
+                preview = ChangeCategoryParams.Change.Preview(
+                    name = item.name,
+                    color = item.color
+                )
             ),
             sharedElements = sharedElements
         )

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

@@ -54,6 +54,7 @@ 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<ChangeCategoryParams>(ARGS_PARAMS) ?: ChangeCategoryParams.New
@@ -137,12 +138,10 @@ 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 setPreview() = (params as? ChangeCategoryParams.Change)?.preview?.run {
+        with(previewChangeCategory) {
+            itemName = name
+            itemColor = color
         }
     }
 

feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt

@@ -61,7 +61,15 @@ class StatisticsViewModel @Inject constructor(
 
         router.navigate(
             screen = Screen.STATISTICS_DETAIL,
-            data = StatisticsDetailParams(item.id, filterType),
+            data = StatisticsDetailParams(
+                id = item.id,
+                filterType = filterType,
+                preview = StatisticsDetailParams.Preview(
+                    name = item.name,
+                    iconId = (item as? StatisticsViewData.Activity)?.iconId,
+                    color = item.color
+                )
+            ),
             sharedElements = sharedElements
         )
     }

feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/extra/StatisticsDetailExtra.kt

@@ -11,11 +11,8 @@ import com.example.util.simpletimetracker.core.dialog.StandardDialogListener
 import com.example.util.simpletimetracker.core.extension.visible
 import com.example.util.simpletimetracker.core.utils.BuildVersions
 import com.example.util.simpletimetracker.core.view.TransitionNames
-import com.example.util.simpletimetracker.domain.extension.orZero
-import com.example.util.simpletimetracker.domain.model.ChartFilterType
 import com.example.util.simpletimetracker.feature_statistics_detail.R
 import com.example.util.simpletimetracker.feature_statistics_detail.di.StatisticsDetailComponentProvider
-import com.example.util.simpletimetracker.feature_statistics_detail.extra.StatisticsDetailExtra
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailChartViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailViewData
@@ -43,7 +40,9 @@ class StatisticsDetailFragment : BaseFragment(R.layout.statistics_detail_fragmen
     private val viewModel: StatisticsDetailViewModel by viewModels(
         factoryProducer = { viewModelFactory }
     )
-    private val typeId: Long by lazy { arguments?.getLong(ARGS_ID).orZero() }
+    private val params: StatisticsDetailParams by lazy {
+        arguments?.getParcelable(ARGS_PARAMS) ?: StatisticsDetailParams()
+    }
 
     override fun initDi() {
         (activity?.application as StatisticsDetailComponentProvider)
@@ -52,14 +51,16 @@ class StatisticsDetailFragment : BaseFragment(R.layout.statistics_detail_fragmen
     }
 
     override fun initUi() {
+        setPreview()
+
         if (BuildVersions.isLollipopOrHigher()) {
             sharedElementEnterTransition = TransitionInflater.from(context)
                 .inflateTransition(android.R.transition.move)
         }
 
         ViewCompat.setTransitionName(
             layoutStatisticsDetailItem,
-            TransitionNames.STATISTICS_DETAIL + typeId
+            TransitionNames.STATISTICS_DETAIL + params.id
         )
     }
 
@@ -70,8 +71,7 @@ class StatisticsDetailFragment : BaseFragment(R.layout.statistics_detail_fragmen
     }
 
     override fun initViewModel(): Unit = with(viewModel) {
-        val filterType = arguments?.getSerializable(ARGS_FILTER_TYPE) as? ChartFilterType
-        extra = StatisticsDetailExtra(typeId, filterType ?: ChartFilterType.ACTIVITY)
+        extra = params
         previewViewData.observe(viewLifecycleOwner, ::setPreviewViewData)
         viewData.observe(viewLifecycleOwner, ::setViewData)
         chartViewData.observe(viewLifecycleOwner, ::updateChartViewData)
@@ -85,6 +85,14 @@ class StatisticsDetailFragment : BaseFragment(R.layout.statistics_detail_fragmen
         viewModel.onVisible()
     }
 
+    private fun setPreview() = params.preview?.run {
+        StatisticsDetailPreviewViewData(
+            name = name,
+            iconId = iconId,
+            color = color
+        ).let(::setPreviewViewData)
+    }
+
     private fun setPreviewViewData(viewData: StatisticsDetailPreviewViewData) {
         tvStatisticsDetailItemName.text = viewData.name
         layoutStatisticsDetailItem.setCardBackgroundColor(viewData.color)
@@ -117,15 +125,11 @@ class StatisticsDetailFragment : BaseFragment(R.layout.statistics_detail_fragmen
     }
 
     companion object {
-        private const val ARGS_ID = "args_id"
-        private const val ARGS_FILTER_TYPE = "args_filter_type"
+        private const val ARGS_PARAMS = "args_params"
 
         fun createBundle(data: Any?): Bundle = Bundle().apply {
             when (data) {
-                is StatisticsDetailParams -> {
-                    putLong(ARGS_ID, data.id)
-                    putSerializable(ARGS_FILTER_TYPE, data.filterType)
-                }
+                is StatisticsDetailParams -> putParcelable(ARGS_PARAMS, data)
             }
         }
     }

feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt

@@ -8,7 +8,6 @@ import com.example.util.simpletimetracker.core.adapter.ViewHolderType
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeCategoryInteractor
 import com.example.util.simpletimetracker.domain.model.ChartFilterType
-import com.example.util.simpletimetracker.feature_statistics_detail.extra.StatisticsDetailExtra
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailViewDataInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailViewDataMapper
 import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartGrouping
@@ -21,6 +20,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.viewData.Sta
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.Screen
 import com.example.util.simpletimetracker.navigation.params.RecordsAllParams
+import com.example.util.simpletimetracker.navigation.params.StatisticsDetailParams
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -31,7 +31,7 @@ class StatisticsDetailViewModel @Inject constructor(
     private val mapper: StatisticsDetailViewDataMapper
 ) : ViewModel() {
 
-    lateinit var extra: StatisticsDetailExtra
+    lateinit var extra: StatisticsDetailParams
 
     val viewData: LiveData<StatisticsDetailViewData> by lazy {
         return@lazy MutableLiveData(loadInitialViewData())

feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt

@@ -10,9 +10,15 @@ sealed class ChangeCategoryParams : Parcelable {
     @Parcelize
     data class Change(
         override val id: Long,
-        val name: String,
-        @ColorInt val color: Int
-    ) : ChangeCategoryParams()
+        val preview: Preview? = null
+    ) : ChangeCategoryParams() {
+
+        @Parcelize
+        data class Preview(
+            val name: String,
+            @ColorInt val color: Int
+        ) : Parcelable
+    }
 
     @Parcelize
     object New : ChangeCategoryParams() {

navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/ChangeCategoryParams.kt

@@ -1,8 +1,22 @@
 package com.example.util.simpletimetracker.navigation.params
 
+import android.os.Parcelable
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
 import com.example.util.simpletimetracker.domain.model.ChartFilterType
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 data class StatisticsDetailParams(
-    val id: Long,
-    val filterType: ChartFilterType
-)
+    val id: Long = 0,
+    val filterType: ChartFilterType = ChartFilterType.ACTIVITY,
+    val preview: Preview? = null
+) : Parcelable {
+
+    @Parcelize
+    data class Preview(
+        val name: String,
+        @DrawableRes val iconId: Int? = null,
+        @ColorInt val color: Int
+    ) : Parcelable
+}