Showing
2 changed files
with
113 additions
and
110 deletions
1 | import 'dart:developer' as developer; | 1 | import 'dart:developer' as developer; |
2 | import 'get_main.dart'; | 2 | import 'get_main.dart'; |
3 | 3 | ||
4 | -///Voidcallback from logs | 4 | +///VoidCallback from logs |
5 | typedef LogWriterCallback = void Function(String text, {bool isError}); | 5 | typedef LogWriterCallback = void Function(String text, {bool isError}); |
6 | 6 | ||
7 | /// default logger from GetX | 7 | /// default logger from GetX |
@@ -55,7 +55,7 @@ class GetMaterialApp extends StatelessWidget { | @@ -55,7 +55,7 @@ class GetMaterialApp extends StatelessWidget { | ||
55 | this.defaultTransition, | 55 | this.defaultTransition, |
56 | this.getPages, | 56 | this.getPages, |
57 | this.opaqueRoute, | 57 | this.opaqueRoute, |
58 | - this.enableLog, | 58 | + this.enableLog = kDebugMode, |
59 | this.logWriterCallback, | 59 | this.logWriterCallback, |
60 | this.popGesture, | 60 | this.popGesture, |
61 | this.transitionDuration, | 61 | this.transitionDuration, |
@@ -170,7 +170,7 @@ class GetMaterialApp extends StatelessWidget { | @@ -170,7 +170,7 @@ class GetMaterialApp extends StatelessWidget { | ||
170 | this.onInit, | 170 | this.onInit, |
171 | this.onReady, | 171 | this.onReady, |
172 | this.onDispose, | 172 | this.onDispose, |
173 | - this.enableLog, | 173 | + this.enableLog = kDebugMode, |
174 | this.logWriterCallback, | 174 | this.logWriterCallback, |
175 | this.popGesture, | 175 | this.popGesture, |
176 | this.smartManagement = SmartManagement.full, | 176 | this.smartManagement = SmartManagement.full, |
@@ -227,117 +227,120 @@ class GetMaterialApp extends StatelessWidget { | @@ -227,117 +227,120 @@ class GetMaterialApp extends StatelessWidget { | ||
227 | 227 | ||
228 | @override | 228 | @override |
229 | Widget build(BuildContext context) => GetBuilder<GetMaterialController>( | 229 | Widget build(BuildContext context) => GetBuilder<GetMaterialController>( |
230 | - init: Get.rootController, | ||
231 | - dispose: (d) { | ||
232 | - onDispose?.call(); | ||
233 | - }, | ||
234 | - initState: (i) { | ||
235 | - Get.engine!.addPostFrameCallback((timeStamp) { | ||
236 | - onReady?.call(); | ||
237 | - }); | ||
238 | - if (locale != null) Get.locale = locale; | 230 | + init: Get.rootController, |
231 | + dispose: (d) { | ||
232 | + onDispose?.call(); | ||
233 | + }, | ||
234 | + initState: (i) { | ||
235 | + Get.engine!.addPostFrameCallback((timeStamp) { | ||
236 | + onReady?.call(); | ||
237 | + }); | ||
238 | + if (locale != null) Get.locale = locale; | ||
239 | 239 | ||
240 | - if (fallbackLocale != null) Get.fallbackLocale = fallbackLocale; | 240 | + if (fallbackLocale != null) Get.fallbackLocale = fallbackLocale; |
241 | 241 | ||
242 | - if (translations != null) { | ||
243 | - Get.addTranslations(translations!.keys); | ||
244 | - } else if (translationsKeys != null) { | ||
245 | - Get.addTranslations(translationsKeys!); | ||
246 | - } | 242 | + if (translations != null) { |
243 | + Get.addTranslations(translations!.keys); | ||
244 | + } else if (translationsKeys != null) { | ||
245 | + Get.addTranslations(translationsKeys!); | ||
246 | + } | ||
247 | 247 | ||
248 | - Get.customTransition = customTransition; | 248 | + Get.customTransition = customTransition; |
249 | 249 | ||
250 | - initialBinding?.dependencies(); | ||
251 | - if (getPages != null) { | ||
252 | - Get.addPages(getPages!); | ||
253 | - } | 250 | + initialBinding?.dependencies(); |
251 | + if (getPages != null) { | ||
252 | + Get.addPages(getPages!); | ||
253 | + } | ||
254 | 254 | ||
255 | - //Get.setDefaultDelegate(routerDelegate); | ||
256 | - Get.smartManagement = smartManagement; | ||
257 | - onInit?.call(); | 255 | + //Get.setDefaultDelegate(routerDelegate); |
256 | + Get.smartManagement = smartManagement; | ||
257 | + onInit?.call(); | ||
258 | 258 | ||
259 | - Get.config( | ||
260 | - enableLog: enableLog ?? Get.isLogEnable, | ||
261 | - logWriterCallback: logWriterCallback, | ||
262 | - defaultTransition: defaultTransition ?? Get.defaultTransition, | ||
263 | - defaultOpaqueRoute: opaqueRoute ?? Get.isOpaqueRouteDefault, | ||
264 | - defaultPopGesture: popGesture ?? Get.isPopGestureEnable, | ||
265 | - defaultDurationTransition: | ||
266 | - transitionDuration ?? Get.defaultTransitionDuration, | ||
267 | - ); | ||
268 | - }, | ||
269 | - builder: (_) => routerDelegate != null | ||
270 | - ? MaterialApp.router( | ||
271 | - routerDelegate: routerDelegate!, | ||
272 | - routeInformationParser: routeInformationParser!, | ||
273 | - scaffoldMessengerKey: scaffoldMessengerKey, | ||
274 | - backButtonDispatcher: backButtonDispatcher, | ||
275 | - routeInformationProvider: routeInformationProvider, | ||
276 | - key: _.unikey, | ||
277 | - builder: defaultBuilder, | ||
278 | - title: title, | ||
279 | - onGenerateTitle: onGenerateTitle, | ||
280 | - color: color, | ||
281 | - theme: _.theme ?? theme ?? ThemeData.fallback(), | ||
282 | - darkTheme: | ||
283 | - _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(), | ||
284 | - themeMode: _.themeMode ?? themeMode, | ||
285 | - locale: Get.locale ?? locale, | ||
286 | - localizationsDelegates: localizationsDelegates, | ||
287 | - localeListResolutionCallback: localeListResolutionCallback, | ||
288 | - localeResolutionCallback: localeResolutionCallback, | ||
289 | - supportedLocales: supportedLocales, | ||
290 | - debugShowMaterialGrid: debugShowMaterialGrid, | ||
291 | - showPerformanceOverlay: showPerformanceOverlay, | ||
292 | - checkerboardRasterCacheImages: checkerboardRasterCacheImages, | ||
293 | - checkerboardOffscreenLayers: checkerboardOffscreenLayers, | ||
294 | - showSemanticsDebugger: showSemanticsDebugger, | ||
295 | - debugShowCheckedModeBanner: debugShowCheckedModeBanner, | ||
296 | - shortcuts: shortcuts, | ||
297 | - scrollBehavior: scrollBehavior, | ||
298 | - ) | ||
299 | - : MaterialApp( | ||
300 | - key: _.unikey, | ||
301 | - navigatorKey: | ||
302 | - (navigatorKey == null ? Get.key : Get.addKey(navigatorKey!)), | ||
303 | - scaffoldMessengerKey: scaffoldMessengerKey, | ||
304 | - home: home, | ||
305 | - routes: routes ?? const <String, WidgetBuilder>{}, | ||
306 | - initialRoute: initialRoute, | ||
307 | - onGenerateRoute: (getPages != null ? generator : onGenerateRoute), | ||
308 | - onGenerateInitialRoutes: (getPages == null || home != null) | ||
309 | - ? onGenerateInitialRoutes | ||
310 | - : initialRoutesGenerate, | ||
311 | - onUnknownRoute: onUnknownRoute, | ||
312 | - navigatorObservers: (navigatorObservers == null | ||
313 | - ? <NavigatorObserver>[ | ||
314 | - GetObserver(routingCallback, Get.routing) | ||
315 | - ] | ||
316 | - : <NavigatorObserver>[ | ||
317 | - GetObserver(routingCallback, Get.routing) | ||
318 | - ] | ||
319 | - ..addAll(navigatorObservers!)), | ||
320 | - builder: defaultBuilder, | ||
321 | - title: title, | ||
322 | - onGenerateTitle: onGenerateTitle, | ||
323 | - color: color, | ||
324 | - theme: _.theme ?? theme ?? ThemeData.fallback(), | ||
325 | - darkTheme: | ||
326 | - _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(), | ||
327 | - themeMode: _.themeMode ?? themeMode, | ||
328 | - locale: Get.locale ?? locale, | ||
329 | - localizationsDelegates: localizationsDelegates, | ||
330 | - localeListResolutionCallback: localeListResolutionCallback, | ||
331 | - localeResolutionCallback: localeResolutionCallback, | ||
332 | - supportedLocales: supportedLocales, | ||
333 | - debugShowMaterialGrid: debugShowMaterialGrid, | ||
334 | - showPerformanceOverlay: showPerformanceOverlay, | ||
335 | - checkerboardRasterCacheImages: checkerboardRasterCacheImages, | ||
336 | - checkerboardOffscreenLayers: checkerboardOffscreenLayers, | ||
337 | - showSemanticsDebugger: showSemanticsDebugger, | ||
338 | - debugShowCheckedModeBanner: debugShowCheckedModeBanner, | ||
339 | - shortcuts: shortcuts, | ||
340 | - scrollBehavior: scrollBehavior, | ||
341 | - // actions: actions, | ||
342 | - )); | 259 | + Get.config( |
260 | + enableLog: enableLog ?? Get.isLogEnable, | ||
261 | + logWriterCallback: logWriterCallback, | ||
262 | + defaultTransition: defaultTransition ?? Get.defaultTransition, | ||
263 | + defaultOpaqueRoute: opaqueRoute ?? Get.isOpaqueRouteDefault, | ||
264 | + defaultPopGesture: popGesture ?? Get.isPopGestureEnable, | ||
265 | + defaultDurationTransition: | ||
266 | + transitionDuration ?? Get.defaultTransitionDuration, | ||
267 | + ); | ||
268 | + }, | ||
269 | + builder: (_) => routerDelegate != null | ||
270 | + ? MaterialApp.router( | ||
271 | + routerDelegate: routerDelegate!, | ||
272 | + routeInformationParser: routeInformationParser!, | ||
273 | + scaffoldMessengerKey: scaffoldMessengerKey, | ||
274 | + backButtonDispatcher: backButtonDispatcher, | ||
275 | + routeInformationProvider: routeInformationProvider, | ||
276 | + key: _.unikey, | ||
277 | + builder: defaultBuilder, | ||
278 | + title: title, | ||
279 | + onGenerateTitle: onGenerateTitle, | ||
280 | + color: color, | ||
281 | + theme: _.theme ?? theme ?? ThemeData.fallback(), | ||
282 | + darkTheme: | ||
283 | + _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(), | ||
284 | + themeMode: _.themeMode ?? themeMode, | ||
285 | + locale: Get.locale ?? locale, | ||
286 | + localizationsDelegates: localizationsDelegates, | ||
287 | + localeListResolutionCallback: localeListResolutionCallback, | ||
288 | + localeResolutionCallback: localeResolutionCallback, | ||
289 | + supportedLocales: supportedLocales, | ||
290 | + debugShowMaterialGrid: debugShowMaterialGrid, | ||
291 | + showPerformanceOverlay: showPerformanceOverlay, | ||
292 | + checkerboardRasterCacheImages: checkerboardRasterCacheImages, | ||
293 | + checkerboardOffscreenLayers: checkerboardOffscreenLayers, | ||
294 | + showSemanticsDebugger: showSemanticsDebugger, | ||
295 | + debugShowCheckedModeBanner: debugShowCheckedModeBanner, | ||
296 | + shortcuts: shortcuts, | ||
297 | + scrollBehavior: scrollBehavior, | ||
298 | + ) | ||
299 | + : MaterialApp( | ||
300 | + key: _.unikey, | ||
301 | + navigatorKey: (navigatorKey == null | ||
302 | + ? Get.key | ||
303 | + : Get.addKey(navigatorKey!)), | ||
304 | + scaffoldMessengerKey: scaffoldMessengerKey, | ||
305 | + home: home, | ||
306 | + routes: routes ?? const <String, WidgetBuilder>{}, | ||
307 | + initialRoute: initialRoute, | ||
308 | + onGenerateRoute: | ||
309 | + (getPages != null ? generator : onGenerateRoute), | ||
310 | + onGenerateInitialRoutes: (getPages == null || home != null) | ||
311 | + ? onGenerateInitialRoutes | ||
312 | + : initialRoutesGenerate, | ||
313 | + onUnknownRoute: onUnknownRoute, | ||
314 | + navigatorObservers: (navigatorObservers == null | ||
315 | + ? <NavigatorObserver>[ | ||
316 | + GetObserver(routingCallback, Get.routing) | ||
317 | + ] | ||
318 | + : <NavigatorObserver>[ | ||
319 | + GetObserver(routingCallback, Get.routing) | ||
320 | + ] | ||
321 | + ..addAll(navigatorObservers!)), | ||
322 | + builder: defaultBuilder, | ||
323 | + title: title, | ||
324 | + onGenerateTitle: onGenerateTitle, | ||
325 | + color: color, | ||
326 | + theme: _.theme ?? theme ?? ThemeData.fallback(), | ||
327 | + darkTheme: | ||
328 | + _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(), | ||
329 | + themeMode: _.themeMode ?? themeMode, | ||
330 | + locale: Get.locale ?? locale, | ||
331 | + localizationsDelegates: localizationsDelegates, | ||
332 | + localeListResolutionCallback: localeListResolutionCallback, | ||
333 | + localeResolutionCallback: localeResolutionCallback, | ||
334 | + supportedLocales: supportedLocales, | ||
335 | + debugShowMaterialGrid: debugShowMaterialGrid, | ||
336 | + showPerformanceOverlay: showPerformanceOverlay, | ||
337 | + checkerboardRasterCacheImages: checkerboardRasterCacheImages, | ||
338 | + checkerboardOffscreenLayers: checkerboardOffscreenLayers, | ||
339 | + showSemanticsDebugger: showSemanticsDebugger, | ||
340 | + debugShowCheckedModeBanner: debugShowCheckedModeBanner, | ||
341 | + shortcuts: shortcuts, | ||
342 | + scrollBehavior: scrollBehavior, | ||
343 | + // actions: actions, | ||
344 | + ), | ||
345 | + ); | ||
343 | } | 346 | } |
-
Please register or login to post a comment