add option to ignore new items for widget grid

Razeeman · Razeeman · commit f5dd88b01a19 · 2026-01-31T17:51:47.000+03:00
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt
@@ -3,7 +3,7 @@ package com.example.util.simpletimetracker.data_local.prefs
 import android.content.SharedPreferences
 import com.example.util.simpletimetracker.data_local.base.delegate
 import com.example.util.simpletimetracker.data_local.base.logPrefsDataAccess
-import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
@@ -12,6 +12,8 @@ import java.util.Calendar
 import javax.inject.Inject
 import javax.inject.Singleton
 import androidx.core.content.edit
+import com.example.util.simpletimetracker.domain.widget.model.GridWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.WidgetDataFilterType
 
 @Singleton
 class PrefsRepoImpl @Inject constructor(
@@ -495,10 +497,7 @@ class PrefsRepoImpl @Inject constructor(
         val filteredTypesData = data.typeIds.map(Long::toString).toSet()
         val filteredCategoriesData = data.categoryIds.map(Long::toString).toSet()
         val filteredTagsData = data.tagIds.map(Long::toString).toSet()
-        val filteringType = when (data.filteringType) {
-            StatisticsWidgetData.FilterType.FILTER -> 0
-            StatisticsWidgetData.FilterType.SELECT -> 1
-        }
+        val filteringType = mapWidgetDataFilterType(data.filteringType)
 
         prefs.edit {
             putInt(KEY_STATISTICS_WIDGET_FILTER_TYPE + widgetId, filterTypeData)
@@ -541,11 +540,8 @@ class PrefsRepoImpl @Inject constructor(
         val filteredTags = prefs
             .getStringSet(KEY_STATISTICS_WIDGET_FILTERED_TAGS + widgetId, emptySet())
             ?.mapNotNull { it.toLongOrNull() }.orEmpty().toSet()
-        val filteringType = when (prefs.getInt(KEY_STATISTICS_WIDGET_FILTERING_TYPE + widgetId, 0)) {
-            0 -> StatisticsWidgetData.FilterType.FILTER
-            1 -> StatisticsWidgetData.FilterType.SELECT
-            else -> StatisticsWidgetData.FilterType.FILTER
-        }
+        val filteringType = prefs.getInt(KEY_STATISTICS_WIDGET_FILTERING_TYPE + widgetId, 0)
+            .let(::mapToWidgetDataFilterType)
 
         return StatisticsWidgetData(
             chartFilterType = filterType,
@@ -614,24 +610,38 @@ class PrefsRepoImpl @Inject constructor(
         return prefs.getInt(key, 0)
     }
 
-    override fun setGridWidgetFilteredTypes(widgetId: Int, typeIds: Set<Long>) {
-        val key = KEY_GRID_WIDGET_FILTERED_TYPES + widgetId
-        logPrefsDataAccess("setGridWidgetFilteredTypes $key")
-        prefs.edit { putStringSet(key, typeIds.map(Long::toString).toSet()) }
+    override fun setGridWidgetData(widgetId: Int, data: GridWidgetData) {
+        logPrefsDataAccess("setGridWidgetFilteredTypes $widgetId")
+        val filteredTypesData = data.typeIds.map(Long::toString).toSet()
+        val filteringType = mapWidgetDataFilterType(data.filteringType)
+
+        prefs.edit {
+            putStringSet(KEY_GRID_WIDGET_FILTERED_TYPES + widgetId, filteredTypesData)
+            putInt(KEY_GRID_WIDGET_FILTERING_TYPE + widgetId, filteringType)
+        }
     }
 
-    override fun getGridWidgetFilteredTypes(widgetId: Int): Set<Long> {
-        val key = KEY_GRID_WIDGET_FILTERED_TYPES + widgetId
-        logPrefsDataAccess("getGridWidgetFilteredTypes $key")
-        return prefs.getStringSet(key, emptySet())
+    override fun getGridWidgetData(widgetId: Int): GridWidgetData {
+        logPrefsDataAccess("getGridWidgetFilteredTypes $widgetId")
+
+        val filteredTypes = prefs
+            .getStringSet(KEY_GRID_WIDGET_FILTERED_TYPES + widgetId, emptySet())
             ?.mapNotNull { it.toLongOrNull() }.orEmpty().toSet()
+        val filteringType = prefs.getInt(KEY_GRID_WIDGET_FILTERING_TYPE + widgetId, 0)
+            .let(::mapToWidgetDataFilterType)
+
+        return GridWidgetData(
+            typeIds = filteredTypes,
+            filteringType = filteringType,
+        )
     }
 
     override fun removeGridWidget(widgetId: Int) {
         logPrefsDataAccess("removeGridWidget $widgetId")
         prefs.edit {
             remove(KEY_GRID_WIDGET_PAGE + widgetId)
             remove(KEY_GRID_WIDGET_FILTERED_TYPES + widgetId)
+            remove(KEY_GRID_WIDGET_FILTERING_TYPE + widgetId)
         }
     }
 
@@ -665,6 +675,21 @@ class PrefsRepoImpl @Inject constructor(
         return prefs.contains(key)
     }
 
+    private fun mapWidgetDataFilterType(data: WidgetDataFilterType): Int {
+        return when (data) {
+            WidgetDataFilterType.FILTER -> 0
+            WidgetDataFilterType.SELECT -> 1
+        }
+    }
+
+    private fun mapToWidgetDataFilterType(data: Int): WidgetDataFilterType {
+        return when (data) {
+            0 -> WidgetDataFilterType.FILTER
+            1 -> WidgetDataFilterType.SELECT
+            else -> WidgetDataFilterType.FILTER
+        }
+    }
+
     @Suppress("unused")
     companion object {
         private const val DO_NOT_DISTURB_PERIOD_START: Long = 0 // midnight
@@ -795,6 +820,7 @@ class PrefsRepoImpl @Inject constructor(
         private const val KEY_QUICK_SETTINGS_WIDGET_TYPE = "quick_settings_widget_type_"
         private const val KEY_GRID_WIDGET_PAGE = "grid_widget_page_"
         private const val KEY_GRID_WIDGET_FILTERED_TYPES = "grid_widget_filtered_types_"
+        private const val KEY_GRID_WIDGET_FILTERING_TYPE = "grid_widget_filtering_type_"
 
         // Removed
         private const val KEY_SORT_RECORD_TYPES_BY_COLOR = "sortRecordTypesByColor" // Boolean
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt
@@ -18,7 +18,8 @@ import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.statistics.model.StatisticsStreaksType
-import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.GridWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -834,12 +835,12 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.getGridWidget(widgetId)
     }
 
-    suspend fun setGridWidgetFilteredTypes(widgetId: Int, typeIds: Set<Long>) = withContext(Dispatchers.IO) {
-        prefsRepo.setGridWidgetFilteredTypes(widgetId, typeIds)
+    suspend fun setGridWidgetData(widgetId: Int, data: GridWidgetData) = withContext(Dispatchers.IO) {
+        prefsRepo.setGridWidgetData(widgetId, data)
     }
 
-    suspend fun getGridWidgetFilteredTypes(widgetId: Int): Set<Long> = withContext(Dispatchers.IO) {
-        prefsRepo.getGridWidgetFilteredTypes(widgetId)
+    suspend fun getGridWidgetData(widgetId: Int): GridWidgetData = withContext(Dispatchers.IO) {
+        prefsRepo.getGridWidgetData(widgetId)
     }
 
     suspend fun removeGridWidget(widgetId: Int) = withContext(Dispatchers.IO) {
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt
@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.domain.prefs.repo
 
-import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.GridWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 
 interface PrefsRepo {
@@ -226,9 +227,9 @@ interface PrefsRepo {
 
     fun getGridWidget(widgetId: Int): Int
 
-    fun setGridWidgetFilteredTypes(widgetId: Int, typeIds: Set<Long>)
+    fun setGridWidgetData(widgetId: Int, data: GridWidgetData)
 
-    fun getGridWidgetFilteredTypes(widgetId: Int): Set<Long>
+    fun getGridWidgetData(widgetId: Int): GridWidgetData
 
     fun removeGridWidget(widgetId: Int)
 
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/GridWidgetData.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/GridWidgetData.kt
@@ -0,0 +1,8 @@
+package com.example.util.simpletimetracker.domain.widget.model
+
+// Ids are either filtered or selected,
+// depending on filtering type.
+data class GridWidgetData(
+    val typeIds: Set<Long>,
+    val filteringType: WidgetDataFilterType,
+)
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/StatisticsWidgetData.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/StatisticsWidgetData.kt
@@ -1,4 +1,7 @@
-package com.example.util.simpletimetracker.domain.statistics.model
+package com.example.util.simpletimetracker.domain.widget.model
+
+import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
+import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 
 // Ids are either filtered or selected,
 // depending on filtering type.
@@ -8,11 +11,5 @@ data class StatisticsWidgetData(
     val typeIds: Set<Long>,
     val categoryIds: Set<Long>,
     val tagIds: Set<Long>,
-    val filteringType: FilterType,
-) {
-
-    enum class FilterType {
-        FILTER,
-        SELECT,
-    }
-}
+    val filteringType: WidgetDataFilterType,
+)
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/WidgetDataFilterType.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/WidgetDataFilterType.kt
@@ -0,0 +1,6 @@
+package com.example.util.simpletimetracker.domain.widget.model
+
+enum class WidgetDataFilterType {
+    FILTER,
+    SELECT,
+}
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/WidgetTransparencyPercent.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/widget/model/WidgetTransparencyPercent.kt
@@ -0,0 +1,5 @@
+package com.example.util.simpletimetracker.domain.widget.model
+
+data class WidgetTransparencyPercent(
+    val value: Long,
+)
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.feature_settings.interactor
 
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent
+import com.example.util.simpletimetracker.domain.widget.model.WidgetTransparencyPercent
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_settings.R
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt
@@ -16,7 +16,7 @@ import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType
 import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder
 import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
-import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent
+import com.example.util.simpletimetracker.domain.widget.model.WidgetTransparencyPercent
 import com.example.util.simpletimetracker.feature_settings.R
 import com.example.util.simpletimetracker.feature_settings.model.CustomizeOptionsMenuListItem
 import com.example.util.simpletimetracker.feature_settings.viewData.CardOrderViewData
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt
@@ -4,7 +4,7 @@ import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.extension.flip
 import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
-import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent
+import com.example.util.simpletimetracker.domain.widget.model.WidgetTransparencyPercent
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroStopInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RecordsContainerUpdateInteractor
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/common/WidgetGetActualFilteredIdsInteractor.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/common/WidgetGetActualFilteredIdsInteractor.kt
@@ -0,0 +1,22 @@
+package com.example.util.simpletimetracker.feature_widget.common
+
+import com.example.util.simpletimetracker.domain.widget.model.WidgetDataFilterType
+import javax.inject.Inject
+
+class WidgetGetActualFilteredIdsInteractor @Inject constructor() {
+
+    fun execute(
+        filterType: WidgetDataFilterType,
+        widgetItemIds: Set<Long>,
+        allItemIds: Set<Long>,
+    ): Set<Long> {
+        return when (filterType) {
+            WidgetDataFilterType.FILTER -> {
+                widgetItemIds
+            }
+            WidgetDataFilterType.SELECT -> {
+                allItemIds.filter { it !in widgetItemIds }.toSet()
+            }
+        }
+    }
+}
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/WidgetGridRemoveViewsFactory.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/WidgetGridRemoveViewsFactory.kt
@@ -37,6 +37,7 @@ import com.example.util.simpletimetracker.feature_views.extension.ifNull
 import com.example.util.simpletimetracker.feature_views.extension.measureExactly
 import com.example.util.simpletimetracker.feature_views.extension.setAllMargins
 import com.example.util.simpletimetracker.feature_widget.R
+import com.example.util.simpletimetracker.feature_widget.common.WidgetGetActualFilteredIdsInteractor
 import com.example.util.simpletimetracker.feature_widget.common.WidgetViewsHolder
 import com.example.util.simpletimetracker.feature_widget.grid.WidgetGridProvider.Companion.CONTROLS_NEW_PAGE
 import com.example.util.simpletimetracker.feature_widget.grid.WidgetGridProvider.Companion.ITEM_CLICK_ACTION
@@ -60,6 +61,7 @@ class WidgetGridRemoveViewsFactory @Inject constructor(
     private val filterGoalsByDayOfWeekInteractor: FilterGoalsByDayOfWeekInteractor,
     private val recordTypeGoalInteractor: RecordTypeGoalInteractor,
     private val getCurrentRecordsDurationInteractor: GetCurrentRecordsDurationInteractor,
+    private val widgetGetActualFilteredIdsInteractor: WidgetGetActualFilteredIdsInteractor,
 ) {
 
     private var preparedView: RecordTypeView? = null
@@ -69,9 +71,14 @@ class WidgetGridRemoveViewsFactory @Inject constructor(
         appWidgetManager: AppWidgetManager,
         appWidgetId: Int,
     ): RemoteViews {
-        val filteredTypeIds = prefsInteractor.getGridWidgetFilteredTypes(appWidgetId)
-        val recordTypes = recordTypeInteractor.getAll()
-            .filter { !it.hidden && it.id !in filteredTypeIds }
+        val allTypes = recordTypeInteractor.getAll().filter { !it.hidden }
+        val widgetData = prefsInteractor.getGridWidgetData(appWidgetId)
+        val filteredTypeIds = widgetGetActualFilteredIdsInteractor.execute(
+            filterType = widgetData.filteringType,
+            widgetItemIds = widgetData.typeIds,
+            allItemIds = allTypes.map(RecordType::id).toSet(),
+        )
+        val recordTypes = allTypes.filter { it.id !in filteredTypeIds }
         val runningRecords = runningRecordInteractor.getAll()
         val isDarkTheme = prefsInteractor.getDarkMode()
         val backgroundTransparency = prefsInteractor.getWidgetBackgroundTransparencyPercent()
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/settings/WidgetGridSettingsFragment.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/settings/WidgetGridSettingsFragment.kt
@@ -52,18 +52,26 @@ class WidgetGridSettingsFragment : BaseFragment<Binding>() {
         btnWidgetGridSettingsShowAll.setOnClick(viewModel::onShowAllClick)
         btnWidgetGridSettingsHideAll.setOnClick(viewModel::onHideAllClick)
         btnWidgetGridSettingsSave.setOnClick(throttle(viewModel::onSaveClick))
+        checkboxWidgetGridNewItems.setOnClick(throttle(viewModel::onDoNotIncludeNewItemsClick))
     }
 
     override fun initViewModel() = with(viewModel) {
         extra = WidgetGridSettingsExtra(getWidgetId())
         types.observe(recordTypesAdapter::replace)
+        doNotIncludeNewItems.observe(::setDoNotIncludeItemsState)
         handled.observe(::exit)
     }
 
     private fun getWidgetId(): Int {
         return activity?.intent.getAppWidgetIdOrInvalid()
     }
 
+    private fun setDoNotIncludeItemsState(isChecked: Boolean) = with(binding) {
+        if (checkboxWidgetGridNewItems.isChecked != isChecked) {
+            checkboxWidgetGridNewItems.isChecked = isChecked
+        }
+    }
+
     private fun exit(widgetId: Int) {
         (activity as? WidgetGridSettingsActivity)?.exit(widgetId)
     }
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/settings/WidgetGridSettingsViewModel.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/settings/WidgetGridSettingsViewModel.kt
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/interactor/WidgetStatisticsIdsInteractor.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/interactor/WidgetStatisticsIdsInteractor.kt
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/interactor/WidgetStatisticsViewDataInteractor.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/interactor/WidgetStatisticsViewDataInteractor.kt
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt
diff --git a/features/feature_widget/src/main/res/layout/widget_grid_settings_fragment.xml b/features/feature_widget/src/main/res/layout/widget_grid_settings_fragment.xml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package com.example.util.simpletimetracker.domain.widget.model
++
 +enum class WidgetDataFilterType {
 +    FILTER,
 +    SELECT,
 +}