From bcbfa8ed5e3bb8ff52140d1cf01f1bec1996f8c9 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Sun, 19 Nov 2023 11:08:42 +0100
Subject: [PATCH] Show exercise names instead of their UUIDs

closes #297
closes #300
---
 lib/widgets/workouts/gym_mode.dart | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart
index 3b1c3d84..b188d52d 100644
--- a/lib/widgets/workouts/gym_mode.dart
+++ b/lib/widgets/workouts/gym_mode.dart
@@ -59,7 +59,7 @@ class _GymModeState extends State<GymMode> {
   var _totalElements = 1;
 
   /// Map with the first (navigation) page for each exercise
-  final Map<String, int> _exercisePages = {};
+  final Map<ExerciseBase, int> _exercisePages = {};
   final PageController _controller = PageController(
     initialPage: 0,
   );
@@ -89,7 +89,7 @@ class _GymModeState extends State<GymMode> {
             .findExerciseBaseById(setting.exerciseBaseId);
 
         if (firstPage) {
-          _exercisePages[exerciseBase.uuid!] = currentPage;
+          _exercisePages[exerciseBase] = currentPage;
           currentPage++;
         }
 
@@ -169,7 +169,7 @@ class _GymModeState extends State<GymMode> {
 class StartPage extends StatelessWidget {
   final PageController _controller;
   final Day _day;
-  final Map<String, int> _exercisePages;
+  final Map<ExerciseBase, int> _exercisePages;
 
   const StartPage(this._controller, this._day, this._exercisePages);
 
@@ -235,7 +235,7 @@ class LogPage extends StatefulWidget {
   final ExerciseBase _exerciseBase;
   final WorkoutPlan _workoutPlan;
   final double _ratioCompleted;
-  final Map<String, int> _exercisePages;
+  final Map<ExerciseBase, int> _exercisePages;
   final Log _log = Log.empty();
 
   LogPage(
@@ -664,7 +664,7 @@ class ExerciseOverview extends StatelessWidget {
   final PageController _controller;
   final ExerciseBase _exerciseBase;
   final double _ratioCompleted;
-  final Map<String, int> _exercisePages;
+  final Map<ExerciseBase, int> _exercisePages;
 
   const ExerciseOverview(
     this._controller,
@@ -725,7 +725,7 @@ class SessionPage extends StatefulWidget {
   final WorkoutPlan _workoutPlan;
   final PageController _controller;
   final TimeOfDay _start;
-  final Map<String, int> _exercisePages;
+  final Map<ExerciseBase, int> _exercisePages;
 
   const SessionPage(
     this._workoutPlan,
@@ -932,9 +932,13 @@ class _SessionPageState extends State<SessionPage> {
 class TimerWidget extends StatefulWidget {
   final PageController _controller;
   final double _ratioCompleted;
-  final Map<String, int> _exercisePages;
+  final Map<ExerciseBase, int> _exercisePages;
 
-  const TimerWidget(this._controller, this._ratioCompleted, this._exercisePages);
+  const TimerWidget(
+    this._controller,
+    this._ratioCompleted,
+    this._exercisePages,
+  );
 
   @override
   _TimerWidgetState createState() => _TimerWidgetState();
@@ -1059,7 +1063,7 @@ class NavigationFooter extends StatelessWidget {
 class NavigationHeader extends StatelessWidget {
   final PageController _controller;
   final String _title;
-  final Map<String, int> exercisePages;
+  final Map<ExerciseBase, int> exercisePages;
 
   const NavigationHeader(
     this._title,
@@ -1079,7 +1083,7 @@ class NavigationHeader extends StatelessWidget {
           children: [
             ...exercisePages.keys.map((e) {
               return ListTile(
-                title: Text(e),
+                title: Text(e.getExercise(Localizations.localeOf(context).languageCode).name),
                 trailing: const Icon(Icons.chevron_right),
                 onTap: () {
                   _controller.animateToPage(