diff --git a/lib/src/feature/initialization/model/environment.dart b/lib/src/feature/initialization/model/environment.dart index 09b2d61..2ba6d33 100644 --- a/lib/src/feature/initialization/model/environment.dart +++ b/lib/src/feature/initialization/model/environment.dart @@ -11,11 +11,11 @@ enum Environment { /// Production environment. prod._('PROD'); + const Environment._(this.value); + /// The environment value. final String value; - const Environment._(this.value); - /// Returns the environment from the given [value]. static Environment from(String? value) => switch (value) { 'DEV' => Environment.dev, diff --git a/lib/src/feature/initialization/widget/initialization_failed_app.dart b/lib/src/feature/initialization/widget/initialization_failed_app.dart index 495df60..aca64d4 100644 --- a/lib/src/feature/initialization/widget/initialization_failed_app.dart +++ b/lib/src/feature/initialization/widget/initialization_failed_app.dart @@ -4,6 +4,14 @@ import 'package:flutter/material.dart'; /// Screen that is shown when the initialization of the app fails. /// {@endtemplate} class InitializationFailedApp extends StatefulWidget { + /// {@macro initialization_failed_screen} + const InitializationFailedApp({ + required this.error, + required this.stackTrace, + this.onRetryInitialization, + super.key, + }); + /// The error that caused the initialization to fail. final Object error; @@ -15,14 +23,6 @@ class InitializationFailedApp extends StatefulWidget { /// If null, the retry button will not be shown. final Future Function()? onRetryInitialization; - /// {@macro initialization_failed_screen} - const InitializationFailedApp({ - required this.error, - required this.stackTrace, - this.onRetryInitialization, - super.key, - }); - @override State createState() => _InitializationFailedAppState(); } @@ -71,7 +71,7 @@ class _InitializationFailedAppState extends State { ), const SizedBox(height: 16), Padding( - padding: const EdgeInsets.all(8.0), + padding: const EdgeInsets.all(8), child: Text( '${widget.stackTrace}', style: Theme.of(context).textTheme.bodyLarge, diff --git a/lib/src/feature/initialization/widget/material_context.dart b/lib/src/feature/initialization/widget/material_context.dart index 9a496b3..165fba6 100644 --- a/lib/src/feature/initialization/widget/material_context.dart +++ b/lib/src/feature/initialization/widget/material_context.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:wordly/src/core/constant/localization/localization.dart'; import 'package:wordly/src/core/utils/extensions/extensions.dart'; import 'package:wordly/src/feature/game/widget/game_page.dart'; -import 'package:wordly/src/feature/settings/model/app_theme.dart'; import 'package:wordly/src/feature/settings/widget/settings_scope.dart'; /// {@template material_context} @@ -23,7 +22,7 @@ class MaterialContext extends StatelessWidget { final settings = SettingsScope.settingsOf(context); final mediaQueryData = MediaQuery.of(context); - final theme = settings.appTheme ?? AppTheme.defaultTheme; + final theme = settings.appTheme; final lightTheme = theme.buildThemeData(ThemeMode.light); final darkTheme = theme.buildThemeData(ThemeMode.dark);