v.4.11.1. #139 "Maximum number of events" option added to "Event filters" section

Author: yvolk

CHANGELOG.md

@@ -2,14 +2,16 @@
 
 <a id="v4.11"/>
 
-### 2025-01-08 v4.11.0 Start hour of a day option
+### 2025-01-11 v4.11.1 Start hour of a day option
 * "Start hour of a day" option added to "Other settings" section.
 
   Changing its value from default 0 to e.g. 4 causes all events that start before 4 AM to be shown
   under previous day's header. This may be convenient for people who stay up after midnight
   or wake up early.
   Valid values are from -12 to 12.
   [#140](https://github.com/andstatus/todoagenda/issues/140)
+* "Maximum number of events" option added to "Event filters" section.
+  [#139](https://github.com/andstatus/todoagenda/issues/139)
 
 <a id="v4.10"/>
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 709
-        versionName '4.11.0'
+        versionCode 710
+        versionName '4.11.1'
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 

app/src/main/kotlin/org/andstatus/todoagenda/RemoteViewsFactory.kt

@@ -150,22 +150,30 @@ class RemoteViewsFactory(val context: Context, private val widgetId: Int, create
                 if (settings.logEvents) {
                     Log.i("visualizer_query", "${visualizer}")
                     it.forEachIndexed { index, entry ->
-                        Log.i("visualizer_query", "${index+1}. $entry")
+                        Log.i("visualizer_query", "${index + 1}. $entry")
                     }
                 }
             }
         }
         if (settings.logEvents) {
             eventEntries.forEachIndexed { index, entry ->
-                Log.i("queryWidgetEntries", "${index+1}. $entry")
+                Log.i("queryWidgetEntries", "${index + 1}. $entry")
             }
         }
         eventEntries.sort()
         val noHidden: List<WidgetEntry<*>> = eventEntries.filter { it.notHidden() }
         val deduplicated = if (settings.hideDuplicates) filterOutDuplicates(noHidden) else noHidden
-        val widgetEntries: List<WidgetEntry<*>> =
-            if (settings.showDayHeaders) addDayHeaders(deduplicated) else deduplicated
-        val withLast = LastEntry.addLast(settings, widgetEntries)
+        val limited = if (settings.maxNumberOfEvents > 0) {
+            deduplicated.take(settings.maxNumberOfEvents)
+        } else {
+            deduplicated
+        }
+        val withDayHeaders = if (settings.showDayHeaders) addDayHeaders(limited) else limited
+        val withLast = if (settings.maxNumberOfEvents > 0 && limited.size == settings.maxNumberOfEvents) {
+            withDayHeaders
+        } else {
+            LastEntry.addLast(settings, withDayHeaders)
+        }
         return withLast
     }
 

app/src/main/kotlin/org/andstatus/todoagenda/prefs/ApplicationPreferences.kt

@@ -3,6 +3,7 @@ package org.andstatus.todoagenda.prefs
 import android.content.Context
 import android.text.TextUtils
 import androidx.preference.PreferenceManager
+import org.andstatus.todoagenda.prefs.InstanceSettings.Companion.PREF_MAX_NUMBER_OF_EVENTS
 import org.andstatus.todoagenda.prefs.InstanceSettings.Companion.PREF_TEXT_SHADOW
 import org.andstatus.todoagenda.prefs.InstanceSettings.Companion.PREF_TEXT_SHADOW_DEFAULT
 import org.andstatus.todoagenda.prefs.colors.BackgroundColorPref
@@ -85,6 +86,11 @@ object ApplicationPreferences {
                     .showOnlyClosestInstanceOfRecurringEvent
             )
             setHideDuplicates(context, settings.hideDuplicates)
+            setString(
+                context,
+                PREF_MAX_NUMBER_OF_EVENTS,
+                settings.maxNumberOfEvents.limitToString()
+            )
             setAllDayEventsPlacement(context, settings.allDayEventsPlacement)
             setString(context, InstanceSettings.PREF_TASK_SCHEDULING, settings.taskScheduling.value)
             setString(context, InstanceSettings.PREF_TASK_WITHOUT_DATES, settings.taskWithoutDates.value)
@@ -443,6 +449,11 @@ object ApplicationPreferences {
         return getBoolean(context, InstanceSettings.PREF_HIDE_DUPLICATES, false)
     }
 
+    fun getMaxNumberOfEvents(context: Context): Int = getIntStoredAsString(
+        context, PREF_MAX_NUMBER_OF_EVENTS,
+        InstanceSettings.EMPTY.maxNumberOfEvents
+    )
+
     fun setHideDuplicates(context: Context?, value: Boolean) {
         setBoolean(context, InstanceSettings.PREF_HIDE_DUPLICATES, value)
     }
@@ -555,4 +566,6 @@ object ApplicationPreferences {
             0
         }
     }
+
+    fun Int.limitToString(): String = if (this < 1) "" else toString()
 }

app/src/main/kotlin/org/andstatus/todoagenda/prefs/EventFiltersPreferencesFragment.kt

@@ -8,6 +8,7 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import org.andstatus.todoagenda.R
+import org.andstatus.todoagenda.prefs.ApplicationPreferences.limitToString
 
 class EventFiltersPreferencesFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -25,6 +26,7 @@ class EventFiltersPreferencesFragment : PreferenceFragmentCompat(), OnSharedPref
         showEvenRange()
         showHideBasedOnKeywords()
         showShowBasedOnKeywords()
+        showMaximumNumberOfEvents()
         showAllDayEventsPlacement()
         showTaskScheduling()
         showTasksWithoutDates()
@@ -63,6 +65,12 @@ class EventFiltersPreferencesFragment : PreferenceFragmentCompat(), OnSharedPref
         }
     }
 
+    private fun showMaximumNumberOfEvents() =
+        findPreference<Preference>(InstanceSettings.PREF_MAX_NUMBER_OF_EVENTS)?.setSummary(
+            ApplicationPreferences.getMaxNumberOfEvents(requireActivity()).limitToString()
+        )
+
+
     private fun showAllDayEventsPlacement() {
         val preference = findPreference<Preference>(InstanceSettings.PREF_ALL_DAY_EVENTS_PLACEMENT)
         preference?.setSummary(ApplicationPreferences.getAllDayEventsPlacement(requireActivity()).valueResId)

app/src/main/kotlin/org/andstatus/todoagenda/prefs/InstanceSettings.kt

@@ -87,6 +87,7 @@ data class InstanceSettings(
     val showBasedOnKeywords: String? = "",
     val showOnlyClosestInstanceOfRecurringEvent: Boolean = false,
     val hideDuplicates: Boolean = false,
+    val maxNumberOfEventsIn: Int = -1,
     val allDayEventsPlacement: AllDayEventsPlacement = AllDayEventsPlacement.defaultValue,
     val taskScheduling: TaskScheduling = TaskScheduling.defaultValue,
     val taskWithoutDates: TasksWithoutDates = TasksWithoutDates.defaultValue,
@@ -130,6 +131,7 @@ data class InstanceSettings(
     } else {
         defaultTimeZone
     }
+    val maxNumberOfEvents: Int = if (maxNumberOfEventsIn < 1) -1 else maxNumberOfEventsIn
     val filterMode: FilterMode = if (filterModeIn == FilterMode.NORMAL_FILTER &&
         snapshotMode.isSnapshotMode
     ) FilterMode.DEBUG_FILTER else filterModeIn
@@ -219,6 +221,7 @@ data class InstanceSettings(
         put(PREF_SHOW_BASED_ON_KEYWORDS, showBasedOnKeywords)
         put(PREF_SHOW_ONLY_CLOSEST_INSTANCE_OF_RECURRING_EVENT, showOnlyClosestInstanceOfRecurringEvent)
         put(PREF_HIDE_DUPLICATES, hideDuplicates)
+        put(PREF_MAX_NUMBER_OF_EVENTS, maxNumberOfEvents)
         put(PREF_ALL_DAY_EVENTS_PLACEMENT, allDayEventsPlacement.value)
         put(PREF_TASK_SCHEDULING, taskScheduling.value)
         put(PREF_TASK_WITHOUT_DATES, taskWithoutDates.value)
@@ -410,6 +413,7 @@ data class InstanceSettings(
         const val PREF_HIDE_BASED_ON_KEYWORDS = "hideBasedOnKeywords"
         const val PREF_SHOW_BASED_ON_KEYWORDS = "showBasedOnKeywords"
         const val PREF_SHOW_ONLY_CLOSEST_INSTANCE_OF_RECURRING_EVENT = "showOnlyClosestInstanceOfRecurringEvent"
+        const val PREF_MAX_NUMBER_OF_EVENTS = "maxNumberOfEvents"
         const val PREF_HIDE_DUPLICATES = "hideDuplicates"
         const val PREF_ALL_DAY_EVENTS_PLACEMENT = "allDayEventsPlacement"
         const val PREF_TASK_SCHEDULING = "taskScheduling"
@@ -595,6 +599,9 @@ data class InstanceSettings(
                 hideDuplicates = if (json.has(PREF_HIDE_DUPLICATES)) {
                     json.getBoolean(PREF_HIDE_DUPLICATES)
                 } else EMPTY.hideDuplicates,
+                maxNumberOfEventsIn = if (json.has(PREF_MAX_NUMBER_OF_EVENTS)) {
+                    json.getInt(PREF_MAX_NUMBER_OF_EVENTS)
+                } else EMPTY.maxNumberOfEvents,
                 allDayEventsPlacement = if (json.has(PREF_ALL_DAY_EVENTS_PLACEMENT)) {
                     AllDayEventsPlacement.fromValue(
                         json.getString(
@@ -731,6 +738,7 @@ data class InstanceSettings(
                         context
                     ),
                     hideDuplicates = ApplicationPreferences.getHideDuplicates(context),
+                    maxNumberOfEventsIn = ApplicationPreferences.getMaxNumberOfEvents(context),
                     allDayEventsPlacement = ApplicationPreferences.getAllDayEventsPlacement(context),
                     taskScheduling = ApplicationPreferences.getTaskScheduling(context),
                     taskWithoutDates = ApplicationPreferences.getTasksWithoutDates(context),

app/src/main/play/release-notes/en-US/default.txt

@@ -1 +1,2 @@
-v4.11.0. "Start hour of a day" option added.
+v4.11.1. "Maximum number of events" option added to "Event filters" section.
+  "Start hour of a day" option added to "Other settings" section.

app/src/main/play/release-notes/ru-RU/default.txt

@@ -1 +1,2 @@
-v4.11.0. Добавлена опция "Час начала дня".
+v4.11.1. Добавлена опция "Максимальное количество событий" в секцию "Фильтры событий".
+  Добавлена опция "Час начала дня" в секцию "Другие настройки".

app/src/main/res/values-ru/strings.xml

@@ -183,6 +183,7 @@
     <string name="pref_show_based_on_keywords_title">Показать только при начичии ключевых слов в названии</string>
     <string name="show_only_closest_instance_of_recurring_event">Показать только ближайший экземпляр повторяющегося события</string>
     <string name="hide_duplicates">Убрать дубликаты</string>
+    <string name="max_number_of_events_title">Максимальное количество событий</string>
     <string name="all_day_events_placement_title">Размещение событий \"Весь день\" (у которых нех времени)</string>
     <string name="all_day_events_placement_top_of_the_days_events">В верхней части дня события</string>
     <string name="all_day_events_placement_bottom_of_the_days_events">В нижней части дня события</string>

app/src/main/res/values/strings.xml

@@ -219,6 +219,7 @@
     <string name="pref_show_based_on_keywords_title">Show based on keywords in a title</string>
     <string name="show_only_closest_instance_of_recurring_event">Show only the closest instance of a recurring event</string>
     <string name="hide_duplicates">Hide duplicates</string>
+    <string name="max_number_of_events_title">Maximum number of events</string>
     <string name="all_day_events_placement_title">All day events placement</string>
     <string name="all_day_events_placement_top_of_the_days_events">At the top of the day\'s events</string>
     <string name="all_day_events_placement_bottom_of_the_days_events">At the bottom of the day\'s events</string>