diff --git a/.metadata b/.metadata index a64a16055..f0f8422a7 100644 --- a/.metadata +++ b/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - channel: stable + revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1" + channel: "[user-branch]" project_type: app @@ -13,14 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - - platform: android - create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - - platform: ios - create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 - base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + - platform: web + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 # User provided section diff --git a/lib/features/profile/presentation/widgets/set_height_dialog.dart b/lib/features/profile/presentation/widgets/set_height_dialog.dart index 375604eeb..0fd337dd4 100644 --- a/lib/features/profile/presentation/widgets/set_height_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_height_dialog.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:horizontal_picker/horizontal_picker.dart'; import 'package:opennutritracker/generated/l10n.dart'; -class SetHeightDialog extends StatelessWidget { +class SetHeightDialog extends StatefulWidget { static const _heightRangeCM = 100.0; - static const _heightRangeFt = 10; + static const _heightRangeFt = 10.0; final double userHeight; final bool usesImperialUnits; @@ -15,9 +15,29 @@ class SetHeightDialog extends StatelessWidget { required this.usesImperialUnits, }); + @override + State createState() => _SetHeightDialogState(); +} + +class _SetHeightDialogState extends State { + late double selectedHeight; + + @override + void initState() { + super.initState(); + selectedHeight = widget.userHeight; + } + @override Widget build(BuildContext context) { - double selectedHeight = userHeight; + final minValue = widget.usesImperialUnits + ? widget.userHeight - SetHeightDialog._heightRangeFt + : widget.userHeight - SetHeightDialog._heightRangeCM; + + final maxValue = widget.usesImperialUnits + ? widget.userHeight + SetHeightDialog._heightRangeFt + : widget.userHeight + SetHeightDialog._heightRangeCM; + return AlertDialog( title: Text(S.of(context).selectHeightDialogLabel), content: Wrap( @@ -27,18 +47,18 @@ class SetHeightDialog extends StatelessWidget { HorizontalPicker( height: 100, backgroundColor: Colors.transparent, - minValue: usesImperialUnits - ? selectedHeight - _heightRangeFt - : selectedHeight - _heightRangeCM, - maxValue: usesImperialUnits - ? selectedHeight + _heightRangeFt - : selectedHeight + _heightRangeCM, + // Prevent negative minimum height + minValue: minValue < 0 ? 1 : minValue, // setting it to 1, because 0 triggers zero-division error + maxValue: maxValue, divisions: 400, - suffix: usesImperialUnits + suffix: widget.usesImperialUnits ? S.of(context).ftLabel : S.of(context).cmLabel, onChanged: (value) { - selectedHeight = value; + setState(() { + // Prevent negative height values + selectedHeight = value < 0 ? 1 : value; + }); }, ), ], @@ -62,4 +82,4 @@ class SetHeightDialog extends StatelessWidget { ], ); } -} +} \ No newline at end of file diff --git a/lib/features/profile/presentation/widgets/set_weight_dialog.dart b/lib/features/profile/presentation/widgets/set_weight_dialog.dart index e7bcb179c..d644fb55d 100644 --- a/lib/features/profile/presentation/widgets/set_weight_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_weight_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:horizontal_picker/horizontal_picker.dart'; import 'package:opennutritracker/generated/l10n.dart'; -class SetWeightDialog extends StatelessWidget { +class SetWeightDialog extends StatefulWidget { static const weightRangeKg = 50.0; static const weightRangeLbs = 100.0; @@ -15,9 +15,29 @@ class SetWeightDialog extends StatelessWidget { required this.usesImperialUnits, }); + @override + State createState() => _SetWeightDialogState(); +} + +class _SetWeightDialogState extends State { + late double selectedWeight; + + @override + void initState() { + super.initState(); + selectedWeight = widget.userWeight; + } + @override Widget build(BuildContext context) { - double selectedWeight = userWeight; + final minValue = widget.usesImperialUnits + ? widget.userWeight - SetWeightDialog.weightRangeLbs + : widget.userWeight - SetWeightDialog.weightRangeKg; + + final maxValue = widget.usesImperialUnits + ? widget.userWeight + SetWeightDialog.weightRangeLbs + : widget.userWeight + SetWeightDialog.weightRangeKg; + return AlertDialog( title: Text(S.of(context).selectWeightDialogLabel), content: Wrap( @@ -27,19 +47,17 @@ class SetWeightDialog extends StatelessWidget { HorizontalPicker( height: 100, backgroundColor: Colors.transparent, - minValue: usesImperialUnits - ? userWeight - weightRangeLbs - : userWeight - weightRangeKg, - maxValue: usesImperialUnits - ? userWeight + weightRangeLbs - : userWeight + weightRangeKg, + minValue: minValue < 0 ? 0 : minValue, // 👈 no negative minimum + maxValue: maxValue, initialPosition: InitialPosition.center, divisions: 1000, - suffix: usesImperialUnits + suffix: widget.usesImperialUnits ? S.of(context).lbsLabel : S.of(context).kgLabel, onChanged: (value) { - selectedWeight = value; + setState(() { + selectedWeight = value < 0 ? 0 : value; // 👈 no negative values + }); }, ), ], @@ -55,7 +73,6 @@ class SetWeightDialog extends StatelessWidget { ), TextButton( onPressed: () { - // TODO validate selected weight Navigator.pop(context, selectedWeight); }, child: Text(S.of(context).dialogOKLabel), diff --git a/pubspec.lock b/pubspec.lock index d47cd59b7..dff27f76e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -82,10 +82,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" auto_size_text: dependency: "direct main" description: @@ -106,10 +106,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -202,10 +202,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -226,10 +226,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -242,10 +242,10 @@ packages: dependency: "direct main" description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" convert: dependency: transitive description: @@ -322,10 +322,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -710,18 +710,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -758,10 +758,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -774,10 +774,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -846,10 +846,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -1139,10 +1139,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1195,10 +1195,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" storage_client: dependency: transitive description: @@ -1211,10 +1211,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -1227,10 +1227,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" supabase: dependency: transitive description: @@ -1267,18 +1267,18 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" timing: dependency: transitive description: @@ -1403,10 +1403,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" watcher: dependency: transitive description: @@ -1480,5 +1480,5 @@ packages: source: hosted version: "2.0.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0"