WT1.1.11 Null-Safe migration

lib/bloc/test_set_control/test_set_control_bloc.dart

@@ -17,30 +17,31 @@ class TestSetControlBloc extends Bloc<TestSetControlEvent, TestSetControlState>
   final TestSetExecuteBloc executeBloc;
   final ExerciseType exerciseType;
   final ExerciseRepository exerciseRepository = ExerciseRepository();
-  TestSetControlBloc({this.exercisePlanDetail, this.executeBloc, this.exerciseType}) : super(TestSetControlInitial()) {
+
+  late double initQuantity;
+  late double initUnitQuantity;
+  late double quantity;
+  late double unitQuantity;
+  late double oneRepMax;
+  late int step;
+
+  TestSetControlBloc({required this.exercisePlanDetail, required this.executeBloc, required this.exerciseType})
+      : super(TestSetControlInitial()) {
     initBloc();
   }
 
   void initBloc() {
-    if (exercisePlanDetail.exerciseType.unitQuantity != null) {
-      oneRepMax = executeBloc.calculate1RM(exercisePlanDetail.exercises.last.unitQuantity, exercisePlanDetail.exercises.last.quantity);
-      initQuantity = 12;
-      quantity = initQuantity;
-      initUnitQuantity = oneRepMax * 0.75;
-      unitQuantity = initUnitQuantity;
-    }
-    step = exercisePlanDetail.exercises.length;
+    oneRepMax = executeBloc.calculate1RM(exercisePlanDetail.exercises!.last.unitQuantity, exercisePlanDetail.exercises!.last.quantity);
+    initQuantity = 12;
+    quantity = initQuantity;
+    initUnitQuantity = oneRepMax * 0.75;
+    unitQuantity = initUnitQuantity;
+
+    step = exercisePlanDetail.exercises!.length;
     exerciseRepository.customer = Cache().userLoggedIn;
     exerciseRepository.exerciseType = exerciseType;
   }
 
-  double initQuantity;
-  double initUnitQuantity;
-  double quantity;
-  double unitQuantity;
-  double oneRepMax;
-  int step;
-
   @override
   Stream<TestSetControlState> mapEventToState(
     TestSetControlEvent event,

lib/bloc/test_set_control/test_set_control_event.dart

@@ -13,7 +13,7 @@ class TestSetControlLoad extends TestSetControlEvent {
 
 class TestSetControlQuantityChange extends TestSetControlEvent {
   final double quantity;
-  const TestSetControlQuantityChange({this.quantity});
+  const TestSetControlQuantityChange({required this.quantity});
 
   @override
   List<Object> get props => [quantity];
@@ -21,7 +21,7 @@ class TestSetControlQuantityChange extends TestSetControlEvent {
 
 class TestSetControlUnitQuantityChange extends TestSetControlEvent {
   final double quantity;
-  const TestSetControlUnitQuantityChange({this.quantity});
+  const TestSetControlUnitQuantityChange({required this.quantity});
 
   @override
   List<Object> get props => [quantity];

lib/bloc/test_set_control/test_set_control_state.dart

@@ -21,7 +21,7 @@ class TestSetControlReady extends TestSetControlState {
 
 class TestSetControlError extends TestSetControlState {
   final String message;
-  const TestSetControlError({this.message});
+  const TestSetControlError({required this.message});
 
   @override
   List<Object> get props => [message];