WT1.1.11 Null-Safe migration

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -15,23 +15,24 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   final bool readonly;
   int step = 1;
 
-  double initialRM;
-  double unitQuantity;
-  double quantity;
-  double origQuantity;
-  double oneRepQuantity;
-  double oneRepUnitQuantity;
+  late double initialRM;
+  late double unitQuantity;
+  late double quantity;
+  late double origQuantity;
+  late double oneRepQuantity;
+  late double oneRepUnitQuantity;
 
-  double firstQuantity; // quantity of the first test
-  double firstUnitQuantity; // unit quantity of the first test
+  double? firstQuantity; // quantity of the first test
+  double? firstUnitQuantity; // unit quantity of the first test
 
   double scrollOffset = 0;
 
   @override
-  ExerciseControlBloc({this.exerciseRepository, this.readonly, @required this.timerBloc}) : super(ExerciseControlInitial()) {
-    print("Exercise ${exerciseRepository.exercise.toJson()}");
-    oneRepQuantity = exerciseRepository.exercise.quantity;
-    oneRepUnitQuantity = exerciseRepository.exercise.unitQuantity;
+  ExerciseControlBloc({required this.exerciseRepository, required this.readonly, required this.timerBloc})
+      : super(ExerciseControlInitial()) {
+    print("Exercise ${exerciseRepository.exercise!.toJson()}");
+    oneRepQuantity = exerciseRepository.exercise!.quantity!;
+    oneRepUnitQuantity = exerciseRepository.exercise!.unitQuantity!;
     initialRM = this.calculate1RM(percent75: false);
     unitQuantity = this.calculate1RM(percent75: true).roundToDouble();
     quantity = 12;
@@ -76,14 +77,14 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           scrollOffset = step * 400.0;
 
           quantity = origQuantity;
-          if (exerciseRepository.exercise.quantity == null) {
+          if (exerciseRepository.exercise!.quantity == null) {
             exerciseRepository.setQuantity(quantity);
           }
           exerciseRepository.end = DateTime.now();
           await exerciseRepository.addExercise();
           //exerciseRepository.initExercise();
 
-          step <= 3 ? timerBloc.add(TimerStart(duration: 300)) : timerBloc.add(TimerEnd());
+          step <= 3 ? timerBloc.add(TimerStart(duration: 300)) : timerBloc.add(TimerEnd(duration: 300));
         }
         yield ExerciseControlReady();
       }
@@ -92,12 +93,12 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     }
   }
 
-  double calculate1RM({bool percent75}) {
+  double calculate1RM({bool percent75 = true}) {
     if (exerciseRepository.exercise == null) {
       exerciseRepository.getLastExercise();
     }
-    double weight = exerciseRepository.exercise.unitQuantity;
-    double repeat = exerciseRepository.exercise.quantity;
+    double weight = exerciseRepository.exercise!.unitQuantity!;
+    double repeat = exerciseRepository.exercise!.quantity!;
     if (weight == 0 || repeat == 0) {
       return 0;
     }
@@ -117,8 +118,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     final double rmOconner = weight * (1 + repeat / 40);
     print("Weight: $weight oneRepQuantity: $repeat,  $rmWendler, Oconner: $rmOconner");
 
-    weight = exerciseRepository.exercise.unitQuantity;
-    repeat = exerciseRepository.exercise.quantity;
+    weight = exerciseRepository.exercise!.unitQuantity!;
+    repeat = exerciseRepository.exercise!.quantity!;
 
     final double repeatWendler = (rmWendler - weight) / 0.0333 / weight;
     final double repeatOconner = (rmOconner / weight - 1) * 40;

lib/bloc/exercise_control/exercise_control_event.dart

@@ -15,16 +15,16 @@ class ExerciseControlLoad extends ExerciseControlEvent {
 class ExerciseControlQuantityChange extends ExerciseControlEvent {
   final double quantity;
   final int step;
-  const ExerciseControlQuantityChange({this.quantity, this.step});
+  const ExerciseControlQuantityChange({required this.quantity, required this.step});
 }
 
 class ExerciseControlUnitQuantityChange extends ExerciseControlEvent {
   final double quantity;
   final int step;
-  const ExerciseControlUnitQuantityChange({this.quantity, this.step});
+  const ExerciseControlUnitQuantityChange({required this.quantity, required this.step});
 }
 
 class ExerciseControlSubmit extends ExerciseControlEvent {
   final int step;
-  const ExerciseControlSubmit({this.step});
+  const ExerciseControlSubmit({required this.step});
 }

lib/bloc/exercise_control/exercise_control_state.dart

@@ -22,9 +22,8 @@ class ExerciseControlReady extends ExerciseControlState {
 
 class ExerciseControlError extends ExerciseControlState {
   final String message;
-  const ExerciseControlError({this.message});
-
+  const ExerciseControlError({required this.message});
 
   @override
   List<Object> get props => [message];
-}
+}