Reveal full next card behind opaque deck front

This commit is contained in:
2026-11-07 19:51:10 +00:00
parent f6491e995f
commit 0f2711e8fa
4 changed files with 36 additions and 5 deletions
@@ -27,6 +27,9 @@ class ChatSwitchCard extends StatelessWidget {
final shadow = usesCupertinoHost(context)
? CupertinoColors.black
: Theme.of(context).shadowColor;
final surface = usesCupertinoHost(context)
? CupertinoTheme.of(context).scaffoldBackgroundColor
: Theme.of(context).colorScheme.surface;
return LayoutBuilder(
builder: (context, constraints) => Opacity(
opacity: pose.opacity,
@@ -35,6 +38,7 @@ class ChatSwitchCard extends StatelessWidget {
transform: pose.transform(constraints.biggest),
child: DecoratedBox(
decoration: BoxDecoration(
color: motion.isAnimating && !motion.isTape ? surface : null,
boxShadow: [
BoxShadow(
color: shadow.withValues(alpha: .24 * pose.shadow),
+5 -5
View File
@@ -65,11 +65,11 @@ Rect quickSwitchRect(
final deck =
style == QuickSwitchAnimation.cardStack ||
style == QuickSwitchAnimation.deckSlide;
final travel = deck
? outgoing
? ((t - .45) / .55).clamp(0.0, 1.0)
: (t / .8).clamp(0.0, 1.0)
: t;
// The next card is already full-sized behind the opaque front card.
// Sliding the front card aside reveals it instead of exposing empty space
// above a view still travelling up from the small preview.
if (deck && !outgoing) return to;
final travel = deck ? ((t - .45) / .55).clamp(0.0, 1.0) : t;
return Rect.lerp(from, to, travel)!;
}
@@ -101,6 +101,22 @@ void main() {
)
.first,
);
final surfaceColor =
tester
.widget<DecoratedBox>(
find
.descendant(
of: find.byWidgetPredicate(
(w) => w is ChatSwitchCard && w.outgoing,
),
matching: find.byType(DecoratedBox),
)
.first,
)
.decoration
as BoxDecoration;
expect(surfaceColor.color, isNotNull);
expect(surfaceColor.color!.a, 1);
expect(
card.transform.entry(3, 2) != 0,
{
@@ -28,6 +28,17 @@ void main() {
}
});
test('deck reveals a full-size next card behind the front card', () {
for (final style in [
QuickSwitchAnimation.cardStack,
QuickSwitchAnimation.deckSlide,
]) {
for (final t in [0.0, .3, .5, 1.0]) {
expect(quickSwitchRect(style, t, peek, full, outgoing: false), full);
}
}
});
test('every style settles without residual transforms or missing cards', () {
for (final style in QuickSwitchAnimation.values) {
for (final outgoing in [true, false]) {