WT1.1.11 Null-Safe migration

lib/bloc/menu/menu_bloc.dart

@@ -23,8 +23,8 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
   final ExerciseRepository exerciseRepository = ExerciseRepository();
   ExerciseDeviceRepository exerciseDeviceRepository = ExerciseDeviceRepository();
   int parent = 0;
-  WorkoutMenuTree workoutItem;
-  final List<int> listFilterDevice = List();
+  WorkoutMenuTree? workoutItem;
+  final List<int> listFilterDevice = [];
 
   String infoTitle = "";
   String infoText = "";
@@ -32,13 +32,13 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
   String infoText3 = "";
   String infoLink = "";
   int missingParent = 0;
-  String missingTreeName = "";
+  String? missingTreeName = "";
 
-  BuildContext context;
+  late BuildContext context;
 
-  ExerciseAbility ability;
+  ExerciseAbility? ability;
 
-  MenuBloc({this.menuTreeRepository}) : super(MenuInitial()) {
+  MenuBloc({required this.menuTreeRepository}) : super(MenuInitial()) {
     parent = 0;
   }
 
@@ -48,7 +48,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
       exerciseRepository.getBaseExerciseFinishedPercent();
       percent = Cache().getPercentExercises();
     }
-    if (context == null) return;
+
     percent = percent * 100;
     //log("Percent " + percent.toString());
     if (percent == -1 || percent == 0) {
@@ -78,7 +78,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
     //log("Missing " + missingTreeName);
     if (missingTreeName != null) {
       if (percent > 0) {
-        infoText = t("Please continue your tests with a") + " '" + missingTreeName + "' " + t("exercise!");
+        infoText = t("Please continue your tests with a") + " '" + missingTreeName! + "' " + t("exercise!");
         infoLink = t("Bring me there");
       }
     }
@@ -97,13 +97,13 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
         yield MenuLoading();
         //await menuTreeRepository.createTree();
         //menuTreeRepository.getBranch(this.parent);
-        setMenuInfo();
-        exerciseDeviceRepository.setDevices(Cache().getDevices());
+        //setMenuInfo();
+        exerciseDeviceRepository.setDevices(Cache().getDevices()!);
         yield MenuReady();
       } else if (event is MenuRecreateTree) {
         yield MenuLoading();
         // ie. at language changes
-        await menuTreeRepository.createTree();
+        menuTreeRepository.createTree();
         yield MenuReady();
       } else if (event is MenuTreeDown) {
         yield MenuLoading();
@@ -111,7 +111,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
         workoutItem = event.item;
 
         if (workoutItem != null) {
-          setAbility(workoutItem.nameEnglish);
+          setAbility(workoutItem!.nameEnglish);
         }
         final LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(event.parent);
 
@@ -126,8 +126,8 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
 
         LinkedHashMap<String, WorkoutMenuTree> branch;
         if (workoutItem != null) {
-          setAbility(workoutItem.nameEnglish);
-          branch = menuTreeRepository.getBranch(workoutItem.parent);
+          setAbility(workoutItem!.nameEnglish);
+          branch = menuTreeRepository.getBranch(workoutItem!.parent);
           await getImages(branch);
         }
 
@@ -138,12 +138,11 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
         workoutItem = menuTreeRepository.getParentItem(parent);
 
         if (workoutItem != null) {
-          setAbility(workoutItem.nameEnglish);
-        }
-        final LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(workoutItem.parent);
-        if (branch != null) {
-          await getImages(branch);
+          setAbility(workoutItem!.nameEnglish);
         }
+        final LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(workoutItem!.parent);
+        await getImages(branch);
+
         yield MenuReady();
       } else if (event is MenuClickExercise) {
         yield MenuLoading();
@@ -193,15 +192,15 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
 
   Future<void> putBranchImageToHash(LinkedHashMap<String, WorkoutMenuTree> branch) async {
     await Future.forEach(branch.keys, (key) async {
-      final WorkoutMenuTree value = branch[key];
-      if (!value.imageName.contains("asset")) {
+      final WorkoutMenuTree? value = branch[key];
+      if (value != null && !value.imageName.contains("asset")) {
         await wt.ImageCache().putImageToList(value.id, value.imageName);
       }
     });
   }
 
-  String getImage(int id, String name) {
-    String imageString;
+  String? getImage(int id, String name) {
+    String? imageString;
     if (name.contains("http")) {
       imageString = wt.ImageCache().getImageString(id, name);
     }
@@ -212,7 +211,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
     return !listFilterDevice.contains(deviceId);
   }
 
-  LinkedHashMap<String, WorkoutMenuTree> getFilteredBranch(int parent) {
+  LinkedHashMap<String, WorkoutMenuTree> getFilteredBranch(int? parent) {
     if (parent == null) return LinkedHashMap();
 
     LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(parent);
@@ -224,8 +223,8 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
     branch.forEach((key, value) {
       final WorkoutMenuTree elem = value;
       if (elem.exerciseType != null) {
-        for (int i = 0; i < elem.exerciseType.devices.length; i++) {
-          if (listFilterDevice.contains(elem.exerciseType.devices[i])) {
+        for (int i = 0; i < elem.exerciseType!.devices.length; i++) {
+          if (listFilterDevice.contains(elem.exerciseType!.devices[i])) {
             filtered[elem.name] = elem;
           }
         }

lib/bloc/menu/menu_event.dart

@@ -16,26 +16,26 @@ class MenuCreate extends MenuEvent {
 }
 
 class MenuTreeDown extends MenuEvent {
-  final WorkoutMenuTree item;
+  final WorkoutMenuTree? item;
   final int parent;
-  const MenuTreeDown({this.parent, this.item});
+  MenuTreeDown({required this.parent, this.item});
 
   @override
-  List<Object> get props => [parent, item];
+  List<Object> get props => [parent];
 }
 
 class MenuTreeUp extends MenuEvent {
   final int parent;
-  final WorkoutMenuTree item;
-  const MenuTreeUp({this.parent, this.item});
+  final WorkoutMenuTree? item;
+  const MenuTreeUp({required this.parent, this.item});
 
   @override
-  List<Object> get props => [parent, item];
+  List<Object> get props => [parent];
 }
 
 class MenuTreeJump extends MenuEvent {
   final int parent;
-  const MenuTreeJump({this.parent});
+  const MenuTreeJump({required this.parent});
 
   @override
   List<Object> get props => [parent];
@@ -43,7 +43,7 @@ class MenuTreeJump extends MenuEvent {
 
 class MenuClickExercise extends MenuEvent {
   final int exerciseTypeId;
-  const MenuClickExercise({this.exerciseTypeId});
+  const MenuClickExercise({required this.exerciseTypeId});
 
   @override
   List<Object> get props => [exerciseTypeId];
@@ -55,5 +55,5 @@ class MenuRecreateTree extends MenuEvent {
 
 class MenuFilterExerciseType extends MenuEvent {
   final int deviceId;
-  const MenuFilterExerciseType({this.deviceId});
+  const MenuFilterExerciseType({required this.deviceId});
 }

lib/bloc/menu/menu_state.dart

@@ -1,7 +1,7 @@
 part of 'menu_bloc.dart';
 
 @immutable
-abstract class MenuState extends Equatable  {
+abstract class MenuState extends Equatable {
   const MenuState();
 
   @override
@@ -12,22 +12,15 @@ class MenuInitial extends MenuState {
   const MenuInitial();
 }
 
-class MenuLoading extends MenuState {
-
-}
+class MenuLoading extends MenuState {}
 
 class MenuReady extends MenuState {
-  final WorkoutMenuTree workoutTree;
-
-  const MenuReady({this.workoutTree});
-
-  @override
-  List<Object> get props => [workoutTree];
+  const MenuReady();
 }
 
 class MenuError extends MenuState {
   final String message;
-  const MenuError({this.message});
+  const MenuError({required this.message});
 
   @override
   List<Object> get props => [message];