WIP: Default weight using profile

lib/main.dart

@@ -163,14 +163,15 @@ class MainApp extends StatelessWidget {
           update: (context, base, previous) =>
               previous ?? ExercisesProvider(WgerBaseProvider(base)),
         ),
-        ChangeNotifierProxyProvider2<AuthProvider, ExercisesProvider, RoutinesProvider>(
+        ChangeNotifierProxyProvider3<AuthProvider, ExercisesProvider, UserProvider, RoutinesProvider>(
           create: (context) => RoutinesProvider(
             WgerBaseProvider(Provider.of(context, listen: false)),
             Provider.of(context, listen: false),
+            Provider.of(context, listen: true),
             [],
           ),
-          update: (context, auth, exercises, previous) =>
-              previous ?? RoutinesProvider(WgerBaseProvider(auth), exercises, []),
+          update: (context, auth, exercises, user, previous) =>
+              previous ?? RoutinesProvider(WgerBaseProvider(auth), exercises, user, []),
         ),
         ChangeNotifierProxyProvider<AuthProvider, NutritionPlansProvider>(
           create: (context) => NutritionPlansProvider(

lib/models/workouts/set_config_data.dart

@@ -107,7 +107,7 @@ class SetConfigData {
     this.maxNrOfSets,
     this.weight,
     this.maxWeight,
-    this.weightUnitId = WEIGHT_UNIT_KG,
+    this.weightUnitId,
     this.weightRounding,
     this.repetitions,
     this.maxRepetitions,

lib/models/workouts/slot_entry.dart

@@ -192,7 +192,7 @@ class SlotEntry {
     int? order,
     SlotEntryType? type,
     required Exercise exercise,
-    int? weightUnitId,
+    this.weightUnitId,
     this.weightRounding,
     int? repetitionUnitId,
     this.repetitionRounding,
@@ -203,7 +203,6 @@ class SlotEntry {
     this.type = type ?? SlotEntryType.normal;
     exerciseObj = exercise;
     exerciseId = exercise.id!;
-    this.weightUnitId = weightUnitId ?? WEIGHT_UNIT_KG;
 
     this.repetitionUnitId = repetitionUnitId ?? REP_UNIT_REPETITIONS_ID;
   }

lib/providers/routines.dart

@@ -37,6 +37,7 @@ import 'package:wger/models/workouts/slot_entry.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/user.dart';
 
 class RoutinesProvider with ChangeNotifier {
   final _logger = Logger('RoutinesProvider');
@@ -67,13 +68,15 @@ class RoutinesProvider with ChangeNotifier {
   Routine? activeRoutine;
   final ExercisesProvider _exerciseProvider;
   final WgerBaseProvider baseProvider;
+  final UserProvider _userProvider;
   List<Routine> _routines = [];
   List<WeightUnit> _weightUnits = [];
   List<RepetitionUnit> _repetitionUnits = [];
 
   RoutinesProvider(
     this.baseProvider,
     this._exerciseProvider,
+    this._userProvider,
     List<Routine> entries, {
     List<WeightUnit>? weightUnits,
     List<RepetitionUnit>? repetitionUnits,
@@ -112,8 +115,9 @@ class RoutinesProvider with ChangeNotifier {
   }
 
   /// Return the default weight unit (kg)
-  WeightUnit get defaultWeightUnit {
-    return _weightUnits.firstWhere((element) => element.id == WEIGHT_UNIT_KG);
+  Future<WeightUnit> get defaultWeightUnit async {
+    final id = await _userProvider.isMetric() ? WEIGHT_UNIT_KG : WEIGHT_UNIT_LB;
+    return _weightUnits.firstWhere((element) => element.id == id);
   }
 
   WeightUnit findWeightUnitById(int id) => _weightUnits.firstWhere((element) => element.id == id);
@@ -203,9 +207,13 @@ class RoutinesProvider with ChangeNotifier {
             (e) => e.id == setConfig.repetitionsUnitId,
           );
 
-          setConfig.weightUnit = _weightUnits.firstWhere(
-            (e) => e.id == setConfig.weightUnitId,
-          );
+          if (setConfig.weightUnitId != null) {
+            setConfig.weightUnit = _weightUnits.firstWhere(
+                  (e) => e.id == setConfig.weightUnitId,
+            );
+          } else {
+            setConfig.weightUnit = await defaultWeightUnit;
+          }
         }
       }
     }

lib/providers/user.dart

@@ -244,7 +244,7 @@ class UserProvider with ChangeNotifier {
   }
 
   /// Fetch the current user's profile
-  Future<void> fetchAndSetProfile() async {
+  Future<void> _fetchAndSetProfile() async {
     final userData = await baseProvider.fetch(baseProvider.makeUrl(PROFILE_URL));
     try {
       profile = Profile.fromJson(userData);
@@ -255,10 +255,13 @@ class UserProvider with ChangeNotifier {
 
   /// Save the user's profile to the server
   Future<void> saveProfile() async {
-    await baseProvider.post(
-      profile!.toJson(),
-      baseProvider.makeUrl(PROFILE_URL),
-    );
+    final profile = this.profile;
+    if (profile != null) {
+      await baseProvider.post(
+        profile.toJson(),
+        baseProvider.makeUrl(PROFILE_URL),
+      );
+    }
   }
 
   /// Verify the user's email
@@ -271,4 +274,11 @@ class UserProvider with ChangeNotifier {
     );
     //log(verificationData.toString());
   }
+
+  Future<bool> isMetric() async {
+    if (profile == null) {
+      await _fetchAndSetProfile();
+    }
+    return profile?.isMetric ?? false;
+  }
 }

lib/screens/home_tabs_screen.dart

@@ -93,14 +93,12 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
       final galleryProvider = context.read<GalleryProvider>();
       final weightProvider = context.read<BodyWeightProvider>();
       final measurementProvider = context.read<MeasurementProvider>();
-      final userProvider = context.read<UserProvider>();
 
       //
       // Base data
       widget._logger.info('Loading base data');
       await Future.wait([
         authProvider.setServerVersion(),
-        userProvider.fetchAndSetProfile(),
         routinesProvider.fetchAndSetUnits(),
         nutritionPlansProvider.fetchIngredientsFromCache(),
         exercisesProvider.fetchAndSetInitialData(),

test/routine/routine_screen_test.dart

@@ -28,14 +28,16 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/routines.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/screens/routine_screen.dart';
 
 import '../../test_data/routines.dart';
 import 'routine_screen_test.mocks.dart';
 
-@GenerateMocks([WgerBaseProvider])
+@GenerateMocks([WgerBaseProvider, UserProvider])
 void main() {
   final mockBaseProvider = MockWgerBaseProvider();
+  final mockUserProvider = MockUserProvider();
   final exercisesProvider = ExercisesProvider(
     mockBaseProvider,
     database: ExerciseDatabase.inMemory(NativeDatabase.memory()),
@@ -48,6 +50,7 @@ void main() {
       create: (context) => RoutinesProvider(
         mockBaseProvider,
         exercisesProvider,
+        mockUserProvider,
         [getTestRoutine()],
       ),
       child: MaterialApp(