Committed by
GitHub
Merge pull request #1665 from Bdaya-Dev/fix-router-outlet
Fix when child is null in MaterialApp builder
Showing
1 changed file
with
14 additions
and
18 deletions
| @@ -210,6 +210,18 @@ class GetMaterialApp extends StatelessWidget { | @@ -210,6 +210,18 @@ class GetMaterialApp extends StatelessWidget { | ||
| 210 | ]; | 210 | ]; | 
| 211 | } | 211 | } | 
| 212 | 212 | ||
| 213 | + Widget defaultBuilder(BuildContext context, Widget? child) { | ||
| 214 | + return Directionality( | ||
| 215 | + textDirection: textDirection ?? | ||
| 216 | + (rtlLanguages.contains(Get.locale?.languageCode) | ||
| 217 | + ? TextDirection.rtl | ||
| 218 | + : TextDirection.ltr), | ||
| 219 | + child: builder == null | ||
| 220 | + ? (child ?? SizedBox.shrink()) | ||
| 221 | + : builder!(context, child), | ||
| 222 | + ); | ||
| 223 | + } | ||
| 224 | + | ||
| 213 | @override | 225 | @override | 
| 214 | Widget build(BuildContext context) => GetBuilder<GetMaterialController>( | 226 | Widget build(BuildContext context) => GetBuilder<GetMaterialController>( | 
| 215 | init: Get.rootController, | 227 | init: Get.rootController, | 
| @@ -258,15 +270,7 @@ class GetMaterialApp extends StatelessWidget { | @@ -258,15 +270,7 @@ class GetMaterialApp extends StatelessWidget { | ||
| 258 | backButtonDispatcher: backButtonDispatcher, | 270 | backButtonDispatcher: backButtonDispatcher, | 
| 259 | routeInformationProvider: routeInformationProvider, | 271 | routeInformationProvider: routeInformationProvider, | 
| 260 | key: _.unikey, | 272 | key: _.unikey, | 
| 261 | - builder: (context, child) { | ||
| 262 | - return Directionality( | ||
| 263 | - textDirection: textDirection ?? | ||
| 264 | - (rtlLanguages.contains(Get.locale?.languageCode) | ||
| 265 | - ? TextDirection.rtl | ||
| 266 | - : TextDirection.ltr), | ||
| 267 | - child: builder == null ? child! : builder!(context, child), | ||
| 268 | - ); | ||
| 269 | - }, | 273 | + builder: defaultBuilder, | 
| 270 | title: title, | 274 | title: title, | 
| 271 | onGenerateTitle: onGenerateTitle, | 275 | onGenerateTitle: onGenerateTitle, | 
| 272 | color: color, | 276 | color: color, | 
| @@ -308,15 +312,7 @@ class GetMaterialApp extends StatelessWidget { | @@ -308,15 +312,7 @@ class GetMaterialApp extends StatelessWidget { | ||
| 308 | GetObserver(routingCallback, Get.routing) | 312 | GetObserver(routingCallback, Get.routing) | 
| 309 | ] | 313 | ] | 
| 310 | ..addAll(navigatorObservers!)), | 314 | ..addAll(navigatorObservers!)), | 
| 311 | - builder: (context, child) { | ||
| 312 | - return Directionality( | ||
| 313 | - textDirection: textDirection ?? | ||
| 314 | - (rtlLanguages.contains(Get.locale?.languageCode) | ||
| 315 | - ? TextDirection.rtl | ||
| 316 | - : TextDirection.ltr), | ||
| 317 | - child: builder == null ? child! : builder!(context, child), | ||
| 318 | - ); | ||
| 319 | - }, | 315 | + builder: defaultBuilder, | 
| 320 | title: title, | 316 | title: title, | 
| 321 | onGenerateTitle: onGenerateTitle, | 317 | onGenerateTitle: onGenerateTitle, | 
| 322 | color: color, | 318 | color: color, | 
- 
Please register or login to post a comment