diff --git a/app/lib/features/runs/ui/runs_list.dart b/app/lib/features/runs/ui/runs_list.dart index 5dcda49f..a19d4c5f 100644 --- a/app/lib/features/runs/ui/runs_list.dart +++ b/app/lib/features/runs/ui/runs_list.dart @@ -1,3 +1,4 @@ +import '../../../ui/motion/motion.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -128,6 +129,14 @@ class RunsList extends StatelessWidget { entries.add((label: group.label, run: null)); entries.addAll(group.runs.map((run) => (label: null, run: run))); } + // Runs that start while the list is open enter with a short fade. + return ArrivalScope( + ids: [for (final run in controller.visibleRuns) '${run['id']}'], + child: _entriesList(entries), + ); + } + + Widget _entriesList(List<({String? label, JsonMap? run})> entries) { return ListView.builder( itemCount: entries.length, itemBuilder: (context, index) { @@ -141,7 +150,10 @@ class RunsList extends StatelessWidget { child: Semantics(header: true, child: Text(label, style: style)), ); } - return _runTile(context, entry.run!); + return Arrival( + id: '${entry.run!['id']}', + child: _runTile(context, entry.run!), + ); }, ); } diff --git a/app/lib/shell/adaptive_shell.dart b/app/lib/shell/adaptive_shell.dart index ec39c07d..0851e56f 100644 --- a/app/lib/shell/adaptive_shell.dart +++ b/app/lib/shell/adaptive_shell.dart @@ -1,3 +1,4 @@ +import '../ui/motion/motion.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -145,9 +146,12 @@ class _AdaptiveShellState extends State { automaticallyImplyLeading: false, middle: Text(spec?.title ?? details.label), trailing: spec != null && spec.actions.isNotEmpty - ? Row( - mainAxisSize: MainAxisSize.min, - children: spec.actions, + ? MotionSwitcher( + child: Row( + key: ObjectKey(_bar.ownerFor(_selected)), + mainAxisSize: MainAxisSize.min, + children: spec.actions, + ), ) : widget.onSearch == null ? null @@ -209,7 +213,15 @@ class _AdaptiveShellState extends State { ), title: Text(spec?.title ?? details.label), actions: [ - ...?spec?.actions, + if (spec != null && spec.actions.isNotEmpty) + // A screen taking the bar over cross-fades its actions in. + MotionSwitcher( + child: Row( + key: ObjectKey(_bar.ownerFor(_selected)), + mainAxisSize: MainAxisSize.min, + children: spec.actions, + ), + ), if (widget.onSearch != null && (spec?.actions.isEmpty ?? true)) IconButton( key: const ValueKey('shell.search'), diff --git a/app/lib/shell/attention_badge.dart b/app/lib/shell/attention_badge.dart index 6e88d04e..24662a34 100644 --- a/app/lib/shell/attention_badge.dart +++ b/app/lib/shell/attention_badge.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../features/attention/domain/attention_models.dart'; +import '../ui/motion/motion.dart'; /// Mirrors the Runs-heading bell count onto the Runs destination icon. /// @@ -28,7 +29,16 @@ class AttentionDestinationIcon extends StatelessWidget { final visible = count > 0; final Widget icon = cupertino ? _CupertinoCountOverlay(count: count, visible: visible, child: child) - : Badge(label: Text('$count'), isLabelVisible: visible, child: child); + : Badge( + label: visible + ? MotionSwitcher( + scale: true, + child: Text('$count', key: ValueKey(count)), + ) + : null, + isLabelVisible: visible, + child: child, + ); if (!visible) return icon; // The number alone would read as a stray "3"; the item carries the bell's // full label instead. @@ -72,7 +82,10 @@ class _CupertinoCountOverlay extends StatelessWidget { ), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1), - child: Text('$count', style: style), + child: MotionSwitcher( + scale: true, + child: Text('$count', key: ValueKey(count), style: style), + ), ), ), ), @@ -101,36 +114,37 @@ class ActivityBadge extends StatelessWidget { @override Widget build(BuildContext context) { - if (count <= 0) return child; + final visible = count > 0; final color = cupertino ? CupertinoColors.systemBlue.resolveFrom(context) : Theme.of(context).colorScheme.primary; final text = cupertino ? CupertinoColors.white : Theme.of(context).colorScheme.onPrimary; - return Semantics( - label: '$count $label', - child: ExcludeSemantics( - child: Stack( - clipBehavior: Clip.none, - children: [ - child, - PositionedDirectional( - top: bottom ? null : -6, - bottom: bottom ? -6 : null, - end: -10, - child: DecoratedBox( - decoration: ShapeDecoration( - color: color, - shape: const StadiumBorder(), - ), - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 5, - vertical: 1, - ), + final stack = Stack( + clipBehavior: Clip.none, + children: [ + child, + PositionedDirectional( + top: bottom ? null : -6, + bottom: bottom ? -6 : null, + end: -10, + child: AnimatedScale( + scale: visible ? 1 : 0, + duration: Motion.of(context, Motion.quick), + curve: Motion.curve, + child: DecoratedBox( + decoration: ShapeDecoration( + color: color, + shape: const StadiumBorder(), + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1), + child: MotionSwitcher( + scale: true, child: Text( - '$count', + visible ? '$count' : '', + key: ValueKey(count), style: TextStyle( color: text, fontSize: 10, @@ -140,9 +154,14 @@ class ActivityBadge extends StatelessWidget { ), ), ), - ], + ), ), - ), + ], + ); + if (!visible) return stack; + return Semantics( + label: '$count $label', + child: ExcludeSemantics(child: stack), ); } } diff --git a/app/lib/shell/shell_bar.dart b/app/lib/shell/shell_bar.dart index 7d8f3c0d..0af822e7 100644 --- a/app/lib/shell/shell_bar.dart +++ b/app/lib/shell/shell_bar.dart @@ -37,6 +37,10 @@ class ShellBarRegistry extends ChangeNotifier { ShellBarSpec? specFor(AppDestination destination) => _specs[destination]?.$2; + /// The screen that published [destination]'s bar; it changes when another + /// screen takes the bar over. + Object? ownerFor(AppDestination destination) => _specs[destination]?.$1; + void _set(AppDestination destination, Object owner, ShellBarSpec spec) { // A screen's update can land after the shell itself has gone. if (_disposed) return; diff --git a/app/lib/ui/layout/sticky_section.dart b/app/lib/ui/layout/sticky_section.dart index 5bee3715..b1de4dba 100644 --- a/app/lib/ui/layout/sticky_section.dart +++ b/app/lib/ui/layout/sticky_section.dart @@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../adaptive/host.dart'; +import '../motion/motion.dart'; /// A collapsible section for a [CustomScrollView]: its title stays pinned at /// the top while its content scrolls under it, so it can always be closed @@ -50,7 +51,17 @@ class StickySection extends StatelessWidget { ), ), ), - if (open) SliverToBoxAdapter(child: body), + // The content grows and shrinks under the pinned title. + SliverToBoxAdapter( + child: ClipRect( + child: AnimatedSize( + duration: Motion.of(context, Motion.standard), + curve: Motion.curve, + alignment: Alignment.topCenter, + child: open ? body : const SizedBox(width: double.infinity), + ), + ), + ), ], ); } @@ -118,15 +129,16 @@ class StickySectionTitle extends StatelessWidget { overflow: TextOverflow.ellipsis, ), ), - Icon( - open - ? (cupertino - ? CupertinoIcons.chevron_up - : Icons.expand_less) - : (cupertino - ? CupertinoIcons.chevron_down - : Icons.expand_more), - color: muted, + AnimatedRotation( + turns: open ? 0.5 : 0, + duration: Motion.of(context, Motion.standard), + curve: Motion.curve, + child: Icon( + cupertino + ? CupertinoIcons.chevron_down + : Icons.expand_more, + color: muted, + ), ), ], ), diff --git a/app/lib/ui/motion/motion.dart b/app/lib/ui/motion/motion.dart new file mode 100644 index 00000000..c45ba849 --- /dev/null +++ b/app/lib/ui/motion/motion.dart @@ -0,0 +1,167 @@ +import 'package:flutter/widgets.dart'; + +/// Short, quiet motion shared by the app: opening and closing sections, +/// counts and statuses changing, live items arriving. Every duration drops +/// to zero when the system asks for reduced motion. +abstract final class Motion { + /// A count, an icon or a status swapping in place. + static const Duration quick = Duration(milliseconds: 150); + + /// A section opening or closing, a bar changing its actions. + static const Duration standard = Duration(milliseconds: 200); + + static const Curve curve = Curves.easeOutCubic; + + /// [duration], or zero under the system's reduce-motion setting. + static Duration of(BuildContext context, Duration duration) => + MediaQuery.maybeDisableAnimationsOf(context) ?? false + ? Duration.zero + : duration; +} + +/// Swaps [child] with a short cross-fade whenever its key changes. +class MotionSwitcher extends StatelessWidget { + const MotionSwitcher({ + super.key, + required this.child, + this.duration = Motion.quick, + this.scale = false, + }); + + final Widget child; + final Duration duration; + + /// Also grows the incoming child from 80%: for badges and pills. + final bool scale; + + @override + Widget build(BuildContext context) => AnimatedSwitcher( + duration: Motion.of(context, duration), + switchInCurve: Motion.curve, + switchOutCurve: Motion.curve, + transitionBuilder: (child, animation) { + final faded = FadeTransition(opacity: animation, child: child); + if (!scale) return faded; + return ScaleTransition( + scale: Tween(begin: 0.8, end: 1).animate(animation), + child: faded, + ); + }, + child: child, + ); +} + +/// Names the items of a live list, so items that arrive after the first load +/// can enter with a short fade and slide while the first load and items +/// scrolled into view appear at once. +class ArrivalScope extends StatefulWidget { + const ArrivalScope({super.key, required this.ids, required this.child}); + + /// Every item currently in the list, built or not. + final Iterable ids; + final Widget child; + + @override + State createState() => _ArrivalScopeState(); +} + +class _ArrivalScopeState extends State { + final Set _known = {}; + final Set _fresh = {}; + bool _primed = false; + + void _absorb() { + final ids = widget.ids.toList(); + if (!_primed) { + // The first non-empty list is the starting point, not an arrival. + if (ids.isEmpty) return; + _known.addAll(ids); + _primed = true; + return; + } + for (final id in ids) { + if (_known.add(id)) _fresh.add(id); + } + } + + @override + void initState() { + super.initState(); + _absorb(); + } + + @override + void didUpdateWidget(ArrivalScope oldWidget) { + super.didUpdateWidget(oldWidget); + _absorb(); + } + + /// True once for an item that arrived after the first load. + bool _claim(Object id) => _fresh.remove(id); + + @override + Widget build(BuildContext context) => + _ArrivalData(state: this, child: widget.child); +} + +class _ArrivalData extends InheritedWidget { + const _ArrivalData({required this.state, required super.child}); + + final _ArrivalScopeState state; + + @override + bool updateShouldNotify(_ArrivalData oldWidget) => false; +} + +/// One item of an [ArrivalScope]: fades and slides in when it is new. +class Arrival extends StatefulWidget { + const Arrival({super.key, required this.id, required this.child}); + + final Object id; + final Widget child; + + @override + State createState() => _ArrivalState(); +} + +class _ArrivalState extends State with SingleTickerProviderStateMixin { + AnimationController? _controller; + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + if (_controller != null) return; + final scope = context.getInheritedWidgetOfExactType<_ArrivalData>()?.state; + final duration = Motion.of(context, Motion.standard); + if (scope == null || + duration == Duration.zero || + !scope._claim(widget.id)) { + return; + } + _controller = AnimationController(vsync: this, duration: duration) + ..forward(); + } + + @override + void dispose() { + _controller?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final controller = _controller; + if (controller == null) return widget.child; + final curved = CurvedAnimation(parent: controller, curve: Motion.curve); + return FadeTransition( + opacity: curved, + child: SlideTransition( + position: Tween( + begin: const Offset(0, 0.15), + end: Offset.zero, + ).animate(curved), + child: widget.child, + ), + ); + } +} diff --git a/app/test/shell/attention_badge_test.dart b/app/test/shell/attention_badge_test.dart index a11e2e71..9719bda0 100644 --- a/app/test/shell/attention_badge_test.dart +++ b/app/test/shell/attention_badge_test.dart @@ -56,7 +56,10 @@ void main() { expect(badge, findsOneWidget); expect(tester.widget(badge).isLabelVisible, isFalse); expect( - find.descendant(of: badge, matching: find.byType(Text)), + find.descendant( + of: badge, + matching: find.textContaining(RegExp(r'\d')), + ), findsNothing, ); expect(find.bySemanticsLabel(anyAttention), findsNothing); diff --git a/app/test/shell/shell_bar_test.dart b/app/test/shell/shell_bar_test.dart index 4b7486ae..d9734edb 100644 --- a/app/test/shell/shell_bar_test.dart +++ b/app/test/shell/shell_bar_test.dart @@ -94,7 +94,7 @@ void main() { expect( find.descendant( of: find.byKey(const ValueKey('shell.badge.chat.unread')), - matching: find.byType(Text), + matching: find.textContaining(RegExp(r'\d')), ), findsNothing, ); diff --git a/app/test/ui/motion/motion_test.dart b/app/test/ui/motion/motion_test.dart new file mode 100644 index 00000000..33db5be4 --- /dev/null +++ b/app/test/ui/motion/motion_test.dart @@ -0,0 +1,40 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/ui/motion/motion.dart'; + +Widget _list(List ids, {bool reduce = false}) => Directionality( + textDirection: TextDirection.ltr, + child: MediaQuery( + data: MediaQueryData(disableAnimations: reduce), + child: ArrivalScope( + ids: ids, + child: Column( + children: [ + for (final id in ids) + Arrival(key: ValueKey(id), id: id, child: Text(id)), + ], + ), + ), + ), +); + +Finder _fadeOf(String id) => + find.ancestor(of: find.text(id), matching: find.byType(FadeTransition)); + +void main() { + testWidgets('only items after the first load fade in', (tester) async { + await tester.pumpWidget(_list(['a', 'b'])); + expect(_fadeOf('a'), findsNothing); + + await tester.pumpWidget(_list(['c', 'a', 'b'])); + expect(_fadeOf('c'), findsOneWidget); + expect(_fadeOf('a'), findsNothing); + await tester.pumpAndSettle(); + }); + + testWidgets('reduced motion shows arrivals at once', (tester) async { + await tester.pumpWidget(_list(['a'], reduce: true)); + await tester.pumpWidget(_list(['b', 'a'], reduce: true)); + expect(_fadeOf('b'), findsNothing); + }); +}