diff --git a/app/lib/ui/adaptive/floating_destination_bar.dart b/app/lib/ui/adaptive/floating_destination_bar.dart index d5ac232e..d1b3c456 100644 --- a/app/lib/ui/adaptive/floating_destination_bar.dart +++ b/app/lib/ui/adaptive/floating_destination_bar.dart @@ -336,7 +336,8 @@ class _TabEntranceState extends State<_TabEntrance> _controller = AnimationController( vsync: this, duration: - Motion.standard + Motion.tabEntranceStagger * (widget.count - 1), + Motion.tabEntranceDuration + + Motion.tabEntranceStagger * (widget.count - 1), ); } @@ -345,7 +346,7 @@ class _TabEntranceState extends State<_TabEntrance> super.didChangeDependencies(); if (_started) return; _started = true; - final duration = Motion.of(context, Motion.standard); + final duration = Motion.of(context, Motion.tabEntranceDuration); _controller.duration = duration + Motion.tabEntranceStagger * (widget.count - 1); if (duration == Duration.zero) { @@ -365,16 +366,45 @@ class _TabEntranceState extends State<_TabEntrance> Widget build(BuildContext context) { final total = _controller.duration!.inMicroseconds; final start = Motion.tabEntranceStagger.inMicroseconds * widget.index; + final window = Motion.tabEntranceDuration.inMicroseconds; final begin = total == 0 ? 0.0 : start / total; - final animation = CurvedAnimation( + final end = total == 0 ? 1.0 : (start + window) / total; + final pop = CurvedAnimation( parent: _controller, - curve: Interval(begin, 1, curve: Motion.curve), + curve: Interval( + begin, + end.clamp(begin, 1.0).toDouble(), + curve: Curves.easeOutBack, + ), + ); + final opacity = CurvedAnimation( + parent: _controller, + curve: Interval( + begin, + total == 0 + ? 1.0 + : (start + window * Motion.tabEntranceOpacityPortion) + .clamp(start, total) + .toDouble() / + total, + curve: Curves.easeOut, + ), ); return FadeTransition( - opacity: animation, - child: ScaleTransition( - scale: Tween(begin: 0.88, end: 1).animate(animation), + opacity: opacity, + child: AnimatedBuilder( + animation: pop, child: widget.child, + builder: (context, child) => Transform.translate( + offset: Offset(0, (1 - pop.value) * Motion.tabEntranceSlideDistance), + child: Transform.scale( + scale: Tween( + begin: Motion.tabEntranceScaleBegin, + end: 1, + ).evaluate(pop), + child: child, + ), + ), ), ); } diff --git a/app/lib/ui/motion/motion.dart b/app/lib/ui/motion/motion.dart index 67059a18..3e57abe2 100644 --- a/app/lib/ui/motion/motion.dart +++ b/app/lib/ui/motion/motion.dart @@ -10,8 +10,20 @@ abstract final class Motion { /// A section opening or closing, a bar changing its actions. static const Duration standard = Duration(milliseconds: 200); - /// Delay between neighbouring controls entering as one group. - static const Duration tabEntranceStagger = Duration(milliseconds: 40); + /// Duration of each tab's entrance pop. + static const Duration tabEntranceDuration = Duration(milliseconds: 260); + + /// Delay between neighbouring tabs entering as one group. + static const Duration tabEntranceStagger = Duration(milliseconds: 70); + + /// The scale at which a tab starts its entrance pop. + static const double tabEntranceScaleBegin = 0.6; + + /// The upward travel distance of a tab's entrance pop, in logical pixels. + static const double tabEntranceSlideDistance = 6; + + /// The fraction of a tab's entrance spent fading in. + static const double tabEntranceOpacityPortion = 0.6; static const Curve curve = Curves.easeOutCubic; diff --git a/app/test/ui/adaptive/floating_bar_edge_gap_test.dart b/app/test/ui/adaptive/floating_bar_edge_gap_test.dart index 09a9b845..d712d0c2 100644 --- a/app/test/ui/adaptive/floating_bar_edge_gap_test.dart +++ b/app/test/ui/adaptive/floating_bar_edge_gap_test.dart @@ -171,14 +171,23 @@ void main() { ); final entrance = find.descendant( of: find.byType(FloatingDestinationBar), - matching: find.byType(FadeTransition), + matching: find.byWidgetPredicate( + (widget) => + widget is FadeTransition && widget.child is AnimatedBuilder, + ), ); - expect( - tester.widget(entrance.first).opacity.value, - inInclusiveRange(0, 1), - ); - await tester.pump(const Duration(milliseconds: 320)); - expect(tester.widget(entrance.first).opacity.value, 1); + double firstOpacity() => + tester.widget(entrance.at(0)).opacity.value; + double lastOpacity() => + tester.widget(entrance.at(2)).opacity.value; + expect(firstOpacity(), 0); + expect(lastOpacity(), 0); + await tester.pump(const Duration(milliseconds: 130)); + expect(firstOpacity(), greaterThan(0.9)); + expect(lastOpacity(), lessThan(0.2)); + await tester.pump(const Duration(milliseconds: 270)); + expect(firstOpacity(), 1); + expect(lastOpacity(), 1); await tester.tap(find.byKey(tabKey(1))); await tester.pump();