WT 1.1.24+2 Weight calculation

lib/view/customer_welcome_page.dart

@@ -21,7 +21,7 @@ class _CustomerWelcomePageState extends State<CustomerWelcomePage> with Trans {
     setContext(context);
     return Scaffold(
       appBar: AppBarMin(
-        back: true,
+        back: false,
       ),
       body: Container(
           decoration: BoxDecoration(

lib/view/exercise_new_page.dart

@@ -134,9 +134,6 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans, Logging {
           child: ExerciseSave(
               exerciseName: exerciseBloc.exerciseRepository.exerciseType!.nameTranslation,
               exerciseDescription: exerciseBloc.exerciseRepository.exerciseType!.descriptionTranslation,
-              exerciseTask: exerciseBloc.exerciseRepository.exerciseType!.unitQuantityUnit != null
-                  ? t("Please take a relative bigger weight and repeat 12-20 times and do your best! MAXIMIZE it!")
-                  : t("Please repeat as much times as you can! MAXIMIZE it!"),
               unit: exerciseBloc.exerciseRepository.exerciseType!.unit,
               unitQuantityUnit: exerciseBloc.exerciseRepository.exerciseType!.unitQuantityUnit,
               hasUnitQuantity: exerciseBloc.exerciseRepository.exerciseType!.unitQuantityUnit != null,

lib/view/registration.dart

@@ -54,10 +54,10 @@ class RegistrationPage extends StatelessWidget with Trans {
                         title: t("Successful Registration"),
                         descriptions: t("Based on your initial data, we will generate the personalized training plan for you."),
                         text: "OK",
-                        onTap: () => {Navigator.of(context).pushNamed('customerWelcomePage')},
+                        onTap: () => {Navigator.of(context).popAndPushNamed('customerWelcomePage')},
                         onCancel: () => {
                           trainingPlanRepository.generateTrainingPlan(),
-                          Navigator.of(context).pushNamed("customerWelcomePage"),
+                          Navigator.of(context).popAndPushNamed("customerWelcomePage"),
                         },
                       );
                     });

lib/view/test_set_new.dart

@@ -96,9 +96,6 @@ class TestSetNew extends StatelessWidget with Trans {
     return ExerciseSave(
       exerciseName: bloc.exerciseType.nameTranslation,
       exerciseDescription: bloc.exerciseType.descriptionTranslation,
-      exerciseTask: bloc.exerciseType.unitQuantityUnit != null
-          ? t("Please take a relative bigger weight and repeat 12-20 times and do your best! MAXIMIZE it!")
-          : t("Please repeat as much times as you can! MAXIMIZE it!"),
       unit: bloc.exerciseType.unit,
       unitQuantityUnit: bloc.exerciseType.unitQuantityUnit,
       hasUnitQuantity: bloc.exerciseType.unitQuantityUnit != null,

lib/view/training_plan_execute.dart

@@ -308,7 +308,7 @@ class _ExerciseListState extends State<ExerciseList> with Trans {
 
   void animate() {
     offset = widget.bloc.getOffset();
-    print("Offset: $offset");
+    //print("Offset: $offset");
     if (scrollController.hasClients) {
       scrollController.animateTo(offset, duration: Duration(milliseconds: 300), curve: Curves.easeIn);
     }

lib/view/training_plan_exercise.dart

@@ -21,6 +21,7 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
     final CustomerTrainingPlanDetails detail = args['customerTrainingPlanDetails'];
     // ignore: close_sinks
     final TrainingPlanBloc bloc = BlocProvider.of<TrainingPlanBloc>(context);
+
     setContext(context);
     return Scaffold(
         appBar: AppBarNav(depth: 1),
@@ -89,7 +90,6 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
       return ExerciseSave(
         exerciseName: detail.exerciseType!.nameTranslation,
         exerciseDescription: detail.exerciseType!.descriptionTranslation,
-        exerciseTask: getExerciseTask(detail),
         unit: detail.exerciseType!.unit,
         unitQuantityUnit: detail.exerciseType!.unitQuantityUnit,
         hasUnitQuantity: detail.exerciseType!.unitQuantityUnit != null,
@@ -116,28 +116,6 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
     }
   }
 
-  String getExerciseTask(CustomerTrainingPlanDetails detail) {
-    String desc = "";
-    if (detail.exerciseType!.unit == "second") {
-      return desc;
-    }
-    if (detail.exerciseType!.unitQuantityUnit != null) {
-      if (detail.weight == -1) {
-        return "Please take a relative bigger weight and at least 12 times and do your best! MAXIMIZE it!";
-      } else if (detail.repeats == -1) {
-        return "Please repeat as much times as you can! MAXIMIZE it!";
-      } else {
-        return "Please try to execute this exercise with exact weight and repeats what is suggested";
-      }
-    } else {
-      if (detail.repeats == -1) {
-        return "Please repeat as much times as you can! MAXIMIZE it!";
-      } else {
-        return "Please try to execute this exercise with exact repeats what is suggested";
-      }
-    }
-  }
-
   Widget getDropSet(TrainingPlanBloc bloc, CustomerTrainingPlanDetails detail) {
     return Container(
       decoration: BoxDecoration(