Skip to content

Commit bcbfa8e

Browse files
committed
Show exercise names instead of their UUIDs
closes #297 closes #300
1 parent cf30ad6 commit bcbfa8e

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

lib/widgets/workouts/gym_mode.dart

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class _GymModeState extends State<GymMode> {
5959
var _totalElements = 1;
6060

6161
/// Map with the first (navigation) page for each exercise
62-
final Map<String, int> _exercisePages = {};
62+
final Map<ExerciseBase, int> _exercisePages = {};
6363
final PageController _controller = PageController(
6464
initialPage: 0,
6565
);
@@ -89,7 +89,7 @@ class _GymModeState extends State<GymMode> {
8989
.findExerciseBaseById(setting.exerciseBaseId);
9090

9191
if (firstPage) {
92-
_exercisePages[exerciseBase.uuid!] = currentPage;
92+
_exercisePages[exerciseBase] = currentPage;
9393
currentPage++;
9494
}
9595

@@ -169,7 +169,7 @@ class _GymModeState extends State<GymMode> {
169169
class StartPage extends StatelessWidget {
170170
final PageController _controller;
171171
final Day _day;
172-
final Map<String, int> _exercisePages;
172+
final Map<ExerciseBase, int> _exercisePages;
173173

174174
const StartPage(this._controller, this._day, this._exercisePages);
175175

@@ -235,7 +235,7 @@ class LogPage extends StatefulWidget {
235235
final ExerciseBase _exerciseBase;
236236
final WorkoutPlan _workoutPlan;
237237
final double _ratioCompleted;
238-
final Map<String, int> _exercisePages;
238+
final Map<ExerciseBase, int> _exercisePages;
239239
final Log _log = Log.empty();
240240

241241
LogPage(
@@ -664,7 +664,7 @@ class ExerciseOverview extends StatelessWidget {
664664
final PageController _controller;
665665
final ExerciseBase _exerciseBase;
666666
final double _ratioCompleted;
667-
final Map<String, int> _exercisePages;
667+
final Map<ExerciseBase, int> _exercisePages;
668668

669669
const ExerciseOverview(
670670
this._controller,
@@ -725,7 +725,7 @@ class SessionPage extends StatefulWidget {
725725
final WorkoutPlan _workoutPlan;
726726
final PageController _controller;
727727
final TimeOfDay _start;
728-
final Map<String, int> _exercisePages;
728+
final Map<ExerciseBase, int> _exercisePages;
729729

730730
const SessionPage(
731731
this._workoutPlan,
@@ -932,9 +932,13 @@ class _SessionPageState extends State<SessionPage> {
932932
class TimerWidget extends StatefulWidget {
933933
final PageController _controller;
934934
final double _ratioCompleted;
935-
final Map<String, int> _exercisePages;
935+
final Map<ExerciseBase, int> _exercisePages;
936936

937-
const TimerWidget(this._controller, this._ratioCompleted, this._exercisePages);
937+
const TimerWidget(
938+
this._controller,
939+
this._ratioCompleted,
940+
this._exercisePages,
941+
);
938942

939943
@override
940944
_TimerWidgetState createState() => _TimerWidgetState();
@@ -1059,7 +1063,7 @@ class NavigationFooter extends StatelessWidget {
10591063
class NavigationHeader extends StatelessWidget {
10601064
final PageController _controller;
10611065
final String _title;
1062-
final Map<String, int> exercisePages;
1066+
final Map<ExerciseBase, int> exercisePages;
10631067

10641068
const NavigationHeader(
10651069
this._title,
@@ -1079,7 +1083,7 @@ class NavigationHeader extends StatelessWidget {
10791083
children: [
10801084
...exercisePages.keys.map((e) {
10811085
return ListTile(
1082-
title: Text(e),
1086+
title: Text(e.getExercise(Localizations.localeOf(context).languageCode).name),
10831087
trailing: const Icon(Icons.chevron_right),
10841088
onTap: () {
10851089
_controller.animateToPage(

0 commit comments

Comments
 (0)