feat(agenda): limit how far ahead the agenda screen and widget show (#4) #44

Merged

makiolaj merged 14 commits from feat/agenda-range-limit into release/v2.11.0 2026-06-27 15:08:35 +00:00

Conversation 0 Commits 14 Files Changed 18 +875 -52

makiolaj commented 2026-06-27 12:36:06 +00:00

Owner

Copy Link

Implements Codeberg issue #4 — limit how far ahead the agenda screen and widget show events.

Independent agendaScreenRange and agendaWidgetRange preferences (default: Next 30 days). Each offers: Today, This week, This month, Next 7 days, Next 30 days, or Custom 1–365 days. Rolling windows never degenerate; the calendar-aligned "This week" follows the week-start preference (#3) and "This month" runs to month end.

On-device verification checklist

• Settings → Appearance → Agenda range and Agenda widget range rows, both default "Next 30 days"
• Picker lists Today / This week / This month / Next 7 days / Next 30 days / Custom…
• Custom expands an inline day field (1–365) with a Set button
• Agenda screen honours its setting (e.g. "Today" shows only today's events)
• Agenda widget honours its own, independent setting
• This week ends correctly for the configured week-start (Mon-start → through Sunday; flip week-start and re-check)
• This month ends on the last day of the current month

Closes #4 (Codeberg).

Implements Codeberg issue #4 — limit how far ahead the agenda screen and widget show events. Independent `agendaScreenRange` and `agendaWidgetRange` preferences (default: Next 30 days). Each offers: Today, This week, This month, Next 7 days, Next 30 days, or Custom 1–365 days. Rolling windows never degenerate; the calendar-aligned "This week" follows the week-start preference (#3) and "This month" runs to month end. **On-device verification checklist** - [ ] Settings → Appearance → **Agenda range** and **Agenda widget range** rows, both default "Next 30 days" - [ ] Picker lists Today / This week / This month / Next 7 days / Next 30 days / Custom… - [ ] **Custom** expands an inline day field (1–365) with a Set button - [ ] Agenda screen honours its setting (e.g. "Today" shows only today's events) - [ ] Agenda **widget** honours its own, independent setting - [ ] **This week** ends correctly for the configured week-start (Mon-start → through Sunday; flip week-start and re-check) - [ ] **This month** ends on the last day of the current month Closes #4 (Codeberg).

makiolaj added 2 commits 2026-06-27 12:36:07 +00:00

feat(agenda): limit how far ahead the agenda screen and widget show ... add88fbadf

Add independent agendaScreenRange and agendaWidgetRange preferences, each a
rolling window: 1 day / 1 week / 1 month / custom 1–365 days (default Month).
Rolling (not calendar-aligned) so the span never degenerates near a period
boundary. The in-app Agenda screen and the agenda widget each read their own
setting, configured via a new AgendaRangePicker with an inline custom-days
editor.

Closes #4 (Codeberg)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

feat(agenda): add calendar-aligned "this week"/"this month" ranges ... 766c2ffcf8

Extend AgendaRange with calendar-aligned windows alongside the rolling
ones: ThisWeek runs through the end of the current week (respecting the
week-start preference — a Monday start means everything before next
Monday), ThisMonth through the last day of the current month. dayCount now
takes the anchor day and week-start; the agenda screen and widget resolve
the week-start preference and pass it through. Rolling options relabelled
("Today", "Next 7 days", "Next 30 days") to read distinctly from the new
calendar-aligned ones.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 13:32:06 +00:00

Merge release/v2.11.0 into feat/agenda-range-limit ... 7c9830deda

Integrate #3/#5/#6 (week-start, time-format, hour-lines) into the agenda
range branch. SettingsViewModel folds all five view prefs into one combine;
WidgetData keeps the range-based window and adds the resolved is24Hour.

Also, in the same Appearance section:
- regroup the rows into four titled-by-spacing groups (theme & colour /
  calendar layout / timeline display / agenda) instead of one long card.
- add an explanatory description line under the title of each agenda-range
  picker (PickerDescription).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 13:36:21 +00:00

refactor(settings): regroup Appearance into theme / calendar / agenda ... b2bfdc0f42

Drop the uniform two-per-card grouping for meaningful sections: theme &
colour (2), calendar — default view, week start, time format, hour lines
(4), and agenda (2).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 13:50:20 +00:00

feat(agenda): bottom-left pill to override the range for the session ... 3cf1439850

Add a tonal pill in the agenda's bottom-left corner showing the current
range; tapping it opens the existing AgendaRangePicker as a session-only
override. The override lives in AgendaViewModel (in-memory), so it survives
view switches and rotation but resets to the saved default when the app is
relaunched. The pill fills with the primary container while an override is
active, and a hint in the picker spells out the temporary nature.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 13:59:58 +00:00

feat(agenda): split range picker into two lists with a concrete header ... 366059b012

Group the range options into calendar-aligned (today / this week / this
month) and rolling (next 7 / 30 days / custom) lists. Add a header showing
the concrete span currently in effect — a single date for Today, the month
and year for This month, otherwise a start–end span — so it's clear what
the agenda is showing. The header appears only where a window is supplied
(the agenda pill), not in Settings.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:08:25 +00:00

feat(agenda): range header banner + toggles for banner and pill ... 6ba7f38887

Move the "Showing all events for <window>" line out of the picker and into
the agenda view as an always-visible header above the list. Add two
settings (Agenda group, both ON by default) to toggle the range header
banner and the bottom-left range pill independently. The picker keeps its
two-list grouping but no longer carries the header.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:20:34 +00:00

feat(agenda): warmer empty state + "upcoming" wording ... f8a2569831

Reword the range header to "Showing all upcoming events for". Replace the
dry empty state ("Nothing scheduled" + subtitle) with a single warmer line
("You're all caught up"), drop the subtitle, and switch the icon to a
coffee cup. The empty title is shared with the agenda widget.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:22:36 +00:00

refactor(agenda): put range header and pill on one bar ... 6471c48528

Move the session range pill from the bottom-left corner onto the same top
bar as the "Showing all upcoming events for …" header — header on the left,
pill on the right, each still independently toggleable.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:25:49 +00:00

refactor(agenda): one toggle for the whole range bar ... 0f31981d26

Consolidate the separate "range title" and "range button" settings into a
single "Range bar" toggle, now that the header and switcher live on one bar.
On by default.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:30:30 +00:00

fix(widget): refresh agenda widget when its range (or week start) changes ... f27b0e269d

The agenda widget only re-read agendaWidgetRange on the next data-change /
midnight / periodic refresh (or re-placement), so a settings change appeared
to do nothing until then. Push an updateAll from the settings setters:
the agenda widget on an agenda-widget-range change, and both widgets on a
week-start change (month weekday header + the agenda widget's "this week").

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:37:59 +00:00

fix(widget): debounce widget refresh on pref change ... cd703e9d54

Refreshing the widget directly from the setter raced when a setting was
flipped and flipped back quickly: two concurrent updateAll calls could
coalesce around a stale read and leave the widget on the intermediate value.
Observe the agenda-widget-range and week-start prefs instead and push a
single debounced updateAll once changes settle, so the widget always
converges to the final value.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 14:44:55 +00:00

fix(widget): refresh from setter, serialized with a mutex ... bb92d02000

The debounced observer was unreliable: drop(1) plus the ViewModel lifecycle
could swallow a change after re-entering the app, so a single range change
sometimes didn't refresh the widget. Refresh directly from the settings
setters instead (always fires on a real change), serialized through a mutex
so a rapid flip-and-flip-back can't run two updateAll calls at once and
strand the widget on the intermediate value.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj added 1 commit 2026-06-27 15:03:50 +00:00

fix(widget): drive agenda range via reactive Glance state ... c30a153552

The agenda widget loaded and sliced its data in the provideGlance preamble
and captured it as a non-reactive local. updateAll() reliably recomposes a
live Glance session but does not reliably re-run that preamble, so a range
change was redrawn against the stale slice (intermittently — only when no
session was alive did it pick up the new range). This is the same platform
limitation the month widget already works around.

Mirror that pattern: load the widest selectable window once, store the range
in per-instance Glance state (AGENDA_RANGE_KEY), read it reactively via
currentState, and slice in the composition. The settings setter writes the
state into each instance and recomposes, so a range change now reflects via
plain recomposition regardless of session lifecycle.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

makiolaj merged commit 3ca7200624 into release/v2.11.0 2026-06-27 15:08:35 +00:00

makiolaj deleted branch feat/agenda-range-limit 2026-06-27 15:08:35 +00:00

makiolaj referenced this issue from a commit 2026-06-27 15:08:35 +00:00

Merge pull request 'feat(agenda): limit how far ahead the agenda screen and widget show (#4)' (!44) from feat/agenda-range-limit into release/v2.11.0

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

renovate-bot weblate-bot makiolaj

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: makiolaj/calendula#44