WT1.1.11 Null-Safe migration

lib/bloc/settings/settings_bloc.dart

@@ -16,9 +16,9 @@ part 'settings_event.dart';
 part 'settings_state.dart';
 
 class SettingsBloc extends Bloc<SettingsEvent, SettingsState> with Logging {
-  String language;
-  Locale _locale;
-  BuildContext context;
+  String? language;
+  Locale? _locale;
+  BuildContext? context;
 
   SettingsBloc({this.context}) : super(SettingsInitial());
 
@@ -26,7 +26,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> with Logging {
     _locale = locale;
   }
 
-  Locale getLocale() {
+  Locale? getLocale() {
     return _locale;
   }
 
@@ -37,11 +37,11 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> with Logging {
     if (event is SettingsChangeLanguage) {
       yield SettingsLoading();
       await _changeLang(event.language);
-      yield SettingsReady(_locale);
+      yield SettingsReady();
     } else if (event is SettingsGetLanguage) {
       await AppLanguage().fetchLocale();
       _locale = AppLanguage().appLocal;
-      yield SettingsReady(_locale);
+      yield SettingsReady();
     } else if (event is SettingsSetServer) {
       //yield SettingsLoading();
       final bool live = event.live;
@@ -60,7 +60,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> with Logging {
         await _accessHealthData();
       }
       Cache().initBadges();
-      yield SettingsReady(_locale);
+      yield SettingsReady();
     }
   }
 
@@ -97,17 +97,17 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> with Logging {
         break;
     }
     this.language = lang;
-    AppLanguage().changeLanguage(_locale);
+    AppLanguage().changeLanguage(_locale!);
     await loadLang();
-    await Cache().initBadges();
+    Cache().initBadges();
   }
 
   Future<void> loadLang() async {
     if (_locale != null) {
       log(" -- Loading lang $_locale");
       if (context != null) {
-        AppLocalizations.of(context).setLocale(_locale);
-        await AppLocalizations.of(context).load();
+        AppLocalizations.of(context!)!.setLocale(_locale!);
+        await AppLocalizations.of(context!)!.load();
       } else {
         log("no context, does not load");
       }

lib/bloc/settings/settings_event.dart

@@ -9,7 +9,7 @@ abstract class SettingsEvent extends Equatable {
 
 class SettingsChangeLanguage extends SettingsEvent {
   final String language;
-  const SettingsChangeLanguage({this.language});
+  const SettingsChangeLanguage({required this.language});
 }
 
 class SettingsGetLanguage extends SettingsEvent {
@@ -18,7 +18,7 @@ class SettingsGetLanguage extends SettingsEvent {
 
 class SettingsSetServer extends SettingsEvent {
   final bool live;
-  const SettingsSetServer({this.live});
+  const SettingsSetServer({required this.live});
 
   @override
   List<Object> get props => [this.live];
@@ -26,7 +26,7 @@ class SettingsSetServer extends SettingsEvent {
 
 class SettingsSetHardware extends SettingsEvent {
   final bool hasHardware;
-  const SettingsSetHardware({this.hasHardware});
+  const SettingsSetHardware({required this.hasHardware});
 
   @override
   List<Object> get props => [this.hasHardware];

lib/bloc/settings/settings_state.dart

@@ -10,31 +10,15 @@ abstract class SettingsState extends Equatable {
 
 // ignore: must_be_immutable
 class SettingsInitial extends SettingsState {
-  Locale locale;
   SettingsInitial();
-
-  setLocale(locale) {
-    this.locale = locale;
-  }
-
-  @override
-  List<Object> get props => [locale];
 }
 
 class SettingsLoading extends SettingsState {
-  final Locale locale;
-  const SettingsLoading({this.locale});
-
-  @override
-  List<Object> get props => [locale];
+  const SettingsLoading();
 }
 
 class SettingsReady extends SettingsState {
-  final Locale locale;
-  const SettingsReady(this.locale);
-
-  @override
-  List<Object> get props => [locale];
+  const SettingsReady();
 }
 
 class SettingsError extends SettingsState {
@@ -43,4 +27,4 @@ class SettingsError extends SettingsState {
 
   @override
   List<Object> get props => [message];
-}
+}