Merge pull request #20 from nrise/bug/WGJS-3972

FadeRoute 잔상 이슈 수정
nrise · Feb 6, 2025 · be7ce99 · be7ce99
2 parents 528b73b + 3f305c1
commit be7ce99
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lib/src/page_route/builder/wippy_page_route_builder.dart b/lib/src/page_route/builder/wippy_page_route_builder.dart
@@ -52,7 +52,7 @@ class WippyPageRouteBuilder<T> extends PageRoute<T> {
     Widget child,
   ) {
     try {
-      if (Platform.isIOS) {
+      if (Platform.isIOS && _page.enableCupertinoTransition) {
         return const CupertinoPageTransitionsBuilder().buildTransitions<T>(
           this,
           context,

diff --git a/lib/src/page_route/builder/wippy_transition_page.dart b/lib/src/page_route/builder/wippy_transition_page.dart
@@ -13,12 +13,15 @@ class WippyTransitionPage<T> extends Page<T> {
     this.barrierDismissible = false,
     this.barrierColor,
     this.barrierLabel,
+    this.enableCupertinoTransition = true,
     super.key,
     super.name,
     super.arguments,
     super.restorationId,
   });
 
+  final bool enableCupertinoTransition;
+
   final Widget child;
 
   final Duration transitionDuration;
@@ -37,8 +40,7 @@ class WippyTransitionPage<T> extends Page<T> {
 
   final String? barrierLabel;
 
-  final Widget Function(BuildContext context, Animation<double> animation,
-      Animation<double> secondaryAnimation, Widget child) transitionsBuilder;
+  final Widget Function(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) transitionsBuilder;
 
   @override
   Route<T> createRoute(BuildContext context) => WippyPageRouteBuilder<T>(this);

diff --git a/lib/src/page_route/screen_route_fade_transition_page.dart b/lib/src/page_route/screen_route_fade_transition_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:quantum_dots/qds_foundation.dart';
 import 'package:quantum_dots/src/page_route/builder/wippy_transition_page.dart';
 
 class ScreenRouteFadeTransitionPage<T> extends WippyTransitionPage<T> {
@@ -13,6 +14,7 @@ class ScreenRouteFadeTransitionPage<T> extends WippyTransitionPage<T> {
           transitionsBuilder: _transitionsBuilder,
           transitionDuration: duration,
           reverseTransitionDuration: duration,
+          enableCupertinoTransition: false,
         );
 
   static Widget _transitionsBuilder(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
@@ -21,12 +23,21 @@ class ScreenRouteFadeTransitionPage<T> extends WippyTransitionPage<T> {
       curve: Curves.easeInOut,
     );
 
-    return FadeTransition(
+    return Stack(
+      children: [
+        Container(
+          width: double.infinity,
+          height: double.infinity,
+          color: wippyWhite,
+        ),
+        FadeTransition(
           opacity: Tween<double>(
             begin: 0.0,
             end: 1.0,
           ).animate(curvedAnimation),
           child: child,
-        );
+        ),
+      ],
+    );
   }
 }