Merge pull request #498 from wger-project/feature/body-weight-unit

rolandgeider · web-flow · commit e733bc47f1f5 · 2024-01-23T16:39:37.000+01:00
Use the user's preferred unit for body weight
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -785,7 +785,7 @@
   "@settingsCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Zwischenspeicher erfolgreich gelöscht",
   "@settingsCacheDeletedSnackbar": {},
-  "lb": "Pfund",
+  "lb": "lb",
   "@lb": {
     "description": "Generated entry for translation for server strings"
   }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -167,6 +167,7 @@
   "@rirNotUsed": {
     "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
   },
+  "useMetric": "Use metric units for body weight",
   "weightUnit": "Weight unit",
   "@weightUnit": {},
   "repetitionUnit": "Repetition unit",
diff --git a/lib/models/user/profile.dart b/lib/models/user/profile.dart
@@ -31,6 +31,11 @@ class Profile {
   @JsonKey(required: true, name: 'is_trustworthy')
   bool isTrustworthy;
 
+  @JsonKey(required: true, name: 'weight_unit')
+  String weightUnitStr;
+
+  bool get isMetric => weightUnitStr == 'kg';
+
   @JsonKey(required: true)
   String email;
 
@@ -39,9 +44,11 @@ class Profile {
     required this.emailVerified,
     required this.isTrustworthy,
     required this.email,
+    required this.weightUnitStr,
   });
 
   // Boilerplate
   factory Profile.fromJson(Map<String, dynamic> json) => _$ProfileFromJson(json);
+
   Map<String, dynamic> toJson() => _$ProfileToJson(this);
 }
diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart
diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart
@@ -27,6 +27,7 @@ import 'package:wger/models/workouts/workout_plan.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/gym_mode.dart';
@@ -243,6 +244,7 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
 
   @override
   Widget build(BuildContext context) {
+    final profile = context.read<UserProvider>().profile;
     weightEntriesData = Provider.of<BodyWeightProvider>(context, listen: false);
 
     return Consumer<BodyWeightProvider>(
@@ -267,9 +269,13 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
                     children: [
                       SizedBox(
                         height: 200,
-                        child: MeasurementChartWidgetFl(weightEntriesData.items
-                            .map((e) => MeasurementChartEntry(e.weight, e.date))
-                            .toList()),
+                        child: MeasurementChartWidgetFl(
+                            weightEntriesData.items
+                                .map((e) => MeasurementChartEntry(e.weight, e.date))
+                                .toList(),
+                            unit: profile!.isMetric
+                                ? AppLocalizations.of(context).kg
+                                : AppLocalizations.of(context).lb),
                       ),
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/widgets/user/forms.dart b/lib/widgets/user/forms.dart
@@ -23,14 +23,26 @@ import 'package:wger/models/user/profile.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/theme/theme.dart';
 
-class UserProfileForm extends StatelessWidget {
+class UserProfileForm extends StatefulWidget {
   late final Profile _profile;
-  final _form = GlobalKey<FormState>();
-  final emailController = TextEditingController();
 
   UserProfileForm(Profile profile) {
     _profile = profile;
-    emailController.text = _profile.email;
+  }
+
+  @override
+  State<UserProfileForm> createState() => _UserProfileFormState();
+}
+
+class _UserProfileFormState extends State<UserProfileForm> {
+  final _form = GlobalKey<FormState>();
+
+  final emailController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    emailController.text = widget._profile.email;
   }
 
   @override
@@ -42,16 +54,29 @@ class UserProfileForm extends StatelessWidget {
           ListTile(
             leading: const Icon(Icons.person, color: wgerPrimaryColor),
             title: Text(AppLocalizations.of(context).username),
-            subtitle: Text(_profile.username),
+            subtitle: Text(widget._profile.username),
+          ),
+          SwitchListTile(
+            title: Text(AppLocalizations.of(context).useMetric),
+            subtitle: Text(widget._profile.weightUnitStr),
+            value: widget._profile.isMetric,
+            onChanged: (_) {
+              setState(() {
+                widget._profile.weightUnitStr = widget._profile.isMetric
+                    ? AppLocalizations.of(context).lb
+                    : AppLocalizations.of(context).kg;
+              });
+            },
+            dense: true,
           ),
           ListTile(
             leading: const Icon(Icons.email_rounded, color: wgerPrimaryColor),
             title: TextFormField(
               decoration: InputDecoration(
-                  labelText: _profile.emailVerified
+                  labelText: widget._profile.emailVerified
                       ? AppLocalizations.of(context).verifiedEmail
                       : AppLocalizations.of(context).unVerifiedEmail,
-                  suffixIcon: _profile.emailVerified
+                  suffixIcon: widget._profile.emailVerified
                       ? const Icon(
                           Icons.check_circle,
                           color: Colors.green,
@@ -60,7 +85,7 @@ class UserProfileForm extends StatelessWidget {
               controller: emailController,
               keyboardType: TextInputType.emailAddress,
               onSaved: (newValue) {
-                _profile.email = newValue!;
+                widget._profile.email = newValue!;
               },
               validator: (value) {
                 if (value!.isNotEmpty && !value.contains('@')) {
@@ -70,11 +95,11 @@ class UserProfileForm extends StatelessWidget {
               },
             ),
           ),
-          if (!_profile.emailVerified)
+          if (!widget._profile.emailVerified)
             OutlinedButton(
               onPressed: () async {
                 // Email is already verified
-                if (_profile.emailVerified) {
+                if (widget._profile.emailVerified) {
                   return;
                 }
 
@@ -83,17 +108,14 @@ class UserProfileForm extends StatelessWidget {
                 ScaffoldMessenger.of(context).showSnackBar(
                   SnackBar(
                     content: Text(
-                      AppLocalizations.of(context).verifiedEmailInfo(_profile.email),
+                      AppLocalizations.of(context).verifiedEmailInfo(widget._profile.email),
                     ),
                   ),
                 );
               },
               child: Text(AppLocalizations.of(context).verify),
             ),
           ElevatedButton(
-            style: ElevatedButton.styleFrom(
-                backgroundColor: wgerPrimaryButtonColor,
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50))),
             onPressed: () async {
               // Validate and save the current values to the weightEntry
               final isValid = _form.currentState!.validate();
diff --git a/lib/widgets/weight/entries_list.dart b/lib/widgets/weight/entries_list.dart
@@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/measurement_categories_screen.dart';
 import 'package:wger/widgets/measurements/charts.dart';
@@ -29,6 +30,7 @@ import 'package:wger/widgets/weight/forms.dart';
 class WeightEntriesList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final profile = context.read<UserProvider>().profile;
     final weightProvider = Provider.of<BodyWeightProvider>(context, listen: false);
 
     return Column(
@@ -37,7 +39,11 @@ class WeightEntriesList extends StatelessWidget {
           padding: const EdgeInsets.all(15),
           height: 220,
           child: MeasurementChartWidgetFl(
-              weightProvider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList()),
+            weightProvider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList(),
+            unit: profile!.isMetric
+                ? AppLocalizations.of(context).kg
+                : AppLocalizations.of(context).lb,
+          ),
         ),
         TextButton(
           onPressed: () => Navigator.pushNamed(
diff --git a/test/weight/weight_screen_test.dart b/test/weight/weight_screen_test.dart
@@ -23,32 +23,43 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
 import 'package:wger/widgets/measurements/charts.dart';
 import 'package:wger/widgets/weight/forms.dart';
 
 import '../../test_data/body_weight.dart';
+import '../../test_data/profile.dart';
 import 'weight_screen_test.mocks.dart';
 
-@GenerateMocks([BodyWeightProvider])
+@GenerateMocks([BodyWeightProvider, UserProvider])
 void main() {
-  var mockWeightProvider = MockBodyWeightProvider();
+  late MockBodyWeightProvider mockWeightProvider;
+  late MockUserProvider mockUserProvider;
 
-  Widget createWeightScreen({locale = 'en'}) {
+  setUp(() {
     mockWeightProvider = MockBodyWeightProvider();
     when(mockWeightProvider.items).thenReturn(getWeightEntries());
 
-    return ChangeNotifierProvider<BodyWeightProvider>(
-      create: (context) => mockWeightProvider,
-      child: MaterialApp(
-        locale: Locale(locale),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: WeightScreen(),
-        routes: {
-          FormScreen.routeName: (_) => FormScreen(),
-        },
+    mockUserProvider = MockUserProvider();
+    when(mockUserProvider.profile).thenReturn(tProfile1);
+  });
+
+  Widget createWeightScreen({locale = 'en'}) {
+    return ChangeNotifierProvider<UserProvider>(
+      create: (context) => mockUserProvider,
+      child: ChangeNotifierProvider<BodyWeightProvider>(
+        create: (context) => mockWeightProvider,
+        child: MaterialApp(
+          locale: Locale(locale),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: WeightScreen(),
+          routes: {
+            FormScreen.routeName: (_) => FormScreen(),
+          },
+        ),
       ),
     );
   }
diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart
diff --git a/test_data/profile.dart b/test_data/profile.dart

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@`
`785`	`785`	`"@settingsCacheDescription": {},`
`786`	`786`	`"settingsCacheDeletedSnackbar": "Zwischenspeicher erfolgreich gelöscht",`
`787`	`787`	`"@settingsCacheDeletedSnackbar": {},`
`788`		`- "lb": "Pfund",`
	`788`	`+ "lb": "lb",`
`789`	`789`	`"@lb": {`
`790`	`790`	`"description": "Generated entry for translation for server strings"`
`791`	`791`	`}`