WT1.1.5+3 bug fixes

lib/view/exercise_control_page.dart

@@ -275,10 +275,37 @@ class _ExerciseControlPage extends State<ExerciseControlPage> with Trans {
         title,
         style: GoogleFonts.inter(color: Colors.yellow[300], fontSize: 18, fontWeight: FontWeight.bold),
       ),
-      Text(
+      RichText(
+        text: TextSpan(
+            style: GoogleFonts.inter(
+              fontSize: 16,
+              fontWeight: FontWeight.normal,
+              color: Colors.yellow[300],
+            ),
+            children: [
+              TextSpan(text: t("Please repeat with ")),
+              TextSpan(
+                text: exerciseBloc.unitQuantity.toStringAsFixed(0) + " " + exerciseBloc.exerciseRepository.exerciseType.unitQuantityUnit,
+                style: GoogleFonts.inter(
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.yellow[400],
+                ),
+              ),
+              TextSpan(
+                  text: t("hu_with") +
+                      " " +
+                      strTimes +
+                      " " +
+                      t(
+                        "times!",
+                      ))
+            ]),
+      ),
+      /* Text(
         textInstruction,
         style: GoogleFonts.inter(color: Colors.yellow[300], fontSize: 16),
-      ),
+      ), */
       Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [

lib/view/exercise_new_page.dart

@@ -379,7 +379,7 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans, Logging {
         ),
         Divider(),
         Divider(),
-        Text("Or type the time manually:", style: GoogleFonts.inter(color: Colors.white)),
+        Text(t("Or type the time manually:"), style: GoogleFonts.inter(color: Colors.white)),
         TimePickerWidget(
           onChange: (value) => {print("timer"), bloc.add(ExerciseNewQuantityChange(quantity: value))},
         )

lib/widgets/app_bar.dart

@@ -157,24 +157,19 @@ class _AppBarNav extends State<AppBarNav> with SingleTickerProviderStateMixin, C
       String text = AppLocalizations.of(context).translate("Make your first test");
       double fontSize = text.length > 24 ? 13 : 16;
       return Stack(alignment: Alignment.topLeft, overflow: Overflow.clip, children: [
-        Text(
-          text,
-          style: TextStyle(fontSize: fontSize, color: colorAnim.value, shadows: [Shadow(color: Colors.purple, blurRadius: 15)]),
-        ),
+        GestureDetector(
+            onTap: () => progressExplanation(),
+            child: Text(
+              text,
+              style: TextStyle(fontSize: fontSize, color: colorAnim.value, shadows: [Shadow(color: Colors.purple, blurRadius: 15)]),
+            )),
       ]);
     } else {
       return Stack(
         alignment: Alignment.topLeft,
         children: [
           GestureDetector(
-            onTap: () => showDialog(
-                context: context,
-                builder: (BuildContext context) {
-                  return DialogHTML(
-                    title: AppLocalizations.of(context).translate("Progressindicator for the tests"),
-                    htmlData: AppLocalizations.of(context).translate("Progressindicator_desc"),
-                  );
-                }),
+            onTap: () => progressExplanation(),
             child: LinearPercentIndicator(
               width: cWidth / 4,
               lineHeight: 14.0,
@@ -197,4 +192,15 @@ class _AppBarNav extends State<AppBarNav> with SingleTickerProviderStateMixin, C
       );
     }
   }
+
+  void progressExplanation() {
+    showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return DialogHTML(
+            title: AppLocalizations.of(context).translate("Progressindicator for the tests"),
+            htmlData: AppLocalizations.of(context).translate("Progressindicator_desc"),
+          );
+        });
+  }
 }

lib/widgets/menu_page_widget.dart

@@ -93,7 +93,7 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
         WorkoutMenuTree workoutTree = value;
         _columnChildren.add(Container(
             padding: EdgeInsets.only(top: 15.0, left: cWidth * 0.04, right: cWidth * 0.04),
-            height: (cHeight / 3) - cWidth * 0.16,
+            //height: (cHeight / 3) - cWidth * 0.16,
             child: Badge(
                 padding: EdgeInsets.all(8),
                 position: BadgePosition.bottomEnd(end: 0),
@@ -144,15 +144,16 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
       });
     }
 //delegate: SliverChildListDelegate(_columnChildren),
-    LiveSliverList sliverList = LiveSliverList(
-      itemCount: _columnChildren.length,
-      reAnimateOnVisibility: false,
-      showItemDuration: Duration(milliseconds: 250),
-      itemBuilder: (BuildContext context, int index, Animation<double> animation) => FadeTransition(
-        opacity: animation,
-        child: _columnChildren[index],
-      ),
-      controller: scrollController,
+    SliverList sliverList = SliverList(
+      //itemCount: _columnChildren.length,
+      //reAnimateOnVisibility: false,
+      //showItemDuration: Duration(milliseconds: 150),
+      //itemBuilder: (BuildContext context, int index, Animation<double> animation) => FadeTransition(
+      // opacity: animation,
+      // child: _columnChildren[index],
+      //),
+      //controller: scrollController,
+      delegate: SliverChildListDelegate(_columnChildren),
     );
 
     slivers.add(sliverList);

lib/widgets/time_picker.dart

@@ -37,10 +37,10 @@ class _TimePickerWidgetState extends State<TimePickerWidget> with Trans {
                   : 60,
           (index) => Text(
               inSeconds
-                  ? '$index sec'
+                  ? '$index ' + t("sec")
                   : inHundredths
                       ? index.toString() + ' "'
-                      : '$index min',
+                      : '$index ' + t('min'),
               style: TextStyle(color: Colors.yellow[200]))),
       itemExtent: 40,
     );