limit number of previews in statistics detail

Razeeman · Razeeman · commit f30159c36ba2 · 2025-05-31T08:12:37.000+03:00
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsAutomatedTrackingMapper.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsAutomatedTrackingMapper.kt
@@ -35,7 +35,6 @@ import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TIME_ENDED
 import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TIME_STARTED
 import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TYPE_ICON
 import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TYPE_NOTE
-import com.example.util.simpletimetracker.domain.color.model.AppColor
 import com.example.util.simpletimetracker.domain.extension.indexesOf
 import com.example.util.simpletimetracker.domain.notifications.model.ExternalActionCommentMode
 import com.example.util.simpletimetracker.domain.notifications.model.ExternalActionFindRecordMode
@@ -229,7 +228,7 @@ class SettingsAutomatedTrackingMapper @Inject constructor(
                     extra = EXTRA_GOAL_VALUE,
                     description = resourceRepo.getString(R.string.settings_automated_tracking_goal_value),
                     values = emptyList(),
-                )
+                ),
             ),
         )
 
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailPreviewMoreAdapterDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailPreviewMoreAdapterDelegate.kt
@@ -0,0 +1,20 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.adapter
+
+import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreview
+import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
+import com.example.util.simpletimetracker.feature_statistics_detail.databinding.StatisticsDetailPreviewMoreItemBinding as Binding
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewMoreViewData as ViewData
+
+fun createStatisticsPreviewMoreAdapterDelegate(
+    onClick: (StatisticsDetailPreview) -> Unit,
+) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
+    Binding::inflate,
+) { binding, item, _ ->
+
+    with(binding) {
+        item as ViewData
+
+        root.setOnClickWith(item, onClick)
+    }
+}
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailPreviewsAdapterDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailPreviewsAdapterDelegate.kt
@@ -2,17 +2,21 @@ package com.example.util.simpletimetracker.feature_statistics_detail.adapter
 
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreview
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.StatisticsDetailPreviewsViewData as ViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.databinding.StatisticsDetailPreviewsItemBinding as Binding
 
-fun createStatisticsDetailPreviewsAdapterDelegate() = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
+fun createStatisticsDetailPreviewsAdapterDelegate(
+    onClick: (StatisticsDetailPreview) -> Unit,
+) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
 ) { binding, item, _ ->
 
     with(binding) {
         item as ViewData
 
         root.adapter.replaceAsNew(item.data)
+        root.setClickListener(onClick)
     }
 }
 
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/StatisticsDetailPreviewsView.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/StatisticsDetailPreviewsView.kt
@@ -7,7 +7,9 @@ import android.widget.FrameLayout
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsPreviewAdapterDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsPreviewCompareAdapterDelegate
+import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsPreviewMoreAdapterDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.databinding.StatisticsDetailPreviewsViewLayoutBinding
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreview
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
 import com.example.util.simpletimetracker.feature_views.extension.layoutInflater
 import com.google.android.flexbox.FlexDirection
@@ -28,17 +30,23 @@ class StatisticsDetailPreviewsView @JvmOverloads constructor(
     val adapter: BaseRecyclerAdapter by lazy {
         BaseRecyclerAdapter(
             createStatisticsPreviewCompareAdapterDelegate(),
+            createStatisticsPreviewMoreAdapterDelegate(::onItemClick),
             createStatisticsPreviewAdapterDelegate(),
         )
     }
 
     private val binding = StatisticsDetailPreviewsViewLayoutBinding.inflate(layoutInflater, this)
+    private var clickListener: (StatisticsDetailPreview) -> Unit = {}
 
     init {
         initRecycler()
         initEditMode()
     }
 
+    fun setClickListener(listener: (StatisticsDetailPreview) -> Unit) {
+        clickListener = listener
+    }
+
     private fun initRecycler() {
         binding.rvStatisticsDetailPreviewsContainer.apply {
             layoutManager = FlexboxLayoutManager(context).apply {
@@ -50,6 +58,10 @@ class StatisticsDetailPreviewsView @JvmOverloads constructor(
         }
     }
 
+    private fun onItemClick(item: StatisticsDetailPreview) {
+        clickListener(item)
+    }
+
     private fun initEditMode() {
         if (isInEditMode) {
             List(3) {
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt
@@ -20,6 +20,8 @@ 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.mapper.StatisticsDetailViewDataMapper
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompareViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewMoreViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -48,6 +50,7 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
 
     suspend fun getPreviewData(
         filterParams: List<RecordsFilter>,
+        isExpanded: Boolean,
         isForComparison: Boolean,
     ): List<ViewHolderType> = withContext(Dispatchers.Default) {
         val isDarkTheme = prefsInteractor.getDarkMode()
@@ -136,6 +139,17 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
                 val selectedIds = records.map { it.typeIds }.flatten().distinct()
                 mapActivities(selectedIds)
             }
+        }.let {
+            if (it.size > MAX_PREVIEWS_COUNT && !isExpanded) {
+                val type = if (isForComparison) {
+                    StatisticsDetailPreviewViewData.Type.COMPARISON
+                } else {
+                    StatisticsDetailPreviewViewData.Type.FILTER
+                }
+                it.take(MAX_PREVIEWS_COUNT) + StatisticsDetailPreviewMoreViewData(type)
+            } else {
+                it
+            }
         }
 
         return@withContext if (isForComparison) {
@@ -179,4 +193,8 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
         object SelectedTags : PreviewType
         object ActivitiesFromRecords : PreviewType
     }
+
+    companion object {
+        private const val MAX_PREVIEWS_COUNT = 5
+    }
 }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt
@@ -62,7 +62,9 @@ class StatisticsDetailFragment :
 
     private val contentAdapter: BaseRecyclerAdapter by lazy {
         BaseRecyclerAdapter(
-            createStatisticsDetailPreviewsAdapterDelegate(),
+            createStatisticsDetailPreviewsAdapterDelegate(
+                onClick = viewModel::onPreviewItemClick,
+            ),
             createStatisticsDetailBarChartAdapterDelegate(),
             createStatisticsDetailPieChartAdapterDelegate(),
             createStatisticsDetailDayCalendarAdapterDelegate(),
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreview.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreview.kt
@@ -0,0 +1,3 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.viewData
+
+interface StatisticsDetailPreview
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewCompareViewData.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewCompareViewData.kt
@@ -2,7 +2,7 @@ package com.example.util.simpletimetracker.feature_statistics_detail.viewData
 
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 
-object StatisticsDetailPreviewCompareViewData : ViewHolderType {
+object StatisticsDetailPreviewCompareViewData : ViewHolderType, StatisticsDetailPreview {
 
     // Only one item in recycler
     override fun getUniqueId(): Long = 1L
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewMoreViewData.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewMoreViewData.kt
@@ -0,0 +1,13 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.viewData
+
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+
+data class StatisticsDetailPreviewMoreViewData(
+    val type: StatisticsDetailPreviewViewData.Type,
+) : ViewHolderType, StatisticsDetailPreview {
+
+    override fun getUniqueId(): Long = type.hashCode().toLong()
+
+    override fun isValidType(other: ViewHolderType): Boolean =
+        other is StatisticsDetailPreviewMoreViewData
+}
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewViewData.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailPreviewViewData.kt
@@ -10,7 +10,7 @@ data class StatisticsDetailPreviewViewData(
     val name: String,
     val iconId: RecordTypeIcon? = null,
     @ColorInt val color: Int,
-) : ViewHolderType {
+) : ViewHolderType, StatisticsDetailPreview {
 
     override fun getUniqueId(): Long = id
 
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt
@@ -26,6 +26,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.viewData.Sta
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailClickableLongest
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailClickableShortest
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailClickableTracked
+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.viewModel.delegate.StatisticsDetailChartViewModelDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailDailyCalendarViewModelDelegate
@@ -180,6 +181,10 @@ class StatisticsDetailViewModel @Inject constructor(
         }
     }
 
+    fun onPreviewItemClick(item: StatisticsDetailPreview) {
+        previewDelegate.onPreviewItemClick(item)
+    }
+
     fun onPreviousClick() {
         rangeDelegate.onPreviousClick()
     }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt
@@ -5,7 +5,9 @@ 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.feature_statistics_detail.interactor.StatisticsDetailPreviewInteractor
+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 kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -19,6 +21,8 @@ class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
     }
 
     private var parent: StatisticsDetailViewModelDelegate.Parent? = null
+    private var previewsExpanded: Boolean = false
+    private var previewsComparisonExpanded: Boolean = false
 
     override fun attach(parent: StatisticsDetailViewModelDelegate.Parent) {
         this.parent = parent
@@ -29,15 +33,26 @@ class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
         parent?.updateContent()
     }
 
+    fun onPreviewItemClick(item: StatisticsDetailPreview) {
+        if (item !is StatisticsDetailPreviewMoreViewData) return
+        when (item.type) {
+            StatisticsDetailPreviewViewData.Type.FILTER -> previewsExpanded = true
+            StatisticsDetailPreviewViewData.Type.COMPARISON -> previewsComparisonExpanded = true
+        }
+        updateViewData()
+    }
+
     private suspend fun loadViewData(): StatisticsDetailPreviewCompositeViewData? {
         val parent = parent ?: return null
 
         val data = previewInteractor.getPreviewData(
             filterParams = parent.filter,
+            isExpanded = previewsExpanded,
             isForComparison = false,
         )
         val comparisonData = previewInteractor.getPreviewData(
             filterParams = parent.comparisonFilter,
+            isExpanded = previewsComparisonExpanded,
             isForComparison = true,
         )
         return StatisticsDetailPreviewCompositeViewData(
diff --git a/features/feature_statistics_detail/src/main/res/layout/statistics_detail_preview_more_item.xml b/features/feature_statistics_detail/src/main/res/layout/statistics_detail_preview_more_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?appBackgroundColor"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="8dp">
+
+        <com.example.util.simpletimetracker.feature_views.IconView
+            android:layout_width="16dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="8dp"
+            app:itemIcon="@drawable/more"
+            app:itemIconColor="?appInactiveColor"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="h,1:1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.example.util.simpletimetracker.feature_statistics_detail.viewData`
	`2`	`+`
	`3`	`+interface StatisticsDetailPreview`