Merge remote-tracking branch 'mrkuz/feature/hide-empty-days-in-agenda…

…' into agenda-hide-empty
orgzly-revived · Oct 19, 2023 · 6ed65d1 · 6ed65d1
2 parents a1f98f8 + 94f4b33
commit 6ed65d1
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 5 deletions.
diff --git a/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java b/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java
@@ -813,6 +813,16 @@ public static boolean keepScreenOnMenuItem(Context context) {
                 context.getResources().getBoolean(R.bool.pref_default_keep_screen_on_menu_item));
     }
 
+    /*
+     * Hide empty days in agenda
+     */
+
+    public static boolean hideEmptyDaysInAgenda(Context context) {
+        return getDefaultSharedPreferences(context).getBoolean(
+                context.getResources().getString(R.string.pref_key_hide_empty_days_in_agenda),
+                context.getResources().getBoolean(R.bool.pref_default_hide_empty_days_in_agenda));
+    }
+
     /*
      * Widget
      */

diff --git a/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaFragment.kt b/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaFragment.kt
@@ -229,7 +229,8 @@ class AgendaFragment : QueryFragment(), OnViewHolderClickListener<AgendaItem> {
         viewModel.data.observe(viewLifecycleOwner, Observer { notes ->
             if (BuildConfig.LOG_DEBUG) LogUtils.d(TAG, "Observed notes: ${notes.size}")
 
-            val items = AgendaItems.getList(notes, currentQuery, item2databaseIds)
+            val hideEmptyDaysInAgenda = AppPreferences.hideEmptyDaysInAgenda(context)
+            val items = AgendaItems(hideEmptyDaysInAgenda).getList(notes, currentQuery, item2databaseIds)
 
             if (BuildConfig.LOG_DEBUG)
                 LogUtils.d(TAG, "Replacing data with ${items.size} agenda items")

diff --git a/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaItems.kt b/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaItems.kt
@@ -9,7 +9,7 @@ import com.orgzly.org.datetime.OrgInterval
 import com.orgzly.org.datetime.OrgRange
 import org.joda.time.DateTime
 
-object AgendaItems {
+class AgendaItems(private val hideEmptyDaysInAgenda : Boolean) {
     data class ExpandableOrgRange(
             val range: OrgRange,
             val canBeOverdueToday: Boolean,
@@ -136,8 +136,9 @@ object AgendaItems {
 
         // Add daily
         dailyNotes.forEach { d ->
-            // Always add day heading
-            result.add(AgendaItem.Day(agendaItemId++, DateTime(d.key)))
+            if (d.value.isNotEmpty() || !hideEmptyDaysInAgenda) {
+                result.add(AgendaItem.Day(agendaItemId++, DateTime(d.key)))
+            }
 
             if (d.value.isNotEmpty()) {
                 result.addAll(d.value)

diff --git a/app/src/main/java/com/orgzly/android/widgets/ListWidgetService.kt b/app/src/main/java/com/orgzly/android/widgets/ListWidgetService.kt
@@ -90,7 +90,8 @@ class ListWidgetService : RemoteViewsService() {
 
             if (query.isAgenda()) {
                 val idMap = mutableMapOf<Long, Long>()
-                val agendaItems = AgendaItems.getList(notes, query, idMap)
+                val hideEmptyDaysInAgenda = AppPreferences.hideEmptyDaysInAgenda(context)
+                val agendaItems = AgendaItems(hideEmptyDaysInAgenda).getList(notes, query, idMap)
 
                 dataList = agendaItems.map {
                     when (it) {

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -387,6 +387,7 @@
     <string name="no_states_defined">Keine Status definiert</string>
     <string name="book_name_in_search">Notizbuchname in den Suchergebnissen</string>
     <string name="display_notebook_name">Notizbuchname anzeigen</string>
+    <string name="hide_empty_days_in_agenda">Tage ohne Notizen in Agenda ausblenden</string>
     <string name="display_inherited_tags_in_search_results">Geerbte Schlagwörter in Suchergebnissen</string>
     <string name="display_inherited_tags_in_search_results_summary">Geerbte Schlagwörter in Suchergebnissen anzeigen</string>
     <string name="ongoing_notification">Aktuell</string>

diff --git a/app/src/main/res/values/prefs_keys.xml b/app/src/main/res/values/prefs_keys.xml
@@ -331,6 +331,9 @@
     <string name="pref_key_keep_screen_on_menu_item" translatable="false">pref_key_keep_screen_on_menu_item</string>
     <bool name="pref_default_keep_screen_on_menu_item" translatable="false">false</bool>
 
+    <string name="pref_key_hide_empty_days_in_agenda" translatable="false">pref_key_hide_empty_days_in_agenda</string>
+    <bool name="pref_default_hide_empty_days_in_agenda" translatable="false">false</bool>
+
     <string name="pref_key_selected_note_metadata" translatable="false">pref_key_selected_note_metadata</string>
     <string-array name="note_metadata">
         <item>@string/tags</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -458,6 +458,7 @@
     <string name="book_name_in_search">Notebook name in search results</string>
 
     <string name="display_notebook_name">Display notebook name</string>
+    <string name="hide_empty_days_in_agenda">Hide empty days in agenda</string>
 
     <string name="display_inherited_tags_in_search_results">Inherited tags in search results</string>
     <string name="display_inherited_tags_in_search_results_summary">Display inherited tags in search results</string>

diff --git a/app/src/main/res/xml/prefs_screen_look_and_feel.xml b/app/src/main/res/xml/prefs_screen_look_and_feel.xml
@@ -84,4 +84,12 @@
             android:defaultValue="@bool/pref_default_ignore_system_locale"/>
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/agenda">
+
+        <SwitchPreference
+            android:key="@string/pref_key_hide_empty_days_in_agenda"
+            android:title="@string/hide_empty_days_in_agenda"
+            android:defaultValue="@bool/pref_default_hide_empty_days_in_agenda" />
+    </PreferenceCategory>
+
 </androidx.preference.PreferenceScreen>