1.1.22+3 corrections

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:aitrainer_app/bloc/timer/timer_bloc.dart';
+import 'package:aitrainer_app/model/exercise.dart';
 import 'package:aitrainer_app/repository/exercise_repository.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -26,7 +27,6 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   late double initialRM;
   late double unitQuantity;
   late double quantity;
-  late double origQuantity;
   late double oneRepQuantity;
   late double oneRepUnitQuantity;
 
@@ -36,6 +36,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   double scrollOffset = 0;
   late ExerciseTypeLocal exerciseTypeLocal;
 
+  List<Exercise> controlList = [];
+
   @override
   ExerciseControlBloc({required this.exerciseRepository, required this.readonly, required this.timerBloc})
       : super(ExerciseControlInitial()) {
@@ -53,29 +55,29 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     if (oneRepQuantity > 25) {
       quantity = 35;
     }
-    origQuantity = quantity;
 
     exerciseRepository.setUnitQuantity(unitQuantity);
     exerciseRepository.setQuantity(quantity);
 
+    for (int i = 0; i < 3; i++) {
+      Exercise exercise = Exercise();
+      exercise.quantity = quantity;
+      exercise.unitQuantity = unitQuantity;
+      controlList.add(exercise);
+    }
+
     timerBloc.add(TimerStart(duration: 300));
   }
 
   @override
   Stream<ExerciseControlState> mapEventToState(ExerciseControlEvent event) async* {
     try {
-      /* if (event is ExerciseControlLoad) {
-        yield ExerciseControlLoading();
-        step = 1;
-        yield ExerciseControlReady();
-      } else  */
       if (event is ExerciseControlQuantityChange) {
-        //yield ExerciseControlLoading();
         if (event.step == step) {
           exerciseRepository.setQuantity(event.quantity);
           quantity = event.quantity;
+          controlList[step - 1].quantity = quantity;
         }
-        //yield ExerciseControlReady();
       } else if (event is ExerciseControlUnitQuantityChange) {
         yield ExerciseControlLoading();
         print("event step ${event.step} quantity ${event.quantity}");
@@ -85,7 +87,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           unitQuantity = event.quantity;
           quantity = calculateQuantityByUnitQuantity().toDouble();
           exerciseRepository.setQuantity(quantity);
-          origQuantity = quantity;
+          controlList[step - 1].unitQuantity = event.quantity;
+          controlList[step - 1].quantity = quantity;
         }
         yield ExerciseControlReady();
       } else if (event is ExerciseControlSubmit) {
@@ -94,13 +97,11 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           step++;
           scrollOffset = step * 400.0;
 
-          quantity = origQuantity;
           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(duration: 300));
         }