WT1.1.6+3 bodyType animation, bug fixes

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -33,6 +33,7 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
 
     exerciseRepository.setUnitQuantity(unitQuantity);
     exerciseRepository.setQuantity(quantity);
+    print("init quantity: " + quantity.toString());
   }
 
   @override
@@ -40,6 +41,7 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     try {
       if (event is ExerciseControlLoad) {
         yield ExerciseControlLoading();
+        print("init quantity: " + quantity.toString());
         step = 1;
         yield ExerciseControlReady();
       } else if (event is ExerciseControlQuantityChange) {
@@ -49,6 +51,18 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           quantity = event.quantity;
         }
         //yield ExerciseControlReady();
+      } else if (event is ExerciseControlUnitQuantityChange) {
+        yield ExerciseControlLoading();
+
+        if (event.step == step) {
+          this.unitQuantity = event.quantity;
+          exerciseRepository.setUnitQuantity(event.quantity);
+          unitQuantity = event.quantity;
+          quantity = calculateQuantityByUnitQuantity();
+          exerciseRepository.setQuantity(quantity);
+          origQuantity = quantity;
+        }
+        yield ExerciseControlReady();
       } else if (event is ExerciseControlSubmit) {
         yield ExerciseControlLoading();
         if (event.step == step) {
@@ -57,7 +71,7 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
 
           quantity = origQuantity;
           if (exerciseRepository.exercise.quantity == null) {
-            exerciseRepository.setQuantity(12);
+            exerciseRepository.setQuantity(quantity);
           }
           exerciseRepository.end = DateTime.now();
           await exerciseRepository.addExercise();
@@ -88,4 +102,19 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
 
     return percent75 ? average * this.percentToCalculate : average;
   }
+
+  double calculateQuantityByUnitQuantity() {
+    final double rmWendler = initialRM;
+    final double rmOconner = initialRM;
+    final double weight = exerciseRepository.exercise.unitQuantity;
+    final double repeatWendler = (rmWendler - weight) / 0.0333 / weight;
+    final double repeatOconner = (rmOconner / weight - 1) * 40;
+    print("Weight: " +
+        weight.toString() +
+        " repeatWendler: " +
+        repeatWendler.toStringAsFixed(0) +
+        " repeat Oconner: " +
+        repeatOconner.toStringAsFixed(0));
+    return repeatWendler;
+  }
 }

lib/bloc/exercise_control/exercise_control_event.dart

@@ -18,6 +18,12 @@ class ExerciseControlQuantityChange extends ExerciseControlEvent {
   const ExerciseControlQuantityChange({this.quantity, this.step});
 }
 
+class ExerciseControlUnitQuantityChange extends ExerciseControlEvent {
+  final double quantity;
+  final int step;
+  const ExerciseControlUnitQuantityChange({this.quantity, this.step});
+}
+
 class ExerciseControlSubmit extends ExerciseControlEvent {
   final int step;
   const ExerciseControlSubmit({this.step});