feat(calendar): the toolbar regrouped by grammar (#197) #265

Merged

nalum merged 3 commits from feat/calendar-toolbar into main 2026-08-26 18:38:23 +00:00

Conversation 2 Commits 3 Files changed 28 +678 -419

nalum commented 2026-08-26 03:23:45 +00:00

Owner

Copy link

Closes #197. Stacked on #264 (feat/calendar-create) — merge that first.

The calendar's seven-control chrome regroups into one toolbar, both surfaces (calendar handoff §6, calendar-demo.dc.html):

• When is ‹ › around the one Today control — a drawn calendar box with today's date inside it. The arrows step weeks while the week view is on.
• Who is the members' marks that tap to solo — hidden at one member, inline to five, horizontally scrolling at six or more with Everyone pinned outside the scroller. The filter state narrows from a multi-set to solo-or-everyone, which the §2.6 dot rule already assumed.
• What is one segmented control (All / Events / Jobs), selected in the accent — a filter changes what you see.
• How is a second segmented control (Month / Week / Agenda), selected neutrally — a view only changes how.
• ＋ New event moves off the page heading into the toolbar, targeting the day in focus.

Also in the stack: the web calViewToEnum/FromEnum maps learn WEEK (the pref now round-trips through UserSettings), Android's MonthNav and the week view's inner stepper row retire (the toolbar owns both), and the calendar live-page goldens re-record in their own commit.

No recorded divergences — the Compose toolbar is the web's, group for group.

Closes #197. Stacked on #264 (`feat/calendar-create`) — merge that first. The calendar's seven-control chrome regroups into one toolbar, both surfaces (calendar handoff §6, calendar-demo.dc.html): - **When** is ‹ › around the one Today control — a drawn calendar box with today's date inside it. The arrows step weeks while the week view is on. - **Who** is the members' marks that tap to solo — hidden at one member, inline to five, horizontally scrolling at six or more with Everyone pinned outside the scroller. The filter state narrows from a multi-set to solo-or-everyone, which the §2.6 dot rule already assumed. - **What** is one segmented control (All / Events / Jobs), selected in the accent — a filter changes what you see. - **How** is a second segmented control (Month / Week / Agenda), selected neutrally — a view only changes how. - **＋ New event** moves off the page heading into the toolbar, targeting the day in focus. Also in the stack: the web `calViewToEnum`/`FromEnum` maps learn `WEEK` (the pref now round-trips through `UserSettings`), Android's `MonthNav` and the week view's inner stepper row retire (the toolbar owns both), and the calendar live-page goldens re-record in their own commit. No recorded divergences — the Compose toolbar is the web's, group for group.

nalum added 3 commits 2026-08-26 03:23:45 +00:00

feat(calendar): the toolbar regrouped by grammar, web ... 0673155de1

The shipped toolbar was seven controls in three grammars — who as four
labelled chips, what as three chips, when and how as five circles —
eating 380px of a phone before a date appears, with two selected styles
reading as one choice and two calendar icons meaning different things.
Regrouped (#197): Who is member avatars that tap to solo, scaling by
roster — hidden at one member, inline at two to five, horizontally
scrolling at six or more with Everyone pinned outside the scroller;
What is one segmented control (All / Events / Jobs), selected in the
accent because a filter changes what you see; How is a second segmented
control (Month / Week / Agenda), selected neutrally because a view only
changes how; When is ‹ › around the one Today control — a drawn
calendar box with today's date inside it, never an emoji over a
numeral; and ＋ New event sits in the toolbar targeting the day in
focus. The who-filter narrows from a multi-set to solo-or-everyone,
which is what the § 2.6 dot rule already assumed.

Design: calendar handoff §6, calendar-demo.dc.html.

feat(calendar): the toolbar regrouped by grammar, compose twin ... 6b09d9def7

The same regrouping as the web commit below it, in Compose: the four
chrome lambdas (nav, view toggle, who chips, what chips) collapse into
one toolbar — ‹ › around the drawn today-box, the title, the members'
marks that tap to solo with Everyone pinned outside the scroller, the
What segmented control selected in the accent, the How one selected
neutrally, and New event moved off the page heading into the row.

The filter state narrows to match the grammar: Who is one member or
everyone (soloing replaces multi-select), What is one of all / events /
jobs. The week view's inner stepper row goes — the toolbar's arrows step
weeks while that view is on — and MonthNav goes with it, its only caller
gone. The agenda's leading-chrome count drops from six items to three.

Recorded divergence: none — the toolbar is the web's, group for group.

test(ui): re-record the calendar page goldens for the toolbar 1050004744

nalum referenced this pull request 2026-08-26 03:24:27 +00:00

Calendar: agenda and week views #192

nalum referenced this pull request 2026-08-26 03:24:28 +00:00

Calendar: regroup the toolbar by grammar #197

nalum referenced this pull request 2026-08-26 03:24:40 +00:00

Order of work for the calendar redesign (#187-#198) #199

forgejo-actions commented 2026-08-26 03:31:58 +00:00

Copy link

Test report

Suite	Tests	Result	Skipped
Unit	1440	✅ pass	1
Integration	133	✅ pass	—

Coverage: 27.0%

_{Updated by the check workflow · commit eb743cd3fb}

<!-- ci-test-report --> ## Test report | Suite | Tests | Result | Skipped | | --- | --: | --- | --: | | Unit | 1440 | ✅ pass | 1 | | Integration | 133 | ✅ pass | — | **Coverage:** 27.0% _{Updated by the check workflow · commit eb743cd3fbf5effd245bbde337b5c4504baf7472}

forgejo-actions commented 2026-08-26 03:32:04 +00:00

Copy link

Android test report

Suite	Tests	Result	Skipped
Unit (debug)	193	✅ pass	0

Coverage: 8.9% of lines

_{Updated by the android workflow · commit eb743cd3fb}

<!-- android-test-report --> ## Android test report | Suite | Tests | Result | Skipped | | --- | --: | --- | --: | | Unit (debug) | 193 | ✅ pass | 0 | **Coverage:** 8.9% of lines _{Updated by the android workflow · commit eb743cd3fbf5effd245bbde337b5c4504baf7472}

nalum force-pushed feat/calendar-toolbar from 1050004744 to 796cc1eb3d 2026-08-26 03:45:52 +00:00 Compare

nalum force-pushed feat/calendar-toolbar from 796cc1eb3d to 097cf3998a 2026-08-26 04:32:47 +00:00 Compare

nalum force-pushed feat/calendar-toolbar from 097cf3998a to 8c7cbdfee4 2026-08-26 04:56:51 +00:00 Compare

nalum force-pushed feat/calendar-toolbar from 8c7cbdfee4 to fa8006c528 2026-08-26 05:41:14 +00:00 Compare

nalum force-pushed feat/calendar-toolbar from fa8006c528 to d8c0513b1d 2026-08-26 06:16:46 +00:00 Compare

nalum referenced this pull request 2026-08-26 06:50:38 +00:00

feat(event): an event keeps at least one person #258

nalum force-pushed feat/calendar-toolbar from d8c0513b1d to eb743cd3fb 2026-08-26 07:03:28 +00:00 Compare

nalum referenced this pull request 2026-08-26 08:58:54 +00:00

fix(calendar): the polish round — review fixes and the revised handoff #268

nalum changed target branch from feat/calendar-create to main 2026-08-26 18:38:20 +00:00

nalum merged commit eb743cd3fb into main 2026-08-26 18:38:23 +00:00

nalum deleted branch feat/calendar-toolbar 2026-08-26 18:38:24 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

adr

Needs or introduces an Architecture Decision Record

  

android

affects android app

  

area/calendar

The calendar surfaces: month, week, agenda, day sheet, events

  

area/design-system

Tokens, shared components and the row grammar both surfaces use

  

area/i18n

Strings, msgids and translation across surfaces

  

area/jobs

The jobs surface: board, card, sheet, create

  

area/offline

The offline write queue and sync behaviour

  

area/server

Server behaviour: RPCs, guards, domain rules, proto

  

area/testing

Conformance fixtures, goldens and test harnesses

  

bug

Something is not working

  

ci

CI and release pipeline

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

notifications

Push and notification system

  

question

More information is needed

  

reliability

Robustness, failure modes, resilience

  

security

Security finding or hardening work

  

severity/low

Low severity

  

severity/medium

Medium severity

  

tracking

Plan / tracking issues

  

web

affects web app

  

wontfix

This won't be fixed

No labels

adr

android

area/calendar

area/design-system

area/i18n

area/jobs

area/offline

area/server

area/testing

bug

ci

duplicate

enhancement

help wanted

invalid

notifications

question

reliability

security

severity/low

severity/medium

tracking

web

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

eagraiclainne/app!265

No description provided.