flutter_package / fluttertpc_get

Go to a project
Toggle navigation Toggle navigation pinning
Jonny Borges
Committed by GitHub
865d6506 2 parents 039a9e73 bed0b3b8

Merge pull request #1294 from eduardoflorence/darktheme-default 

Set darkTheme equal theme when darkTheme is null
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
@@ -245,7 +245,8 @@ class GetMaterialApp extends StatelessWidget { @@ -245,7 +245,8 @@ class GetMaterialApp extends StatelessWidget {
245 onGenerateTitle: onGenerateTitle, 245 onGenerateTitle: onGenerateTitle,
246 color: color, 246 color: color,
247 theme: _.theme ?? theme ?? ThemeData.fallback(), 247 theme: _.theme ?? theme ?? ThemeData.fallback(),
248 - darkTheme: _.darkTheme ?? darkTheme ?? ThemeData.fallback(), 248 + darkTheme:
  249 + _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(),
249 themeMode: _.themeMode ?? themeMode, 250 themeMode: _.themeMode ?? themeMode,
250 locale: Get.locale ?? locale, 251 locale: Get.locale ?? locale,
251 localizationsDelegates: localizationsDelegates, 252 localizationsDelegates: localizationsDelegates,
@@ -293,7 +294,8 @@ class GetMaterialApp extends StatelessWidget { @@ -293,7 +294,8 @@ class GetMaterialApp extends StatelessWidget {
293 onGenerateTitle: onGenerateTitle, 294 onGenerateTitle: onGenerateTitle,
294 color: color, 295 color: color,
295 theme: _.theme ?? theme ?? ThemeData.fallback(), 296 theme: _.theme ?? theme ?? ThemeData.fallback(),
296 - darkTheme: _.darkTheme ?? darkTheme ?? ThemeData.fallback(), 297 + darkTheme:
  298 + _.darkTheme ?? darkTheme ?? theme ?? ThemeData.fallback(),
297 themeMode: _.themeMode ?? themeMode, 299 themeMode: _.themeMode ?? themeMode,
298 locale: Get.locale ?? locale, 300 locale: Get.locale ?? locale,
299 localizationsDelegates: localizationsDelegates, 301 localizationsDelegates: localizationsDelegates,