From a8488e462591cc59c5cf01cfd0809ddf57d9ded7 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Thu, 18 Feb 2021 22:00:37 +0100
Subject: [PATCH] Add space after comma in exercise names

---
 lib/models/workouts/setting.dart   |  1 +
 lib/widgets/app_drawer.dart        | 17 +++++++++--------
 lib/widgets/dashboard/widgets.dart |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/models/workouts/setting.dart b/lib/models/workouts/setting.dart
index bd4bbfb1..4d9608e9 100644
--- a/lib/models/workouts/setting.dart
+++ b/lib/models/workouts/setting.dart
@@ -39,6 +39,7 @@ class Setting {
 
   Setting({
     this.id,
+    this.setId,
     this.exerciseObj,
     this.repetitionUnit,
     this.reps,
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 08c208ae..c260fa32 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -22,10 +22,6 @@ import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:wger/locale/locales.dart';
 import 'package:wger/providers/auth.dart';
-import 'package:wger/screens/dashboard.dart';
-import 'package:wger/screens/nutritional_plans_screen.dart';
-import 'package:wger/screens/weight_screen.dart';
-import 'package:wger/screens/workout_plans_screen.dart';
 
 class AppDrawer extends StatelessWidget {
   @override
@@ -39,6 +35,7 @@ class AppDrawer extends StatelessWidget {
             title: Text('wger'),
             automaticallyImplyLeading: false,
           ),
+          /*
           ListTile(
             leading: Icon(Icons.home),
             title: Text(AppLocalizations.of(context).labelDashboard),
@@ -74,11 +71,15 @@ class AppDrawer extends StatelessWidget {
               Navigator.of(context).pushReplacementNamed(WeightScreen.routeName);
             },
           ),
+
+
           Divider(),
           Expanded(child: Container()),
+
+           */
           ListTile(
-            dense: true,
-            leading: Icon(Icons.edit),
+            //dense: true,
+            leading: Icon(Icons.build),
             title: Text('Options'),
             onTap: () {
               showDialog(
@@ -98,7 +99,7 @@ class AppDrawer extends StatelessWidget {
             },
           ),
           ListTile(
-            dense: true,
+            //dense: true,
             leading: Icon(Icons.exit_to_app),
             title: Text('Logout'),
             onTap: () {
@@ -108,7 +109,7 @@ class AppDrawer extends StatelessWidget {
             },
           ),
           AboutListTile(
-            dense: true,
+            //dense: true,
             icon: Icon(Icons.info),
             applicationName: 'wger',
             applicationVersion: '${authProvider.applicationVersion.version} '
diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart
index f6e426af..cf06f1d2 100644
--- a/lib/widgets/dashboard/widgets.dart
+++ b/lib/widgets/dashboard/widgets.dart
@@ -234,7 +234,7 @@ class _DashboardWorkoutWidgetState extends State<DashboardWorkoutWidget> {
                             : Text(workoutDay.description),
                         if (showDetail)
                           ...workoutDay.sets
-                              .map((set) => Text(set.exercisesObj.map((e) => e.name).join(',')))
+                              .map((set) => Text(set.exercisesObj.map((e) => e.name).join(', ')))
                               .toList(),
                       ]);
                     }).toList(),