WT1.1.18+8 repeats MAX

lib/view/training_plan_activate_page.dart

@@ -373,7 +373,22 @@ class TrainingPlanActivatePage extends StatelessWidget with Trans {
                     })
               },
           onRepeatTap: () => {
-                print("Reps"),
+                showDialog(
+                    context: context,
+                    builder: (BuildContext context) {
+                      return DialogCommon(
+                        title: t("Maximum repeats"),
+                        descriptions: t("During the exercise you should try your best:"),
+                        description2: t("do it with the possible maximum repeats."),
+                        text: "OK",
+                        onTap: () => {
+                          Navigator.of(context).pop(),
+                        },
+                        onCancel: () => {
+                          Navigator.of(context).pop(),
+                        },
+                      );
+                    })
               }),
       headerGridLinesVisibility: GridLinesVisibility.both,
       gridLinesVisibility: GridLinesVisibility.both,

lib/view/training_plan_execute_page.dart

@@ -454,7 +454,6 @@ class _ExerciseListState extends State<ExerciseList> with Trans {
         title = AppLocalizations.of(context)!.translate("Stop!");
         description = AppLocalizations.of(context)!.translate("Please continue with the next exercise in the queue:") +
             next.exerciseType!.nameTranslation;
-        description2 = AppLocalizations.of(context)!.translate("Or, you can redifine this exercise queue in the Compact Test menu");
       } else {
         final HashMap args = HashMap();
         args['exerciseType'] = next.exerciseType;
@@ -564,13 +563,17 @@ class _ExerciseTileState extends State<ExerciseTile> with Trans {
     final bool done = state.equalsTo(ExercisePlanDetailState.finished) || state.equalsTo(ExercisePlanDetailState.skipped);
     final String countSerie = widget.detail.set.toString();
     final String step = (widget.detail.exercises.length).toString();
-    String weight = widget.detail.weight!.toStringAsFixed(1);
+    String weight = widget.detail.weight != null ? widget.detail.weight!.toStringAsFixed(1) : "-";
     String restingTime = widget.detail.restingTime == null ? "" : widget.detail.restingTime!.toStringAsFixed(0);
     bool isTest = false;
-    if (widget.detail.weight! == -1) {
+    if (widget.detail.weight != null && widget.detail.weight! == -1) {
       weight = t("TEST");
       isTest = true;
     }
+    String repeats = widget.detail.repeats!.toString();
+    if (widget.detail.repeats! == -1) {
+      repeats = t("MAX");
+    }
     setContext(context);
     return Container(
       color: Colors.transparent,
@@ -679,7 +682,7 @@ class _ExerciseTileState extends State<ExerciseTile> with Trans {
                         style: GoogleFonts.inter(
                             fontSize: 12, color: done ? Colors.grey[100] : Colors.yellow[400], fontWeight: FontWeight.bold)),
                     TextSpan(
-                        text: widget.detail.repeats!.toString(),
+                        text: repeats,
                         style: GoogleFonts.inter(
                           fontSize: 12,
                         )),
@@ -707,19 +710,6 @@ class _ExerciseTileState extends State<ExerciseTile> with Trans {
                         style: GoogleFonts.inter(fontSize: 12, color: done ? Colors.grey[100] : Colors.white, fontWeight: FontWeight.bold)),
                   ]),
             )),
-            /*   done
-                ? AnimatedBuilder(
-                    animation: animation,
-                    builder: (context, snapshot) {
-                      return Column(mainAxisAlignment: MainAxisAlignment.center, children: [
-                        Image.asset(
-                          "asset/image/kupa.png",
-                          width: animation.value,
-                        ),
-                        Text("Result", style: GoogleFonts.inter(fontSize: 10, color: Colors.white)),
-                      ]);
-                    })
-                : Offstage(), */
             isTest
                 ? AnimatedBuilder(
                     animation: animation,

lib/view/training_plan_exercise.dart

@@ -1,15 +1,8 @@
 import 'dart:collection';
 
-import 'package:aitrainer_app/bloc/test_set_control/test_set_control_bloc.dart';
-import 'package:aitrainer_app/bloc/test_set_execute/test_set_execute_bloc.dart';
-import 'package:aitrainer_app/bloc/test_set_new/test_set_new_bloc.dart';
 import 'package:aitrainer_app/bloc/training_plan/training_plan_bloc.dart';
 import 'package:aitrainer_app/library/custom_icon_icons.dart';
-import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/model/customer_training_plan_details.dart';
-import 'package:aitrainer_app/model/exercise_plan_detail.dart';
-import 'package:aitrainer_app/model/exercise_type.dart';
-
 import 'package:aitrainer_app/util/trans.dart';
 import 'package:aitrainer_app/widgets/app_bar.dart';
 import 'package:aitrainer_app/widgets/exercise_save.dart';
@@ -37,9 +30,7 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
         padding: EdgeInsets.all(20),
         decoration: BoxDecoration(
           image: DecorationImage(
-            image: Cache().userLoggedIn!.sex == "m"
-                ? AssetImage("asset/image/WT_black_background.jpg")
-                : AssetImage("asset/image/WT_Results_for_female.jpg"),
+            image: AssetImage("asset/image/WT_black_background.jpg"),
             fit: BoxFit.cover,
             alignment: Alignment.center,
           ),
@@ -77,21 +68,25 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
   Widget getExercises(TrainingPlanBloc bloc, CustomerTrainingPlanDetails detail) {
     final String noTestTextWithWeight = "Please try to execute this exercise with exact weight and repeats what is suggested";
     final String noTestTextNoWeight = "Please try to execute this exercise with exact repeats what is suggested";
+    final String testMaxRepeats = "Please repeat as much times as you can! MAXIMIZE it!";
+    final String testWeight = "Please take a relative bigger weight and at least 12 times and do your best! MAXIMIZE it!";
     return ExerciseSave(
       exerciseName: detail.exerciseType!.nameTranslation,
       exerciseDescription: detail.exerciseType!.descriptionTranslation,
       exerciseTask: detail.exerciseType!.unitQuantityUnit != null
           ? detail.weight == -1
-              ? t("Please take a relative bigger weight and repeat 12-20 times and do your best! MAXIMIZE it!")
-              : noTestTextWithWeight
+              ? t(testWeight)
+              : detail.repeats == -1
+                  ? t(testMaxRepeats)
+                  : t(noTestTextWithWeight)
           : detail.repeats == -1
-              ? t("Please repeat as much times as you can! MAXIMIZE it!")
+              ? t(testMaxRepeats)
               : noTestTextNoWeight,
       unit: detail.exerciseType!.unit,
       unitQuantityUnit: detail.exerciseType!.unitQuantityUnit,
       hasUnitQuantity: detail.exerciseType!.unitQuantityUnit != null,
       weight: detail.weight == -1 ? 30 : detail.weight,
-      repeats: detail.repeats == -1 ? 12 : detail.repeats,
+      repeats: detail.repeats == -1 ? 99 : detail.repeats,
       set: detail.set,
       exerciseNr: detail.exercises.length + 1,
       onUnitQuantityChanged: (value) => bloc.add(TrainingPlanWeightChange(weight: value, detail: detail)),