A launch that opens in brand, and a sheet that stops resizing

── The splash, in three beats ──

Crimson edge to edge with the truck running across it in white; the invert;
then the mark.

The red starts before Flutter does. Four surfaces painted white before any
Dart runs — launch_background at both API levels, windowSplashScreenBackground
on Android 12+ in light and dark, and the iOS launch storyboard — and leaving
any one of them white makes the launch a white flash followed by a red one.
That flash is the only part of a launch a customer consciously notices.

The invert is one gesture rather than a fade. A white truck on a background
turning white is an invisible truck, so the ground lightens as the truck
darkens, off one controller, and the screen turns itself inside out with the
truck still on it. Fading it would have left the screen empty for the moment
before the mark.

The truck's colour is no longer its own: it is painted through srcIn, so the
file's palette is discarded and only alpha survives. A replacement Lottie now
needs no preparation, and tool/lottie_brand.py is off this path.

`splash.json` is a seamless 3.9s loop — frame 0 is frame 60, the truck never
arrives or departs — so there is no completion to hand over on. _truckBeat is
a decision about how long a launch may hold somebody, not a property of the
file. The comment claiming six seconds was wrong on both counts.

── Three things the splash was getting wrong quietly ──

It showed the wrong logo: doormile-icon.png, the previous mark, to a customer
who had just tapped the new one. tool/icons.py now cuts doormile-mark.png from
the same master alpha as the launcher icon, so they cannot drift again.

The fallback loader was invisible on red. _RoadLoader painted in DmColors.brand
on what used to be a white screen; on crimson that is crimson on crimson, and
it drew nothing at all on exactly the devices that had fallen back to it.

The mark appeared and left in the same frame — _minimum was the sum of the
beats exactly, so the clock ran out as the entrance finished. Hence _markHold.

── The truck was not in the middle ──

Not a layout bug: both beats sit in a Center and always did. The artwork is
drawn low and to the right inside its own 500x500 composition, so a centred
widget rendered an off-centre picture — 30pt right, 36pt down.

splash_centring_test.dart renders a frame at phone size and density, finds the
ink and fails if either beat drifts. It is the only form of test that could
have caught this, and the one that will catch it again when the Lottie is
replaced, which is when the correction goes stale. Two things it taught:
one enormous pump does not let the splash's async start-up chain advance, and
capturing at pixelRatio 1 rasterizes the speed lines too faintly to detect,
which truncates the bounding box and moves the measured centre by 12pt.

── The destination sheet stops resizing ──

Tapping ONE TOUCH opened a tall sheet that snapped shorter a few frames later.
DmAsyncList renders four skeleton rows while it loads — 302pt — and the states
that replace them are nearer 200; the sheet was Flexible, so it was as tall as
whichever state its content happened to be in, and the modal is still
animating up while that swap happens.

The list now lives in a box of one height. That also removes a second resize:
the sheet grew from 48% of the screen to 74% when a state was picked. Both
steps now measure 64% and it never changes size again.

And DmAsyncList takes initialItems, fed by AppState.cachedCities: FutureBuilder
reports `waiting` on its first build even for an already-complete future, so a
warm cache still flashed a skeleton over data it already had.

Three skeleton rows here rather than four — sheet_stability_test caught that
302pt overflows the smallest box the clamp can produce.
This commit is contained in:
2026-09-28 12:54:03 +05:30
parent 49b0de0d8f
commit 8427824951
41 changed files with 772 additions and 132 deletions

View File

@@ -197,10 +197,35 @@ class _DestinationSheetState extends State<_DestinationSheet> {
onChanged: (v) => setState(() => _q = v.trim().toLowerCase()),
),
const SizedBox(height: 6),
Flexible(
// ── One height, whatever is inside it ──
//
// This was `Flexible`, so the sheet was as tall as its content — and
// its content changes height twice before the customer has done
// anything. `DmAsyncList` renders four skeleton rows while it loads,
// which is 302pt; the states that replace them are nearer 200. The
// modal is still animating up while that swap happens, so tapping ONE
// TOUCH opened a tall sheet that snapped shorter a few frames later.
//
// It also grew again — 48% of the screen for the states, 74% for the
// districts — so browsing resized the surface under the customer's
// thumb.
//
// A fixed box fixes both. The sheet rises once, at one height, and
// loading, states, districts, empty and error all happen inside it.
// Sized against the screen rather than fixed in points, and floored
// above the skeleton's own height so it can never be the thing that
// decides how tall this is.
SizedBox(
height: (MediaQuery.sizeOf(context).height * 0.44).clamp(240.0, 420.0),
child: DmAsyncList<CityOption>(
key: const ValueKey('destinationList'),
skeletonRows: 4,
// Three, not four: 3 x 68 plus gaps is 224, which fits inside the
// smallest box the clamp above can produce. Four did not.
skeletonRows: 3,
// Skips the skeleton entirely when the cities are already known,
// which after the first open they always are. A shimmer that
// appears and vanishes inside one frame is noise.
initialItems: app.cachedCities,
load: ({bool refresh = false}) => app.loadCities(refresh: refresh),
emptyIcon: LucideIcons.mapPinOff,
emptyTitle: 'No cities open yet',

View File

@@ -33,26 +33,60 @@ import '../tokens.dart';
/// logo forever, and `_Launch` shows the login screen, which is the right place
/// for somebody whose session could not be read.
///
/// ── Two beats, in this order ──
/// ── Three beats, in this order ──
///
/// The animation first, alone, and the mark after it. It was the other way
/// round — mark, then the animation appearing underneath it — which read as a
/// logo with a loading bar stuck to the bottom. Running them in sequence makes
/// the first beat about *what this app does* and the second about *whose app
/// it is*, and neither is competing with the other for the same moment.
/// 1. Crimson, edge to edge, with the truck running across it in white.
/// 2. The invert: the screen goes to white and the truck goes to crimson,
/// on the same curve, at the same time.
/// 3. The mark.
///
/// ── The animation is a drop-in, and it is recoloured ──
/// The animation first and the mark after it. It was the other way round —
/// mark, then the animation appearing underneath it — which read as a logo
/// with a loading bar stuck to the bottom. In sequence, the first beat is
/// about *what this app does* and the last about *whose app it is*, and
/// neither competes with the other for the same moment.
///
/// ── The invert is one gesture, not a fade ──
///
/// A white truck on a background turning white is an invisible truck, so
/// something has to give at beat 2. Fading it out is the obvious answer and
/// the worse one: the screen would be empty for the moment before the mark
/// arrives. Instead both colours run off [_flip] at once — the ground lightens
/// as the truck darkens — so the whole screen turns itself inside out and the
/// truck is still there when it lands.
///
/// ── The red starts before Flutter does ──
///
/// [DmColors.splash] is painted by the *window*, from process start:
/// `launch_background.xml`, `windowSplashScreenBackground` on Android 12+ —
/// both orientations of dark mode included — and the iOS launch storyboard.
/// All four were white. Leaving any one of them white makes the launch a white
/// flash followed by a red one, and the flash is the only part a customer
/// consciously notices.
///
/// ── The truck never finishes, so a beat is chosen for it ──
///
/// `splash.json` is a seamless 3.9s loop: the truck sits in place with speed
/// lines behind it and frame 0 is frame 60. There is no arrival to wait for,
/// which means waiting out a full cycle buys nothing and costs a second and a
/// half. [_truckBeat] is a decision about how long a launch screen may hold
/// somebody, not a property of the file.
///
/// It is also drawn small inside a 500x500 composition — about a quarter of
/// it — so it is scaled up rather than sized up; see [_truckScale].
///
/// ── The animation is a drop-in, and its colour is not its own ──
///
/// If `assets/animations/splash.json` exists it is played. If it does not, the
/// road loader below runs instead.
/// road loader below runs instead, on the same timeline and in the same two
/// colours.
///
/// The file shipped as black line art, which is not a colour this app owns —
/// the darkest thing in the palette is `DmColors.ink`, and the splash is the
/// one screen that is nothing but brand. `tool/lottie_brand.py` rewrites its
/// near-black fills and strokes to the crimson; it is idempotent, so run it
/// again after replacing the file. Both are the same size and the same beat, so
/// which one is present changes nothing about the screen's timing — see
/// `assets/animations/README.txt`.
/// Whatever colours the file was drawn in are thrown away: it is painted
/// through `BlendMode.srcIn`, so every visible pixel becomes the one colour
/// [_flip] is currently on and the alpha is all that survives. That works here
/// because the artwork is line art — verified by rendering it — and it means a
/// replacement file needs no preparation at all. `tool/lottie_brand.py`, which
/// used to rewrite the JSON's fills to crimson, is no longer on this path.
class SplashScreen extends StatefulWidget {
const SplashScreen({super.key, required this.ready, required this.onDone});
@@ -62,33 +96,87 @@ class SplashScreen extends StatefulWidget {
/// Called once, when the splash has served its purpose.
final VoidCallback onDone;
/// Long enough for both beats to read: the animation, then the mark.
static const _minimum = Duration(milliseconds: 2800);
/// How long the truck holds the red screen before the invert starts.
static const _truckBeat = Duration(milliseconds: 2000);
/// The invert: crimson to white, and the truck the other way.
static const _invert = Duration(milliseconds: 450);
/// The mark's entrance, once the screen is white.
static const _markIn = Duration(milliseconds: 600);
/// How long the mark is simply *there* once it has finished arriving.
///
/// Without this the clock ran out on the frame the entrance finished, so the
/// last beat of the launch was a logo that appeared and left in the same
/// moment. A mark nobody gets to look at is not worth animating in.
static const _markHold = Duration(milliseconds: 400);
/// Long enough for all three beats to read — their sum, not a guess. Change
/// one of them and this follows.
///
/// A getter rather than a `const`: adding two `Duration`s is not a constant
/// expression in Dart, and writing the total out as a literal is how the
/// three beats and the clock that outlives them drift apart.
static Duration get _minimum => _truckBeat + _invert + _markIn + _markHold;
/// Past this the app moves on whatever the session is doing.
static const _maximum = Duration(seconds: 7);
/// When the animation gives way to the mark.
/// The truck occupies about a quarter of its 500x500 composition, so at the
/// natural size it is a detail on an empty red field. Scaled rather than
/// sized: [Transform.scale] does not affect layout, so the surrounding box
/// stays the size the mark will need and the two beats cannot jump.
static const _truckScale = 2.2;
/// Pulls the truck back to the middle of the screen.
///
/// The truck runs six seconds end to end, so this shows the opening of it
/// rather than the whole thing. That is the right trade: a launch screen
/// that waits out a six-second loop is a launch screen nobody thanks you
/// for, and the part worth seeing — the truck arriving — is at the front.
static const _handover = Duration(milliseconds: 1800);
/// ── The artwork is not centred in its own composition ──
///
/// `splash.json` is 500x500 and the truck is drawn low and to the right
/// inside it, so centring the *widget* leaves the truck about 30pt right and
/// 36pt below the middle of the phone. Centred layout, off-centre picture —
/// which is the kind of thing that looks like nothing until it is beside a
/// logo that really is centred, and then it looks like a mistake.
///
/// Measured off a render rather than guessed, and held there by
/// `splash_centring_test.dart`: it finds the ink in a rendered frame and
/// fails if either beat drifts off the middle. Replace the Lottie and that
/// test will tell you this number is wrong.
///
/// In unscaled units, applied under [_truckScale], so changing the scale
/// does not silently move the truck off centre again.
static const _truckNudge = Offset(-13.8, -16.5);
@override
State<SplashScreen> createState() => _SplashScreenState();
}
class _SplashScreenState extends State<SplashScreen>
with SingleTickerProviderStateMixin {
/// Started at the handover, not at launch: the mark is the second beat.
late final AnimationController _mark = AnimationController(
with TickerProviderStateMixin {
/// The invert. 0 is crimson ground and a white truck, 1 is the other way.
late final AnimationController _flip = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 620),
duration: SplashScreen._invert,
);
/// False while the animation has the screen; true once the mark takes it.
/// Started when [_flip] lands, not at launch: the mark is the last beat.
late final AnimationController _mark = AnimationController(
vsync: this,
duration: SplashScreen._markIn,
);
late final Animation<double> _flipped = CurvedAnimation(
parent: _flip,
curve: DmMotion.ease,
);
late final Animation<double> _entrance = CurvedAnimation(
parent: _mark,
curve: Curves.easeOutBack,
);
/// False while the truck has the screen; true once the mark takes it.
bool _onMark = false;
bool _started = false;
@@ -125,6 +213,12 @@ class _SplashScreenState extends State<SplashScreen>
// anything reaches the glass — that was the first attempt at this fix, and
// it moved the problem without solving it. `waitUntilFirstFrameRasterized`
// is the signal Android itself waits on before taking its splash down.
_flip.addStatusListener((status) {
if (status != AnimationStatus.completed || !mounted) return;
setState(() => _onMark = true);
_mark.forward();
});
_composition = _loadComposition();
unawaited(_waitForScreen());
@@ -155,10 +249,10 @@ class _SplashScreenState extends State<SplashScreen>
if (_started || !mounted) return;
_started = true;
_holdTimer = Timer(SplashScreen._handover, () {
if (!mounted) return;
setState(() => _onMark = true);
_mark.forward();
// Beat 2 starts on a clock; beat 3 starts when beat 2 lands, so the mark
// can never arrive over a screen that is still turning.
_holdTimer = Timer(SplashScreen._truckBeat, () {
if (mounted) _flip.forward();
});
_minTimer = Timer(SplashScreen._minimum, () {
_elapsed = true;
@@ -196,70 +290,115 @@ class _SplashScreenState extends State<SplashScreen>
_minTimer?.cancel();
_maxTimer?.cancel();
_holdTimer?.cancel();
_flip.dispose();
_mark.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final entrance = CurvedAnimation(parent: _mark, curve: Curves.easeOutBack);
// One rebuild per frame of the invert, and nothing else in the tree is
// listening — the truck and the mark both take their colour from here.
return AnimatedBuilder(
animation: _flipped,
builder: (context, _) {
final t = _flipped.value;
final ground = Color.lerp(DmColors.splash, DmColors.surface, t)!;
final ink = Color.lerp(Colors.white, DmColors.splash, t)!;
return Scaffold(
backgroundColor: DmColors.surface,
body: AnnotatedRegion<SystemUiOverlayStyle>(
value: const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.dark,
systemNavigationBarColor: DmColors.surface,
systemNavigationBarIconBrightness: Brightness.dark,
),
child: Semantics(
label: 'Doormile',
child: Center(
// One box, two beats, cross-faded. A `Column` holding both would
// reserve height for the one that is not showing and push the
// other off centre.
// Sized to the screen, not to a number: the splash is the one
// surface with nothing else on it, so both beats are given most
// of the width rather than sitting small in the middle of it.
child: SizedBox(
height: 320,
child: AnimatedSwitcher(
duration: DmMotion.base,
switchInCurve: DmMotion.ease,
switchOutCurve: DmMotion.ease,
child: _onMark
? ScaleTransition(
key: const ValueKey('mark'),
scale: Tween(begin: 0.82, end: 1.0).animate(entrance),
child: FadeTransition(
opacity: _mark,
child: Image.asset(
'assets/images/doormile-icon.png',
width: 210,
height: 210,
filterQuality: FilterQuality.medium,
),
),
)
: FutureBuilder<LottieComposition?>(
key: const ValueKey('animation'),
future: _composition,
builder: (context, snap) {
final composition = snap.data;
if (composition == null) return const _RoadLoader();
return Lottie(
composition: composition,
width: 340,
height: 320,
fit: BoxFit.contain,
repeat: true,
);
},
),
// The system bars belong to whichever half of the invert is showing.
// Left on dark icons, the status bar is unreadable for the two seconds
// the screen is crimson — which is most of the launch.
final onRed = t < 0.5;
return AnnotatedRegion<SystemUiOverlayStyle>(
value: SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
// Android and iOS name this the opposite way round: one describes
// the icons, the other the surface behind them.
statusBarIconBrightness: onRed ? Brightness.light : Brightness.dark,
statusBarBrightness: onRed ? Brightness.dark : Brightness.light,
systemNavigationBarColor: ground,
systemNavigationBarIconBrightness: onRed
? Brightness.light
: Brightness.dark,
),
child: Scaffold(
backgroundColor: ground,
body: Semantics(
label: 'Doormile',
child: Center(
// One box, two beats, cross-faded. A `Column` holding both
// would reserve height for the one that is not showing and
// push the other off centre.
child: SizedBox(
height: 320,
child: AnimatedSwitcher(
duration: DmMotion.base,
switchInCurve: DmMotion.ease,
switchOutCurve: DmMotion.ease,
child: _onMark ? _buildMark() : _buildTruck(ink),
),
),
),
),
),
);
},
);
}
/// Beat 1 and 2: the truck, in whatever colour the invert is on.
///
/// `srcIn` keeps the alpha and throws the colour away, so the file's own
/// palette is irrelevant and a replacement needs no preparation. It works
/// because the artwork is line art — a filled illustration would flatten to
/// a silhouette here, which is worth checking before dropping one in.
Widget _buildTruck(Color ink) {
return ColorFiltered(
key: const ValueKey('animation'),
colorFilter: ColorFilter.mode(ink, BlendMode.srcIn),
child: FutureBuilder<LottieComposition?>(
future: _composition,
builder: (context, snap) {
final composition = snap.data;
if (composition == null) return const _RoadLoader();
return Transform.scale(
scale: SplashScreen._truckScale,
child: Transform.translate(
offset: SplashScreen._truckNudge,
child: Lottie(
composition: composition,
width: 340,
height: 320,
fit: BoxFit.contain,
repeat: true,
),
),
);
},
),
);
}
/// Beat 3: the mark, on white.
///
/// `doormile-mark.png` is cut from the launcher icon's own master by
/// `tool/icons.py`. It used to be `doormile-icon.png`, a separate file that
/// was nobody's job to keep in step — and by the time the icon was redrawn
/// the splash was showing a customer the previous mark half a second after
/// they tapped the new one.
Widget _buildMark() {
return ScaleTransition(
key: const ValueKey('mark'),
scale: Tween(begin: 0.82, end: 1.0).animate(_entrance),
child: FadeTransition(
opacity: _mark,
child: Image.asset(
'assets/images/doormile-mark.png',
width: 210,
height: 210,
filterQuality: FilterQuality.medium,
),
),
);
@@ -272,6 +411,14 @@ class _SplashScreenState extends State<SplashScreen>
/// in the one shape the mark already contains — the road curving through the D.
/// It is also two primitives and no dependency, so the splash works on a fresh
/// checkout with nothing downloaded.
///
/// ── It used to be invisible half the time ──
///
/// Every colour in here was a fixed `DmColors.brand` or `DmColors.border`, from
/// when the splash was white throughout. On the crimson beat that is crimson on
/// crimson: the fallback drew nothing at all, on exactly the devices that had
/// fallen back to it. It takes its ink from the same [ColorFiltered] the truck
/// does now, so both beats invert together.
class _RoadLoader extends StatefulWidget {
const _RoadLoader();
@@ -280,7 +427,7 @@ class _RoadLoader extends StatefulWidget {
}
class _RoadLoaderState extends State<_RoadLoader>
with SingleTickerProviderStateMixin {
with TickerProviderStateMixin {
late final AnimationController _run = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 1500),
@@ -325,7 +472,11 @@ class _RoadPainter extends CustomPainter {
Paint()
..strokeWidth = 2
..strokeCap = StrokeCap.round
..color = DmColors.border,
// Everything here is painted in white and recoloured by the
// `ColorFiltered` wrapping this widget — `srcIn` keeps only the alpha,
// so what matters is the *opacity* of each part, not its hue. The road
// is the quietest thing on it.
..color = Colors.white.withValues(alpha: 0.30),
);
// Lane markings, travelling backwards under the parcel. They are what
@@ -343,10 +494,9 @@ class _RoadPainter extends CustomPainter {
Paint()
..strokeWidth = 2
..strokeCap = StrokeCap.round
// Strong enough to read as movement. At `brandLine` on white they
// were technically present and invisible, which made the parcel look
// like it was sliding on nothing.
..color = DmColors.brand.withValues(alpha: 0.28),
// Strong enough to read as movement. Too faint and the parcel looks
// like it is sliding on nothing.
..color = Colors.white.withValues(alpha: 0.55),
);
}
@@ -363,18 +513,21 @@ class _RoadPainter extends CustomPainter {
rect.shift(const Offset(0, 3)),
Paint()
..maskFilter = const MaskFilter.blur(BlurStyle.normal, 4)
..color = DmColors.brand.withValues(alpha: 0.22),
..color = Colors.white.withValues(alpha: 0.22),
);
canvas.drawRRect(rect, Paint()..color = DmColors.brand);
canvas.drawRRect(rect, Paint()..color = Colors.white);
// The seam across the box, which is what makes it a parcel and not a
// rectangle.
// Punched out of the parcel rather than drawn over it: under `srcIn` a
// lighter stroke on top would come out the same colour as the box.
canvas.drawLine(
Offset(cx, y - 22),
Offset(cx, y - 4),
Paint()
..blendMode = BlendMode.clear
..strokeWidth = 1.6
..color = Colors.white.withValues(alpha: 0.55),
..color = Colors.white,
);
}