change stat detail preview

Author: Razeeman

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailContentInteractor.kt

@@ -52,9 +52,7 @@ class StatisticsDetailContentInteractor @Inject constructor(
         val result = mutableListOf<ViewHolderType>()
 
         fun getPreviewColor(): Int {
-            return previewViewData
-                ?.data?.color
-                ?: Color.BLACK
+            return previewViewData?.previewColor ?: Color.BLACK
         }
 
         fun getPreviewColorComparison(): Int {

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt

@@ -73,7 +73,7 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
                     statisticsDetailViewDataMapper.mapToPreview(
                         recordType = type,
                         isDarkTheme = isDarkTheme,
-                        showName = !total && index == 0,
+                        showName = !isForComparison && selectedIds.size == 1,
                         isForComparison = isForComparison,
                     )
                 }

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

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_statistics_detail.view
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.example.util.simpletimetracker.core.base.BaseFragment
@@ -12,6 +13,7 @@ import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
 import com.example.util.simpletimetracker.core.dialog.DurationDialogListener
 import com.example.util.simpletimetracker.core.dialog.OptionsListDialogListener
 import com.example.util.simpletimetracker.core.dialog.RecordsFilterListener
+import com.example.util.simpletimetracker.core.extension.addOnBackPressedListener
 import com.example.util.simpletimetracker.core.extension.onItemSwiped
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.toViewData
@@ -137,6 +139,11 @@ class StatisticsDetailFragment :
     }
 
     override fun initUx() = with(binding) {
+        addOnBackPressedListener {
+            // Force show preview otherwise shared transition would brake.
+            viewStatisticsDetailItem.isVisible = true
+            viewModel.onBackPressed()
+        }
         DateSelectorViewDelegate.initUx(
             fragment = this@StatisticsDetailFragment,
             binding = binding.containerDatesSelector,
@@ -207,20 +214,28 @@ class StatisticsDetailFragment :
         )
 
         StatisticsDetailPreviewCompositeViewData(
-            data = preview,
+            previewColor = preview.color,
+            mainPreview = preview,
             additionalData = emptyList(),
             comparisonData = emptyList(),
         ).let(::setPreviewViewData)
     }
 
     private fun setPreviewViewData(viewData: StatisticsDetailPreviewCompositeViewData?) = with(binding) {
-        val first = viewData?.data ?: return@with
+        val preview = viewData?.mainPreview
+
+        if (preview == null) {
+            viewStatisticsDetailItem.isVisible = false
+            return@with
+        } else {
+            viewStatisticsDetailItem.isVisible = true
+        }
 
-        viewStatisticsDetailItem.itemName = first.name
-        viewStatisticsDetailItem.itemColor = first.color
-        if (first.iconId != null) {
+        viewStatisticsDetailItem.itemName = preview.name
+        viewStatisticsDetailItem.itemColor = preview.color
+        if (preview.iconId != null) {
             viewStatisticsDetailItem.itemIconVisible = true
-            viewStatisticsDetailItem.itemIcon = first.iconId
+            viewStatisticsDetailItem.itemIcon = preview.iconId
         } else {
             viewStatisticsDetailItem.itemIconVisible = false
         }

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewCompositeViewData.kt

@@ -3,7 +3,8 @@ package com.example.util.simpletimetracker.feature_statistics_detail.viewData
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 
 data class StatisticsDetailPreviewCompositeViewData(
-    val data: StatisticsDetailPreviewViewData?,
+    val previewColor: Int?,
+    val mainPreview: StatisticsDetailPreviewViewData?,
     val additionalData: List<ViewHolderType>,
     val comparisonData: List<ViewHolderType>,
 )

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

@@ -279,6 +279,10 @@ class StatisticsDetailViewModel @Inject constructor(
         streaksDelegate.onStreaksCalendarClick(viewData, coordinates)
     }
 
+    fun onBackPressed() {
+        router.back()
+    }
+
     private fun onRecordsClick() {
         val finalFilters = filterDelegate.provideFilter()
             .plus(rangeDelegate.getDateFilter())

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt

@@ -4,16 +4,13 @@ import androidx.lifecycle.LiveData
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.lazySuspend
 import com.example.util.simpletimetracker.core.extension.set
-import com.example.util.simpletimetracker.core.extension.toModel
-import com.example.util.simpletimetracker.domain.extension.orFalse
-import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailPreviewInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailTotalRecordsSelectedInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreview
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewMoreViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
-import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParam
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -65,9 +62,28 @@ class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
             isExpanded = previewsComparisonExpanded,
             isForComparison = true,
         )
+        val showMainPreview = total || data.size == 1
+
+        val mainPreview: StatisticsDetailPreviewViewData?
+        val additionalData: List<ViewHolderType>
+        if (showMainPreview) {
+            mainPreview = data.firstOrNull() as? StatisticsDetailPreviewViewData
+            additionalData = data.drop(1)
+        } else {
+            mainPreview = null
+            additionalData = data
+        }
+
+        val previewColor = mainPreview?.color
+            ?: additionalData
+                .filterIsInstance<StatisticsDetailPreviewViewData>()
+                .firstOrNull()
+                ?.color
+
         return StatisticsDetailPreviewCompositeViewData(
-            data = data.firstOrNull() as? StatisticsDetailPreviewViewData,
-            additionalData = data.drop(1),
+            previewColor = previewColor,
+            mainPreview = mainPreview,
+            additionalData = additionalData,
             comparisonData = comparisonData,
         )
     }