Review fixes for advancing series and provider occurrences (#135, #137) (#147)

In Agendula's own storage, ticking off the current occurrence of a repeating task now moves the series on to its next date and keeps a completed copy, as tasks.org and Apple Reminders do.

Before, the series stayed open and the completion was a `RECURRENCE-ID` override with `STATUS:COMPLETED` in the same resource. That's valid iCalendar, but Infomaniak's web view and Apple Reminders ignore it and keep showing the task as open, which is what #137 reports. The reporter hasn't confirmed their storage mode yet. With tasks.org/OpenTasks the provider already moves the series on, so this change is about the built-in CalDAV sync.

How it works (`RoomTasksDataSource`):
- Ticking or cancelling the series' **first open occurrence** moves the master to its next open occurrence. Closed overrides on either side become standalone completed copies (new UID, fresh alarm identities), including the ones 1.3.0 left behind. `COUNT` drops by the occurrences used up (counted before `EXDATE`, shared with `splitSeries`), `EXDATE` values before the new start are dropped, and status and progress are reset. An edited occurrence is converted in place, so its id, edits and own properties survive. Lines inside nested components, such as a `VALARM`'s `UID`, are kept.
- Series with `RDATE`s keep the override model, because moving the anchor onto an `RDATE` would re-align the `RRULE`. So do recurring subtasks, whose copies would otherwise pile up under the parent.
- How the series moved is recorded in two new local tables, `advanced_occurrences` and `advanced_detached` (schema v5, migration and migration test included). They are never part of the synced `VTODO`. A record keeps mapping the occurrence to its copy (pruned after 30 days), so the detail screen and reminders find the copy even after it was edited. Every save path goes through one check: when the only thing that changes on a copy is that it reopens (compared as the editor writes values back), the move is undone. That covers undo, the completed section, the editor, the detail screen and other apps through Agendula's provider. The anchor goes back, `COUNT` regains what it spent, the dropped `EXDATE`s return in the list's own value shape, other edits made since are kept, and a reopened state such as 40% stays on the occurrence. Detached overrides come back as overrides; one deleted since, or given its own parent or subtasks, is excluded instead. A copy that was edited, moved or given subtasks, or whose series moved on, changed its rule or was deleted, reopens as a task of its own.
- If a sync discards the local version of a moved series because the server's is newer, the copies of moves the server never saw are deleted too, and the server's own overrides stand for those occurrences. Moves already uploaded are marked settled and left alone.
- `task(series, anchor)` resolves a moved-past occurrence to its copy, so the detail screen and reminder checks see it as done. The repository then acts on the row it resolved, including the detail screen's subtasks, so deleting or saving from a screen opened before the move can't hit the whole series.
- A stale tick (an old notification or widget row) for an occurrence the series has already moved past does nothing.
- Ticking the last open occurrence closes the series, and reopening any of its occurrences reopens the series.
- Any other occurrence (with earlier ones still open) keeps the override model.

Also fixed here: `AgendulaTaskProviderTest` failed on `release/v1.3.1` whenever Agendula ran on an external provider, because `ProviderWriter` checked the active store first. Read-only tables are now refused as such whichever store is active (one exhaustive `when` per operation), and the two tests that check value errors skip when the provider takes no writes at all.

Tests: `RoomTasksDataSourceTest` covers each case above. There is also a migration test, a `ProviderWriterTest` for reopening through the provider, and `RoomSyncStoreAdvancesTest` (full flavour) for the sync discard. The full on-device suite (223 tests) passes on the emulator, and the unit tests pass for both flavours.

Closes #137

Co-authored-by: Jean-Luc Makiola <business@jeanlucmakiola.de>
Reviewed-on: https://codeberg.org/jlmakiola/agendula/pulls/144

CHANGELOG.md

@@ -7,12 +7,6 @@ All notable changes to this project are documented here. The format follows
 
 ## [Unreleased]
 
-### Fixed
-- With 3-button navigation, the navigation bar no longer covers the last home
-  search results, and in landscape it no longer covers the home screen, the
-  task list or the home top bar's buttons. The task details and editor no
-  longer leave an empty gap between the open keyboard and the text (#152).
-
 ## [1.3.1] - 2026-11-09
 
 ### Changed

app/src/main/java/de/jeanlucmakiola/agendula/ui/common/SideInsets.kt

@@ -1,27 +0,0 @@
-package de.jeanlucmakiola.agendula.ui.common
-
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.unit.dp
-
-/**
- * Pads by the start/end of a scaffold's [inner] padding and consumes it, so a
- * side navigation bar or cutout (3-button nav in landscape) is cleared once.
- */
-@Composable
-fun Modifier.sideInsetsPadding(inner: PaddingValues): Modifier {
-    val layoutDirection = LocalLayoutDirection.current
-    val sides = PaddingValues(
-        start = inner.calculateStartPadding(layoutDirection),
-        top = 0.dp,
-        end = inner.calculateEndPadding(layoutDirection),
-        bottom = 0.dp,
-    )
-    return this.padding(sides).consumeWindowInsets(sides)
-}

app/src/main/java/de/jeanlucmakiola/agendula/ui/detail/TaskDetailScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -269,9 +268,6 @@ private fun DetailBody(
         modifier = Modifier
             .fillMaxSize()
             .padding(inner)
-            // Consume the bar insets so imePadding adds only what the keyboard
-            // covers beyond them.
-            .consumeWindowInsets(inner)
             // Shrink the scroll viewport by the keyboard so the focused add-subtask
             // field scrolls into view above the IME instead of being hidden.
             .imePadding()

app/src/main/java/de/jeanlucmakiola/agendula/ui/edit/TaskEditScreen.kt

@@ -57,7 +57,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -220,9 +219,7 @@ fun TaskEditScreen(
             viewModel = viewModel,
             scroll = scroll,
             onTitleBottom = { titleBottom = it },
-            // Consumed so EditContent's imePadding adds only what the keyboard
-            // covers beyond the bars.
-            modifier = Modifier.padding(inner).consumeWindowInsets(inner),
+            modifier = Modifier.padding(inner),
         )
     }
 

app/src/main/java/de/jeanlucmakiola/agendula/ui/lists/ListsScreen.kt

@@ -29,16 +29,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.displayCutout
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.only
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.union
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
-import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
@@ -108,7 +99,6 @@ import de.jeanlucmakiola.agendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.agendula.ui.common.ShapedActionButton
 import de.jeanlucmakiola.agendula.ui.common.SyncPullBox
 import de.jeanlucmakiola.agendula.ui.common.priorityAccent
-import de.jeanlucmakiola.agendula.ui.common.sideInsetsPadding
 import de.jeanlucmakiola.agendula.ui.tasklist.priorityLabel
 import de.jeanlucmakiola.floret.components.positionOf
 import de.jeanlucmakiola.floret.time.formatDateTimeCompact
@@ -190,10 +180,7 @@ fun ListsScreen(
             available = syncAvailable && !searchActive,
             syncing = syncing,
             onSync = viewModel::syncAll,
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(top = inner.calculateTopPadding())
-                .sideInsetsPadding(inner),
+            modifier = Modifier.fillMaxSize().padding(top = inner.calculateTopPadding()),
         ) {
             when (val s = state) {
                 ListsUiState.Loading -> Unit // brief; avoids a flash before first emission
@@ -526,10 +513,7 @@ private fun HomeTopBar(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .windowInsetsPadding(
-                    WindowInsets.systemBars.union(WindowInsets.displayCutout)
-                        .only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
-                )
+                .statusBarsPadding()
                 .height(72.dp)
                 .padding(horizontal = 12.dp),
             verticalAlignment = Alignment.CenterVertically,
@@ -688,14 +672,10 @@ private fun SearchResults(
                 )
             }
         } else {
-            // The last result scrolls clear of the navigation bar and the keyboard.
             LazyColumn(modifier = Modifier.fillMaxSize()) {
                 items(results, key = { it.occurrenceKey }) { task ->
                     UpcomingRow(task = task, onClick = { onOpenTask(task) })
                 }
-                item(key = "bottom-inset") {
-                    Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars.union(WindowInsets.ime)))
-                }
             }
         }
     }

app/src/main/java/de/jeanlucmakiola/agendula/ui/tasklist/TaskListScreen.kt

@@ -115,7 +115,6 @@ import de.jeanlucmakiola.agendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.agendula.ui.common.SyncPullBox
 import de.jeanlucmakiola.agendula.ui.common.ignoringEdgeSwipes
 import de.jeanlucmakiola.agendula.ui.common.priorityAccent
-import de.jeanlucmakiola.agendula.ui.common.sideInsetsPadding
 import de.jeanlucmakiola.agendula.ui.lists.ListEditorSheet
 import de.jeanlucmakiola.agendula.ui.lists.listWriteFailureMessage
 import de.jeanlucmakiola.agendula.ui.lists.ListWriteFailure
@@ -251,7 +250,7 @@ fun TaskListScreen(
             }
         },
     ) { inner ->
-        Box(modifier = Modifier.fillMaxSize().sideInsetsPadding(inner)) {
+        Box(modifier = Modifier.fillMaxSize()) {
             SyncPullBox(
                 available = syncAvailable,
                 syncing = syncing,
@@ -261,10 +260,7 @@ fun TaskListScreen(
             ) {
                 when (val s = state) {
                     TaskListUiState.Loading -> Unit // brief; avoids a flash before first emission
-                    TaskListUiState.Failure -> CenteredMessage(
-                        stringResource(R.string.task_list_failure),
-                        PaddingValues(top = inner.calculateTopPadding(), bottom = inner.calculateBottomPadding()),
-                    )
+                    TaskListUiState.Failure -> CenteredMessage(stringResource(R.string.task_list_failure), inner)
                     is TaskListUiState.Content -> TaskListBody(
                         s, filter, inner, onOpenTask, onRequestDelete, viewModel,
                         onClearCompleted = if (listId != null && list?.isReadOnly != true) ({ confirmClear = true }) else null,

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

@@ -763,95 +763,4 @@
     <string name="widget_config_background">الخلفية</string>
     <string name="widget_config_background_solid">سادة</string>
     <string name="widget_config_theme">السمة</string>
-    <string name="app_name_tasks_alias">مهام</string>
-    <string name="list_where">أين</string>
-    <string name="settings_backup_subtitle">التصدير و الاستيراد</string>
-    <string name="error_reminder_without_date">اضبط تاريخ بدء أو استحقاق لاستخدام تذكير.</string>
-    <string name="reminder_at_start">في وقت البدء</string>
-    <string name="reminder_at_due_time">في وقت الاستحقاق</string>
-    <string name="reminder_on_start_date">عند موعد البدء</string>
-    <string name="reminder_on_due_date">عند موعد الاستحقاق</string>
-    <string name="reminder_at_time">%1$s عند %2$s</string>
-    <string name="reminder_anchor_start">من البدء</string>
-    <string name="reminder_anchor_due">من تاريخ الاستحقاق</string>
-    <string name="reminder_time">الوقت</string>
-    <string name="reminder_benefit_delivery_title">تنبيه عندما يكون الأمر مهمًا</string>
-    <string name="reminder_benefit_reversible_title">يمكنك تغييره في أي وقت</string>
-    <string name="settings_app_name_hint">اعرض Agendula كـ ”مهام“ في مشغّل التطبيقات الخاص بك. فقط الاسم في المشغّل يتغير؛ وقد ينتقل الرمز إلى مكان جديد. يُغلَق Agendula عندما تقوم بالتبديل، لذا أعِد فتحه من المشغّل.</string>
-    <string name="settings_allday_reminder_time_summary">العد التنازلي لمهام التي تستمر طوال اليوم عند %1$s</string>
-    <string name="settings_store_permission_denied_hint">مهام التطبيق الآخر تبقى غير قابلة للوصول حتى تسمح بالوصول. اضغط لفتح إعدادات التطبيق.</string>
-    <string name="settings_copy_counting">جارٍ حساب ما هناك لنسخه…</string>
-    <string name="settings_copy_confirm_empty">%1$s لا يحتوي على مهام لنسخها.</string>
-    <string name="settings_copy_nothing">لم يكن هناك شيء للنسخ</string>
-    <string name="export_hint">ملف .ics واحد لكل قائمة، قابل للقراءة بواسطة تطبيقات المهام والتقويم الأخرى. القوائم الموضوع عليها بعلامة صح تذهب إلى مجلد تختاره أنت، أو إلى ملف مضغوط (zip) واحد.</string>
-    <string name="export_no_lists">لا توجد قوائم للتصدير</string>
-    <string name="export_to_folder">الحفظ إلى مجلد</string>
-    <string name="export_to_zip">حفظ كملف مضغوط (zip)</string>
-    <plurals name="export_done">
-        <item quantity="zero">تم تصدير (%1$d) لا قوائم</item>
-        <item quantity="one">تم تصدير قائمة واحدة (%1$d)</item>
-        <item quantity="two">تم تصدير قائمتان (%1$d)</item>
-        <item quantity="few">تم تصدير %1$d قوائم</item>
-        <item quantity="many">تم تصدير %1$d قائمة</item>
-        <item quantity="other">تم تصدير %1$d قائمة</item>
-    </plurals>
-    <plurals name="reminder_minutes_before_start">
-        <item quantity="zero">(%1$d) لا دقائق قبل البدء</item>
-        <item quantity="one">%1$d دقيقة واحده قبل البدء</item>
-        <item quantity="two">%1$d دقيقتان قبل البدء</item>
-        <item quantity="few">%1$d دقائق قبل البدء</item>
-        <item quantity="many">%1$d دقيقة قبل البدء</item>
-        <item quantity="other">%1$d دقيقة قبل البدء</item>
-    </plurals>
-    <plurals name="reminder_hours_before_start">
-        <item quantity="zero">(%1$d) لا ساعات قبل البدء</item>
-        <item quantity="one">%1$d ساعة واحده قبل البدء</item>
-        <item quantity="two">%1$d ساعتان قبل البدء</item>
-        <item quantity="few">%1$d ساعات قبل البدء</item>
-        <item quantity="many">%1$d ساعة قبل البدء</item>
-        <item quantity="other">%1$d ساعة قبل البدء</item>
-    </plurals>
-    <plurals name="reminder_days_before_start">
-        <item quantity="zero">(%1$d) لا أيام قبل البدء</item>
-        <item quantity="one">%1$d يوم واحد قبل البدء</item>
-        <item quantity="two">%1$d يومان قبل البدء</item>
-        <item quantity="few">%1$d أيام قبل البدء</item>
-        <item quantity="many">%1$d يوم قبل البدء</item>
-        <item quantity="other">%1$d يوم قبل البدء</item>
-    </plurals>
-    <plurals name="reminder_weeks_before_start">
-        <item quantity="zero">(%1$d) لا أسابيع قبل البدء</item>
-        <item quantity="one">%1$d أسبوع واحد قبل البدء</item>
-        <item quantity="two">%1$d أسبوعان قبل البدء</item>
-        <item quantity="few">%1$d أسابيع قبل البدء</item>
-        <item quantity="many">%1$d أسبوع قبل البدء</item>
-        <item quantity="other">%1$d أسبوع قبل البدء</item>
-    </plurals>
-    <string name="settings_accounts_subtitle">مزامنة مهامك مع خادم CalDAV</string>
-    <string name="accounts_add">إضافة حسابًا</string>
-    <string name="accounts_sync_interval">المزامنة تلقائيًا</string>
-    <string name="accounts_sync_interval_manual">فقط عند تقوم بالمزامنة</string>
-    <string name="accounts_push_via">تصل التغييرات فورًا، عبر %1$s</string>
-    <string name="widget_unavailable">افتح Agendula لإنهاء الإعداد</string>
-    <string name="widget_today_all_done">انتهى كل شيء</string>
-    <string name="widget_config_title">إظهار في الأداة المصغرة</string>
-    <string name="widget_config_group_by_list">تجميع حسب القائمة</string>
-    <string name="widget_config_group_by_list_hint">إظهار مهام كل قائمة ضمن عنوانها الخاص</string>
-    <string name="widget_config_background_solid_hint">يملأ الأداة المصغّرة بلون سطح السمة</string>
-    <string name="widget_config_background_tinted_hint">أكثر نعومة، تعبئة لونية متناغمة</string>
-    <string name="widget_config_background_transparent">شفافة</string>
-    <string name="widget_config_background_transparent_hint">لا تعبئة — تبقى المهام قابلة للقراءة في حاوياتها الخاصة</string>
-    <string name="widget_config_row_color_neutral_hint">يستخدم كل صف نفس التعبئة اللونية المتناغمة</string>
-    <string name="widget_config_row_color_by_list">حسب القائمة</string>
-    <string name="widget_config_row_color_by_list_hint">كل صف متناغم باللون الخاص بقائمته</string>
-    <string name="widget_today_description">حلقة تقدم لمهام اليوم</string>
-    <string name="widget_up_next_description">مهمتك الوحيدة الأقرب لموعد الاستحقاق</string>
-    <string name="widget_lists_label">قوائم</string>
-    <string name="widget_lists_description">مربع اختصار لكل قائمة، مع عدد مرّات فتحه</string>
-    <string name="widget_week_label">أسبوع</string>
-    <string name="widget_week_description">شريط من سبعة أيام لعدد المهام</string>
-    <string name="widget_config_background_tinted">ملونة</string>
-    <string name="settings_theme_black">أسود</string>
-    <string name="settings_theme_black_summary">داكن مع خلفيات سوداء نقية، لشاشات AMOLED</string>
-    <string name="settings_app_name">اسم التطبيق</string>
 </resources>

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

@@ -320,18 +320,4 @@
     <string name="reminder_at_due">V čase úkolu</string>
     <string name="reminder_on_the_day">V daný den</string>
     <string name="settings_list_reminders_title">Upozornění pro jednotlivé seznamy</string>
-    <string name="shortcut_new_task">Nový úkol</string>
-    <string name="shortcut_today">Dnes</string>
-    <string name="qs_tile_new_task">Nový úkol</string>
-    <string name="sort_title">Seřadit podle</string>
-    <string name="view_options_title">Řazení a filtrování</string>
-    <string name="view_filter_tags">Filtrovat podle štítku</string>
-    <string name="view_filter_clear">Zrušit filtr</string>
-    <string name="sort_due">Termín splnění</string>
-    <string name="sort_title_alpha">Název</string>
-    <string name="sort_created">Nedávno přidané</string>
-    <string name="clear_completed_action">Zrušit</string>
-    <string name="undo">Zpět</string>
-    <string name="section_today">Dnes</string>
-    <string name="section_upcoming">Nadcházející</string>
 </resources>

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

@@ -28,11 +28,4 @@
     <string name="qs_tile_new_task">Новая задача</string>
     <string name="lists_reorder">Переопределить список</string>
     <string name="lists_reorder_done">Завершить переопределение</string>
-    <string name="app_name_tasks_alias">Задачи</string>
-    <string name="lists_reorder_handle">Перетащите, чтобы изменить порядок</string>
-    <string name="sort_title">Сортировать по</string>
-    <string name="view_options_title">Сортировать и фильтровать</string>
-    <string name="view_filter_tags">Фильтр по тегу</string>
-    <string name="view_filter_clear">Очистить фильтр</string>
-    <string name="sort_due">Срок выполнения</string>
 </resources>