WT1.1.3 logo change, error fixes

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -13,7 +13,6 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   final bool readonly;
   final double percentToCalculate;
   int step = 1;
-  final List<double> repeats = List();
 
   double initialRM;
   double unitQuantity;
@@ -27,17 +26,13 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
 
   @override
   ExerciseControlBloc({this.exerciseRepository, this.readonly, this.percentToCalculate}) : super(ExerciseControlInitial()) {
-    firstUnitQuantity = exerciseRepository.exercise.unitQuantity;
-    firstQuantity = exerciseRepository.exercise.quantity;
-    repeats.add(firstUnitQuantity);
-    repeats.add(firstQuantity);
-
     initialRM = this.calculate1RM(percent75: false);
     unitQuantity = this.calculate1RM(percent75: true).roundToDouble();
     quantity = percentToCalculate == 0.75 ? 12 : 30;
     origQuantity = quantity;
 
     exerciseRepository.setUnitQuantity(unitQuantity);
+    exerciseRepository.setQuantity(quantity);
   }
 
   @override
@@ -48,31 +43,24 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
         step = 1;
         yield ExerciseControlReady();
       } else if (event is ExerciseControlQuantityChange) {
-        yield ExerciseControlLoading();
+        //yield ExerciseControlLoading();
         if (event.step == step) {
           exerciseRepository.setQuantity(event.quantity);
           quantity = event.quantity;
         }
-        yield ExerciseControlReady();
+        //yield ExerciseControlReady();
       } else if (event is ExerciseControlSubmit) {
         yield ExerciseControlLoading();
         if (event.step == step) {
           step++;
-          scrollOffset = step * 200.0;
-/*           print("step " +
-              step.toString() +
-              " quantity " +
-              quantity.toString() +
-              " origQuantity: " +
-              origQuantity.toString() +
-              " scrollOffset: " +
-              scrollOffset.toString()); */
-          repeats.add(quantity);
+          scrollOffset = step * 400.0;
+
           quantity = origQuantity;
           exerciseRepository.end = DateTime.now();
           await exerciseRepository.addExercise();
 
           exerciseRepository.setQuantity(quantity);
+          exerciseRepository.exercise.exerciseId = null;
         }
         yield ExerciseControlReady();
       }