feat(timeline): optional hour separator lines in week & day view (#5) #43

Merged

makiolaj merged 2 commits from feat/timeline-hour-lines into release/v2.11.0 2026-06-27 13:18:26 +00:00

Conversation 0 Commits 2 Files Changed 11 +112 -3

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

Owner

Copy Link

Implements Codeberg issue #5 — optional hour separator lines in the week/day timeline.

New showHourLines preference (default OFF). When on, a faint outline-variant line is drawn at each hour, over the column background but beneath event blocks, via a reusable hourSeparatorLines() modifier and LocalShowHourLines.

⚠️ Stacked on #6 (feat/time-format-toggle) since both touch the timeline. Until PR #6 merges into release/v2.11.0, this PR's diff also shows #6's commit; it will shrink to just the hour-lines change once #6 is merged. Merge #6 first.

On-device verification checklist

• Settings → Appearance → Hour lines switch, default off
• Turning it on draws a faint line at each hour in week view
• Same in day view
• Lines sit under event blocks (events still fully visible/legible)
• Line colour is subtle in both light and dark themes
• Off again removes the lines

Closes #5 (Codeberg).

Implements Codeberg issue #5 — optional hour separator lines in the week/day timeline. New `showHourLines` preference (default OFF). When on, a faint outline-variant line is drawn at each hour, over the column background but beneath event blocks, via a reusable `hourSeparatorLines()` modifier and `LocalShowHourLines`. ⚠️ **Stacked on #6** (`feat/time-format-toggle`) since both touch the timeline. Until PR #6 merges into `release/v2.11.0`, this PR's diff also shows #6's commit; it will shrink to just the hour-lines change once #6 is merged. **Merge #6 first.** **On-device verification checklist** - [x] Settings → Appearance → **Hour lines** switch, default **off** - [x] Turning it on draws a faint line at each hour in **week** view - [x] Same in **day** view - [x] Lines sit *under* event blocks (events still fully visible/legible) - [x] Line colour is subtle in both light and dark themes - [x] Off again removes the lines Closes #5 (Codeberg).

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

feat(settings): add 12/24-hour time format toggle ... c91608e48a

Add a TimeFormatPref (Auto/12h/24h) preference. Auto follows the device's
24-hour system setting; the others force a clock app-wide. The resolved
convention is provided once at the app root via LocalUse24HourFormat, so
every in-app time label reads it without per-screen plumbing.

A shared, pure TimeFormat helper (formatTimeOfDay / formatMinuteOfDay /
formatHourLabel / timeOfDayFormatter) is now the single source for all
time-of-day rendering. Routing every site through it also fixes a
pre-existing inconsistency: the week/day timeline gutters and the agenda
screen + widget hard-coded 24h, while event detail/edit/search/reminders
followed the locale — so a 12h-locale user previously saw mixed formats.

Covered: week & day timelines (gutter + event blocks), agenda screen and
widget, event detail/edit, search, and reminder notifications.

Closes #6 (Codeberg)

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

feat(timeline): optional hour separator lines in week & day view ... 09a1aecb76

Add a showHourLines preference (default off — the existing clean look).
When on, the week and day timelines draw a faint outline-variant line at
each hour boundary, sitting over the column background but beneath event
blocks. The toggle is provided app-wide via LocalShowHourLines and applied
through a reusable hourSeparatorLines() modifier.

Closes #5 (Codeberg)

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

makiolaj added 2 commits 2026-06-27 12:55:09 +00:00

Merge remote-tracking branch 'origin/release/v2.11.0' into feat/time-format-toggle ... 93cc264fbf

# Conflicts:
#	app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
#	app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml

Merge branch 'feat/time-format-toggle' into feat/timeline-hour-lines f8efa4d3e4

makiolaj merged commit 5e98059388 into release/v2.11.0 2026-06-27 13:18:26 +00:00

makiolaj deleted branch feat/timeline-hour-lines 2026-06-27 13:18:27 +00:00

makiolaj referenced this issue from a commit 2026-06-27 13:18:28 +00:00

Merge pull request 'feat(timeline): optional hour separator lines in week & day view (#5)' (!43) from feat/timeline-hour-lines 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#43