Merge pull request #459 from 12people/ux_fixes

Removing Dismissible for better discoverability

Author: rolandgeider

lib/l10n/app_en.arb

@@ -808,5 +808,11 @@
   "none__bodyweight_exercise_": "none (bodyweight exercise)",
   "@none__bodyweight_exercise_": {
     "description": "Generated entry for translation for server strings"
-  }
+  },
+  "editSchedule": "Edit schedule",
+  "log": "Log",
+  "@log": {
+    "description": "Log a specific meal"
+  },
+  "done": "Done"
 }

lib/screens/nutritional_plan_screen.dart

@@ -107,6 +107,7 @@ class NutritionalPlanScreen extends StatelessWidget {
               ),
             ],
             flexibleSpace: FlexibleSpaceBar(
+              titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16),
               title: Text(
                 nutritionalPlan.getLabel(context),
                 style: Theme.of(context).textTheme.titleLarge?.copyWith(color: appBarForeground),

lib/screens/workout_plan_screen.dart

@@ -82,6 +82,7 @@ class _WorkoutPlanScreenState extends State<WorkoutPlanScreen> {
             iconTheme: const IconThemeData(color: appBarForeground),
             backgroundColor: wgerPrimaryColor,
             flexibleSpace: FlexibleSpaceBar(
+              titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16),
               title: Text(
                 workoutPlan.name,
                 style: Theme.of(context).textTheme.titleLarge?.copyWith(color: appBarForeground),

lib/widgets/dashboard/widgets.dart

@@ -146,14 +146,6 @@ class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
     return out;
   }
 
-  Widget getTrailing() {
-    if (!_hasContent) {
-      return const Text('');
-    }
-
-    return _showDetail ? const Icon(Icons.expand_less) : const Icon(Icons.expand_more);
-  }
-
   @override
   Widget build(BuildContext context) {
     return Card(
@@ -174,24 +166,34 @@ class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
               Icons.restaurant,
               color: Theme.of(context).textTheme.headlineSmall!.color,
             ),
-            trailing: getTrailing(),
+            trailing: _hasContent
+                ? Tooltip(
+                    message: AppLocalizations.of(context).toggleDetails,
+                    child: _showDetail
+                        ? const Icon(
+                            Icons.info,
+                          )
+                        : const Icon(Icons.info_outline))
+                : const SizedBox(),
             onTap: () {
               setState(() {
                 _showDetail = !_showDetail;
               });
             },
           ),
           if (_hasContent)
-            Column(
-              children: [
-                ...getContent(),
-                Container(
-                  padding: const EdgeInsets.all(15),
-                  height: 180,
-                  child: FlNutritionalPlanPieChartWidget(_plan!.nutritionalValues),
-                )
-              ],
-            )
+            Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10),
+                child: Column(
+                  children: [
+                    ...getContent(),
+                    Container(
+                      padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 15),
+                      height: 180,
+                      child: FlNutritionalPlanPieChartWidget(_plan!.nutritionalValues),
+                    )
+                  ],
+                ))
           else
             NothingFound(
               AppLocalizations.of(context).noNutritionalPlans,
@@ -441,14 +443,6 @@ class _DashboardWorkoutWidgetState extends State<DashboardWorkoutWidget> {
     _hasContent = _workoutPlan != null;
   }
 
-  Widget getTrailing() {
-    if (!_hasContent) {
-      return const Text('');
-    }
-
-    return _showDetail ? const Icon(Icons.expand_less) : const Icon(Icons.expand_more);
-  }
-
   List<Widget> getContent() {
     final List<Widget> out = [];
 
@@ -540,16 +534,24 @@ class _DashboardWorkoutWidgetState extends State<DashboardWorkoutWidget> {
               Icons.fitness_center,
               color: Theme.of(context).textTheme.headlineSmall!.color,
             ),
-            trailing: getTrailing(),
+            trailing: _hasContent
+                ? Tooltip(
+                    message: AppLocalizations.of(context).toggleDetails,
+                    child: _showDetail
+                        ? const Icon(
+                            Icons.info,
+                          )
+                        : const Icon(Icons.info_outline))
+                : const SizedBox(),
             onTap: () {
               setState(() {
                 _showDetail = !_showDetail;
               });
             },
           ),
           if (_hasContent)
-            Container(
-              padding: const EdgeInsets.only(left: 10),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10),
               child: Column(
                 children: [
                   ...getContent(),