From d00470691eae9dbc86ec32ae10726e9c79181775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 16:15:34 +0900 Subject: [PATCH 1/6] add white background --- .../screen_route_fade_transition_page.dart | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/src/page_route/screen_route_fade_transition_page.dart b/lib/src/page_route/screen_route_fade_transition_page.dart index cc02abe..8aa1499 100644 --- 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 extends WippyTransitionPage { @@ -21,12 +22,21 @@ class ScreenRouteFadeTransitionPage extends WippyTransitionPage { curve: Curves.easeInOut, ); - return FadeTransition( + return Stack( + children: [ + Container( + width: double.infinity, + height: double.infinity, + color: wippyWhite, + ), + FadeTransition( opacity: Tween( begin: 0.0, end: 1.0, ).animate(curvedAnimation), child: child, - ); + ), + ], + ); } } From e22c6d79cbc8007bb0c3504555cc33bca6ab724f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 16:15:42 +0900 Subject: [PATCH 2/6] version up --- example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- example/pubspec_overrides.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 018493d..fd0d379 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -598,7 +598,7 @@ packages: path: ".." relative: true source: path - version: "0.0.18" + version: "0.0.19" rxdart: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 67cd077..8fcf8df 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: sdk: flutter flutter_bloc: ^8.1.6 cupertino_icons: ^1.0.8 - quantum_dots: ^0.0.18 + quantum_dots: ^0.0.19 dev_dependencies: flutter_test: diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 8ed528e..0257e39 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -2,4 +2,4 @@ dependency_overrides: quantum_dots: path: ../ - version: 0.0.18 + version: 0.0.19 diff --git a/pubspec.yaml b/pubspec.yaml index 1b62d92..a327cab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: quantum_dots description: the design system for wippy global product -version: 0.0.18 +version: 0.0.19 homepage: https://github.com/nrise/Quantum-Dots topics: - animations From 0758d590545919b62203b6c452b7e49ccb8f777a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 16:28:37 +0900 Subject: [PATCH 3/6] version up --- example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- example/pubspec_overrides.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index fd0d379..9ce0110 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -598,7 +598,7 @@ packages: path: ".." relative: true source: path - version: "0.0.19" + version: "0.0.20" rxdart: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 8fcf8df..e6af2b2 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: sdk: flutter flutter_bloc: ^8.1.6 cupertino_icons: ^1.0.8 - quantum_dots: ^0.0.19 + quantum_dots: ^0.0.20 dev_dependencies: flutter_test: diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 0257e39..844e233 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -2,4 +2,4 @@ dependency_overrides: quantum_dots: path: ../ - version: 0.0.19 + version: 0.0.20 diff --git a/pubspec.yaml b/pubspec.yaml index a327cab..e51cbed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: quantum_dots description: the design system for wippy global product -version: 0.0.19 +version: 0.0.20 homepage: https://github.com/nrise/Quantum-Dots topics: - animations From d7703393fb28752224a4f8a6ac75e0603bdc324e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 16:52:51 +0900 Subject: [PATCH 4/6] add enableCupertinoTransition --- lib/src/page_route/builder/wippy_page_route_builder.dart | 2 +- lib/src/page_route/builder/wippy_transition_page.dart | 6 ++++-- lib/src/page_route/screen_slide_transition_page.dart | 1 + 3 files changed, 6 insertions(+), 3 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 index 86942d6..cb8ebfd 100644 --- 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 extends PageRoute { Widget child, ) { try { - if (Platform.isIOS) { + if (Platform.isIOS && _page.enableCupertinoTransition) { return const CupertinoPageTransitionsBuilder().buildTransitions( this, context, diff --git a/lib/src/page_route/builder/wippy_transition_page.dart b/lib/src/page_route/builder/wippy_transition_page.dart index a14de8f..8005790 100644 --- 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 extends Page { 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 extends Page { final String? barrierLabel; - final Widget Function(BuildContext context, Animation animation, - Animation secondaryAnimation, Widget child) transitionsBuilder; + final Widget Function(BuildContext context, Animation animation, Animation secondaryAnimation, Widget child) transitionsBuilder; @override Route createRoute(BuildContext context) => WippyPageRouteBuilder(this); diff --git a/lib/src/page_route/screen_slide_transition_page.dart b/lib/src/page_route/screen_slide_transition_page.dart index 104bb5c..ed37491 100644 --- a/lib/src/page_route/screen_slide_transition_page.dart +++ b/lib/src/page_route/screen_slide_transition_page.dart @@ -12,6 +12,7 @@ class ScreenSlideTransitionPage extends WippyTransitionPage { reverseTransitionDuration: const Duration(milliseconds: 200), barrierColor: wippyWhite, transitionsBuilder: _transitionsBuilder, + enableCupertinoTransition: false, ); static Widget _transitionsBuilder(BuildContext context, Animation animation, Animation secondaryAnimation, Widget child) { From 7fd575ce50299bcef4a1a81188b2269ccb80bdfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 16:53:13 +0900 Subject: [PATCH 5/6] version up --- example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- example/pubspec_overrides.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 9ce0110..dda25aa 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -598,7 +598,7 @@ packages: path: ".." relative: true source: path - version: "0.0.20" + version: "0.0.21" rxdart: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e6af2b2..2f85777 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: sdk: flutter flutter_bloc: ^8.1.6 cupertino_icons: ^1.0.8 - quantum_dots: ^0.0.20 + quantum_dots: ^0.0.21 dev_dependencies: flutter_test: diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 844e233..8410522 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -2,4 +2,4 @@ dependency_overrides: quantum_dots: path: ../ - version: 0.0.20 + version: 0.0.21 diff --git a/pubspec.yaml b/pubspec.yaml index e51cbed..e9885b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: quantum_dots description: the design system for wippy global product -version: 0.0.20 +version: 0.0.21 homepage: https://github.com/nrise/Quantum-Dots topics: - animations From c50d1158c639c5f949a635c25a9259bf937fe77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=A7=84=EC=9A=B0?= Date: Thu, 6 Feb 2025 17:36:13 +0900 Subject: [PATCH 6/6] version up --- example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- example/pubspec_overrides.yaml | 2 +- lib/src/page_route/screen_route_fade_transition_page.dart | 1 + lib/src/page_route/screen_slide_transition_page.dart | 1 - pubspec.yaml | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index dda25aa..362ff18 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -598,7 +598,7 @@ packages: path: ".." relative: true source: path - version: "0.0.21" + version: "0.0.22" rxdart: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 2f85777..b8116ab 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: sdk: flutter flutter_bloc: ^8.1.6 cupertino_icons: ^1.0.8 - quantum_dots: ^0.0.21 + quantum_dots: ^0.0.22 dev_dependencies: flutter_test: diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 8410522..3b5951e 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -2,4 +2,4 @@ dependency_overrides: quantum_dots: path: ../ - version: 0.0.21 + version: 0.0.22 diff --git a/lib/src/page_route/screen_route_fade_transition_page.dart b/lib/src/page_route/screen_route_fade_transition_page.dart index 8aa1499..32cf03a 100644 --- a/lib/src/page_route/screen_route_fade_transition_page.dart +++ b/lib/src/page_route/screen_route_fade_transition_page.dart @@ -14,6 +14,7 @@ class ScreenRouteFadeTransitionPage extends WippyTransitionPage { transitionsBuilder: _transitionsBuilder, transitionDuration: duration, reverseTransitionDuration: duration, + enableCupertinoTransition: false, ); static Widget _transitionsBuilder(BuildContext context, Animation animation, Animation secondaryAnimation, Widget child) { diff --git a/lib/src/page_route/screen_slide_transition_page.dart b/lib/src/page_route/screen_slide_transition_page.dart index ed37491..104bb5c 100644 --- a/lib/src/page_route/screen_slide_transition_page.dart +++ b/lib/src/page_route/screen_slide_transition_page.dart @@ -12,7 +12,6 @@ class ScreenSlideTransitionPage extends WippyTransitionPage { reverseTransitionDuration: const Duration(milliseconds: 200), barrierColor: wippyWhite, transitionsBuilder: _transitionsBuilder, - enableCupertinoTransition: false, ); static Widget _transitionsBuilder(BuildContext context, Animation animation, Animation secondaryAnimation, Widget child) { diff --git a/pubspec.yaml b/pubspec.yaml index e9885b3..0067196 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: quantum_dots description: the design system for wippy global product -version: 0.0.21 +version: 0.0.22 homepage: https://github.com/nrise/Quantum-Dots topics: - animations