Logging redesign Phase 5: unified LogScreen(date), period as a state of the day - #182
Merged
Conversation
Adds the redesign's only genuinely new table: a category group that owns a colour role and a default input type. Fully additive; no UI changes. - Group entity (table `groups`) + GroupDao; TrackingCategory gains a nullable groupId (no FK: deleting a group unfiles members instead of cascading). MIGRATION_23_24 creates the table and adds the column; existing rows keep groupId NULL and their colorToken, so nothing changes visually after migrating. - Group CRUD, reorder, delete-with-unfile, and assign/unassign methods on TrackingRepository (new nullable groupDao constructor param, wired in GoFloApplication). - Colour inheritance per PLAN.md section 5: new "inherit" colorToken sentinel resolved by TrackingCategory.effectiveColorToken(groups) to the group's colorRole, or neutral surfaceVariant when groupless. Deliberately not a CategoryColor entry so the Phase 1 role picker does not offer it. Existing tokens are untouched (no grey wipe; confirmed with owner against the handover's neutral-by-default). - Migration test (Migration23To24Test): runs the real MIGRATION_23_24 against a real SQLite v23 schema via sqlite-jdbc (test-only dep), routing execSQL through a reflection proxy, and asserts the exact schema Room expects plus data preservation. MigrationTestHelper is unusable here (no instrumented tests, exportSchema = false). - PLAN.md section 7 progress log updated; subsystem map 02 updated for v24; changelog fragment (minor); LESSONS.md entry on JVM-side Room migration testing. Verified: migration SQL executed against a seeded v23 schema in SQLite (PRAGMA output matches the test's expected schema exactly); a11y_check.py and wcag_check.py both clean. Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
Adds the ~12 stateless, parameterised Compose primitives every later
redesign screen is assembled from, in ui/components/, previews only.
No existing screen is rewired; nothing is removed.
- SectionHeader: uppercase 11sp section label with right-aligned value
- ListCard / ListRow / HairlineDivider: hairline-outlined card of rows
- StepScale: discrete rising tap-steps; exposes to TalkBack as a single
control ("Flow, Medium, 3 of 4") with per-step custom actions
- ChipToggle / ChipRow: tonal-fill + check selection chips (FilterChip)
- ToneHero: tonal hero container, Comfortaa word applied explicitly
- SegmentedToggle: single-choice segmented buttons, optional role tint
- RolePicker: 6 in-theme role pills + fixed-colour track, standalone
(visuals mirrored from the Phase 1 inline picker; ManageCategories
keeps its copy until a later phase rewires it)
- IconPicker: 48dp icon tile grid with radio semantics + display names
- SwitchRow: full-row toggle, Role.Switch + stateDescription, inner
Switch has no click handler
- Timeline / TimelineEntry: timestamped multiple-per-day list with
per-row overflow and an append row
- PrimarySaveBar: sticky 52dp pill with gradient fade
- MetricInput facade stub + MetricConfig/MetricValue value types
(incl. YesNo/TimeOfDay variants ready for Phase 4)
Every primitive accents from a passed-in role Color (tonal container
fills derived via roleContainerTint, lerp toward surface); each carries
light, dark, and 200% font-scale previews through GoFloTheme so the
extended-roles CompositionLocal path is exercised. a11y_check.py and
wcag_check.py both clean. PLAN.md progress log updated; DB stays at 24.
Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg
Co-authored-by: Claude <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
Completes the MetricInput facade so it renders every category input type,
and refactors LogCategoryScreen to render through it with behaviour parity:
- CategoryType gains YES_NO ("yes_no") and TIME ("time"). Both store their
readings as plain value-label strings ("Yes"/"No"; 24-hour "HH:mm") in
tracking_log_values per the owner's resolution of PLAN.md §8 decision #3:
no new columns, no migration (DB stays at v24).
- MetricInput: whole-step rating scales (up to 10 steps) render as StepScale;
decimal or wider ranges keep the parity slider including whole-number
stepped behaviour, large readout, scale labels, min/max labels, and the
unset-value hint. numeric_free keeps unit label + placeholder; increment
keeps the never-below-zero counter (decrement disabled at 0); yes_no
renders a role-tinted SegmentedToggle; time renders the new TimeField
primitive (Material time picker, 24h).
- LogCategoryScreen: the inline per-type when is gone; every non-timed input
renders via MetricInput. Timed increment stays screen-driven (per-tap
immediate saves, no Save button) and now renders the Timeline primitive.
Notes 500-char cap, save/update, delete, date selection, edit-existing,
empty-catalog text, and "previously recorded (removed)" chips unchanged.
- LogCategoryViewModel: additive setSelectedValues; yes_no/time flow through
selectedValues, so the existing else-branch save path persists them and
the numeric_free empty-blocks-save / increment <=0-blocks-save rules are
untouched.
- LogPeriodScreen: PinnedCategoryInput gains additive yes_no/time branches
delegating to MetricInput (pre-existing branches untouched); additive
LogPeriodViewModel.setPinnedSingleValue feeds the existing selection-set
save path.
- TrackingCategory.isNumeric now enumerates the numeric types explicitly so
yes_no/time chart as label categories in Stats instead of being fed into
numeric chart math.
- Create flow: the two new types appear automatically in the New Category
type chips; the unit field is now limited to the genuinely numeric types.
- Docs: PLAN.md §7 row + §8 #3 resolution, subsystem map 01 drift note,
LESSONS.md entry on negation-defined classifications, changelog fragment
(minor).
Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg
Co-authored-by: Claude <noreply@anthropic.com>
The flow slider mapping (1 Spotting / 2 Light / 4 Heavy / else Medium), the flow and symptom fan-out into the tracking system, the pinned-category value rules, and the episode day-number helper move from private members of LogPeriodViewModel into an internal PeriodDaySync object, so the unified day screen (next commit) shares the exact same code instead of a copy that could drift. LogPeriodViewModel delegates to it; behaviour is unchanged. Also widens LogCategoryScreen's metricConfigFor and TimedIncrementTimeline from private to internal for the same reuse. Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
New LogScreen + LogViewModel compose the Phase 3/4 primitives into one
per-day surface behind the additive route log_day?date={date}:
- Off-period: the first tracked category leads as a ToneHero, flow is not
rendered, and the footer is a quiet Period-started-today row (which flips
the screen into its on-period arrangement before saving).
- On-period: the Flow group (StepScale, stepped slider, or chips per the
category's mode, with the 1 Spotting / 2 Light / 4 Heavy / else Medium
mapping) slots in at the top with the period dates card, pinned
showInLogPeriod categories render in the flow context, and the footer is a
filled status row with End/Undo.
- Between the two states everything is identical: symptoms chips with the
inline Add dialog, tracked metrics organised by group (two or more members
render as one ListCard of rows with the active row's input beneath; a group
of one renders as its own open section), per-entry notes with the 500-char
cap, previously-recorded chips, track-against-time, per-entry delete, and
timed-increment timelines with per-tap saves.
- The title and every metric header open a switch sheet organised by group
and tinted by role: from the title it switches day or jumps to a category;
from a metric header it re-files the entered value under another category
without losing it.
- Saving reuses the period screen's exact sequence via PeriodDaySync
(episode continuation and boundary edits, episode meta, flow/symptom/pinned
fan-out, widget and prediction-reminder refresh); off-period saves write
only categories the user touched, using the category screen's per-type
rules. Remove-day, delete-entire-period, disable-period-logging, and the
unsaved-changes guard are all ported.
The LogPeriod and LogCategory routes stay registered and every existing
entry point still uses them; the only new entry is an opt-in preview row in
the calendar day sheet. Removal is Phase 8.
Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg
Co-authored-by: Claude <noreply@anthropic.com>
Marks Phase 5 done in PLAN.md with its deviations, records the new screen and the PeriodDaySync extraction in subsystem map 01, adds the minor-bump changelog fragment, and adds a lesson on translating single-entry save blocking into per-entry skip rules on a batch save surface. Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
CI failed compileDebugKotlin on PR #180: role/selected/contentDescription/ customActions were assigned inside semantics{} blocks as this.role etc. without importing the corresponding androidx.compose.ui.semantics extension properties (importing the Role class does not cover the lowercase role property). Adds the missing imports to IconPicker, ListCard, RolePicker, StepScale, and Timeline, and extends the LESSONS.md shadowing entry with the import requirement. Verified with a semantics-vs-imports sweep over every main-source Kotlin file plus a11y_check.py. Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
…meField Brings in the phase-3 fix for unresolved semantics extension properties and applies the same fix to TimeField.kt (Phase 4 file, missing the lowercase androidx.compose.ui.semantics.role import), found by sweeping every main-source file with the same checker. Claude-Session: https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg Co-authored-by: Claude <noreply@anthropic.com>
…gn-phase-4 # Conflicts: # app/src/main/java/com/mapgie/goflo/ui/components/MetricInput.kt # docs/design/logging-redesign/PLAN.md
mapgie
marked this pull request as ready for review
August 26, 2026 08:18
…gn-phase-5 # Conflicts: # LESSONS.md # app/src/main/java/com/mapgie/goflo/ui/screens/log/LogCategoryScreen.kt # docs/design/logging-redesign/PLAN.md # docs/design/logging-redesign/subsystem-maps/01-logging-screens.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Phase 5: unified
LogScreen(date)One screen logs a day; a running period is a state of that day, not a separate destination. Fully additive: the
LogPeriodandLogCategoryroutes stay registered, every existing entry point still uses them, and the only way into the new screen is an opt-in "Try the new day log (preview)" row in the calendar day sheet. Removal is Phase 8.What's here
ui/screens/log/LogScreen.kt+LogViewModel.kt(new): the unified day surface behind routelog_day?date={date}(Screen.LogDay), composed from the Phase 3/4 primitives (SectionHeader,ListCard/ListRow,ToneHero,ChipRow,MetricInput,TimelineviaTimedIncrementTimeline,PrimarySaveBar).ui/screens/log/PeriodDaySync.kt(new): the flow slider mapping, flow/symptom fan-out, pinned-value rules, and day-number helper extracted fromLogPeriodViewModel's private members.LogPeriodViewModelnow delegates to it (behaviour unchanged), andLogViewModelcalls the same code, so the two surfaces cannot drift.ToneHero(its own role colour; the DB default role is secondary) and the footer is a quiet "Period started today" hairline row; on-period the Flow group and period-dates card slot in at the top, pinned categories render in the flow context, and the footer becomes a filledprimaryContainerstatus row ("Period ongoing", "Since <date>", End/Undo). Everything between is the same components in the same order.TrackingRepositorygroup methods): a group of 2+ categories renders as oneListCardof rows, tapping a row opens its input below the card; a group of one (and lone ungrouped categories) renders as its own open section; 2+ ungrouped categories share one "Tracking" card.Screen.LogDay+MainActivityregistration;DayLogSheetgains an optionalonOpenDayLogparam (default null; existing callers unaffected) wired only fromHomeScreen.§3 Logging preservation checklist (each item: works on the old screens AND on the new one)
default) — old untouched; new viaMetricInput/ChipRowper categorynumeric_slider) — old untouched; new viaMetricInput(StepScale for whole ratings up to 10 steps, parity slider otherwise, per Phase 4)numeric_free) — old untouched; new viaMetricInput, empty input skips that category (the single-entry screen's "empty blocks save" translated per entry)increment) — old untouched; new viaMetricInput, count of 0 skips (pinned-on-period keeps the period screen's save-including-0 rule)TimedIncrementTimelinewith per-tap saves and per-entry deleteMetricInput, stored as the same value-label stringsPeriodDaySync.flowLabelForSliderValue)AddSymptomDialogwriting to the value catalog — both (same dialog, sameaddValueToCategorypath)showInLogPeriodcategories in the flow context — both (new: rendered after Flow while on-period, in their normal group otherwise; saves keepcomputePinnedValuessemantics incl. slider-min fallback and count 0)PeriodRepository.periodForDate,logPeriodDay/logPeriodRange/updateEpisode, day-past-stored-end extension rule preserved)syncFlowToTrackingLog,syncSymptomsToTrackingLog, pinned logs) — both, through the sharedPeriodDaySyncGoFloWidget.updateAllWidgets) + reminder refresh (ReminderScheduler.refreshPredictionReminders) on period-affecting saves — bothPhase guide acceptance criteria
LogViewModel.refileEntry)StepScale's single-control semantics are as specified; needs device passa11y_check.pygreen (run locally)wcag_check.pygreen (run locally; no colour values changed)LogPeriod/LogCategoryroutes still registered and reachable; nothing deletedDeviations (also recorded in PLAN.md §7)
loggedAt). Pinned categories keep the period screen's always-save fan-out while on-period.LogCategoryViewModel's new-entry rule); editing one specific log among several same-day logs remains aLogCategoryflow via the day sheet.DayLogSheetis the only new entry, so a broken new screen can never block logging.Notes for Phase 6
LogUiState.groups(TrackingRepository.getAllGroupsOnce) and renders group labels withGroup.colorRole; category tints resolve througheffectiveColorToken(groups), so"inherit"categories will follow group recolouring with no screen changes.TrackingSectionsalready implements the "group of 2+ = one card, group of 1 = own section" rule the What You Track home will mirror.🤖 Generated with Claude Code
https://claude.ai/code/session_01PZJLynVBkgLtehJFXffnfg
Generated by Claude Code