Merge pull request #633 from wger-project/pr/sizzlesloth/632

improve pr 632
wger-project · Sep 7, 2024 · 96faf89 · 96faf89
2 parents 80e33f3 + a64a50f
commit 96faf89
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -29,11 +29,12 @@
 - Bassam Mutairi - <https://github.com/mutairibassam>
 - Dieter Plaetinck - <https://github.com/Dieterbe>
 - Dennis van Peer - <https://github.com/Denpeer>
+- sizzlesloth - <https://github.com/sizzlesloth>
 
 ## Translators
 
 - Saudi Arabian
-  - Hanaa Allohibi <Gmail: programmerHanaa> 
+  - Hanaa Allohibi <Gmail: programmerHanaa>
 
 - German
 
@@ -66,7 +67,7 @@
 - Norwegian Bokmål
 
   - Allan Nordhøy <[email protected]> (98)
-  
+
 - Japanese
 
   - Kosei TANAKA <[email protected]> (97)
@@ -76,5 +77,5 @@
   - Nenza Nurfirmansyah <[email protected]> (73)
 
 - Croatian
-  
+
   - Sandi Milohaic <[email protected]>
diff --git a/lib/screens/weight_screen.dart b/lib/screens/weight_screen.dart
@@ -43,7 +43,7 @@ class WeightScreen extends StatelessWidget {
             FormScreen.routeName,
             arguments: FormScreenArguments(
               AppLocalizations.of(context).newEntry,
-              WeightForm(lastWeightEntry?.copyWith(id: null)),
+              WeightForm(lastWeightEntry?.copyWith(id: null, date: DateTime.now())),
             ),
           );
         },

diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart
@@ -209,7 +209,9 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
                                 FormScreen.routeName,
                                 arguments: FormScreenArguments(
                                   AppLocalizations.of(context).newEntry,
-                                  WeightForm(weightProvider.getNewestEntry()?.copyWith(id: null)),
+                                  WeightForm(weightProvider
+                                      .getNewestEntry()
+                                      ?.copyWith(id: null, date: DateTime.now())),
                                 ),
                               );
                             },

diff --git a/lib/widgets/weight/forms.dart b/lib/widgets/weight/forms.dart
@@ -110,8 +110,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.minus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) - 0.25;
-                        weightController.text = newValue.toString();
+                        final num newValue = num.parse(weightController.text) - 0.1;
+                        weightController.text = newValue.toStringAsFixed(1);
                       } on FormatException {}
                     },
                   ),
@@ -125,8 +125,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.plus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) + 0.25;
-                        weightController.text = newValue.toString();
+                        final num newValue = num.parse(weightController.text) + 0.1;
+                        weightController.text = newValue.toStringAsFixed(1);
                       } on FormatException {}
                     },
                   ),

diff --git a/test/weight/weight_form_test.dart b/test/weight/weight_form_test.dart
@@ -52,10 +52,10 @@ void main() {
     expect(find.text('79'), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('quickMinusSmall')));
-    expect(find.text('78.75'), findsOneWidget);
+    expect(find.text('78.9'), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('quickPlus')));
-    expect(find.text('79.75'), findsOneWidget);
+    expect(find.text('79.9'), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('quickPlusSmall')));
     expect(find.text('80.0'), findsOneWidget);