From db4b62c9809b548cb67e63e5fa9bc52ae3e70e0e Mon Sep 17 00:00:00 2001 From: Marvin M <39344769+M123-dev@users.noreply.github.com> Date: Thu, 8 Jul 2021 11:35:32 +0200 Subject: [PATCH 1/7] Updated dependencies --- .gitignore | 1 + pubspec.lock | 976 --------------------------------------------------- pubspec.yaml | 12 +- 3 files changed, 6 insertions(+), 983 deletions(-) delete mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index 8317ac5e..f3204eff 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ .pub-cache/ .pub/ /build/ +pubspec.lock # Web related lib/generated_plugin_registrant.dart diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100644 index 36691efb..00000000 --- a/pubspec.lock +++ /dev/null @@ -1,976 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - url: "https://pub.dartlang.org" - source: hosted - version: "22.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.1" - android_metadata: - dependency: "direct main" - description: - name: android_metadata - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.1" - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.2" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.6.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - build: - dependency: transitive - description: - name: build - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - build_config: - dependency: transitive - description: - name: build_config - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - build_daemon: - dependency: transitive - description: - name: build_daemon - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" - build_runner: - dependency: "direct dev" - description: - name: build_runner - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - url: "https://pub.dartlang.org" - source: hosted - version: "7.0.0" - built_collection: - dependency: transitive - description: - name: built_collection - url: "https://pub.dartlang.org" - source: hosted - version: "5.1.0" - built_value: - dependency: transitive - description: - name: built_value - url: "https://pub.dartlang.org" - source: hosted - version: "8.1.0" - camera: - dependency: "direct main" - description: - name: camera - url: "https://pub.dartlang.org" - source: hosted - version: "0.8.1+3" - camera_platform_interface: - dependency: transitive - description: - name: camera_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - charts_common: - dependency: transitive - description: - name: charts_common - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.0" - charts_flutter: - dependency: "direct main" - description: - name: charts_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.0" - checked_yaml: - dependency: transitive - description: - name: checked_yaml - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - chewie: - dependency: transitive - description: - name: chewie - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.2" - chewie_audio: - dependency: transitive - description: - name: chewie_audio - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.3" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - code_builder: - dependency: transitive - description: - name: code_builder - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.0" - collection: - dependency: "direct main" - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - cross_file: - dependency: transitive - description: - name: cross_file - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.1+1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.17.0" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - dart_style: - dependency: transitive - description: - name: dart_style - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - ffi: - dependency: transitive - description: - name: ffi - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.2" - file: - dependency: transitive - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.2" - fixnum: - dependency: transitive - description: - name: fixnum - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_calendar_carousel: - dependency: "direct main" - description: - name: flutter_calendar_carousel - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - flutter_html: - dependency: "direct main" - description: - name: flutter_html - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - flutter_keyboard_visibility: - dependency: transitive - description: - name: flutter_keyboard_visibility - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.2" - flutter_keyboard_visibility_platform_interface: - dependency: transitive - description: - name: flutter_keyboard_visibility_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - flutter_keyboard_visibility_web: - dependency: transitive - description: - name: flutter_keyboard_visibility_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - flutter_launcher_icons: - dependency: "direct dev" - description: - name: flutter_launcher_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.0" - flutter_layout_grid: - dependency: transitive - description: - name: flutter_layout_grid - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_math_fork: - dependency: transitive - description: - name: flutter_math_fork - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.3+1" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - flutter_svg: - dependency: transitive - description: - name: flutter_svg - url: "https://pub.dartlang.org" - source: hosted - version: "0.22.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_typeahead: - dependency: "direct main" - description: - name: flutter_typeahead - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.3" - flutter_web_plugins: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - font_awesome_flutter: - dependency: "direct main" - description: - name: font_awesome_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "9.1.0" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - graphs: - dependency: transitive - description: - name: graphs - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.0" - http: - dependency: "direct main" - description: - name: http - url: "https://pub.dartlang.org" - source: hosted - version: "0.13.3" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.2" - image_picker: - dependency: "direct main" - description: - name: image_picker - url: "https://pub.dartlang.org" - source: hosted - version: "0.8.1+3" - image_picker_for_web: - dependency: transitive - description: - name: image_picker_for_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - image_picker_platform_interface: - dependency: transitive - description: - name: image_picker_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - intl: - dependency: "direct main" - description: - name: intl - url: "https://pub.dartlang.org" - source: hosted - version: "0.17.0" - io: - dependency: transitive - description: - name: io - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - js: - dependency: transitive - description: - name: js - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.3" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.1" - json_serializable: - dependency: "direct dev" - description: - name: json_serializable - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.3" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.10" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - mime: - dependency: transitive - description: - name: mime - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - mockito: - dependency: "direct dev" - description: - name: mockito - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.10" - nested: - dependency: transitive - description: - name: nested - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - network_image_mock: - dependency: "direct dev" - description: - name: network_image_mock - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - numerus: - dependency: transitive - description: - name: numerus - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.1" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - package_info: - dependency: "direct main" - description: - name: package_info - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.1" - path_parsing: - dependency: transitive - description: - name: path_parsing - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.1" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.0" - platform: - dependency: transitive - description: - name: platform - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - pool: - dependency: transitive - description: - name: pool - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.0" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.1" - provider: - dependency: "direct main" - description: - name: provider - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.0" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - pubspec_parse: - dependency: transitive - description: - name: pubspec_parse - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.6" - shared_preferences_linux: - dependency: transitive - description: - name: shared_preferences_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_platform_interface: - dependency: transitive - description: - name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_web: - dependency: transitive - description: - name: shared_preferences_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_windows: - dependency: transitive - description: - name: shared_preferences_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shelf: - dependency: transitive - description: - name: shelf - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.4" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - simple_gesture_detector: - dependency: transitive - description: - name: simple_gesture_detector - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_gen: - dependency: transitive - description: - name: source_gen - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - stream_transform: - dependency: transitive - description: - name: stream_transform - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - table_calendar: - dependency: "direct main" - description: - name: table_calendar - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" - timing: - dependency: transitive - description: - name: timing - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - tuple: - dependency: transitive - description: - name: tuple - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - url_launcher: - dependency: "direct main" - description: - name: url_launcher - url: "https://pub.dartlang.org" - source: hosted - version: "6.0.9" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" - url_launcher_web: - dependency: transitive - description: - name: url_launcher_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - video_player: - dependency: transitive - description: - name: video_player - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.7" - video_player_platform_interface: - dependency: transitive - description: - name: video_player_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.0" - video_player_web: - dependency: transitive - description: - name: video_player_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - wakelock: - dependency: transitive - description: - name: wakelock - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.2" - wakelock_macos: - dependency: transitive - description: - name: wakelock_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0+1" - wakelock_platform_interface: - dependency: transitive - description: - name: wakelock_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.1+1" - wakelock_web: - dependency: transitive - description: - name: wakelock_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0+1" - wakelock_windows: - dependency: transitive - description: - name: wakelock_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - webview_flutter: - dependency: transitive - description: - name: webview_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.9" - win32: - dependency: transitive - description: - name: win32 - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.5" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "5.1.2" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.0" -sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.2.0" diff --git a/pubspec.yaml b/pubspec.yaml index f711f2fa..a0e6b7c3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 0.2.0+11 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.13.3 <3.0.0' dependencies: flutter: @@ -34,16 +34,14 @@ dependencies: android_metadata: ^0.2.1 camera: ^0.8.1+3 charts_flutter: ^0.11.0 - collection: ^1.15.0-nullsafety.4 - cupertino_icons: ^1.0.0 - flutter_calendar_carousel: ^2.0.1 + cupertino_icons: ^1.0.3 flutter_html: ^2.1.0 - flutter_typeahead: ^3.1.1 + flutter_typeahead: ^3.1.3 font_awesome_flutter: ^9.1.0 - http: ^0.13.2 + http: ^0.13.3 image_picker: ^0.8.1+3 intl: ^0.17.0 - json_annotation: ^4.0.0 + json_annotation: ^4.0.1 package_info: ^2.0.2 provider: ^5.0.0 shared_preferences: ^2.0.6 From 96527ad25e61b376c42c5e7764e3549f05365c2b Mon Sep 17 00:00:00 2001 From: Marvin M <39344769+M123-dev@users.noreply.github.com> Date: Thu, 8 Jul 2021 11:41:43 +0200 Subject: [PATCH 2/7] Changed workout name + workout day name restriction https://github.com/wger-project/flutter/issues/48 And it autoformatted --- lib/widgets/workouts/forms.dart | 115 +++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 39 deletions(-) diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart index 03e8099e..8308663e 100644 --- a/lib/widgets/workouts/forms.dart +++ b/lib/widgets/workouts/forms.dart @@ -41,7 +41,8 @@ class WorkoutForm extends StatelessWidget { WorkoutForm(this._plan); final TextEditingController workoutNameController = TextEditingController(); - final TextEditingController workoutDescriptionController = TextEditingController(); + final TextEditingController workoutDescriptionController = + TextEditingController(); @override Widget build(BuildContext context) { @@ -56,13 +57,17 @@ class WorkoutForm extends StatelessWidget { children: [ TextFormField( key: Key('field-name'), - decoration: InputDecoration(labelText: AppLocalizations.of(context).name), + decoration: + InputDecoration(labelText: AppLocalizations.of(context).name), controller: workoutNameController, validator: (value) { - const minLength = 5; + const minLength = 1; const maxLength = 100; - if (value!.isEmpty || value.length < minLength || value.length > maxLength) { - return AppLocalizations.of(context).enterCharacters(minLength, maxLength); + if (value!.isEmpty || + value.length < minLength || + value.length > maxLength) { + return AppLocalizations.of(context) + .enterCharacters(minLength, maxLength); } return null; }, @@ -73,7 +78,8 @@ class WorkoutForm extends StatelessWidget { ), TextFormField( key: Key('field-description'), - decoration: InputDecoration(labelText: AppLocalizations.of(context).description), + decoration: InputDecoration( + labelText: AppLocalizations.of(context).description), minLines: 3, maxLines: 10, controller: workoutDescriptionController, @@ -81,7 +87,8 @@ class WorkoutForm extends StatelessWidget { const minLength = 0; const maxLength = 1000; if (value!.length > maxLength) { - return AppLocalizations.of(context).enterCharacters(minLength, maxLength); + return AppLocalizations.of(context) + .enterCharacters(minLength, maxLength); } return null; }, @@ -103,10 +110,12 @@ class WorkoutForm extends StatelessWidget { // Save to DB if (_plan.id != null) { - await Provider.of(context, listen: false).editWorkout(_plan); + await Provider.of(context, listen: false) + .editWorkout(_plan); Navigator.of(context).pop(); } else { - _plan = await Provider.of(context, listen: false) + _plan = await Provider.of(context, + listen: false) .addWorkout(_plan); Navigator.of(context).pushReplacementNamed( WorkoutPlanScreen.routeName, @@ -192,10 +201,13 @@ class _DayFormWidgetState extends State { widget._day.description = value!; }, validator: (value) { - const minLength = 5; + const minLength = 1; const maxLength = 100; - if (value!.isEmpty || value.length < minLength || value.length > maxLength) { - return AppLocalizations.of(context).enterCharacters(minLength, maxLength); + if (value!.isEmpty || + value.length < minLength || + value.length > maxLength) { + return AppLocalizations.of(context) + .enterCharacters(minLength, maxLength); } if (widget._day.daysOfWeek.length == 0) { @@ -205,7 +217,9 @@ class _DayFormWidgetState extends State { }, ), SizedBox(height: 10), - ...Day.weekdays.keys.map((dayNr) => DayCheckbox(dayNr, widget._day)).toList(), + ...Day.weekdays.keys + .map((dayNr) => DayCheckbox(dayNr, widget._day)) + .toList(), ElevatedButton( key: Key(SUBMIT_BUTTON_KEY_NAME), child: Text(AppLocalizations.of(context).save), @@ -217,12 +231,14 @@ class _DayFormWidgetState extends State { try { if (widget._day.id == null) { - Provider.of(context, listen: false).addDay( + Provider.of(context, listen: false) + .addDay( widget._day, widget.workout, ); } else { - Provider.of(context, listen: false).editDay( + Provider.of(context, listen: false) + .editDay( widget._day, ); } @@ -259,7 +275,8 @@ class SetFormWidget extends StatefulWidget { late Set _set; SetFormWidget(this._day, [Set? set]) { - this._set = set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4); + this._set = + set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4); } @override @@ -300,9 +317,11 @@ class _SetFormWidgetState extends State { setting.order = order; setting.exercise = exercise; setting.weightUnit = - Provider.of(context, listen: false).defaultWeightUnit; + Provider.of(context, listen: false) + .defaultWeightUnit; setting.repetitionUnit = - Provider.of(context, listen: false).defaultRepetitionUnit; + Provider.of(context, listen: false) + .defaultRepetitionUnit; widget._set.settings.add(setting); } @@ -321,7 +340,8 @@ class _SetFormWidgetState extends State { child: Column( //crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(AppLocalizations.of(context).nrOfSets(_currentSetSliderValue.round())), + Text(AppLocalizations.of(context) + .nrOfSets(_currentSetSliderValue.round())), Slider( value: _currentSetSliderValue, min: 1, @@ -370,14 +390,18 @@ class _SetFormWidgetState extends State { content: Column( mainAxisSize: MainAxisSize.min, children: [ - Text(AppLocalizations.of(context).selectExercises), + Text(AppLocalizations.of(context) + .selectExercises), SizedBox(height: 10), - Text(AppLocalizations.of(context).sameRepetitions) + Text(AppLocalizations.of(context) + .sameRepetitions) ], ), actions: [ TextButton( - child: Text(MaterialLocalizations.of(context).closeButtonLabel), + child: Text( + MaterialLocalizations.of(context) + .closeButtonLabel), onPressed: () { Navigator.of(context).pop(); }, @@ -391,7 +415,8 @@ class _SetFormWidgetState extends State { ), ), suggestionsCallback: (pattern) async { - return await Provider.of(context, listen: false) + return await Provider.of(context, + listen: false) .searchExercise( pattern, Localizations.localeOf(context).languageCode, @@ -400,12 +425,14 @@ class _SetFormWidgetState extends State { itemBuilder: (context, suggestion) { final result = suggestion! as Map; - final exercise = Provider.of(context, listen: false) - .findById(result['data']['id']); + final exercise = + Provider.of(context, listen: false) + .findById(result['data']['id']); return ListTile( leading: Container( width: 45, - child: ExerciseImageWidget(image: exercise.getMainImage), + child: + ExerciseImageWidget(image: exercise.getMainImage), ), title: Text(exercise.name), subtitle: Text( @@ -417,8 +444,9 @@ class _SetFormWidgetState extends State { }, onSuggestionSelected: (suggestion) { final result = suggestion! as Map; - final exercise = Provider.of(context, listen: false) - .findById(result['data']['id']); + final exercise = + Provider.of(context, listen: false) + .findById(result['data']['id']); addExercise(exercise); this._exercisesController.text = ''; }, @@ -433,7 +461,8 @@ class _SetFormWidgetState extends State { .where((s) => s.weight == null && s.reps == null) .length == widget._set.settings.length) { - return AppLocalizations.of(context).enterRepetitionsOrWeight; + return AppLocalizations.of(context) + .enterRepetitionsOrWeight; } return null; }, @@ -441,8 +470,9 @@ class _SetFormWidgetState extends State { ), SizedBox(height: 10), ...widget._set.exercisesObj.map((exercise) { - final settings = - widget._set.settings.where((e) => e.exerciseObj.id == exercise.id).toList(); + final settings = widget._set.settings + .where((e) => e.exerciseObj.id == exercise.id) + .toList(); return ExerciseSetting( exercise, @@ -462,22 +492,25 @@ class _SetFormWidgetState extends State { } _formKey.currentState!.save(); - final workoutProvider = - Provider.of(context, listen: false); + final workoutProvider = Provider.of( + context, + listen: false); // Save set Set setDb = await workoutProvider.addSet(widget._set); widget._set.id = setDb.id; // Remove unused settings - widget._set.settings.removeWhere((s) => s.weight == null && s.reps == null); + widget._set.settings + .removeWhere((s) => s.weight == null && s.reps == null); // Save remaining settings for (var setting in widget._set.settings) { setting.setId = setDb.id!; setting.comment = ''; - Setting settingDb = await workoutProvider.addSetting(setting); + Setting settingDb = + await workoutProvider.addSetting(setting); setting.id = settingDb.id; } @@ -553,7 +586,8 @@ class ExerciseSetting extends StatelessWidget { SizedBox(width: 4), Flexible( flex: 3, - child: WeightUnitInputWidget(setting, key: Key(i.toString())), + child: + WeightUnitInputWidget(setting, key: Key(i.toString())), ), ], ), @@ -800,7 +834,8 @@ class _WeightUnitInputWidgetState extends State { return DropdownButtonFormField( value: selectedWeightUnit, - decoration: InputDecoration(labelText: AppLocalizations.of(context).weightUnit), + decoration: + InputDecoration(labelText: AppLocalizations.of(context).weightUnit), onChanged: (WeightUnit? newValue) { setState(() { selectedWeightUnit = newValue!; @@ -827,7 +862,8 @@ class RepetitionUnitInputWidget extends StatefulWidget { RepetitionUnitInputWidget(this._setting); @override - _RepetitionUnitInputWidgetState createState() => _RepetitionUnitInputWidgetState(); + _RepetitionUnitInputWidgetState createState() => + _RepetitionUnitInputWidgetState(); } class _RepetitionUnitInputWidgetState extends State { @@ -837,7 +873,8 @@ class _RepetitionUnitInputWidgetState extends State { return DropdownButtonFormField( value: selectedWeightUnit, - decoration: InputDecoration(labelText: AppLocalizations.of(context).repetitionUnit), + decoration: InputDecoration( + labelText: AppLocalizations.of(context).repetitionUnit), isDense: true, onChanged: (RepetitionUnit? newValue) { setState(() { From 3671b62d790daba0292918622d895136886fa992 Mon Sep 17 00:00:00 2001 From: Marvin M <39344769+M123-dev@users.noreply.github.com> Date: Thu, 8 Jul 2021 11:50:28 +0200 Subject: [PATCH 3/7] Update forms.dart --- lib/widgets/workouts/forms.dart | 111 +++++++++++--------------------- 1 file changed, 37 insertions(+), 74 deletions(-) diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart index 8308663e..133f71a3 100644 --- a/lib/widgets/workouts/forms.dart +++ b/lib/widgets/workouts/forms.dart @@ -41,8 +41,7 @@ class WorkoutForm extends StatelessWidget { WorkoutForm(this._plan); final TextEditingController workoutNameController = TextEditingController(); - final TextEditingController workoutDescriptionController = - TextEditingController(); + final TextEditingController workoutDescriptionController = TextEditingController(); @override Widget build(BuildContext context) { @@ -57,17 +56,13 @@ class WorkoutForm extends StatelessWidget { children: [ TextFormField( key: Key('field-name'), - decoration: - InputDecoration(labelText: AppLocalizations.of(context).name), + decoration: InputDecoration(labelText: AppLocalizations.of(context).name), controller: workoutNameController, validator: (value) { const minLength = 1; const maxLength = 100; - if (value!.isEmpty || - value.length < minLength || - value.length > maxLength) { - return AppLocalizations.of(context) - .enterCharacters(minLength, maxLength); + if (value!.isEmpty || value.length < minLength || value.length > maxLength) { + return AppLocalizations.of(context).enterCharacters(minLength, maxLength); } return null; }, @@ -78,8 +73,7 @@ class WorkoutForm extends StatelessWidget { ), TextFormField( key: Key('field-description'), - decoration: InputDecoration( - labelText: AppLocalizations.of(context).description), + decoration: InputDecoration(labelText: AppLocalizations.of(context).description), minLines: 3, maxLines: 10, controller: workoutDescriptionController, @@ -87,8 +81,7 @@ class WorkoutForm extends StatelessWidget { const minLength = 0; const maxLength = 1000; if (value!.length > maxLength) { - return AppLocalizations.of(context) - .enterCharacters(minLength, maxLength); + return AppLocalizations.of(context).enterCharacters(minLength, maxLength); } return null; }, @@ -110,12 +103,10 @@ class WorkoutForm extends StatelessWidget { // Save to DB if (_plan.id != null) { - await Provider.of(context, listen: false) - .editWorkout(_plan); + await Provider.of(context, listen: false).editWorkout(_plan); Navigator.of(context).pop(); } else { - _plan = await Provider.of(context, - listen: false) + _plan = await Provider.of(context, listen: false) .addWorkout(_plan); Navigator.of(context).pushReplacementNamed( WorkoutPlanScreen.routeName, @@ -203,11 +194,8 @@ class _DayFormWidgetState extends State { validator: (value) { const minLength = 1; const maxLength = 100; - if (value!.isEmpty || - value.length < minLength || - value.length > maxLength) { - return AppLocalizations.of(context) - .enterCharacters(minLength, maxLength); + if (value!.isEmpty || value.length < minLength || value.length > maxLength) { + return AppLocalizations.of(context).enterCharacters(minLength, maxLength); } if (widget._day.daysOfWeek.length == 0) { @@ -217,9 +205,7 @@ class _DayFormWidgetState extends State { }, ), SizedBox(height: 10), - ...Day.weekdays.keys - .map((dayNr) => DayCheckbox(dayNr, widget._day)) - .toList(), + ...Day.weekdays.keys.map((dayNr) => DayCheckbox(dayNr, widget._day)).toList(), ElevatedButton( key: Key(SUBMIT_BUTTON_KEY_NAME), child: Text(AppLocalizations.of(context).save), @@ -231,14 +217,12 @@ class _DayFormWidgetState extends State { try { if (widget._day.id == null) { - Provider.of(context, listen: false) - .addDay( + Provider.of(context, listen: false).addDay( widget._day, widget.workout, ); } else { - Provider.of(context, listen: false) - .editDay( + Provider.of(context, listen: false).editDay( widget._day, ); } @@ -275,8 +259,7 @@ class SetFormWidget extends StatefulWidget { late Set _set; SetFormWidget(this._day, [Set? set]) { - this._set = - set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4); + this._set = set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4); } @override @@ -317,11 +300,9 @@ class _SetFormWidgetState extends State { setting.order = order; setting.exercise = exercise; setting.weightUnit = - Provider.of(context, listen: false) - .defaultWeightUnit; + Provider.of(context, listen: false).defaultWeightUnit; setting.repetitionUnit = - Provider.of(context, listen: false) - .defaultRepetitionUnit; + Provider.of(context, listen: false).defaultRepetitionUnit; widget._set.settings.add(setting); } @@ -340,8 +321,7 @@ class _SetFormWidgetState extends State { child: Column( //crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(AppLocalizations.of(context) - .nrOfSets(_currentSetSliderValue.round())), + Text(AppLocalizations.of(context).nrOfSets(_currentSetSliderValue.round())), Slider( value: _currentSetSliderValue, min: 1, @@ -390,18 +370,14 @@ class _SetFormWidgetState extends State { content: Column( mainAxisSize: MainAxisSize.min, children: [ - Text(AppLocalizations.of(context) - .selectExercises), + Text(AppLocalizations.of(context).selectExercises), SizedBox(height: 10), - Text(AppLocalizations.of(context) - .sameRepetitions) + Text(AppLocalizations.of(context).sameRepetitions) ], ), actions: [ TextButton( - child: Text( - MaterialLocalizations.of(context) - .closeButtonLabel), + child: Text(MaterialLocalizations.of(context).closeButtonLabel), onPressed: () { Navigator.of(context).pop(); }, @@ -415,8 +391,7 @@ class _SetFormWidgetState extends State { ), ), suggestionsCallback: (pattern) async { - return await Provider.of(context, - listen: false) + return await Provider.of(context, listen: false) .searchExercise( pattern, Localizations.localeOf(context).languageCode, @@ -425,14 +400,12 @@ class _SetFormWidgetState extends State { itemBuilder: (context, suggestion) { final result = suggestion! as Map; - final exercise = - Provider.of(context, listen: false) - .findById(result['data']['id']); + final exercise = Provider.of(context, listen: false) + .findById(result['data']['id']); return ListTile( leading: Container( width: 45, - child: - ExerciseImageWidget(image: exercise.getMainImage), + child: ExerciseImageWidget(image: exercise.getMainImage), ), title: Text(exercise.name), subtitle: Text( @@ -444,9 +417,8 @@ class _SetFormWidgetState extends State { }, onSuggestionSelected: (suggestion) { final result = suggestion! as Map; - final exercise = - Provider.of(context, listen: false) - .findById(result['data']['id']); + final exercise = Provider.of(context, listen: false) + .findById(result['data']['id']); addExercise(exercise); this._exercisesController.text = ''; }, @@ -461,8 +433,7 @@ class _SetFormWidgetState extends State { .where((s) => s.weight == null && s.reps == null) .length == widget._set.settings.length) { - return AppLocalizations.of(context) - .enterRepetitionsOrWeight; + return AppLocalizations.of(context).enterRepetitionsOrWeight; } return null; }, @@ -470,9 +441,8 @@ class _SetFormWidgetState extends State { ), SizedBox(height: 10), ...widget._set.exercisesObj.map((exercise) { - final settings = widget._set.settings - .where((e) => e.exerciseObj.id == exercise.id) - .toList(); + final settings = + widget._set.settings.where((e) => e.exerciseObj.id == exercise.id).toList(); return ExerciseSetting( exercise, @@ -492,25 +462,22 @@ class _SetFormWidgetState extends State { } _formKey.currentState!.save(); - final workoutProvider = Provider.of( - context, - listen: false); + final workoutProvider = + Provider.of(context, listen: false); // Save set Set setDb = await workoutProvider.addSet(widget._set); widget._set.id = setDb.id; // Remove unused settings - widget._set.settings - .removeWhere((s) => s.weight == null && s.reps == null); + widget._set.settings.removeWhere((s) => s.weight == null && s.reps == null); // Save remaining settings for (var setting in widget._set.settings) { setting.setId = setDb.id!; setting.comment = ''; - Setting settingDb = - await workoutProvider.addSetting(setting); + Setting settingDb = await workoutProvider.addSetting(setting); setting.id = settingDb.id; } @@ -586,8 +553,7 @@ class ExerciseSetting extends StatelessWidget { SizedBox(width: 4), Flexible( flex: 3, - child: - WeightUnitInputWidget(setting, key: Key(i.toString())), + child: WeightUnitInputWidget(setting, key: Key(i.toString())), ), ], ), @@ -834,8 +800,7 @@ class _WeightUnitInputWidgetState extends State { return DropdownButtonFormField( value: selectedWeightUnit, - decoration: - InputDecoration(labelText: AppLocalizations.of(context).weightUnit), + decoration: InputDecoration(labelText: AppLocalizations.of(context).weightUnit), onChanged: (WeightUnit? newValue) { setState(() { selectedWeightUnit = newValue!; @@ -862,8 +827,7 @@ class RepetitionUnitInputWidget extends StatefulWidget { RepetitionUnitInputWidget(this._setting); @override - _RepetitionUnitInputWidgetState createState() => - _RepetitionUnitInputWidgetState(); + _RepetitionUnitInputWidgetState createState() => _RepetitionUnitInputWidgetState(); } class _RepetitionUnitInputWidgetState extends State { @@ -873,8 +837,7 @@ class _RepetitionUnitInputWidgetState extends State { return DropdownButtonFormField( value: selectedWeightUnit, - decoration: InputDecoration( - labelText: AppLocalizations.of(context).repetitionUnit), + decoration: InputDecoration(labelText: AppLocalizations.of(context).repetitionUnit), isDense: true, onChanged: (RepetitionUnit? newValue) { setState(() { From 399c33b3cac67d5897729e9819c509d681d24bd4 Mon Sep 17 00:00:00 2001 From: Marvin M <39344769+M123-dev@users.noreply.github.com> Date: Mon, 12 Jul 2021 00:09:29 +0200 Subject: [PATCH 4/7] Readded pubspec.lock --- .gitignore | 1 - pubspec.lock | 969 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 969 insertions(+), 1 deletion(-) create mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index f3204eff..8317ac5e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ .pub-cache/ .pub/ /build/ -pubspec.lock # Web related lib/generated_plugin_registrant.dart diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 00000000..575051c7 --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,969 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "22.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.1" + android_metadata: + dependency: "direct main" + description: + name: android_metadata + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.1" + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.2" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.6.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + build: + dependency: transitive + description: + name: build + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" + build_config: + dependency: transitive + description: + name: build_config + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + build_daemon: + dependency: transitive + description: + name: build_daemon + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + build_runner: + dependency: "direct dev" + description: + name: build_runner + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.6" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + url: "https://pub.dartlang.org" + source: hosted + version: "7.0.1" + built_collection: + dependency: transitive + description: + name: built_collection + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.0" + built_value: + dependency: transitive + description: + name: built_value + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.1" + camera: + dependency: "direct main" + description: + name: camera + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.1+4" + camera_platform_interface: + dependency: transitive + description: + name: camera_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + charts_common: + dependency: transitive + description: + name: charts_common + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.0" + charts_flutter: + dependency: "direct main" + description: + name: charts_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + chewie: + dependency: transitive + description: + name: chewie + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.2" + chewie_audio: + dependency: transitive + description: + name: chewie_audio + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + code_builder: + dependency: transitive + description: + name: code_builder + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.1+3" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.0" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + ffi: + dependency: transitive + description: + name: ffi + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_html: + dependency: "direct main" + description: + name: flutter_html + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + flutter_keyboard_visibility: + dependency: transitive + description: + name: flutter_keyboard_visibility + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.2" + flutter_keyboard_visibility_platform_interface: + dependency: transitive + description: + name: flutter_keyboard_visibility_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + flutter_keyboard_visibility_web: + dependency: transitive + description: + name: flutter_keyboard_visibility_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.0" + flutter_layout_grid: + dependency: transitive + description: + name: flutter_layout_grid + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_math_fork: + dependency: transitive + description: + name: flutter_math_fork + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3+1" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "0.22.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_typeahead: + dependency: "direct main" + description: + name: flutter_typeahead + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + font_awesome_flutter: + dependency: "direct main" + description: + name: font_awesome_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "9.1.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + graphs: + dependency: transitive + description: + name: graphs + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" + http: + dependency: "direct main" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.3" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.2" + image_picker: + dependency: "direct main" + description: + name: image_picker + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.1+3" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + image_picker_platform_interface: + dependency: transitive + description: + name: image_picker_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + intl: + dependency: "direct main" + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.0" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.1" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.3" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.10" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + mime: + dependency: transitive + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + mockito: + dependency: "direct dev" + description: + name: mockito + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.10" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + network_image_mock: + dependency: "direct dev" + description: + name: network_image_mock + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + numerus: + dependency: transitive + description: + name: numerus + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + package_info: + dependency: "direct main" + description: + name: package_info + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.11.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.0" + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0" + process: + dependency: transitive + description: + name: process + url: "https://pub.dartlang.org" + source: hosted + version: "4.2.1" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.0" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.6" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shared_preferences_macos: + dependency: transitive + description: + name: shared_preferences_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shelf: + dependency: transitive + description: + name: shelf + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + simple_gesture_detector: + dependency: transitive + description: + name: simple_gesture_detector + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + table_calendar: + dependency: "direct main" + description: + name: table_calendar + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.0" + timing: + dependency: transitive + description: + name: timing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + tuple: + dependency: transitive + description: + name: tuple + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.9" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + video_player: + dependency: transitive + description: + name: video_player + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.10" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.0" + video_player_web: + dependency: transitive + description: + name: video_player_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + wakelock: + dependency: transitive + description: + name: wakelock + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.2" + wakelock_macos: + dependency: transitive + description: + name: wakelock_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0+1" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.1+1" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0+1" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.9" + win32: + dependency: transitive + description: + name: win32 + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.5" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.2" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" +sdks: + dart: ">=2.13.3 <3.0.0" + flutter: ">=2.2.0" From 5352eb51ee19ac97a9898ff099c09f940330ee94 Mon Sep 17 00:00:00 2001 From: yiter Date: Tue, 13 Jul 2021 09:54:08 +0000 Subject: [PATCH 5/7] Translated using Weblate (Chinese (Simplified)) Currently translated at 96.8% (125 of 129 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hans/ --- lib/l10n/app_zh.arb | 117 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 96 insertions(+), 21 deletions(-) diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 2e251bc9..c219e797 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -3,7 +3,7 @@ "@customServerUrl": { "description": "Label in the form where the users can enter their own wger instance" }, - "invalidUsername": "请输入一个合法的用户名", + "invalidUsername": "请输入正确的用户名", "@invalidUsername": { "description": "Error message when the user enters an invalid username" }, @@ -11,7 +11,7 @@ "@username": {}, "email": "邮箱", "@email": {}, - "invalidEmail": "请输入一个有效的邮箱地址", + "invalidEmail": "请输入正确的邮箱地址", "@invalidEmail": { "description": "Error message when the user enters an invalid email" }, @@ -19,7 +19,7 @@ "@confirmPassword": {}, "password": "密码", "@password": {}, - "passwordTooShort": "密码太短", + "passwordTooShort": "密码长度不够", "@passwordTooShort": { "description": "Error message when the user a password that is too short" }, @@ -55,7 +55,7 @@ "@login": { "description": "Text for login button" }, - "newDay": "全新的一天", + "newDay": "训练日", "@newDay": {}, "workoutSession": "健身记录", "@workoutSession": { @@ -95,7 +95,7 @@ "@comment": { "description": "Comment, additional information" }, - "dayDescriptionHelp": "今天做了哪些锻炼项目", + "dayDescriptionHelp": "写一写完成了哪些锻炼，或者锻炼了身体的哪些部位", "@dayDescriptionHelp": {}, "set": "设置", "@set": { @@ -105,11 +105,11 @@ "@repetitionUnit": {}, "weightUnit": "重量单位", "@weightUnit": {}, - "noWorkoutPlans": "你还没有设定健身计划", + "noWorkoutPlans": "你还没有设定锻炼计划", "@noWorkoutPlans": { "description": "Message shown when the user has no workout plans" }, - "newWorkout": "新计划", + "newWorkout": "新增锻炼计划", "@newWorkout": { "description": "Header when adding a new workout" }, @@ -133,11 +133,11 @@ "@successfullyDeleted": { "description": "Message when an item was successfully deleted" }, - "labelDashboard": "统计", + "labelDashboard": "主页", "@labelDashboard": { "description": "Title for screen dashboard" }, - "labelWorkoutPlan": "计划", + "labelWorkoutPlan": "锻炼计划", "@labelWorkoutPlan": { "description": "Title for screen workout plan" }, @@ -153,7 +153,7 @@ "@labelBottomNavWorkout": { "description": "Label used in bottom navigation, use a short word" }, - "labelWorkoutPlans": "计划", + "labelWorkoutPlans": "锻炼计划", "@labelWorkoutPlans": { "description": "Title for screen workout plans" }, @@ -181,15 +181,15 @@ "@optionsLabel": { "description": "Label for the popup with general app options" }, - "selectImage": "选择一张图片", + "selectImage": "请选择一张图片", "@selectImage": { "description": "Label and error message when the user hasn't selected an image to save" }, - "enterValidNumber": "请输入一个有效的阿拉伯数字", + "enterValidNumber": "请输入有效数值", "@enterValidNumber": { "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')" }, - "enterCharacters": "最小值： {min} ，最大值： {max}", + "enterCharacters": "最短长度是{min} 位，最长 {max}位", "@enterCharacters": { "description": "Error message when the user hasn't entered the correct number of characters in a form", "type": "text", @@ -228,7 +228,7 @@ "@aboutSourceTitle": { "description": "Title for source code section in the about dialog" }, - "aboutDescription": "谢谢使用wger!", + "aboutDescription": "谢谢使用!", "@aboutDescription": { "description": "Text in the about dialog" }, @@ -286,7 +286,7 @@ "@carbohydrates": {}, "protein": "蛋白质", "@protein": {}, - "kcal": "千卡路里", + "kcal": "千卡", "@kcal": { "description": "Energy in a meal in kilocalories, kcal" }, @@ -298,11 +298,11 @@ "@g": { "description": "Abbreviation for gram" }, - "kJ": "千焦耳", + "kJ": "千焦", "@kJ": { "description": "Energy in a meal in kilo joules, kJ" }, - "ingredient": "杂项", + "ingredient": "营养成分", "@ingredient": {}, "timeEnd": "结束时间", "@timeEnd": { @@ -338,13 +338,13 @@ "@nutritionalPlans": {}, "nutritionalDiary": "摄食日记", "@nutritionalDiary": {}, - "nutritionalPlan": "营养规划", + "nutritionalPlan": "饮食规划", "@nutritionalPlan": {}, "logMeal": "记下这次用餐", "@logMeal": {}, "mealLogged": "用餐情况保存到日记中", "@mealLogged": {}, - "addMeal": "用餐", + "addMeal": "增加用餐", "@addMeal": {}, "save": "保存", "@save": {}, @@ -354,6 +354,81 @@ }, "description": "详细信息", "@description": {}, - "logHelpEntriesUnits": "有计量单位和数量的会以图形化的方式展现，其他例如时间、未完成的项目将不会出现在这里", - "@logHelpEntriesUnits": {} + "logHelpEntriesUnits": "有计量单位和数量的会以图形化的方式展现，类似时间、未完成的项目将不会出现在这里", + "@logHelpEntriesUnits": {}, + "selectIngredient": "请选择一个营养成分", + "@selectIngredient": { + "description": "Error message when the user hasn't selected an ingredient from the autocompleter" + }, + "setUnitsAndRir": "设置计量单位和组内重复次数", + "@setUnitsAndRir": { + "description": "Label shown on the slider where the user can toggle showing units and RiR", + "type": "text" + }, + "nrOfSets": "锻炼次数: {nrOfSets}", + "@nrOfSets": { + "description": "Label shown on the slider where the user selects the nr of sets", + "type": "text", + "placeholders": { + "nrOfSets": {} + } + }, + "enterRepetitionsOrWeight": "请至少填写其中一项的重复次数或重量", + "@enterRepetitionsOrWeight": { + "description": "Error message when the user hasn't filled in the forms for exercise sets" + }, + "timeStartAhead": "开始时间不能早于结束时间", + "@timeStartAhead": {}, + "addIngredient": "添加营养成分", + "@addIngredient": {}, + "addSet": "增加训练项目", + "@addSet": { + "description": "Label for the button that adds a set (to a workout day)" + }, + "logHelpEntries": "同一项目在当天有多次记录的情况下，图中显示训练量较大的项目", + "@logHelpEntries": {}, + "plateCalculator": "圈", + "@plateCalculator": { + "description": "Label used for the plate calculator in the gym mode" + }, + "rirNotUsed": "未设置组内重复次数", + "@rirNotUsed": { + "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log" + }, + "rir": "组内重复次数", + "@rir": { + "description": "Shorthand for Repetitions In Reserve" + }, + "reps": "重复次数", + "@reps": { + "description": "Shorthand for repetitions, used when space constraints are tighter" + }, + "repetitions": "重复次数", + "@repetitions": { + "description": "Repetitions for an exercise set" + }, + "setNr": "设置 {nr}", + "@setNr": { + "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.", + "type": "text", + "placeholders": { + "nr": {} + } + }, + "muscles": "主要部位", + "@muscles": { + "description": "(main) muscles trained by an exercise" + }, + "aboutTranslationText": "可以在weblate网站上参与翻译工作", + "@aboutTranslationText": { + "description": "Text for translation section in the about dialog" + }, + "aboutTranslationTitle": "翻译", + "@aboutTranslationTitle": { + "description": "Title for translation section in the about dialog" + }, + "musclesSecondary": "次要部位", + "@musclesSecondary": { + "description": "secondary muscles trained by an exercise" + } } From 568a165180a71ce1cabc0722bccaeb0b792f28d8 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 13 Jul 2021 17:13:19 +0200 Subject: [PATCH 6/7] Make more obvious that exercises are added together into a superset Closes #56 --- lib/l10n/app_en.arb | 4 ++++ lib/widgets/workouts/forms.dart | 32 +++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 191af707..1f56cfb8 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -108,6 +108,10 @@ "@searchExercise": { "description": "Label on set form. Selected exercises are added to the set" }, + "supersetWith": "superset with", + "@supersetWith": { + "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'" + }, "equipment": "Equipment", "@equipment": { "description": "Equipment needed to perform an exercise" diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart index 03e8099e..3fcfa88f 100644 --- a/lib/widgets/workouts/forms.dart +++ b/lib/widgets/workouts/forms.dart @@ -440,16 +440,34 @@ class _SetFormWidgetState extends State { ), ), SizedBox(height: 10), - ...widget._set.exercisesObj.map((exercise) { + ...widget._set.exercisesObj.asMap().entries.map((entry) { + final index = entry.key; + final exercise = entry.value; + final showSupersetInfo = (index + 1) < widget._set.exercisesObj.length; final settings = widget._set.settings.where((e) => e.exerciseObj.id == exercise.id).toList(); - return ExerciseSetting( - exercise, - settings, - _detailed, - _currentSetSliderValue, - removeExercise, + return Column( + children: [ + ExerciseSetting( + exercise, + settings, + _detailed, + _currentSetSliderValue, + removeExercise, + ), + if (showSupersetInfo) + Padding( + padding: const EdgeInsets.all(3.0), + child: Text('+'), + ), + if (showSupersetInfo) Text(AppLocalizations.of(context).supersetWith), + if (showSupersetInfo) + Padding( + padding: const EdgeInsets.all(3.0), + child: Text('+'), + ), + ], ); }).toList(), ElevatedButton( From 5bcc47a16eb26e36f78da1e3f7ceedcadbe3f9d3 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 13 Jul 2021 17:14:47 +0200 Subject: [PATCH 7/7] Bump dependencies --- pubspec.lock | 28 ++++++++++++++-------------- pubspec.yaml | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 36691efb..3fd2f2ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -56,7 +56,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" build_config: dependency: transitive description: @@ -77,21 +77,21 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.0.1" built_collection: dependency: transitive description: @@ -105,14 +105,14 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.0" + version: "8.1.1" camera: dependency: "direct main" description: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.8.1+3" + version: "0.8.1+4" camera_platform_interface: dependency: transitive description: @@ -210,7 +210,7 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.1+1" + version: "0.3.1+4" crypto: dependency: transitive description: @@ -238,7 +238,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" fake_async: dependency: transitive description: @@ -358,7 +358,7 @@ packages: name: flutter_typeahead url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "3.2.0" flutter_web_plugins: dependency: transitive description: flutter @@ -440,14 +440,14 @@ packages: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" intl: dependency: "direct main" description: @@ -622,7 +622,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" pool: dependency: transitive description: @@ -713,7 +713,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.1.4" + version: "1.2.0" shelf_web_socket: dependency: transitive description: @@ -872,7 +872,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.1.7" + version: "2.1.10" video_player_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f711f2fa..04f334ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,13 +32,13 @@ dependencies: sdk: flutter android_metadata: ^0.2.1 - camera: ^0.8.1+3 + camera: ^0.8.1+4 charts_flutter: ^0.11.0 collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.0 flutter_calendar_carousel: ^2.0.1 flutter_html: ^2.1.0 - flutter_typeahead: ^3.1.1 + flutter_typeahead: ^3.2.0 font_awesome_flutter: ^9.1.0 http: ^0.13.2 image_picker: ^0.8.1+3 @@ -55,7 +55,7 @@ dev_dependencies: sdk: flutter #flutter_driver: # sdk: flutter - build_runner: ^2.0.5 + build_runner: ^2.0.6 flutter_launcher_icons: ^0.9.0 json_serializable: ^4.1.3 mockito: ^5.0.10