flutter_package / fluttertpc_get

Go to a project
Toggle navigation Toggle navigation pinning
Jonny Borges
Committed by GitHub
e1d812e5 2 parents c12b6d5e 9a5aea28

Merge pull request #1665 from Bdaya-Dev/fix-router-outlet 

Fix when child is null in MaterialApp builder
Inline Side-by-side
Showing 1 changed file with 14 additions and 18 deletions
... ... @@ -210,6 +210,18 @@ class GetMaterialApp extends StatelessWidget {
];
}
Widget defaultBuilder(BuildContext context, Widget? child) {
return Directionality(
textDirection: textDirection ??
(rtlLanguages.contains(Get.locale?.languageCode)
? TextDirection.rtl
: TextDirection.ltr),
child: builder == null
? (child ?? SizedBox.shrink())
: builder!(context, child),
);
}
@override
Widget build(BuildContext context) => GetBuilder<GetMaterialController>(
init: Get.rootController,
... ... @@ -258,15 +270,7 @@ class GetMaterialApp extends StatelessWidget {
backButtonDispatcher: backButtonDispatcher,
routeInformationProvider: routeInformationProvider,
key: _.unikey,
builder: (context, child) {
return Directionality(
textDirection: textDirection ??
(rtlLanguages.contains(Get.locale?.languageCode)
? TextDirection.rtl
: TextDirection.ltr),
child: builder == null ? child! : builder!(context, child),
);
},
builder: defaultBuilder,
title: title,
onGenerateTitle: onGenerateTitle,
color: color,
... ... @@ -308,15 +312,7 @@ class GetMaterialApp extends StatelessWidget {
GetObserver(routingCallback, Get.routing)
]
..addAll(navigatorObservers!)),
builder: (context, child) {
return Directionality(
textDirection: textDirection ??
(rtlLanguages.contains(Get.locale?.languageCode)
? TextDirection.rtl
: TextDirection.ltr),
child: builder == null ? child! : builder!(context, child),
);
},
builder: defaultBuilder,
title: title,
onGenerateTitle: onGenerateTitle,
color: color,
... ...