Committed by
GitHub
Merge pull request #2577 from dksalsgus/feature/transition
fix : check themeData transition
Showing
1 changed file
with
23 additions
and
15 deletions
| @@ -104,20 +104,13 @@ class GetMaterialController extends FullLifeCycleController { | @@ -104,20 +104,13 @@ class GetMaterialController extends FullLifeCycleController { | ||
| 104 | notFoundRoute: config.unknownRoute, | 104 | notFoundRoute: config.unknownRoute, | 
| 105 | navigatorKey: config.navigatorKey, | 105 | navigatorKey: config.navigatorKey, | 
| 106 | navigatorObservers: (config.navigatorObservers == null | 106 | navigatorObservers: (config.navigatorObservers == null | 
| 107 | - ? <NavigatorObserver>[ | ||
| 108 | - GetObserver(config.routingCallback, Get.routing) | ||
| 109 | - ] | ||
| 110 | - : <NavigatorObserver>[ | ||
| 111 | - GetObserver(config.routingCallback, routing), | ||
| 112 | - ...config.navigatorObservers! | ||
| 113 | - ]), | 107 | + ? <NavigatorObserver>[GetObserver(config.routingCallback, Get.routing)] | 
| 108 | + : <NavigatorObserver>[GetObserver(config.routingCallback, routing), ...config.navigatorObservers!]), | ||
| 114 | ); | 109 | ); | 
| 115 | 110 | ||
| 116 | routeInformationParser = config.routeInformationParser ?? | 111 | routeInformationParser = config.routeInformationParser ?? | 
| 117 | createInformationParser( | 112 | createInformationParser( | 
| 118 | - initialRoute: config.initialRoute ?? | ||
| 119 | - config.getPages?.first.name ?? | ||
| 120 | - cleanRouteName("/${config.home.runtimeType}"), | 113 | + initialRoute: config.initialRoute ?? config.getPages?.first.name ?? cleanRouteName("/${config.home.runtimeType}"), | 
| 121 | ); | 114 | ); | 
| 122 | 115 | ||
| 123 | if (config.locale != null) Get.locale = config.locale; | 116 | if (config.locale != null) Get.locale = config.locale; | 
| @@ -140,17 +133,33 @@ class GetMaterialController extends FullLifeCycleController { | @@ -140,17 +133,33 @@ class GetMaterialController extends FullLifeCycleController { | ||
| 140 | 133 | ||
| 141 | Get.isLogEnable = config.enableLog ?? kDebugMode; | 134 | Get.isLogEnable = config.enableLog ?? kDebugMode; | 
| 142 | Get.log = config.logWriterCallback ?? defaultLogWriterCallback; | 135 | Get.log = config.logWriterCallback ?? defaultLogWriterCallback; | 
| 143 | - defaultTransition = config.defaultTransition; | 136 | + defaultTransition = config.defaultTransition ?? getThemeTransition(); | 
| 144 | defaultOpaqueRoute = config.opaqueRoute ?? true; | 137 | defaultOpaqueRoute = config.opaqueRoute ?? true; | 
| 145 | defaultPopGesture = config.popGesture ?? GetPlatform.isIOS; | 138 | defaultPopGesture = config.popGesture ?? GetPlatform.isIOS; | 
| 146 | - defaultTransitionDuration = | ||
| 147 | - config.transitionDuration ?? Duration(milliseconds: 300); | 139 | + defaultTransitionDuration = config.transitionDuration ?? Duration(milliseconds: 300); | 
| 148 | 140 | ||
| 149 | // defaultTransitionCurve = Curves.easeOutQuad; | 141 | // defaultTransitionCurve = Curves.easeOutQuad; | 
| 150 | // defaultDialogTransitionCurve = Curves.easeOutQuad; | 142 | // defaultDialogTransitionCurve = Curves.easeOutQuad; | 
| 151 | // defaultDialogTransitionDuration = Duration(milliseconds: 300); | 143 | // defaultDialogTransitionDuration = Duration(milliseconds: 300); | 
| 152 | } | 144 | } | 
| 153 | 145 | ||
| 146 | + getThemeTransition() { | ||
| 147 | + final platform = Get.theme.platform; | ||
| 148 | + final matchingTransition = Get.theme.pageTransitionsTheme.builders[platform]; | ||
| 149 | + switch (matchingTransition) { | ||
| 150 | + case CupertinoPageTransitionsBuilder(): | ||
| 151 | + return Transition.cupertino; | ||
| 152 | + case ZoomPageTransitionsBuilder(): | ||
| 153 | + return Transition.zoom; | ||
| 154 | + case FadeUpwardsPageTransitionsBuilder(): | ||
| 155 | + return Transition.fade; | ||
| 156 | + case OpenUpwardsPageTransitionsBuilder(): | ||
| 157 | + return Transition.native; | ||
| 158 | + default: | ||
| 159 | + return null; | ||
| 160 | + } | ||
| 161 | + } | ||
| 162 | + | ||
| 154 | String cleanRouteName(String name) { | 163 | String cleanRouteName(String name) { | 
| 155 | name = name.replaceAll('() => ', ''); | 164 | name = name.replaceAll('() => ', ''); | 
| 156 | 165 | ||
| @@ -256,8 +265,7 @@ class GetMaterialController extends FullLifeCycleController { | @@ -256,8 +265,7 @@ class GetMaterialController extends FullLifeCycleController { | ||
| 256 | List<NavigatorObserver>? navigatorObservers, | 265 | List<NavigatorObserver>? navigatorObservers, | 
| 257 | TransitionDelegate<dynamic>? transitionDelegate, | 266 | TransitionDelegate<dynamic>? transitionDelegate, | 
| 258 | PopMode backButtonPopMode = PopMode.history, | 267 | PopMode backButtonPopMode = PopMode.history, | 
| 259 | - PreventDuplicateHandlingMode preventDuplicateHandlingMode = | ||
| 260 | - PreventDuplicateHandlingMode.reorderRoutes, | 268 | + PreventDuplicateHandlingMode preventDuplicateHandlingMode = PreventDuplicateHandlingMode.reorderRoutes, | 
| 261 | GlobalKey<NavigatorState>? navigatorKey, | 269 | GlobalKey<NavigatorState>? navigatorKey, | 
| 262 | }) { | 270 | }) { | 
| 263 | return GetDelegate( | 271 | return GetDelegate( | 
- 
Please register or login to post a comment