Refactor routine handling for the dashboard widgets

This makes sure that edits to the routine (such as changing the order
of the days, etc.) are properly reflected in the dashboard.

Author: rolandgeider

lib/providers/routines.dart

@@ -63,7 +63,7 @@ class RoutinesProvider with ChangeNotifier {
   static const _routineConfigRestTime = 'rest-config';
   static const _routineConfigMaxRestTime = 'max-rest-config';
 
-  Routine? _currentRoutine;
+  Routine? activeRoutine;
   late ExercisesProvider _exerciseProvider;
   final WgerBaseProvider baseProvider;
   List<Routine> _routines = [];
@@ -97,7 +97,7 @@ class RoutinesProvider with ChangeNotifier {
 
   /// Clears all lists
   void clear() {
-    _currentRoutine = null;
+    activeRoutine = null;
     _routines = [];
     _weightUnits = [];
     _repetitionUnits = [];
@@ -138,28 +138,14 @@ class RoutinesProvider with ChangeNotifier {
     return _routines.indexWhere((routine) => routine.id == id);
   }
 
-  /// Set the currently "active" workout plan
-  void setCurrentPlan(int id) {
-    _currentRoutine = findById(id);
-  }
-
-  /// Returns the currently "active" workout plan
-  Routine? get currentRoutine {
-    return _currentRoutine;
-  }
-
-  /// Reset the currently "active" workout plan to null
-  void resetCurrentRoutine() {
-    _currentRoutine = null;
-  }
-
-  /// Returns the current active workout plan. At the moment this is just
-  /// the latest, but this might change in the future.
-  Routine? get activeRoutine {
+  /// Sets the current active routine. At the moment this is just the latest,
+  /// but this might change in the future.
+  void setActiveRoutine() {
     if (_routines.isNotEmpty) {
-      return _routines.first;
+      activeRoutine = _routines.first;
+    } else {
+      activeRoutine = null;
     }
-    return null;
   }
 
   /*
@@ -179,12 +165,13 @@ class RoutinesProvider with ChangeNotifier {
       await fetchAndSetRoutineFull(entry['id']);
     }
 
+    setActiveRoutine();
     notifyListeners();
   }
 
-  /// Fetches all workout plan sparsely, i.e. only with the data on the plan
-  /// object itself and no child attributes
-  Future<void> fetchAndSetAllPlansSparse() async {
+  /// Fetches all routines sparsely, i.e. only with the data on the object itself
+  /// and no child attributes
+  Future<void> fetchAndSetAllRoutinesSparse() async {
     final data = await baseProvider.fetch(
       baseProvider.makeUrl(_routinesUrlPath, query: {'limit': '1000', 'is_template': 'false'}),
     );
@@ -194,7 +181,7 @@ class RoutinesProvider with ChangeNotifier {
       _routines.add(plan);
     }
 
-    // _workoutPlans.sort((a, b) => b.created.compareTo(a.created));
+    setActiveRoutine();
     notifyListeners();
   }
 
@@ -216,18 +203,19 @@ class RoutinesProvider with ChangeNotifier {
     }
   }
 
-  /// Fetches a workout plan sparsely, i.e. only with the data on the plan
-  /// object itself and no child attributes
+  /// Fetches a routine sparsely, i.e. only with the data on the object itself
+  /// and no child attributes
   Future<Routine> fetchAndSetRoutineSparse(int planId) async {
     final fullPlanData = await baseProvider.fetch(
       baseProvider.makeUrl(_routinesUrlPath, id: planId),
     );
-    final plan = Routine.fromJson(fullPlanData);
-    _routines.add(plan);
+    final routine = Routine.fromJson(fullPlanData);
+    _routines.add(routine);
     _routines.sort((a, b) => b.created.compareTo(a.created));
 
+    setActiveRoutine();
     notifyListeners();
-    return plan;
+    return routine;
   }
 
   /// Fetches a workout plan fully, i.e. with all corresponding child attributes
@@ -306,7 +294,7 @@ class RoutinesProvider with ChangeNotifier {
     routine.dayDataGym = dayDataEntriesGym;
 
     // Logs
-    routine.sessions = List<WorkoutSessionApi>.from(sessionDataEntries);
+    routine.sessions = List<WorkoutSessionApi>.of(sessionDataEntries);
     for (final session in routine.sessions) {
       for (final log in session.logs) {
         if (log.weightUnitId != null) {
@@ -327,6 +315,7 @@ class RoutinesProvider with ChangeNotifier {
       _routines.add(routine);
     }
 
+    setActiveRoutine();
     notifyListeners();
     return routine;
   }

lib/screens/dashboard.dart

@@ -20,7 +20,10 @@ import 'package:flutter/material.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/widgets/core/app_bar.dart';
 import 'package:wger/widgets/dashboard/calendar.dart';
-import 'package:wger/widgets/dashboard/widgets.dart';
+import 'package:wger/widgets/dashboard/widgets/measurements.dart';
+import 'package:wger/widgets/dashboard/widgets/nutrition.dart';
+import 'package:wger/widgets/dashboard/widgets/routines.dart';
+import 'package:wger/widgets/dashboard/widgets/weight.dart';
 
 class DashboardScreen extends StatelessWidget {
   const DashboardScreen();
@@ -35,7 +38,7 @@ class DashboardScreen extends StatelessWidget {
         padding: EdgeInsets.all(10),
         child: Column(
           children: [
-            DashboardWorkoutWidget(),
+            DashboardRoutineWidget(),
             DashboardNutritionWidget(),
             DashboardWeightWidget(),
             DashboardMeasurementWidget(),

lib/screens/home_tabs_screen.dart

@@ -106,7 +106,7 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
         await Future.wait([
           galleryProvider.fetchAndSetGallery(),
           nutritionPlansProvider.fetchAndSetAllPlansSparse(),
-          routinesProvider.fetchAndSetAllPlansSparse(),
+          routinesProvider.fetchAndSetAllRoutinesSparse(),
           // routinesProvider.fetchAndSetAllRoutinesFull(),
           weightProvider.fetchAndSetEntries(),
           measurementProvider.fetchAndSetAllCategoriesAndEntries(),
@@ -128,12 +128,11 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
         widget._logger.warning(e.toString());
       }
 
-      // Current workout plan
+      // Current routine
       widget._logger.info('Loading current routine');
       if (routinesProvider.activeRoutine != null) {
         final planId = routinesProvider.activeRoutine!.id!;
         await routinesProvider.fetchAndSetRoutineFull(planId);
-        routinesProvider.setCurrentPlan(planId);
       }
     }
 
@@ -149,38 +148,38 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
           return const Scaffold(
             body: LoadingWidget(),
           );
-        } else {
-          return Scaffold(
-            body: _screenList.elementAt(_selectedIndex),
-            bottomNavigationBar: NavigationBar(
-              destinations: [
-                NavigationDestination(
-                  icon: const Icon(Icons.home),
-                  label: AppLocalizations.of(context).labelDashboard,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.fitness_center),
-                  label: AppLocalizations.of(context).labelBottomNavWorkout,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.restaurant),
-                  label: AppLocalizations.of(context).labelBottomNavNutrition,
-                ),
-                NavigationDestination(
-                  icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
-                  label: AppLocalizations.of(context).weight,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.photo_library),
-                  label: AppLocalizations.of(context).gallery,
-                ),
-              ],
-              onDestinationSelected: _onItemTapped,
-              selectedIndex: _selectedIndex,
-              labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
-            ),
-          );
         }
+
+        return Scaffold(
+          body: _screenList.elementAt(_selectedIndex),
+          bottomNavigationBar: NavigationBar(
+            destinations: [
+              NavigationDestination(
+                icon: const Icon(Icons.home),
+                label: AppLocalizations.of(context).labelDashboard,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.fitness_center),
+                label: AppLocalizations.of(context).labelBottomNavWorkout,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.restaurant),
+                label: AppLocalizations.of(context).labelBottomNavNutrition,
+              ),
+              NavigationDestination(
+                icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
+                label: AppLocalizations.of(context).weight,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.photo_library),
+                label: AppLocalizations.of(context).gallery,
+              ),
+            ],
+            onDestinationSelected: _onItemTapped,
+            selectedIndex: _selectedIndex,
+            labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
+          ),
+        );
       },
     );
   }