Skip to content

Improve onboarding and location UX - #81

Merged
Merkost merged 146 commits into
masterfrom
compose_migration
Jul 17, 2026
Merged

Improve onboarding and location UX#81
Merkost merged 146 commits into
masterfrom
compose_migration

Conversation

@Merkost

@Merkost Merkost commented Jun 12, 2026

Copy link
Copy Markdown
Owner

Summary

  • fix onboarding landscape layout and polish the first-spot prompt card
  • add current-location button states for permission, searching, GPS off, and unavailable
  • improve location permission dialog/settings recovery, including app-settings actions

Verification

  • ./gradlew :shared:compileDebugKotlinAndroid --no-daemon
  • ./gradlew :shared:testDebugUnitTest --no-daemon
  • ./gradlew :shared:detekt --no-daemon
  • ./gradlew :shared:compileKotlinIosSimulatorArm64 --no-daemon

Merkost and others added 30 commits June 12, 2026 14:54
@Merkost
Improve onboarding and location UX
54ed84e
@Merkost
Handle map stats network failures
73d7717
@Merkost
Document solunar replacement plan
61f909b
@Merkost @claude
docs: add UI/UX modern-refresh spec, 12 implementation plans, progres…
7662507 
…s tracker

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add Spacing design tokens (commonMain)
ad11d57 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add Elevation design tokens (commonMain)
6081f25 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add Emphasis/alpha design tokens (commonMain)
fca3876 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add Motion design tokens (commonMain)
cbc458b 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add extraSmall shape + ShapeTokens.bottomSheet; canonical radius scale
72a3088 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Color cleanup: privatise dead palette, add error roles + BrandGradien…
5dc71d8 
…ts, drop dead field

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Test token values: Spacing/Elevation/Emphasis/Motion/Shape/error role…
ca19cb6 
…s/BrandGradients

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Address Plan 01A review: ReplaceWith imports, correct deprecation rol…
624f859 
…e, stronger token tests

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add real Nunito 400/500/600/700 weight files (OFL)
aad8633 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Type.kt: per-weight Nunito mapping, tuned lineHeight/letterSpacing, f…
fdcd84e 
…ull scale

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Remove obsolete single-weight nunito.ttf
37efc7d 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add AppButton + AppButtonStyle core primitive
4b94fa1 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add AppIconButton with enforced 48dp target and required contentDescr…
d51a7ce 
…iption

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add AppText + AppTextStyle + TextWithLeadingIcon with role-mapping test
4b7f88c 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add AppCard + SectionCard single tokenized card primitives
cb1982b 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add FormTextField + PickerField input primitives
5f7f3ba 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add no_places_added/no_photos_added empty-state strings (both already…
6a98c48 
… present, no edit needed)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Plan 02A review fixes: clickable SectionCard, IconSize tokens, testab…
90b9a09 
…le AppTextStyle mapping

- SectionCard passes onClick through to AppCard so the whole card is the tap target; the edit pencil is now a decorative Icon hint, not a second tap target (explicit trailing still wins)
- Add IconSize tokens (sm/md/lg); use them for AppButton spinner+leading icon, TextWithLeadingIcon, and SectionCard icons; spinner stroke uses Spacing.xxs
- Extract pure textStyleFor(style, typography); toTextStyle delegates to it; AppTextStyleTest asserts the real M3 role mapping against Typography()

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add EmptyState/ErrorState/LoadingState/InlineLoader/ListAppendLoader …
685193c 
…with centered viewport

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add SkeletonBox/SkeletonLine + CardSkeleton/ListItemSkeleton primitives
83685bf 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add ScreenStateContent<T> crossfade over BaseViewState; uses Motion.m…
7b81eb7 
…edium (no crossfade token in Plan 01)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add PagedListScaffold<T> generic paged-list state machine
026d4d4 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add AppButtonStyle contract test; verify component library builds + i…
d515276 
…nstalls

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add string resources for formatters, banners, and a11y descriptions
bb0e0d2 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add MeasurementFormatter with unit tests
5e038ac 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add UnitFormatter, DateLabels, errorToMessage formatters
b4be6f7 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Merkost and others added 29 commits June 13, 2026 17:12
@Merkost @claude
Remove duplicate custom GoogleButton (Login uses kmpauth GoogleButton…
dd0aeb6 
…UiContainer)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Consistency/a11y sweep: remove stray uppercase/hardcoded colors/off-g…
d285aa3 
…rid dp

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add regression fence asserting legacy composables stay removed
bacea52 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Mark Plan 11 complete; document migration tail surfaced by grep gates
3ceceeb 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Migrate all call sites off legacy text/button/card wrappers
eeb1039 
Replace PrimaryText/SecondaryText*/SupportText/BigText/SubtitleText/
SecondaryTextColored with AppText; DefaultButton*/DefaultIconButton with
AppButton/AppIconButton (drops all-caps .uppercase()); DefaultCardClickable
with AppCard(contentPadding=0). secondaryTextColor -> onSurfaceVariant;
tokenize touched off-grid dp.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Delete dead legacy wrappers; modernize NoContentView; extend fence
9dcfe13 
Text.kt/Buttons.kt/Cards.kt fully unreferenced after the migration -> deleted.
NoContentView rebuilt on AppText + onSurfaceVariant (no customColors). Fence
guards the 14 removed wrapper symbols. Adds the Plan 13 mapping reference.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Mark Plan 13 complete; migration tail resolved
11c4c19 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Fix launch crash: declare org.apache.http.legacy for Maps SDK
a558d67 
Google Maps SDK (MapsDynamite) threw NoClassDefFoundError org.apache.http.ProtocolVersion
on startup, crashing the app at the map start destination.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Fix first-place prompt card overlapping the map FAB
cde5105 
Lift FirstSpotPromptCard above the bottom-end FAB via Spacing.fabClearance.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Login: show app logo instead of the walking-fish lottie
de03696 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Fix double system-bar insets (big top gap on every screen)
fc2efdb 
Restore contentWindowInsets=WindowInsets(0) on the app shell Scaffold so the
status-bar/nav-bar inset is owned once by each screen's own TopAppBar/nav bar,
not counted twice.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Re-brand cards: white surface + real elevation + large corners
e7c4574 
AppCard defaulted to grey surfaceContainer with 1dp elevation (stock-material
flat grey). Restore the premium look: surface container color, raisedCard
elevation, large corner radius — de-greys every card app-wide.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Restore the bespoke animated bottom navigation bar
05ea6b1 
Bring back the loved Jetsnack-style bar (width-lerp selection, sliding
outlined-pill indicator, fade/scale uppercase labels) replacing the stock
M3 NavigationBar.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Fix Weather: white hero text, single percent, single location
66207db 
WeatherMetric now inherits LocalContentColor (white on the blue hero, dark on
neutral cards); hero Surface sets contentColor=onPrimary. weather_percent_value
%% -> % (CMP does not unescape %%). Top bar title is static so the location is
shown once via the picker chip.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Brand the FAB speed-dial consistently via BrandFab
195db94 
Collapsed/close and mini-FABs now all use the brand gradient (BrandFab gains a
size-overridable modifier) instead of mismatched tonal/solid/grey fills.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Introduce FishingTheme; route all theme access through it
bf10f9b 
Add a controlled FishingTheme object (colorScheme/typography/shapes/customColors
+ spacing/iconSize/emphasis/elevation) as the single bridge to Material3, and
migrate every feature-code MaterialTheme.* accessor (~440 sites across 72 files)
to FishingTheme.*. Raw MaterialTheme now lives only in the theme setup and the
FishingTheme bridge, so the design system is owned and controllable.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add UI/UX improvement roadmap (multi-agent audit synthesis)
5135157 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Catch list: photo-journal cards with thumbnail + prominent weight
b5dd82f 
Lead each catch with a 64dp rounded photo thumbnail (downloadPhotoLinks, coil3
SubcomposeAsyncImage) with a tinted fish-silhouette fallback and a +N count
badge; weight becomes a prominent primary-colored metric; amount demoted to an
inline caption; date separator pill de-greyed (surfaceContainerHigh, no more
deprecated cardColor).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Wire empty-state CTAs on Catches/Places lists
de1f0ca 
EmptyStateNoCatches/NoPlaces now show an action button (the onAddCatch/onAddPlace
callbacks were defined but unused), so new users get a clear next step.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Weather hero: brand diagonal gradient + min-height for font scaling
47a4dc9 
Replace the flat Surface(primary) with BrandGradients.primaryDiagonal and
heightIn(min) so the most-viewed surface carries brand identity and survives
large font scales.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Expand UI/UX roadmap with full 8-audit synthesis
b706397 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Weather trend chart: fix flat line via data-driven Y-range
d5d716b 
Pressure/temperature lines plotted near-flat because Vico anchored the Y axis
near 0; set CartesianLayerRangeProvider.fixed(minY,maxY) from the data min/max
with 15% padding so real variation is visible.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Statistics: surface average weight + most-caught species
27a8e6b 
Render the computed-but-hidden CatchStatistics.averageWeight and
mostCaughtSpecies as a third StatTile row.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Weather: Bite Forecast, pressure-trend headline, wind, named moon, hi…
42d0c21 
…gh/low

Add a transparent Bite Forecast card (pure WeatherUtils heuristic over pressure
trend, cloud cover, wind, dawn/dusk) with rating + factor chips; a pressure-trend
headline (arrow + delta + Rising/Falling/Steady); a Wind metric making the hero a
balanced 2x2 grid (centered cells); named moon phase instead of a percent; and
High/Low on daily rows.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Accessibility + haptics pass
6c3fbb3 
Bottom bar: Role.Tab + selectableGroup + tab-position stateDescription + real icon
contentDescription. FABs: state-aware contentDescription + Role.Button + merged
mini-FAB rows. Charts: chartSemantics() summary for TalkBack. Photos: non-null
contentDescription. Add AppHaptics (LocalHapticFeedback) wired into the FAB
speed-dial.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Detail screens: full-bleed hero photo headers
fb21122 
Catch & Place detail now lead with a hero photo (scrim + overlaid title/weight/
date) when a photo exists, falling back to a branded gradient header instead of
the tiny icon.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Update roadmap status: wave 1 shipped; search/swipe deferred to data-…
2273b9c 
…layer pass

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Add list search + swipe-to-delete with undo (Catches & Places)
e6b0224 
Search: per-VM searchQuery StateFlow combined into the paged flow, filtering
PagingData client-side (fishType/placeTitle/description for catches; title/
description for places); compact SearchField at the top of each list.
Swipe-to-delete: PagedListScaffold gains key + onDelete -> SwipeToDismissBox
(left-swipe reveals an error-tinted delete background only while swiping); VMs
delete via repo and show an Undo snackbar that re-adds (addNewCatch/addNewMarker).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost @claude
Roadmap: mark search + swipe-delete shipped
cfac458 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Merkost
Merkost merged commit cfac458 into master Jul 17, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Merkost