The effort pass, end to end. Every screen was run through one test — if I remove this sentence, does the customer make a worse decision? — and the parts that failed it are gone. The flow Home ▸ BOOK ▸ Where is it going? ▸ When shall we collect? ▸ details ▸ booked BOOK opens a sheet, not a form. The destination is browsed state-then-district because a flat list of every serviceable district survives twelve and not sixty, and search cuts across states because somebody who knows they are sending to Chennai should not have to know which state it is in. Districts multi-select, but only where the server allows it: BookingLimits advertises maxDestinations: 1 until the Miler build keys on consignmentid, and a sheet that ignored that would sell a booking the network cannot complete. The pickup window is now a step the customer answers rather than a slot chosen for them. A pickup window is a promise about somebody's afternoon. What the screens stopped saying Home lost the orb caption for returning customers and a four-cell live card. Send lost the city strip, both address fields, the optional disclosure and three sentences about charging — the route, the packages and the button are what is left. Tracking lost a radar with a bike in it, a Milers-in-your-zone count, a "Step 2 of 7" and a sentence describing the screen you were looking at. The window sheet lost "Fastest pickup", "4 Milers nearby" and "Relaxed evening handover". Type Poppins, which has no variable release — four static cuts, and the sans styles set fontWeight alone because fontVariations on a static font is ignored in silence. Every weight dropped a step and the tracking went deeper: Poppins is built on near-circles and carries more ink than the humanist faces before it. Objects One lit sphere on Home, and the primary button now takes its gradient and rim because a committing action that is not lit like the hero reads as a different material. The tracking rail's connector is crimson as far as the parcel has come, so the line is the progress bar. Confirmation is a white tick on green: crimson is this app's action colour and that screen has nothing left to do. Bugs found on the way The OTP screen dropped digits. Four fields passing focus along lose a keystroke that arrives mid-transition, so "1234" became "124" and the screen answered "That code did not match" — blaming the customer for its own race. One field now, four boxes that only draw. Nothing ever asked for the customer's location: detectPickupLocation was the OTP screen's job, so a restored session or an auto-login never triggered the permission prompt and the pickup map had nothing to centre on. The launcher icon and both splash screens pointed at a house drawn as two vector paths — a placeholder that shipped. The splash clock started when the widget was built rather than when it was visible, so the truck got 0.45s of a 1.8s beat behind Android's own splash. It waits on waitUntilFirstFrameRasterized now, raced against a timeout so a binding that never reports one cannot strand the app. Also: design/screens/ holds all 19 screens under readable names, tool/ has the scripts that refresh them and rebrand the Lottie, and DESIGN.md is current. flutter analyze clean. 88 tests, 1 skipped. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EqVJPB9B4QuieZnBAAKgYQ
434 lines
14 KiB
Dart
434 lines
14 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:lucide_icons_flutter/lucide_icons.dart';
|
|
|
|
import '../tokens.dart';
|
|
import 'cards.dart';
|
|
|
|
/// Labelled field.
|
|
///
|
|
/// White with a hairline at rest, and on focus the edge goes crimson with a
|
|
/// 3pt wash ring around it. The ring is the whole reason this is a container
|
|
/// rather than an `InputDecoration`: it is a spread shadow in the brand's
|
|
/// lightest tint, which no `InputBorder` can draw, and it is what makes the
|
|
/// focused field read as lit rather than merely outlined.
|
|
///
|
|
/// [optional] appends the grey marker that keeps skippable destination and
|
|
/// recipient fields honestly signposted.
|
|
class DmTextField extends StatefulWidget {
|
|
const DmTextField({
|
|
super.key,
|
|
this.label,
|
|
required this.controller,
|
|
this.hint,
|
|
this.optional = false,
|
|
this.keyboardType,
|
|
this.maxLength,
|
|
this.maxLines = 1,
|
|
this.prefix,
|
|
this.textInputAction,
|
|
this.onSubmitted,
|
|
this.autofocus = false,
|
|
this.digitsOnly = false,
|
|
this.mono = false,
|
|
this.onClear,
|
|
this.floating = false,
|
|
});
|
|
|
|
/// The caption above the field, or null for a field that stands alone.
|
|
///
|
|
/// Nullable because a screen whose heading already says what to type does
|
|
/// not need to say it again directly underneath — "Enter your mobile number"
|
|
/// above a field captioned "Phone number" is one sentence printed twice.
|
|
final String? label;
|
|
final TextEditingController controller;
|
|
final String? hint;
|
|
final bool optional;
|
|
final TextInputType? keyboardType;
|
|
final int? maxLength;
|
|
final int maxLines;
|
|
final String? prefix;
|
|
final TextInputAction? textInputAction;
|
|
final ValueChanged<String>? onSubmitted;
|
|
final bool autofocus;
|
|
final bool digitsOnly;
|
|
|
|
/// Sets the value in mono — a pincode or a phone number, where the customer
|
|
/// checks the digits back.
|
|
final bool mono;
|
|
|
|
/// Shows a clear button on the right when non-null.
|
|
final VoidCallback? onClear;
|
|
|
|
/// Puts [label] inside the field while it is empty, and floats it above once
|
|
/// there is something to caption.
|
|
///
|
|
/// An empty field under its own caption is two rows to ask one question, and
|
|
/// on a screen with two of them that is four rows of chrome around two
|
|
/// slabs of white. Floating, the question sits where the answer will go — so
|
|
/// the field is never blank and the caption only appears when it has a job,
|
|
/// which is reminding the customer what they already typed.
|
|
final bool floating;
|
|
|
|
@override
|
|
State<DmTextField> createState() => _DmTextFieldState();
|
|
}
|
|
|
|
class _DmTextFieldState extends State<DmTextField> {
|
|
final FocusNode _node = FocusNode();
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_node.addListener(() => setState(() {}));
|
|
if (widget.floating) {
|
|
widget.controller.addListener(_onText);
|
|
}
|
|
}
|
|
|
|
void _onText() => setState(() {});
|
|
|
|
@override
|
|
void dispose() {
|
|
if (widget.floating) widget.controller.removeListener(_onText);
|
|
_node.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final focused = _node.hasFocus;
|
|
|
|
// A floating label is above the field only once it has a reason to be:
|
|
// something typed, or a cursor in it.
|
|
final lifted = !widget.floating ||
|
|
focused ||
|
|
widget.controller.text.isNotEmpty;
|
|
final textStyle = widget.mono
|
|
? DmText.monoLg.copyWith(fontSize: 15.5, color: DmColors.ink)
|
|
: DmText.field;
|
|
|
|
return Padding(
|
|
padding: const EdgeInsets.only(bottom: 14),
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
if (widget.label != null)
|
|
AnimatedSize(
|
|
duration: DmMotion.fast,
|
|
curve: DmMotion.ease,
|
|
alignment: Alignment.bottomLeft,
|
|
child: !lifted
|
|
? const SizedBox(width: double.infinity)
|
|
: Padding(
|
|
padding: const EdgeInsets.only(bottom: 8),
|
|
child: Text.rich(
|
|
TextSpan(
|
|
style: DmText.label,
|
|
children: [
|
|
TextSpan(text: widget.label),
|
|
if (widget.optional)
|
|
const TextSpan(
|
|
text: ' Optional',
|
|
style: TextStyle(
|
|
color: DmColors.ink4,
|
|
fontWeight: FontWeight.w500,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
AnimatedContainer(
|
|
duration: DmMotion.fast,
|
|
curve: DmMotion.ease,
|
|
constraints: BoxConstraints(
|
|
minHeight: widget.maxLines > 1 ? 0 : DmSpace.field,
|
|
),
|
|
decoration: BoxDecoration(
|
|
color: DmColors.surface,
|
|
borderRadius: DmRadius.all(DmRadius.sm),
|
|
border: Border.all(
|
|
color: focused ? DmColors.brand : DmColors.border,
|
|
),
|
|
boxShadow: focused
|
|
? const [
|
|
BoxShadow(
|
|
color: DmColors.brandSoft,
|
|
spreadRadius: 3,
|
|
blurRadius: 0,
|
|
),
|
|
]
|
|
: null,
|
|
),
|
|
child: Row(
|
|
crossAxisAlignment: widget.maxLines > 1
|
|
? CrossAxisAlignment.start
|
|
: CrossAxisAlignment.center,
|
|
children: [
|
|
if (widget.prefix != null) ...[
|
|
Padding(
|
|
padding: const EdgeInsets.fromLTRB(15, 0, 12, 0),
|
|
child: Text(
|
|
widget.prefix!,
|
|
style: DmText.field.copyWith(
|
|
color: DmColors.ink2,
|
|
fontWeight: FontWeight.w700,
|
|
),
|
|
),
|
|
),
|
|
// A hairline between the country code and the number: they
|
|
// are two different things and reading them as one string is
|
|
// how a digit gets lost.
|
|
Container(width: 1, height: 22, color: DmColors.border),
|
|
],
|
|
Expanded(
|
|
child: TextField(
|
|
controller: widget.controller,
|
|
focusNode: _node,
|
|
keyboardType: widget.keyboardType,
|
|
maxLines: widget.maxLines,
|
|
autofocus: widget.autofocus,
|
|
textInputAction: widget.textInputAction,
|
|
onSubmitted: widget.onSubmitted,
|
|
cursorColor: DmColors.brand,
|
|
cursorRadius: const Radius.circular(2),
|
|
style: textStyle,
|
|
inputFormatters: [
|
|
if (widget.maxLength != null)
|
|
LengthLimitingTextInputFormatter(widget.maxLength),
|
|
if (widget.digitsOnly)
|
|
FilteringTextInputFormatter.digitsOnly,
|
|
],
|
|
decoration: InputDecoration(
|
|
isDense: true,
|
|
// While the label is down inside the field it IS the
|
|
// placeholder; [hint] only gets the slot once the label
|
|
// has floated out of it.
|
|
hintText: lifted
|
|
? widget.hint
|
|
: (widget.label ?? widget.hint),
|
|
hintStyle: DmText.field.copyWith(
|
|
color: DmColors.ink3,
|
|
fontWeight: FontWeight.w500,
|
|
),
|
|
filled: false,
|
|
counterText: '',
|
|
contentPadding: EdgeInsets.fromLTRB(
|
|
widget.prefix == null ? 15 : 12,
|
|
widget.maxLines > 1 ? 15 : 14,
|
|
8,
|
|
widget.maxLines > 1 ? 15 : 14,
|
|
),
|
|
border: InputBorder.none,
|
|
enabledBorder: InputBorder.none,
|
|
focusedBorder: InputBorder.none,
|
|
),
|
|
),
|
|
),
|
|
if (widget.onClear != null)
|
|
Padding(
|
|
padding: const EdgeInsets.only(right: 6),
|
|
child: InkWell(
|
|
onTap: widget.onClear,
|
|
borderRadius: DmRadius.all(DmRadius.xs),
|
|
child: const SizedBox(
|
|
width: 34,
|
|
height: 34,
|
|
child: Icon(LucideIcons.x, size: 17, color: DmColors.ink3),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// A settings row: label left, value or control right.
|
|
class DmRow extends StatelessWidget {
|
|
const DmRow({
|
|
super.key,
|
|
required this.label,
|
|
this.value,
|
|
this.trailing,
|
|
this.onTap,
|
|
this.showChevron = false,
|
|
this.icon,
|
|
});
|
|
|
|
final String label;
|
|
final String? value;
|
|
final Widget? trailing;
|
|
final VoidCallback? onTap;
|
|
final bool showChevron;
|
|
|
|
/// The row's leading glyph. Account's rows all carry one, so the list can be
|
|
/// scanned by shape before it is read.
|
|
///
|
|
/// It used to sit in a washed crimson tile. Four of those down a settings
|
|
/// list put four brand-coloured blocks on the quietest screen in the app,
|
|
/// and each one cost 56pt of the width the row's value needed — which is why
|
|
/// "38 Mettupalayam Road" rendered as "38 Mettupal…". The glyph alone scans
|
|
/// just as well.
|
|
final IconData? icon;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Material(
|
|
color: Colors.transparent,
|
|
child: InkWell(
|
|
onTap: onTap,
|
|
splashColor: DmColors.brandSoft,
|
|
highlightColor: DmColors.brandSoft.withValues(alpha: 0.5),
|
|
child: Container(
|
|
constraints: const BoxConstraints(minHeight: 56),
|
|
padding: const EdgeInsets.fromLTRB(16, 11, 16, 11),
|
|
child: Row(
|
|
children: [
|
|
if (icon != null) ...[
|
|
Icon(icon, size: 19, color: DmColors.ink3),
|
|
const SizedBox(width: 14),
|
|
],
|
|
// The label takes the width it needs and the value takes what
|
|
// is left. A fixed 3:2 split gave the label room it was not
|
|
// using — "Saved addresses" is short — and rendered the value
|
|
// beside it as "38 Mettupal…", which is a truncation nobody can
|
|
// read anything out of. The label stays Flexible so a long one
|
|
// at large text sizes can still give way.
|
|
Flexible(
|
|
child: Text(
|
|
label,
|
|
style: DmText.cardTitle,
|
|
maxLines: 1,
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
),
|
|
if (value != null) ...[
|
|
const SizedBox(width: 12),
|
|
Expanded(
|
|
child: Text(
|
|
value!,
|
|
style: DmText.value,
|
|
textAlign: TextAlign.right,
|
|
maxLines: 1,
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
),
|
|
],
|
|
?trailing,
|
|
if (showChevron) ...[
|
|
const SizedBox(width: 8),
|
|
const Icon(
|
|
LucideIcons.chevronRight,
|
|
size: 18,
|
|
color: DmColors.ink4,
|
|
),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Card that rules a group of [DmRow]s together.
|
|
class DmRowGroup extends StatelessWidget {
|
|
const DmRowGroup({super.key, required this.children});
|
|
|
|
final List<Widget> children;
|
|
|
|
@override
|
|
Widget build(BuildContext context) => DmCard(children: children);
|
|
}
|
|
|
|
/// Switch in brand colours.
|
|
class DmSwitch extends StatelessWidget {
|
|
const DmSwitch({super.key, required this.value, required this.onChanged});
|
|
|
|
final bool value;
|
|
final ValueChanged<bool> onChanged;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Switch.adaptive(
|
|
value: value,
|
|
onChanged: (v) {
|
|
HapticFeedback.selectionClick();
|
|
onChanged(v);
|
|
},
|
|
activeThumbColor: Colors.white,
|
|
activeTrackColor: DmColors.brand,
|
|
inactiveThumbColor: Colors.white,
|
|
inactiveTrackColor: DmColors.border,
|
|
trackOutlineColor: WidgetStateProperty.all(Colors.transparent),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// The search field used by every picker sheet.
|
|
///
|
|
/// It was written inline inside the pickup sheet and then wanted again by the
|
|
/// destination sheet, which is the moment a style becomes a component. Filled
|
|
/// white on the canvas rather than outlined: a search field that is the only
|
|
/// control above a list does not need an edge to be found, and the fill is what
|
|
/// makes it read as a place to type rather than as the first row of the list.
|
|
class DmSearchField extends StatelessWidget {
|
|
const DmSearchField({
|
|
super.key,
|
|
required this.controller,
|
|
required this.hint,
|
|
this.onChanged,
|
|
this.autofocus = false,
|
|
});
|
|
|
|
final TextEditingController controller;
|
|
final String hint;
|
|
final ValueChanged<String>? onChanged;
|
|
final bool autofocus;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return TextField(
|
|
controller: controller,
|
|
onChanged: onChanged,
|
|
autofocus: autofocus,
|
|
cursorColor: DmColors.brand,
|
|
style: DmText.field,
|
|
textInputAction: TextInputAction.search,
|
|
decoration: InputDecoration(
|
|
hintText: hint,
|
|
hintStyle: DmText.field.copyWith(
|
|
color: DmColors.ink3,
|
|
fontWeight: FontWeight.w500,
|
|
),
|
|
prefixIcon: const Icon(
|
|
LucideIcons.search,
|
|
size: 20,
|
|
color: DmColors.ink3,
|
|
),
|
|
filled: true,
|
|
fillColor: DmColors.surface,
|
|
contentPadding: const EdgeInsets.symmetric(
|
|
horizontal: 16,
|
|
vertical: 14,
|
|
),
|
|
border: _border(DmColors.border, 1),
|
|
enabledBorder: _border(DmColors.border, 1),
|
|
focusedBorder: _border(DmColors.brand, 1.5),
|
|
),
|
|
);
|
|
}
|
|
|
|
static OutlineInputBorder _border(Color color, double width) =>
|
|
OutlineInputBorder(
|
|
borderRadius: DmRadius.all(DmRadius.sm),
|
|
borderSide: BorderSide(color: color, width: width),
|
|
);
|
|
}
|