Properly handle localized inputs in further forms

Author: rolandgeider

lib/widgets/nutrition/forms.dart

@@ -322,7 +322,7 @@ class IngredientFormState extends State<IngredientForm> {
                     keyboardType: textInputTypeDecimal,
                     onChanged: (value) {
                       setState(() {
-                        final v = double.tryParse(value);
+                        final v = numberFormat.tryParse(value);
                         if (v != null) {
                           _mealItem.amount = v;
                         }
@@ -336,7 +336,7 @@ class IngredientFormState extends State<IngredientForm> {
                       if (text.isEmpty) {
                         return i18n.enterValue;
                       }
-                      final parsed = double.tryParse(text);
+                      final parsed = numberFormat.tryParse(text);
                       if (parsed == null) {
                         return i18n.enterValidNumber;
                       }

lib/widgets/routines/forms/slot_entry.dart

@@ -67,18 +67,33 @@ class _SlotEntryFormState extends State<SlotEntryForm> {
 
   var _edit = false;
 
+  bool _controllersInitialized = false;
+
   @override
   void initState() {
     super.initState();
     if (widget.entry.nrOfSetsConfigs.isNotEmpty) {
       setsSliderValue = widget.entry.nrOfSetsConfigs.first.value.toDouble();
     }
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_controllersInitialized) {
+      return;
+    }
+    _controllersInitialized = true;
+
+    // Weights can be fractional, so they are rendered with the active locale's
+    // decimal separator to round-trip through numberFormat when the form is saved.
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
 
     if (widget.entry.weightConfigs.isNotEmpty) {
-      weightController.text = widget.entry.weightConfigs.first.value.toString();
+      weightController.text = numberFormat.format(widget.entry.weightConfigs.first.value);
     }
     if (widget.entry.maxWeightConfigs.isNotEmpty) {
-      maxWeightController.text = widget.entry.maxWeightConfigs.first.value.toString();
+      maxWeightController.text = numberFormat.format(widget.entry.maxWeightConfigs.first.value);
     }
 
     if (widget.entry.repetitionsConfigs.isNotEmpty) {
@@ -98,7 +113,8 @@ class _SlotEntryFormState extends State<SlotEntryForm> {
     }
 
     if (widget.entry.rirConfigs.isNotEmpty) {
-      rirController.text = widget.entry.rirConfigs.first.value.round().toString();
+      // RiR uses 0.5 steps, so the fractional part must be kept
+      rirController.text = widget.entry.rirConfigs.first.value.toString();
     }
   }
 
@@ -389,7 +405,8 @@ class _SlotEntryFormState extends State<SlotEntryForm> {
                         ),
                         provider.handleConfig(
                           widget.entry,
-                          numberFormat.tryParse(rirController.text),
+                          // RiR is slider-driven and held as an invariant string
+                          num.tryParse(rirController.text),
                           ConfigType.rir,
                         ),
                       ]);

test/routine/slot_entry_form_test.dart

@@ -23,6 +23,7 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/base_config.dart';
 import 'package:wger/models/workouts/slot_entry.dart';
 import 'package:wger/providers/routines.dart';
 import 'package:wger/widgets/routines/forms/repetitions.dart';
@@ -47,7 +48,7 @@ void main() {
     when(mockRoutinesProvider.findRepetitionUnitById(any)).thenReturn(testRepetitionUnit1);
   });
 
-  Widget renderWidget({simpleMode = true, locale = 'en'}) {
+  Widget renderWidget({simpleMode = true, locale = 'en', SlotEntry? entry}) {
     final key = GlobalKey<NavigatorState>();
 
     return ChangeNotifierProvider<RoutinesProvider>(
@@ -57,7 +58,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(body: SlotEntryForm(slotEntry, 1, simpleMode: simpleMode)),
+        home: Scaffold(body: SlotEntryForm(entry ?? slotEntry, 1, simpleMode: simpleMode)),
       ),
     );
   }
@@ -156,4 +157,47 @@ void main() {
     expect(capturedArgs[(6 * 3) + 1], 100);
     expect(capturedArgs[(6 * 3) + 2], ConfigType.maxRest);
   });
+
+  testWidgets('Fractional weight survives a no-op save in a comma-decimal locale', (
+    WidgetTester tester,
+  ) async {
+    final entry = getTestRoutine().days[0].slots[0].entries[0];
+    entry.weightConfigs.first.value = 2.5;
+
+    await tester.pumpWidget(renderWidget(simpleMode: false, locale: 'de', entry: entry));
+    await tester.pumpAndSettle();
+
+    // The field shows the locale-formatted value, not the invariant "2.5"
+    expect(find.text('2,5'), findsOneWidget);
+
+    // Save without touching anything
+    await tester.tap(find.byKey(const ValueKey(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pumpAndSettle();
+
+    final capturedArgs = verify(
+      mockRoutinesProvider.handleConfig(captureAny, captureAny, captureAny),
+    ).captured;
+
+    expect(capturedArgs[(1 * 3) + 2], ConfigType.weight);
+    expect(capturedArgs[(1 * 3) + 1], 2.5);
+  });
+
+  testWidgets('Fractional RiR survives a no-op save', (WidgetTester tester) async {
+    final entry = getTestRoutine().days[0].slots[0].entries[0];
+    entry.rirConfigs = [BaseConfig.firstIteration(2.5, 1)];
+
+    await tester.pumpWidget(renderWidget(simpleMode: false, entry: entry));
+    await tester.pumpAndSettle();
+
+    // Save without touching anything
+    await tester.tap(find.byKey(const ValueKey(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pumpAndSettle();
+
+    final capturedArgs = verify(
+      mockRoutinesProvider.handleConfig(captureAny, captureAny, captureAny),
+    ).captured;
+
+    expect(capturedArgs[(7 * 3) + 2], ConfigType.rir);
+    expect(capturedArgs[(7 * 3) + 1], 2.5);
+  });
 }