Android parity 3/3: platform and integrations

[roznet]

Closes #31. This is PR 3 of the Android parity work: the app now looks and behaves like an Android app, and can import flights from FlyFun Weather. The checklist and the decisions made along the way are in designs/future/android-parity.md §6 and §8. There is one commit per section.

Not compiled. Google Maven is blocked from this cloud session, so ./gradlew could not run. Please build it and run it on the emulator before merging. The :core-logic tests are new too and have not been run yet.

3a: look and layout

• Launcher icon. An adaptive icon made from the iOS artwork, plus a monochrome layer for Android 13 themed icons. scripts/android_launcher_icon.py generates it; re-run it when the iOS icon changes.
• Theme. FlyFunTheme: dynamic colour (Material You), light or dark following the system, drawn edge to edge. There is no fallback palette: dynamic colour needs API 31 and the app's minimum is 33.
• Navigation. NavigationSuiteScaffold replaces the bottom bar: a bar on phones and a rail on tablets.
• Tablet layout. ListDetailPaneScaffold shows the list beside the open flight, person or aircraft on wide screens. The navigation back stack decides which panes show, so phones behave exactly as before and ViewModel scoping, Back and the pickers are unchanged.
  • If you tap another flight in the side list while the open one has unsaved edits, it asks Save / Discard, as Back does.
• New dependencies. androidx.compose.material3.adaptive:adaptive and adaptive-layout pinned at 1.2.0, and material3-adaptive-navigation-suite taken from the Compose BOM. I could not check these versions against Google Maven, so bump them if the build complains.

3b: auth and platform

• Sign in with Apple through the server's existing web flow (/auth/login/apple, form_post callback, then the auth code). It sits beside Google on the sign-in screen and in Settings.
• Token storage. TokenStore now encrypts the token with its own Keystore AES-GCM key, and the deprecated security-crypto dependency is gone.
  • The old encrypted file is deleted, not migrated, so testers will have to sign in once more.
• Rolling sessions (bug fix). Android ignored the server's X-Renewed-Token header, so every session expired at the token's lifetime however often the app was used. The interceptor now keeps the renewed token.
• Launcher shortcuts: New Flight and Scan Passport.

3c: server-backed imports

• FlyFun Weather import. The new-flight import list now has a "FlyFun Weather" entry. It lists the pilot's flights on weather.flyfun.aero using the forms token, and applies the chosen flight's route, schedule and aircraft to the draft.
  • The aircraft is matched by registration. If it isn't on file, it is staged and saved only when the flight is created.
  • A 401 from Weather does not sign the pilot out of forms; it shows a message asking them to sign in with the same account instead.
  • The cross-app flight format (FlightExchange) and the mapping onto the draft are in :core-logic, covered by the new FlightExchangeTest.
• Autorouter: skipped, as agreed. Its routes come as raw ICAO flight plans. It is moved to §7 to wait on gate G4.

3d: localisation

• Strings. Every user-visible literal is now in res/values/strings*.xml, one file per area.
• Translations. scripts/android_strings.py writes values-fr/de/es from the iOS Localizable.xcstrings, matching on the English text. 133 of the 350 strings get a translation today; the rest fall back to English.
• Language setting. locales_config.xml lists en/fr/de/es for the system's per-app language setting.
• Still in English. Text built in :core-logic, which has no access to Android resources: the CSV import summary, the merge summary, the "Anne, Bob and 2 more" line, and parser error messages. The details are in §8.

To check when you build

• The Compose adaptive APIs (calculateThreePaneScaffoldValue, ThreePaneScaffoldDestinationItem, NavigationSuiteType.None) are the likeliest compile errors, because their names have changed between adaptive versions.
• NavController.currentBackStack is used to find which tab's list a screen was opened from.
• Tablet or foldable emulator: check the rail, the list beside an item, and the Save / Discard prompt when switching flights.
• Weather import against a real account.
• Apple sign-in end to end.

🤖 Generated with Claude Code

https://claude.ai/code/session_017wLwwiewwvrkxjTmXNfwNg

---

Generated by Claude Code

[claude]

Reviewed 3a-3d (layout/theme, auth/token storage, FlyFun Weather import, localisation).

Bug: orphaned staged-aircraft FK on a second Weather import (high confidence)

app/android/app/src/main/kotlin/aero/flyfun/forms/ui/flights/FlightsViewModel.kt:443-484 (importWeather)

When a Weather import has a registration not on file, a new AircraftEntity is staged and draft.flight.aircraftId is pointed at it (lines 454-460, 471). If the pilot then imports a second Weather flight into the same draft whose exchange has no registration, registration == null takes the else branch: _stagedAircraft.value is reset to null (line 460), but aircraftId/aircraft are left untouched by the if (registration != null) ... else current.flight.aircraftId guards (lines 471, 479) - so they still point at the now-untracked staged aircraft's id.

At save() (FlightsViewModel.kt:509), _stagedAircraft.value?.takeIf { it.id == draft.flight.aircraftId } is null, so the staged aircraft is never persisted via saveAircraft, yet saveFlight(draft.flight) still writes that dangling aircraftId. FlightEntity declares a Room ForeignKey on aircraftId -> AircraftEntity.id (data/Entities.kt:123-131), so the insert will throw SQLiteConstraintException on Save - a crash reachable purely by importing twice from Weather in the same new-flight draft (second import without a resolvable registration).

Fix: only reset _stagedAircraft.value when registration != null, mirroring the conditional treatment of aircraftId/aircraft right below it.

No other high-confidence issues found; the Keystore TokenStore crypto/concurrency, the rolling-session interceptor split between forms/weather clients, the adaptive/tablet pane and Save-Discard wiring, and the string-resource extraction all checked out correctly against the design notes in designs/future/android-parity.md §8.