wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show exercise names instead of their UUIDs

Browse Source 
closes #297
closes #300
This commit is contained in:
Roland Geider
2023-11-19 11:08:42 +01:00
parent cf30ad6594
commit bcbfa8ed5e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/widgets/workouts/gym_mode.dart
View File

@@ -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(