2.19.1 — drag to reschedule can be turned off (#176)

Release branch for 2.19.1. Merging this cuts the release — versionName is bumped to 2.19.1 (versionCode 21901), which is what release.yaml picks up. ### What's in it - **Drag to reschedule can be turned off** (#173). Settings → Views → *Drag to reschedule*, on by default. Turned off, no event block in the month, week or day view registers a drag gesture. The gate is `EventMoveScope.dragEnabled` rather than the scope itself, so the screen-reader "Move event" action — which only opens the edit form — stays available either way. The setting reads as off until the stored value has actually loaded, so a cold start can't hand out a drag before the preference is known. ### Release prep - CHANGELOG 2.19.1 section written. - Per-version "What's New" hand-written for all 12 store locales (`ar`, `de-DE`, `en-GB`, `en-US`, `es-ES`, `fr-FR`, `it-IT`, `pl-PL`, `pt-BR`, `pt-PT`, `ru-RU`, `zh-CN`). - `lint test assembleDebug` and `check_translations.py` green locally. - main is one commit ahead (Weblate #175, translations only) and merges clean — not merged into the branch, it comes along with this one. Closes #173 Co-authored-by: Jean-Luc Makiola <business@jeanlucmakiola.de> Reviewed-on: https://codeberg.org/jlmakiola/calendula/pulls/176
2026-08-11 18:20:09 +02:00
parent 136167b54c
commit e0fdadc7ca
28 changed files with 157 additions and 13 deletions
--- a/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
@@ -301,6 +301,19 @@ class SettingsPrefs @Inject constructor(
        store.edit { it[TODAY_BUTTON_IN_TOOLBAR_KEY] = enabled }
    }

+    /**
+     * Whether events can be dragged to another slot in the calendar views (#68,
+     * #173). Defaults to ON. Off means no block registers a drag gesture at all;
+     * rescheduling then goes through the edit form.
+     */
+    val dragToReschedule: Flow<Boolean> = store.data.map { prefs ->
+        prefs[DRAG_TO_RESCHEDULE_KEY] ?: true
+    }
+
+    suspend fun setDragToReschedule(enabled: Boolean) {
+        store.edit { it[DRAG_TO_RESCHEDULE_KEY] = enabled }
+    }
+
    /**
     * How far ahead the in-app Agenda screen shows events (v2.11). Defaults to
     * [AgendaRange.Month] — a month of upcoming events. Independent of the
@@ -945,6 +958,7 @@ class SettingsPrefs @Inject constructor(
        internal val MONTH_VIEW_STYLE_KEY = stringPreferencesKey("month_view_style")
        internal val TIMELINE_SCALE_KEY = stringPreferencesKey("timeline_scale")
        internal val TODAY_BUTTON_IN_TOOLBAR_KEY = booleanPreferencesKey("today_button_in_toolbar")
+        internal val DRAG_TO_RESCHEDULE_KEY = booleanPreferencesKey("drag_to_reschedule")
        internal val DEFAULT_VIEW_KEY = stringPreferencesKey("default_view")
        internal val QUICK_SWITCH_VIEWS_KEY = stringPreferencesKey("quick_switch_views")
        internal val DRAWER_VIEW_ORDER_KEY = stringPreferencesKey("drawer_view_order")
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
@@ -312,9 +312,13 @@ fun CalendarHost(
        heldEditKey = key
        editKey = key
    }
-    val moveScope = remember(movableCalendarIds, reschedule) {
+    // Off by preference (#173) switches off the gesture, not the scope: blocks
+    // register no drag, while the edit form and its TalkBack action stay put.
+    val dragToReschedule = viewModel.dragToReschedule.collectAsStateWithLifecycle().value
+    val moveScope = remember(movableCalendarIds, reschedule, dragToReschedule) {
        EventMoveScope(
            movableCalendarIds = movableCalendarIds,
+            dragEnabled = dragToReschedule,
            move = reschedule::move,
            inFlight = reschedule.inFlight,
            undoStarted = reschedule.undoStarted,
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHostViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHostViewModel.kt
@@ -53,4 +53,18 @@ class CalendarHostViewModel @Inject constructor(
            started = SharingStarted.WhileSubscribed(5_000L),
            initialValue = false,
        )
+
+    /**
+     * Whether events may be dragged to another slot to reschedule them (#68, #173).
+     * Off until the stored value arrives, even though the preference itself defaults
+     * on: the wrong guess costs an enabled user a gesture for the few frames a cold
+     * start takes to read DataStore, but re-arms the one thing a disabled user
+     * switched off to be rid of.
+     */
+    val dragToReschedule: StateFlow<Boolean> = prefs.dragToReschedule
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5_000L),
+            initialValue = false,
+        )
 }
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventMoveScope.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventMoveScope.kt
@@ -29,6 +29,12 @@ class EventMoveScope(
     * the repository writes whatever it is handed — so this gate is load-bearing.
     */
    val movableCalendarIds: Set<Long>,
+    /**
+     * Whether the *gesture* is on (#173). Off gates the drag alone: [edit] and the
+     * TalkBack action below stay, since invoking a menu item can't cause the
+     * accidental drags the setting exists to stop.
+     */
+    val dragEnabled: Boolean,
    /** False when the drop was refused outright, so nothing will be written. */
    val move: (MoveRequest) -> Boolean,
    /**
@@ -91,6 +97,17 @@ fun ghostAlpha(lifted: Boolean): Float = animateFloatAsState(
    label = "ghost-alpha",
 ).value

+/**
+ * Whether [event] can be picked up and dragged — its calendar allows moving and
+ * the gesture is switched on. Not the same question as [eventMoveAction], which
+ * survives the setting.
+ */
+@Composable
+fun eventDragAllowed(event: EventInstance): Boolean {
+    val move = LocalEventMove.current ?: return false
+    return move.dragEnabled && move.allows(event)
+}
+
 /**
 * A TalkBack action that opens [event] in the edit form, so rescheduling isn't
 * pointer-only. Null when this event can't be moved.
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/day/DayScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/day/DayScreen.kt
@@ -92,6 +92,7 @@ import de.jeanlucmakiola.calendula.ui.common.TimelineDragController
 import de.jeanlucmakiola.calendula.ui.common.TimelineDragOverlay
 import de.jeanlucmakiola.calendula.ui.common.TimelineDrop
 import de.jeanlucmakiola.calendula.ui.common.beginsOn
+import de.jeanlucmakiola.calendula.ui.common.eventDragAllowed
 import de.jeanlucmakiola.calendula.ui.common.eventMoveAction
 import de.jeanlucmakiola.calendula.ui.common.rememberEventDragSource
 import de.jeanlucmakiola.calendula.ui.common.rememberTimelineDragController
@@ -737,7 +738,7 @@ private fun EventBlock(
    val moveAction = eventMoveAction(block.event)
    // A block clipped at the top continues from the previous day: its top edge
    // is midnight, not the event's start, so dragging it would invent a time.
-    val draggable = moveAction != null && block.beginsOn(date, zone)
+    val draggable = eventDragAllowed(block.event) && block.beginsOn(date, zone)
    val dragModifier = rememberEventDragSource(
        enabled = draggable,
        key = block.event.instanceId,
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt
@@ -2172,7 +2172,7 @@ private fun monthChipDragModifier(
    rowHeightPx: Float,
    isRtl: Boolean,
 ): Modifier = rememberDragSurface(
-    enabled = moveScope != null && controller != null,
+    enabled = moveScope?.dragEnabled == true && controller != null,
    key = week.days.first(),
    onPickUp = { local, pointerInRoot, nodeInRoot, size ->
        val bandTop = band[0]?.takeIf { it.isAttached }?.positionInRoot()?.y
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt
@@ -302,13 +302,14 @@ private fun ReportProblemRow(position: Position) {
@Composable
 private fun LanguageRow(position: Position) {
    val context = LocalContext.current
+    val supported = remember { AppLanguage.supportedTags(context, R.xml.locales_config) }
    // Setting a locale recreates the activity; mirror the choice locally so the
    // row updates instantly even before the recreation lands.
-    var current by remember { mutableStateOf(AppLanguage.currentTag()) }
+    var current by remember { mutableStateOf(AppLanguage.currentTag(supported)) }
    var showDialog by remember { mutableStateOf(false) }

    // null = follow the system; the rest are BCP-47 tags from locales_config.xml.
-    val options = remember { listOf<String?>(null) + AppLanguage.supportedTags(context, R.xml.locales_config) }
+    val options = remember(supported) { listOf<String?>(null) + supported }

    GroupedRow(
        title = stringResource(R.string.settings_language),
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
@@ -42,6 +42,8 @@ data class SettingsUiState(
    val showWeekNumbers: Boolean = false,
    /** Whether the jump-to-today control sits in the top bar instead of the FAB (#60). */
    val todayButtonInToolbar: Boolean = false,
+    /** Whether events can be dragged to another slot to reschedule them (#68, #173). */
+    val dragToReschedule: Boolean = true,
    /** How far ahead the in-app Agenda screen shows events (v2.11). */
    val agendaScreenRange: AgendaRange = AgendaRange.Month,
    /** How far ahead the agenda widget shows events (v2.11). */
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
@@ -145,9 +145,15 @@ class SettingsViewModel @Inject constructor(
                    prefs.showWeekNumbers,
                    prefs.agendaShowToday,
                    prefs.softenCalendarColors,
-                    prefs.todayButtonInToolbar,
-                ) { hourLines, weekNumbers, showToday, soften, todayInToolbar ->
-                    DisplayToggles(hourLines, weekNumbers, showToday, soften, todayInToolbar)
+                    combine(
+                        prefs.todayButtonInToolbar,
+                        prefs.dragToReschedule,
+                        ::Pair,
+                    ),
+                ) { hourLines, weekNumbers, showToday, soften, (todayInToolbar, dragToMove) ->
+                    DisplayToggles(
+                        hourLines, weekNumbers, showToday, soften, todayInToolbar, dragToMove,
+                    )
                },
            ) { view, screenRange, widgetRange, timeFormat, toggles ->
                ViewSettings(
@@ -157,6 +163,7 @@ class SettingsViewModel @Inject constructor(
                    agendaShowToday = toggles.agendaShowToday,
                    softenColors = toggles.softenColors,
                    todayButtonInToolbar = toggles.todayButtonInToolbar,
+                    dragToReschedule = toggles.dragToReschedule,
                )
            },
            combine(
@@ -189,6 +196,7 @@ class SettingsViewModel @Inject constructor(
                agendaShowToday = views.agendaShowToday,
                softenColors = views.softenColors,
                todayButtonInToolbar = views.todayButtonInToolbar,
+                dragToReschedule = views.dragToReschedule,
                agendaShowRangeBar = misc.showRangeBar,
                autofocusEventTitle = misc.autofocusEventTitle,
                pastEventDisplay = misc.pastEventDisplay,
@@ -289,6 +297,7 @@ class SettingsViewModel @Inject constructor(
        val agendaShowToday: Boolean,
        val softenColors: Boolean,
        val todayButtonInToolbar: Boolean,
+        val dragToReschedule: Boolean,
    )

    private data class DisplayToggles(
@@ -297,6 +306,7 @@ class SettingsViewModel @Inject constructor(
        val agendaShowToday: Boolean,
        val softenColors: Boolean,
        val todayButtonInToolbar: Boolean,
+        val dragToReschedule: Boolean,
    )

    private data class MiscSettings(
@@ -534,6 +544,10 @@ class SettingsViewModel @Inject constructor(
        viewModelScope.launch { prefs.setTodayButtonInToolbar(enabled) }
    }

+    fun setDragToReschedule(enabled: Boolean) {
+        viewModelScope.launch { prefs.setDragToReschedule(enabled) }
+    }
+
    /**
     * Switch the launcher label (#44). The card highlights at once, then settles
     * on what the component state reports; the writes are binder round-trips and
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt
@@ -114,7 +114,7 @@ internal fun ViewsScreen(
        GroupedRow(
            title = stringResource(R.string.settings_dim_completed),
            summary = stringResource(R.string.settings_dim_completed_summary),
-            position = Position.Bottom,
+            position = Position.Middle,
            trailing = {
                Switch(
                    checked = state.dimCompletedEvents,
@@ -123,6 +123,18 @@ internal fun ViewsScreen(
            },
            onClick = { viewModel.setDimCompletedEvents(!state.dimCompletedEvents) },
        )
+        GroupedRow(
+            title = stringResource(R.string.settings_drag_to_reschedule),
+            summary = stringResource(R.string.settings_drag_to_reschedule_summary),
+            position = Position.Bottom,
+            trailing = {
+                Switch(
+                    checked = state.dragToReschedule,
+                    onCheckedChange = viewModel::setDragToReschedule,
+                )
+            },
+            onClick = { viewModel.setDragToReschedule(!state.dragToReschedule) },
+        )

        Spacer(Modifier.height(8.dp))
        SectionHeader(stringResource(R.string.settings_month_header))
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt
@@ -100,6 +100,7 @@ import de.jeanlucmakiola.calendula.ui.common.TimelineDragController
 import de.jeanlucmakiola.calendula.ui.common.TimelineDragOverlay
 import de.jeanlucmakiola.calendula.ui.common.TimelineDrop
 import de.jeanlucmakiola.calendula.ui.common.beginsOn
+import de.jeanlucmakiola.calendula.ui.common.eventDragAllowed
 import de.jeanlucmakiola.calendula.ui.common.eventMoveAction
 import de.jeanlucmakiola.calendula.ui.common.rememberEventDragSource
 import de.jeanlucmakiola.calendula.ui.common.rememberTimelineDragController
@@ -905,7 +906,7 @@ private fun EventBlock(
    val moveAction = eventMoveAction(block.event)
    // A block clipped at the top continues from the previous day: its top edge
    // is midnight, not the event's start, so dragging it would invent a time.
-    val draggable = moveAction != null && block.beginsOn(date, zone)
+    val draggable = eventDragAllowed(block.event) && block.beginsOn(date, zone)
    val dragModifier = rememberEventDragSource(
        enabled = draggable,
        key = block.event.instanceId,