From 090abe923fabe299900b95a44f52543ff9b3356a Mon Sep 17 00:00:00 2001 From: tejasbirsingh Date: Tue, 9 May 2023 21:49:21 +0530 Subject: [PATCH 01/40] Add icons, merge email and its verify fields --- AUTHORS.md | 1 + lib/l10n/app_en.arb | 2 ++ lib/widgets/user/forms.dart | 66 +++++++++++++++++++++---------------- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index a1423876..7efdf9e7 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -19,6 +19,7 @@ - Aman Negi - - Sandi Milohanic - - Miroslav Mazel - +- Tejas Bir Singh - ## Translators diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index f0fd2187..7a6a010d 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -241,6 +241,8 @@ }, "save": "Save", "@save": {}, + "verify": "Verify", + "@verify": {}, "addSet": "Add set", "@addSet": { "description": "Label for the button that adds a set (to a workout day)" diff --git a/lib/widgets/user/forms.dart b/lib/widgets/user/forms.dart index 39fb80a7..14e1f28b 100644 --- a/lib/widgets/user/forms.dart +++ b/lib/widgets/user/forms.dart @@ -22,6 +22,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/models/user/profile.dart'; import 'package:wger/providers/user.dart'; +import 'package:wger/theme/theme.dart'; class UserProfileForm extends StatelessWidget { late final Profile _profile; @@ -40,39 +41,23 @@ class UserProfileForm extends StatelessWidget { child: Column( children: [ ListTile( + leading: const Icon(Icons.person, color: wgerPrimaryColor), title: Text(AppLocalizations.of(context).username), subtitle: Text(_profile.username), ), ListTile( - title: Text( - _profile.emailVerified - ? AppLocalizations.of(context).verifiedEmail - : AppLocalizations.of(context).unVerifiedEmail, - ), - subtitle: Text(AppLocalizations.of(context).verifiedEmailReason), - trailing: _profile.emailVerified - ? const Icon(Icons.mark_email_read, color: Colors.green) - : const Icon(Icons.forward_to_inbox), - onTap: () async { - // Email is already verified - if (_profile.emailVerified) { - return; - } - - // Verify - await context.read().verifyEmail(); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - AppLocalizations.of(context).verifiedEmailInfo(_profile.email), - ), - ), - ); - }, - ), - ListTile( + leading: const Icon(Icons.email_rounded, color: wgerPrimaryColor), title: TextFormField( - decoration: InputDecoration(labelText: AppLocalizations.of(context).email), + decoration: InputDecoration( + labelText: _profile.emailVerified + ? AppLocalizations.of(context).verifiedEmail + : AppLocalizations.of(context).unVerifiedEmail, + suffixIcon: _profile.emailVerified + ? const Icon( + Icons.check_circle, + color: Colors.green, + ) + : null), controller: emailController, keyboardType: TextInputType.emailAddress, onSaved: (newValue) { @@ -86,8 +71,30 @@ class UserProfileForm extends StatelessWidget { }, ), ), + if (!_profile.emailVerified) + OutlinedButton( + onPressed: () async { + // Email is already verified + if (_profile.emailVerified) { + return; + } + + // Verify + await context.read().verifyEmail(); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + AppLocalizations.of(context).verifiedEmailInfo(_profile.email), + ), + ), + ); + }, + child: Text(AppLocalizations.of(context).verify), + ), ElevatedButton( - child: Text(AppLocalizations.of(context).save), + style: ElevatedButton.styleFrom( + backgroundColor: wgerPrimaryButtonColor, + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50))), onPressed: () async { // Validate and save the current values to the weightEntry final isValid = _form.currentState!.validate(); @@ -103,6 +110,7 @@ class UserProfileForm extends StatelessWidget { SnackBar(content: Text(AppLocalizations.of(context).successfullySaved)), ); }, + child: Text(AppLocalizations.of(context).save), ), ], ), From d33bb1875f569ff89dcfab126a7cb2f4b67bf4cf Mon Sep 17 00:00:00 2001 From: Jigar Date: Fri, 12 May 2023 05:05:50 +0530 Subject: [PATCH 02/40] fixed validating username problem --- lib/screens/auth_screen.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart index 27c006de..d19e39f9 100644 --- a/lib/screens/auth_screen.dart +++ b/lib/screens/auth_screen.dart @@ -246,12 +246,13 @@ class _AuthCardState extends State { textInputAction: TextInputAction.next, keyboardType: TextInputType.emailAddress, validator: (value) { - if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) { - return AppLocalizations.of(context).usernameValidChars; - } if (value.isEmpty) { return AppLocalizations.of(context).invalidUsername; } + if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) { + return AppLocalizations.of(context).usernameValidChars; + } + return null; }, inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))], From 7db4f60e4a0b77feb75e440ff27d3a11b4b7006d Mon Sep 17 00:00:00 2001 From: Jigar Date: Fri, 12 May 2023 05:37:19 +0530 Subject: [PATCH 03/40] added myself to AUTHORS.md --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index a1423876..91d8eee0 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,6 +2,7 @@ ## Developers +- Jigar Prajapati - - Roland Geider – - Dylan Aird - - Jannik Norden - From b7bf78c7cc31c19f4d099adf516a5fbdbf0a5a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sat, 13 May 2023 20:01:30 +0000 Subject: [PATCH 04/40] Translated using Weblate (Turkish) Currently translated at 100.0% (224 of 224 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/tr/ --- lib/l10n/app_tr.arb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb index 8ce2d8fc..07ece58a 100644 --- a/lib/l10n/app_tr.arb +++ b/lib/l10n/app_tr.arb @@ -717,5 +717,9 @@ "cacheWarning": "Önbelleğe alma nedeniyle değişikliklerin uygulama genelinde görünür olması biraz zaman alabilir.", "@cacheWarning": {}, "searchNamesInEnglish": "Ayrıca İngilizce adları da arayın", - "@searchNamesInEnglish": {} + "@searchNamesInEnglish": {}, + "textPromptTitle": "Başlamaya hazır mısınız?", + "@textPromptTitle": {}, + "textPromptSubheading": "Başlamak için eylem düğmesine basın", + "@textPromptSubheading": {} } From 7e080282ede91bd243d71e5225db4948df6a38cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 01:16:33 +0000 Subject: [PATCH 05/40] Bump url_launcher from 6.1.10 to 6.1.11 Bumps [url_launcher](https://github.com/flutter/packages/tree/main/packages/url_launcher) from 6.1.10 to 6.1.11. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/url_launcher-v6.1.11/packages/url_launcher) --- updated-dependencies: - dependency-name: url_launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 464 ++++++++++++++++++++++++++++++++++----------------- pubspec.yaml | 2 +- 2 files changed, 310 insertions(+), 156 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 346f74cd..3dc17bd3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,259 +5,296 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "8880b4cfe7b5b17d57c052a5a3a8cc1d4f546261c7cc8fbd717bd53f48db0568" + url: "https://pub.dev" source: hosted version: "59.0.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: a89627f49b0e70e068130a36571409726b04dab12da7e5625941d2c8ec278b96 + url: "https://pub.dev" source: hosted version: "5.11.1" android_metadata: dependency: "direct main" description: name: android_metadata - url: "https://pub.dartlang.org" + sha256: "29d15dfd03ff67f84bf706d43f1ac087e82d529698e173133bb7cbc84a67d11d" + url: "https://pub.dev" source: hosted version: "0.2.1" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" + url: "https://pub.dev" source: hosted version: "3.3.2" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + url: "https://pub.dev" source: hosted version: "2.4.1" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted version: "2.1.1" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + url: "https://pub.dev" source: hosted version: "2.3.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + url: "https://pub.dev" source: hosted version: "3.1.1" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + url: "https://pub.dev" source: hosted version: "2.2.0" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + url: "https://pub.dev" source: hosted version: "2.3.3" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + url: "https://pub.dev" source: hosted version: "7.2.7" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d" + url: "https://pub.dev" source: hosted version: "8.5.0" carousel_slider: dependency: "direct main" description: name: carousel_slider - url: "https://pub.dartlang.org" + sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42" + url: "https://pub.dev" source: hosted version: "4.2.1" change: dependency: transitive description: name: change - url: "https://pub.dartlang.org" + sha256: b4d4aceb94f5081d40a2c08211bd779e55373265ce2304b7b38b5c4c218a9263 + url: "https://pub.dev" source: hosted version: "0.6.0" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" charts_common: dependency: transitive description: name: charts_common - url: "https://pub.dartlang.org" + sha256: "7b8922f9b0d9b134122756a787dab1c3946ae4f3fc5022ff323ba0014998ea02" + url: "https://pub.dev" source: hosted version: "0.12.0" charts_flutter: dependency: "direct main" description: name: charts_flutter - url: "https://pub.dartlang.org" + sha256: "4172c3f4b85322fdffe1896ffbed79ae4689ae72cb6fe6690dcaaea620a9c558" + url: "https://pub.dev" source: hosted version: "0.12.0" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" source: hosted version: "2.0.3" cider: dependency: "direct dev" description: name: cider - url: "https://pub.dartlang.org" + sha256: "714a853bf92701b982496df0bd601c0cf2d882cfc1f2d41ae9aff2b20cee016a" + url: "https://pub.dev" source: hosted version: "0.1.5" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.dartlang.org" + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + url: "https://pub.dev" source: hosted version: "0.4.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + url: "https://pub.dev" source: hosted version: "4.4.0" collection: dependency: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted version: "1.17.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted version: "3.1.1" cross_file: dependency: transitive description: name: cross_file - url: "https://pub.dartlang.org" + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + url: "https://pub.dev" source: hosted version: "0.3.3+4" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + url: "https://pub.dev" source: hosted version: "2.3.1" equatable: dependency: "direct main" description: name: equatable - url: "https://pub.dartlang.org" + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" source: hosted version: "2.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" source: hosted version: "1.1.0" flutter: @@ -269,14 +306,16 @@ packages: dependency: "direct main" description: name: flutter_barcode_scanner - url: "https://pub.dartlang.org" + sha256: a4ba37daf9933f451a5e812c753ddd045d6354e4a3280342d895b07fecaab3fa + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_calendar_carousel: dependency: "direct main" description: name: flutter_calendar_carousel - url: "https://pub.dartlang.org" + sha256: da198154b3a7254757ead8d40eee4f2fa53d4500fe8a226cccb951e8763f988b + url: "https://pub.dev" source: hosted version: "2.4.1" flutter_driver: @@ -288,63 +327,72 @@ packages: dependency: "direct main" description: name: flutter_html - url: "https://pub.dartlang.org" + sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd" + url: "https://pub.dev" source: hosted version: "3.0.0-alpha.6" flutter_keyboard_visibility: dependency: transitive description: name: flutter_keyboard_visibility - url: "https://pub.dartlang.org" + sha256: "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb" + url: "https://pub.dev" source: hosted version: "5.4.1" flutter_keyboard_visibility_linux: dependency: transitive description: name: flutter_keyboard_visibility_linux - url: "https://pub.dartlang.org" + sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08" + url: "https://pub.dev" source: hosted version: "1.0.0" flutter_keyboard_visibility_macos: dependency: transitive description: name: flutter_keyboard_visibility_macos - url: "https://pub.dartlang.org" + sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086 + url: "https://pub.dev" source: hosted version: "1.0.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: name: flutter_keyboard_visibility_platform_interface - url: "https://pub.dartlang.org" + sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_keyboard_visibility_web: dependency: transitive description: name: flutter_keyboard_visibility_web - url: "https://pub.dartlang.org" + sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_keyboard_visibility_windows: dependency: transitive description: name: flutter_keyboard_visibility_windows - url: "https://pub.dartlang.org" + sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73 + url: "https://pub.dev" source: hosted version: "1.0.0" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" source: hosted version: "0.13.1" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_localizations: @@ -356,21 +404,24 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0" + url: "https://pub.dev" source: hosted version: "2.0.14" flutter_staggered_grid_view: dependency: "direct main" description: name: flutter_staggered_grid_view - url: "https://pub.dartlang.org" + sha256: "1312314293acceb65b92754298754801b0e1f26a1845833b740b30415bbbcf07" + url: "https://pub.dev" source: hosted version: "0.6.2" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + sha256: f991fdb1533c3caeee0cdc14b04f50f0c3916f0dbcbc05237ccbe4e3c6b93f3f + url: "https://pub.dev" source: hosted version: "2.0.5" flutter_test: @@ -382,7 +433,8 @@ packages: dependency: "direct main" description: name: flutter_typeahead - url: "https://pub.dartlang.org" + sha256: "721610b3d61814efa13fb5f720a6781bc123cd51b7e01f5a45d7c92124376644" + url: "https://pub.dev" source: hosted version: "4.3.8" flutter_web_plugins: @@ -394,14 +446,16 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206" + url: "https://pub.dev" source: hosted version: "10.4.0" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" source: hosted version: "3.2.0" fuchsia_remote_debug_protocol: @@ -413,84 +467,96 @@ packages: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted version: "2.1.1" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + url: "https://pub.dev" source: hosted version: "2.2.0" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + url: "https://pub.dev" source: hosted version: "0.15.3" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" source: hosted version: "0.13.6" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" source: hosted version: "4.0.17" image_picker: dependency: "direct main" description: name: image_picker - url: "https://pub.dartlang.org" + sha256: "3da954c3b8906d82ecb50fd5e2b5401758f06d5678904eed6cbc06172283a263" + url: "https://pub.dev" source: hosted version: "0.8.7+4" image_picker_android: dependency: transitive description: name: image_picker_android - url: "https://pub.dartlang.org" + sha256: "271e0448e82268b3fa1cb2a48e4a911cbc2135587123d7df8e7ca703c5b10da2" + url: "https://pub.dev" source: hosted version: "0.8.6+11" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - url: "https://pub.dartlang.org" + sha256: "98f50d6b9f294c8ba35e25cc0d13b04bfddd25dbc8d32fa9d566a6572f2c081c" + url: "https://pub.dev" source: hosted version: "2.1.12" image_picker_ios: dependency: transitive description: name: image_picker_ios - url: "https://pub.dartlang.org" + sha256: a1546ff5861fc15812953d4733b520c3d371cec3d2859a001ff04c46c4d81883 + url: "https://pub.dev" source: hosted version: "0.8.7+3" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8" + url: "https://pub.dev" source: hosted version: "2.6.3" integration_test: @@ -502,336 +568,384 @@ packages: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted version: "0.6.5" json_annotation: dependency: "direct main" description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" source: hosted version: "4.8.1" json_serializable: dependency: "direct dev" description: name: json_serializable - url: "https://pub.dartlang.org" + sha256: "43793352f90efa5d8b251893a63d767b2f7c833120e3cc02adad55eefec04dc7" + url: "https://pub.dev" source: hosted version: "6.6.2" klizma: dependency: transitive description: name: klizma - url: "https://pub.dartlang.org" + sha256: "3bb0ed5cc183274e39d48fa42a61484e4dda3dc52970aa902379c7403cd7f0f2" + url: "https://pub.dev" source: hosted version: "0.2.1" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted version: "2.0.1" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" source: hosted version: "1.1.1" markdown: dependency: transitive description: name: markdown - url: "https://pub.dartlang.org" + sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e" + url: "https://pub.dev" source: hosted version: "7.1.0" marker: dependency: transitive description: name: marker - url: "https://pub.dartlang.org" + sha256: "970eb97ea43752bd443b91d992068575f37bcc7f952c01334779673b7db23114" + url: "https://pub.dev" source: hosted version: "0.5.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted version: "1.0.4" mockito: dependency: "direct dev" description: name: mockito - url: "https://pub.dartlang.org" + sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + url: "https://pub.dev" source: hosted version: "5.4.0" multi_select_flutter: dependency: "direct main" description: name: multi_select_flutter - url: "https://pub.dartlang.org" + sha256: "503857b415d390d29159df8a9d92d83c6aac17aaf1c307fb7bcfc77d097d20ed" + url: "https://pub.dev" source: hosted version: "4.1.3" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" network_image_mock: dependency: "direct dev" description: name: network_image_mock - url: "https://pub.dartlang.org" + sha256: "855cdd01d42440e0cffee0d6c2370909fc31b3bcba308a59829f24f64be42db7" + url: "https://pub.dev" source: hosted version: "2.1.1" numerus: dependency: transitive description: name: numerus - url: "https://pub.dartlang.org" + sha256: "436759d84f233b40107d0cc31cfa92d24e0960afeb2e506be70926d4cddffd9e" + url: "https://pub.dev" source: hosted version: "2.0.0" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted version: "2.1.0" package_info_plus: dependency: "direct main" description: name: package_info_plus - url: "https://pub.dartlang.org" + sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745" + url: "https://pub.dev" source: hosted version: "3.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + url: "https://pub.dev" source: hosted version: "2.0.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" source: hosted version: "1.0.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + url: "https://pub.dev" source: hosted version: "2.1.10" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + url: "https://pub.dev" source: hosted version: "2.0.6" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + url: "https://pub.dev" source: hosted version: "2.1.6" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted version: "5.1.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted version: "2.1.4" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted version: "1.5.1" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" source: hosted version: "6.0.5" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" source: hosted version: "2.1.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" source: hosted version: "1.2.3" rfc_6901: dependency: transitive description: name: rfc_6901 - url: "https://pub.dartlang.org" + sha256: "8d97680dada633146cf75ab9382f2ce2b7e4bd63ceecd867416cf43b5832b988" + url: "https://pub.dev" source: hosted version: "0.1.1" rive: dependency: "direct main" description: name: rive - url: "https://pub.dartlang.org" + sha256: f7f365ee0e6cf0af99fb239bc3424370ca6ee2b9ad6fc879b1a79ba5e3b40770 + url: "https://pub.dev" source: hosted version: "0.10.4" rive_common: dependency: transitive description: name: rive_common - url: "https://pub.dartlang.org" + sha256: "7c4be235d75c34a0f257b4487c0cc314188aa2f9a6c177d34f02df53d7c25831" + url: "https://pub.dev" source: hosted version: "0.0.5" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b" + url: "https://pub.dev" source: hosted version: "2.1.0" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749" + url: "https://pub.dev" source: hosted version: "2.1.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - url: "https://pub.dartlang.org" + sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07" + url: "https://pub.dev" source: hosted version: "2.2.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa" + url: "https://pub.dev" source: hosted version: "2.2.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d + url: "https://pub.dev" source: hosted version: "2.2.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5" + url: "https://pub.dev" source: hosted version: "2.1.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173" + url: "https://pub.dev" source: hosted version: "2.2.0" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" source: hosted version: "1.4.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" source: hosted version: "1.0.4" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - url: "https://pub.dartlang.org" + sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592" + url: "https://pub.dev" source: hosted version: "0.2.0" sky_engine: @@ -843,280 +957,320 @@ packages: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + sha256: b20e191de6964e98032573cecb1d2b169d96ba63fdb586d24dcd1003ba7e94f6 + url: "https://pub.dev" source: hosted version: "1.3.0" source_helper: dependency: transitive description: name: source_helper - url: "https://pub.dartlang.org" + sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + url: "https://pub.dev" source: hosted version: "1.3.3" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted version: "1.2.0" sync_http: dependency: transitive description: name: sync_http - url: "https://pub.dartlang.org" + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" source: hosted version: "0.3.1" table_calendar: dependency: "direct main" description: name: table_calendar - url: "https://pub.dartlang.org" + sha256: "7f1270313c0cdb245b583ed8518982c01d4a7e95869b3c30abcbae3b642c45d0" + url: "https://pub.dev" source: hosted version: "3.0.8" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted version: "0.4.16" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3 + url: "https://pub.dev" source: hosted - version: "6.1.10" + version: "6.1.11" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd" + url: "https://pub.dev" source: hosted version: "6.0.31" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + url: "https://pub.dev" source: hosted version: "6.1.4" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + url: "https://pub.dev" source: hosted version: "3.0.5" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" + url: "https://pub.dev" source: hosted version: "3.0.5" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + url: "https://pub.dev" source: hosted version: "2.1.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + url: "https://pub.dev" source: hosted version: "2.0.16" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771" + url: "https://pub.dev" source: hosted version: "3.0.6" vector_graphics: dependency: transitive description: name: vector_graphics - url: "https://pub.dartlang.org" + sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79 + url: "https://pub.dev" source: hosted version: "1.1.5" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - url: "https://pub.dartlang.org" + sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced + url: "https://pub.dev" source: hosted version: "1.1.5" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - url: "https://pub.dartlang.org" + sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca" + url: "https://pub.dev" source: hosted version: "1.1.5" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted version: "2.1.4" version: dependency: "direct main" description: name: version - url: "https://pub.dartlang.org" + sha256: "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94" + url: "https://pub.dev" source: hosted version: "3.0.2" version_manipulation: dependency: transitive description: name: version_manipulation - url: "https://pub.dartlang.org" + sha256: "2fcb0597589e894082ebde9140b5c018c0858215eef39539d87c200e3da82ec0" + url: "https://pub.dev" source: hosted version: "0.1.1" video_player: dependency: "direct main" description: name: video_player - url: "https://pub.dartlang.org" + sha256: de95f0e9405f29b5582573d4166132e71f83b3158aac14e8ee5767a54f4f1fbd + url: "https://pub.dev" source: hosted version: "2.6.1" video_player_android: dependency: transitive description: name: video_player_android - url: "https://pub.dartlang.org" + sha256: b608c320ab1a5fd373987c9c3c9ddbd6bda04d209f2a9f0bf197c5b02082201e + url: "https://pub.dev" source: hosted version: "2.4.7" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - url: "https://pub.dartlang.org" + sha256: "824dad3e2986a13766fcccfd1c48c83eef9f896c220a53292e3019b9e98615bb" + url: "https://pub.dev" source: hosted version: "2.4.5" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface - url: "https://pub.dartlang.org" + sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684 + url: "https://pub.dev" source: hosted version: "6.1.0" video_player_web: dependency: transitive description: name: video_player_web - url: "https://pub.dartlang.org" + sha256: "44ce41424d104dfb7cf6982cc6b84af2b007a24d126406025bf40de5d481c74c" + url: "https://pub.dev" source: hosted version: "2.0.16" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + url: "https://pub.dev" source: hosted version: "9.4.0" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" source: hosted version: "2.4.0" webdriver: dependency: transitive description: name: webdriver - url: "https://pub.dartlang.org" + sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841 + url: "https://pub.dev" source: hosted version: "3.0.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c" + url: "https://pub.dev" source: hosted version: "4.1.4" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + url: "https://pub.dev" source: hosted version: "1.0.0" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted version: "6.2.2" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted version: "3.1.2" sdks: diff --git a/pubspec.yaml b/pubspec.yaml index ed510f75..0e6e02a7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: rive: ^0.10.4 shared_preferences: ^2.1.0 table_calendar: ^3.0.8 - url_launcher: ^6.1.10 + url_launcher: ^6.1.11 flutter_barcode_scanner: ^2.0.0 video_player: ^2.6.1 flutter_staggered_grid_view: ^0.6.2 From d0a6ebe287b143eaa27f5d78f94c84a6e9e58ad4 Mon Sep 17 00:00:00 2001 From: Deepanshu Date: Mon, 15 May 2023 09:27:30 +0530 Subject: [PATCH 06/40] updated json annotations --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ed510f75..f9f8493c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,7 +44,7 @@ dependencies: http: ^0.13.5 image_picker: ^0.8.7+3 intl: ^0.17.0 - json_annotation: ^4.8.0 + json_annotation: ^4.8.1 version: ^3.0.2 package_info_plus: ^3.1.2 provider: ^6.0.5 From 1963ae4a8956e07d07f939ce1a8a6f1ee9d40265 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 12:47:29 +0000 Subject: [PATCH 07/40] Bump shared_preferences from 2.1.0 to 2.1.1 Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.1.1/packages/shared_preferences) --- updated-dependencies: - dependency-name: shared_preferences dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3dc17bd3..70ca801f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -872,10 +872,10 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b" + sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" shared_preferences_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0e6e02a7..f61ac32f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: package_info_plus: ^3.1.2 provider: ^6.0.5 rive: ^0.10.4 - shared_preferences: ^2.1.0 + shared_preferences: ^2.1.1 table_calendar: ^3.0.8 url_launcher: ^6.1.11 flutter_barcode_scanner: ^2.0.0 From aba4b824fc36461194427225dc23ca9ea3f03280 Mon Sep 17 00:00:00 2001 From: Jigar Date: Wed, 17 May 2023 15:25:51 +0530 Subject: [PATCH 08/40] now it is fixed for null check --- lib/screens/auth_screen.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart index d19e39f9..e1dd7eb3 100644 --- a/lib/screens/auth_screen.dart +++ b/lib/screens/auth_screen.dart @@ -246,7 +246,7 @@ class _AuthCardState extends State { textInputAction: TextInputAction.next, keyboardType: TextInputType.emailAddress, validator: (value) { - if (value.isEmpty) { + if (value==null || value.isEmpty) { return AppLocalizations.of(context).invalidUsername; } if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) { From 07de8573008e7eaf5b3b06dd2cfd3a0b54f7b2ce Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 19 May 2023 12:57:56 +0200 Subject: [PATCH 09/40] Set platform to iOS 11 --- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 85 ++++++++++++++-------------- ios/Runner.xcodeproj/project.pbxproj | 10 ++-- ios/Runner/Info.plist | 2 + 5 files changed, 53 insertions(+), 48 deletions(-) diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index f2872cf4..4f8d4d24 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/ios/Podfile b/ios/Podfile index 1e8c3c90..2c068c40 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b013bfe1..8169503c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,70 +1,71 @@ PODS: - - camera (0.0.1): - - Flutter - Flutter (1.0.0) + - flutter_barcode_scanner (2.0.0): + - Flutter - flutter_keyboard_visibility (0.0.1): - Flutter - - image_picker (0.0.1): + - image_picker_ios (0.0.1): - Flutter - - package_info (0.0.1): + - integration_test (0.0.1): - Flutter - - shared_preferences_ios (0.0.1): + - package_info_plus (0.4.5): - Flutter + - rive_common (0.0.1): + - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - url_launcher_ios (0.0.1): - Flutter - - video_player (0.0.1): - - Flutter - - wakelock (0.0.1): - - Flutter - - webview_flutter_wkwebview (0.0.1): + - video_player_avfoundation (0.0.1): - Flutter DEPENDENCIES: - - camera (from `.symlinks/plugins/camera/ios`) - Flutter (from `Flutter`) + - flutter_barcode_scanner (from `.symlinks/plugins/flutter_barcode_scanner/ios`) - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - - image_picker (from `.symlinks/plugins/image_picker/ios`) - - package_info (from `.symlinks/plugins/package_info/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - integration_test (from `.symlinks/plugins/integration_test/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) + - rive_common (from `.symlinks/plugins/rive_common/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) - - wakelock (from `.symlinks/plugins/wakelock/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) EXTERNAL SOURCES: - camera: - :path: ".symlinks/plugins/camera/ios" Flutter: :path: Flutter + flutter_barcode_scanner: + :path: ".symlinks/plugins/flutter_barcode_scanner/ios" flutter_keyboard_visibility: :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" - image_picker: - :path: ".symlinks/plugins/image_picker/ios" - package_info: - :path: ".symlinks/plugins/package_info/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" + integration_test: + :path: ".symlinks/plugins/integration_test/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" + rive_common: + :path: ".symlinks/plugins/rive_common/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/ios" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" - wakelock: - :path: ".symlinks/plugins/wakelock/ios" - webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/ios" SPEC CHECKSUMS: - camera: fe33292aff715a981eb34d7ce7b35b54337ff34c - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 - image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6 - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 - url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af - video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb - wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f - webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162 + image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 + integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 + package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5 + shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126 -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 -COCOAPODS: 1.11.2 +COCOAPODS: 1.12.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d44478a3..7bccdc01 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -199,6 +199,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -252,6 +253,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -339,7 +341,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -425,7 +427,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -474,7 +476,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index b8ebd6ec..9aa740a2 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -43,5 +43,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + From 5cbaa2df4a480d83faf2f67ffd976c626687c57b Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 19 May 2023 15:58:28 +0200 Subject: [PATCH 10/40] Update translatable strings from the server --- lib/l10n/app_en.arb | 177 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 145 insertions(+), 32 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index f0fd2187..65f790f3 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -635,37 +635,150 @@ } }, "cacheWarning": "Due to caching it might take some time till the changes are visible throughout the application.", - "abs": "Abs", - "arms": "Arms", - "back": "Back", - "barbell": "Barbell", - "bench": "Bench", - "biceps": "Biceps", - "calves": "Calves", - "cardio": "Cardio", - "chest": "Chest", - "dumbbell": "Dumbbell", - "glutes": "Glutes", - "gym_mat": "Gym mat", - "hamstrings": "Hamstrings", - "incline_bench": "Incline bench", - "kettlebell": "Kettlebell", - "kilometers": "Kilometers", - "lats": "Lats", - "legs": "Legs", - "lower_back": "Lower back", - "miles": "Miles", - "minutes": "Minutes", - "pull_up_bar": "Pull-up bar", - "quads": "Quads", - "repetitions": "Repetitions", - "sz_bar": "SZ-Bar", - "seconds": "Seconds", - "shoulders": "Shoulders", - "swiss_ball": "Swiss Ball", - "triceps": "Triceps", - "until_failure": "Until Failure", - "none__bodyweight_exercise_": "none (bodyweight exercise)", "textPromptTitle": "Ready to start?", - "textPromptSubheading": "Press the action button to begin" + "textPromptSubheading": "Press the action button to begin", + "abs": "Abs", + "@abs": { + "description": "Generated entry for translation for server strings" + }, + "arms": "Arms", + "@arms": { + "description": "Generated entry for translation for server strings" + }, + "back": "Back", + "@back": { + "description": "Generated entry for translation for server strings" + }, + "barbell": "Barbell", + "@barbell": { + "description": "Generated entry for translation for server strings" + }, + "bench": "Bench", + "@bench": { + "description": "Generated entry for translation for server strings" + }, + "biceps": "Biceps", + "@biceps": { + "description": "Generated entry for translation for server strings" + }, + "body_weight": "Body Weight", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "calves": "Calves", + "@calves": { + "description": "Generated entry for translation for server strings" + }, + "cardio": "Cardio", + "@cardio": { + "description": "Generated entry for translation for server strings" + }, + "chest": "Chest", + "@chest": { + "description": "Generated entry for translation for server strings" + }, + "dumbbell": "Dumbbell", + "@dumbbell": { + "description": "Generated entry for translation for server strings" + }, + "glutes": "Glutes", + "@glutes": { + "description": "Generated entry for translation for server strings" + }, + "gym_mat": "Gym mat", + "@gym_mat": { + "description": "Generated entry for translation for server strings" + }, + "hamstrings": "Hamstrings", + "@hamstrings": { + "description": "Generated entry for translation for server strings" + }, + "incline_bench": "Incline bench", + "@incline_bench": { + "description": "Generated entry for translation for server strings" + }, + "kettlebell": "Kettlebell", + "@kettlebell": { + "description": "Generated entry for translation for server strings" + }, + "kilometers": "Kilometers", + "@kilometers": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "Kilometers Per Hour", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "lats": "Lats", + "@lats": { + "description": "Generated entry for translation for server strings" + }, + "legs": "Legs", + "@legs": { + "description": "Generated entry for translation for server strings" + }, + "miles": "Miles", + "@miles": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "Miles Per Hour", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "minutes": "Minutes", + "@minutes": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Plates", + "@plates": { + "description": "Generated entry for translation for server strings" + }, + "pull_up_bar": "Pull-up bar", + "@pull_up_bar": { + "description": "Generated entry for translation for server strings" + }, + "quads": "Quads", + "@quads": { + "description": "Generated entry for translation for server strings" + }, + "repetitions": "Repetitions", + "@repetitions": { + "description": "Generated entry for translation for server strings" + }, + "sz_bar": "SZ-Bar", + "@sz_bar": { + "description": "Generated entry for translation for server strings" + }, + "seconds": "Seconds", + "@seconds": { + "description": "Generated entry for translation for server strings" + }, + "shoulders": "Shoulders", + "@shoulders": { + "description": "Generated entry for translation for server strings" + }, + "swiss_ball": "Swiss Ball", + "@swiss_ball": { + "description": "Generated entry for translation for server strings" + }, + "triceps": "Triceps", + "@triceps": { + "description": "Generated entry for translation for server strings" + }, + "until_failure": "Until Failure", + "@until_failure": { + "description": "Generated entry for translation for server strings" + }, + "kg": "kg", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "lb": "lb", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "none__bodyweight_exercise_": "none (bodyweight exercise)", + "@none__bodyweight_exercise_": { + "description": "Generated entry for translation for server strings" + } } From 026ba114ee376621ccd6a24a9b3324f546cd2651 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 19 May 2023 16:47:18 +0200 Subject: [PATCH 11/40] Update i18n.dart helper --- lib/helpers/i18n.dart | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/helpers/i18n.dart b/lib/helpers/i18n.dart index 9820f740..9cf146fd 100644 --- a/lib/helpers/i18n.dart +++ b/lib/helpers/i18n.dart @@ -28,6 +28,9 @@ String getTranslation(String value, BuildContext context) { case 'Biceps': return AppLocalizations.of(context).biceps; + case 'Body Weight': + return AppLocalizations.of(context).body_weight; + case 'Calves': return AppLocalizations.of(context).calves; @@ -58,21 +61,27 @@ String getTranslation(String value, BuildContext context) { case 'Kilometers': return AppLocalizations.of(context).kilometers; + case 'Kilometers Per Hour': + return AppLocalizations.of(context).kilometers_per_hour; + case 'Lats': return AppLocalizations.of(context).lats; case 'Legs': return AppLocalizations.of(context).legs; - case 'Lower back': - return AppLocalizations.of(context).lower_back; - case 'Miles': return AppLocalizations.of(context).miles; + case 'Miles Per Hour': + return AppLocalizations.of(context).miles_per_hour; + case 'Minutes': return AppLocalizations.of(context).minutes; + case 'Plates': + return AppLocalizations.of(context).plates; + case 'Pull-up bar': return AppLocalizations.of(context).pull_up_bar; @@ -100,6 +109,12 @@ String getTranslation(String value, BuildContext context) { case 'Until Failure': return AppLocalizations.of(context).until_failure; + case 'kg': + return AppLocalizations.of(context).kg; + + case 'lb': + return AppLocalizations.of(context).lb; + case 'none (bodyweight exercise)': return AppLocalizations.of(context).none__bodyweight_exercise_; From 7204b2943d06abc9435855b8da07849f29e0a006 Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 21 May 2023 00:31:32 +0000 Subject: [PATCH 12/40] Translated using Weblate (Ukrainian) Currently translated at 100.0% (229 of 229 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/uk/ --- lib/l10n/app_uk.arb | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index d9b7f2eb..5aed2268 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -621,7 +621,7 @@ "@legs": {}, "back": "Спина", "@back": {}, - "quads": "Квадроцикли", + "quads": "Квадрицепс", "@quads": {}, "arms": "Руки", "@arms": {}, @@ -721,5 +721,29 @@ "textPromptTitle": "Готові почати?", "@textPromptTitle": {}, "textPromptSubheading": "Натисніть кнопку дії, щоб почати", - "@textPromptSubheading": {} + "@textPromptSubheading": {}, + "body_weight": "Вага тіла", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "kg": "кг", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "Кілометрів на годину", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "Миль на годину", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "lb": "фунт", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Пластини", + "@plates": { + "description": "Generated entry for translation for server strings" + } } From 2df450119bb3700cf463e57abd6f7eee85c57587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 01:26:33 +0000 Subject: [PATCH 13/40] Bump flutter_typeahead from 4.3.8 to 4.4.0 Bumps [flutter_typeahead](https://github.com/AbdulRahmanAlHamali/flutter_typeahead) from 4.3.8 to 4.4.0. - [Release notes](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/releases) - [Changelog](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/blob/master/CHANGELOG.md) - [Commits](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/commits) --- updated-dependencies: - dependency-name: flutter_typeahead dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 70ca801f..82c4c0ed 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -433,10 +433,10 @@ packages: dependency: "direct main" description: name: flutter_typeahead - sha256: "721610b3d61814efa13fb5f720a6781bc123cd51b7e01f5a45d7c92124376644" + sha256: "986143baa65734d02b494ffb8c4e22fc1065d272ded050e7229b81e37aed316e" url: "https://pub.dev" source: hosted - version: "4.3.8" + version: "4.4.0" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index b83b8879..035822d7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: equatable: ^2.0.5 flutter_calendar_carousel: ^2.4.1 flutter_html: ^3.0.0-alpha.6 - flutter_typeahead: ^4.3.8 + flutter_typeahead: ^4.4.0 font_awesome_flutter: ^10.4.0 http: ^0.13.5 image_picker: ^0.8.7+3 From b07e98a1076a4685e9e021ef0ddaaa8c7fb04826 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 01:26:54 +0000 Subject: [PATCH 14/40] Bump rive from 0.10.4 to 0.11.0 Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.10.4 to 0.11.0. - [Release notes](https://github.com/rive-app/rive-flutter/releases) - [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/rive-app/rive-flutter/commits) --- updated-dependencies: - dependency-name: rive dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 70ca801f..1b9e7478 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -856,18 +856,18 @@ packages: dependency: "direct main" description: name: rive - sha256: f7f365ee0e6cf0af99fb239bc3424370ca6ee2b9ad6fc879b1a79ba5e3b40770 + sha256: "5755eb9dc0f4d12371e9774cf6a407137d52a95beea6d7fbbf4c4f79e561da53" url: "https://pub.dev" source: hosted - version: "0.10.4" + version: "0.11.0" rive_common: dependency: transitive description: name: rive_common - sha256: "7c4be235d75c34a0f257b4487c0cc314188aa2f9a6c177d34f02df53d7c25831" + sha256: "89c6264706b18e2526ff220bd23f3ab25ef152d57ebed4b9e4f5d72aebba4f97" url: "https://pub.dev" source: hosted - version: "0.0.5" + version: "0.0.6" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b83b8879..b56546c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: version: ^3.0.2 package_info_plus: ^3.1.2 provider: ^6.0.5 - rive: ^0.10.4 + rive: ^0.11.0 shared_preferences: ^2.1.1 table_calendar: ^3.0.8 url_launcher: ^6.1.11 From be5d0059c57b0b6c13cd95f18289fc8a9a95a253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=90=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87=20?= =?UTF-8?q?=D0=97=D0=BB=D0=BE=D0=B1=D0=B8=D0=BD?= Date: Tue, 23 May 2023 09:16:02 +0000 Subject: [PATCH 15/40] Translated using Weblate (Russian) Currently translated at 99.1% (227 of 229 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ru/ --- lib/l10n/app_ru.arb | 237 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 235 insertions(+), 2 deletions(-) diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index c08bdab3..a6b78338 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -9,9 +9,9 @@ "@labelWorkoutPlans": { "description": "Title for screen workout plans" }, - "registerInstead": "Зарегистроваться вместо этого", + "registerInstead": "У вас нет аккаунта? Зарегистрируйтесь сейчас", "@registerInstead": {}, - "loginInstead": "Войти вместо этого", + "loginInstead": "Уже есть аккаунт? Войти", "@loginInstead": {}, "labelDashboard": "Панель управления", "@labelDashboard": { @@ -564,5 +564,238 @@ "placeholders": { "min": {} } + }, + "noMeasurementEntries": "У вас нет записей измерений", + "@noMeasurementEntries": {}, + "moreMeasurementEntries": "Добавить новое измерение", + "@moreMeasurementEntries": { + "description": "Message shown when the user wants to add new measurement" + }, + "userProfile": "Ваш профиль", + "@userProfile": {}, + "exerciseList": "Список упражнений", + "@exerciseList": {}, + "baseNameEnglish": "Для всех упражнений необходимо базовое название на английском языке", + "@baseNameEnglish": {}, + "verifiedEmail": "Подтвержденный адрес электронной почты", + "@verifiedEmail": {}, + "swiss_ball": "Гимнастический мяч", + "@swiss_ball": { + "description": "Generated entry for translation for server strings" + }, + "chest": "Грудь", + "@chest": { + "description": "Generated entry for translation for server strings" + }, + "kettlebell": "Гиря", + "@kettlebell": { + "description": "Generated entry for translation for server strings" + }, + "calves": "Икры", + "@calves": { + "description": "Generated entry for translation for server strings" + }, + "success": "Успешно", + "@success": { + "description": "Message when an action completed successfully, usually used as a heading" + }, + "exerciseName": "Название упражнения", + "@exerciseName": { + "description": "Label for the name of a workout exercise" + }, + "textPromptTitle": "Готовы начать?", + "@textPromptTitle": {}, + "body_weight": "Вес тела", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "cardio": "Кардио", + "@cardio": { + "description": "Generated entry for translation for server strings" + }, + "dumbbell": "Гантели", + "@dumbbell": { + "description": "Generated entry for translation for server strings" + }, + "gym_mat": "Спортивный коврик", + "@gym_mat": { + "description": "Generated entry for translation for server strings" + }, + "incline_bench": "Наклонная скамья", + "@incline_bench": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "км/ч", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "lats": "Широчайшие", + "@lats": { + "description": "Generated entry for translation for server strings" + }, + "miles": "Мили", + "@miles": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "миль/ч", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Блины", + "@plates": { + "description": "Generated entry for translation for server strings" + }, + "quads": "Четырехглавые", + "@quads": { + "description": "Generated entry for translation for server strings" + }, + "sz_bar": "SZ-гриф", + "@sz_bar": { + "description": "Generated entry for translation for server strings" + }, + "kg": "кг", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "lb": "фунт", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "images": "Изображения", + "@images": {}, + "language": "Язык", + "@language": {}, + "abs": "Пресс", + "@abs": { + "description": "Generated entry for translation for server strings" + }, + "arms": "Руки", + "@arms": { + "description": "Generated entry for translation for server strings" + }, + "back": "Спина", + "@back": { + "description": "Generated entry for translation for server strings" + }, + "biceps": "Бицепсы", + "@biceps": { + "description": "Generated entry for translation for server strings" + }, + "translation": "Перевод", + "@translation": {}, + "baseData": "Основы на английском", + "@baseData": { + "description": "The base data for an exercise such as category, trained muscles, etc." + }, + "glutes": "Ягодицы", + "@glutes": { + "description": "Generated entry for translation for server strings" + }, + "kilometers": "Километры", + "@kilometers": { + "description": "Generated entry for translation for server strings" + }, + "seconds": "Секунд", + "@seconds": { + "description": "Generated entry for translation for server strings" + }, + "until_failure": "До отказа", + "@until_failure": { + "description": "Generated entry for translation for server strings" + }, + "bench": "Скамья", + "@bench": { + "description": "Generated entry for translation for server strings" + }, + "barbell": "Штанга", + "@barbell": { + "description": "Generated entry for translation for server strings" + }, + "none__bodyweight_exercise_": "без (с собственным весом)", + "@none__bodyweight_exercise_": { + "description": "Generated entry for translation for server strings" + }, + "shoulders": "Плечи", + "@shoulders": { + "description": "Generated entry for translation for server strings" + }, + "next": "Следующее", + "@next": {}, + "pull_up_bar": "Турник", + "@pull_up_bar": { + "description": "Generated entry for translation for server strings" + }, + "exercises": "Упражнения", + "@exercises": { + "description": "Multiple exercises for a workout" + }, + "add_exercise_image_license": "Изображения должны быть совместимы с CC BY SA лицензией. Если вы сомневаетесь, загружайте только те фотографии, которые вы сделали сами", + "@add_exercise_image_license": {}, + "unVerifiedEmail": "Неподтвержденный адрес электронной почты", + "@unVerifiedEmail": {}, + "contributeExercise": "Добавить упражнение", + "@contributeExercise": {}, + "addExercise": "Добавить упражнение", + "@addExercise": {}, + "translateExercise": "Перевести это упражнение", + "@translateExercise": {}, + "contributeExerciseWarning": "Вы можете добавлять упражнения только в том случае, если ваша учетная запись старше {days} дней и вы подтвердили свою электронную почту", + "@contributeExerciseWarning": { + "description": "Number of days before which a person can add exercise", + "placeholders": { + "days": { + "type": "String", + "example": "14" + } + } + }, + "textPromptSubheading": "Нажмите кнопку действия, чтобы начать", + "@textPromptSubheading": {}, + "minutes": "Минут", + "@minutes": { + "description": "Generated entry for translation for server strings" + }, + "triceps": "Трицепс", + "@triceps": { + "description": "Generated entry for translation for server strings" + }, + "searchNamesInEnglish": "Также ищите названия на английском", + "@searchNamesInEnglish": {}, + "selectEntry": "Пожалуйста, выберите запись", + "@selectEntry": {}, + "variations": "Варианты", + "@variations": { + "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)" + }, + "alsoKnownAs": "Также известно как: {aliases}", + "@alsoKnownAs": { + "placeholders": { + "aliases": {} + }, + "description": "List of alternative names for an exercise" + }, + "verifiedEmailReason": "Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять упражнения", + "@verifiedEmailReason": {}, + "verifiedEmailInfo": "Письмо с подтверждением отправлено на {email}", + "@verifiedEmailInfo": { + "placeholders": { + "email": {} + } + }, + "alternativeNames": "Альтернативные названия", + "@alternativeNames": {}, + "oneNamePerLine": "Одно название на строку", + "@oneNamePerLine": {}, + "whatVariationsExist": "Какие варианты этого упражнения существуют, если таковые имеются?", + "@whatVariationsExist": {}, + "previous": "Предыдущее", + "@previous": {}, + "aboutPageTitle": "О Wger", + "@aboutPageTitle": {}, + "cacheWarning": "Из-за кэширования может пройти некоторое время, прежде чем изменения станут видны во всем приложении.", + "@cacheWarning": {}, + "legs": "Ноги", + "@legs": { + "description": "Generated entry for translation for server strings" } } From 4f8fff27b594c521f997a824d4fa22135aeb01f4 Mon Sep 17 00:00:00 2001 From: Dalton Scavassa Date: Fri, 26 May 2023 19:13:10 +0200 Subject: [PATCH 16/40] Added translation using Weblate (Portuguese (Brazil)) --- lib/l10n/app_pt_BR.arb | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/l10n/app_pt_BR.arb diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/lib/l10n/app_pt_BR.arb @@ -0,0 +1 @@ +{} From 93c9785f2394f87b1eb7385801b0dc26637b1d14 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Fri, 26 May 2023 19:40:53 +0000 Subject: [PATCH 17/40] Translated using Weblate (Croatian) Currently translated at 100.0% (229 of 229 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/ --- lib/l10n/app_hr.arb | 253 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 249 insertions(+), 4 deletions(-) diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb index 32bfd599..a359d639 100644 --- a/lib/l10n/app_hr.arb +++ b/lib/l10n/app_hr.arb @@ -47,13 +47,13 @@ "@customServerUrl": { "description": "Label in the form where the users can enter their own wger instance" }, - "customServerHint": "Upiši adresu vlastitog poslužitelja, inače će se koristiti zadana", + "customServerHint": "Upiši adresu tvog poslužitelja, inače će se koristiti zadani", "@customServerHint": { "description": "Hint text for the form where the users can enter their own wger instance" }, - "registerInstead": "Umjesto toga se registriraj", + "registerInstead": "Nemaš račun? Registriraj se", "@registerInstead": {}, - "loginInstead": "Umjesto toga se prijavi", + "loginInstead": "Već imaš račun? Prijavi se", "@loginInstead": {}, "labelWorkoutPlans": "Planovi treninga", "@labelWorkoutPlans": { @@ -221,7 +221,7 @@ "@selectExercise": { "description": "Error message when the user hasn't selected an exercise in the form" }, - "enterCharacters": "Upiši znakove između {min} i {max}", + "enterCharacters": "Upiši {min} do {max} znakova", "@enterCharacters": { "description": "Error message when the user hasn't entered the correct number of characters in a form", "type": "text", @@ -556,5 +556,250 @@ "close": "Zatvori", "@close": { "description": "Translation for close" + }, + "enterMinCharacters": "Upiši barem {min} znakova", + "@enterMinCharacters": { + "description": "Error message when the user hasn't entered the minimum amount characters in a form", + "type": "text", + "placeholders": { + "min": {} + } + }, + "add_exercise_image_license": "Slike moraju biti kompatibilne s licencom CC BY SA. Ako si u nedoumici, prenesi samo svoje vlastite fotografije.", + "@add_exercise_image_license": {}, + "whatVariationsExist": "Koje varijante ove vježbe postoje?", + "@whatVariationsExist": {}, + "images": "Slike", + "@images": {}, + "alternativeNames": "Alternativna imena", + "@alternativeNames": {}, + "previous": "Prethodno", + "@previous": {}, + "oneNamePerLine": "Jedno ime po retku", + "@oneNamePerLine": {}, + "translation": "Prijevod", + "@translation": {}, + "addExercise": "Dodaj vježbu", + "@addExercise": {}, + "translateExercise": "Prevedi ovu vježbu", + "@translateExercise": {}, + "baseData": "Osnovni podaci na engleskom jeziku", + "@baseData": { + "description": "The base data for an exercise such as category, trained muscles, etc." + }, + "arms": "Ruke", + "@arms": { + "description": "Generated entry for translation for server strings" + }, + "back": "Leđa", + "@back": { + "description": "Generated entry for translation for server strings" + }, + "chest": "Prsa", + "@chest": { + "description": "Generated entry for translation for server strings" + }, + "sz_bar": "SZ šipka", + "@sz_bar": { + "description": "Generated entry for translation for server strings" + }, + "userProfile": "Tvoj profil", + "@userProfile": {}, + "exerciseList": "Popis vježbi", + "@exerciseList": {}, + "exercises": "Vježbe", + "@exercises": { + "description": "Multiple exercises for a workout" + }, + "exerciseName": "Ime vježbe", + "@exerciseName": { + "description": "Label for the name of a workout exercise" + }, + "selectEntry": "Odaberi unos", + "@selectEntry": {}, + "success": "Uspjeh", + "@success": { + "description": "Message when an action completed successfully, usually used as a heading" + }, + "noMeasurementEntries": "Nemaš unose mjerenja", + "@noMeasurementEntries": {}, + "moreMeasurementEntries": "Dodaj novo mjerenje", + "@moreMeasurementEntries": { + "description": "Message shown when the user wants to add new measurement" + }, + "variations": "Varijante", + "@variations": { + "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)" + }, + "alsoKnownAs": "Poznato i kao: {aliases}", + "@alsoKnownAs": { + "placeholders": { + "aliases": {} + }, + "description": "List of alternative names for an exercise" + }, + "verifiedEmail": "Potvrđena e-mail adresa", + "@verifiedEmail": {}, + "unVerifiedEmail": "Nepotvrđena e-mail adresa", + "@unVerifiedEmail": {}, + "verifiedEmailInfo": "E-mail poruka za potvrdu je poslana na {email}", + "@verifiedEmailInfo": { + "placeholders": { + "email": {} + } + }, + "contributeExerciseWarning": "Vježbe možeš dodati samo ako je tvoj račun stariji od {days} dana i ako si potvrdio/la tvoju e-mail adresu", + "@contributeExerciseWarning": { + "description": "Number of days before which a person can add exercise", + "placeholders": { + "days": { + "type": "String", + "example": "14" + } + } + }, + "cacheWarning": "Zbog predmemoriranja, vidljivost promjena u aplikaciji može nešto potrajati.", + "@cacheWarning": {}, + "verifiedEmailReason": "Za dodavanje vježbi moraš potvrditi tvoju e-mail adresu", + "@verifiedEmailReason": {}, + "cardio": "Kardio", + "@cardio": { + "description": "Generated entry for translation for server strings" + }, + "quads": "Ekstenzije nogu", + "@quads": { + "description": "Generated entry for translation for server strings" + }, + "pull_up_bar": "Šipka za povlačenje", + "@pull_up_bar": { + "description": "Generated entry for translation for server strings" + }, + "shoulders": "Ramena", + "@shoulders": { + "description": "Generated entry for translation for server strings" + }, + "triceps": "Triceps", + "@triceps": { + "description": "Generated entry for translation for server strings" + }, + "swiss_ball": "Lopta za fitness", + "@swiss_ball": { + "description": "Generated entry for translation for server strings" + }, + "until_failure": "Do neuspjeha", + "@until_failure": { + "description": "Generated entry for translation for server strings" + }, + "none__bodyweight_exercise_": "ništa (vježba za tjelesnu težinu)", + "@none__bodyweight_exercise_": { + "description": "Generated entry for translation for server strings" + }, + "seconds": "Sekunde", + "@seconds": { + "description": "Generated entry for translation for server strings" + }, + "textPromptTitle": "Spreman?", + "@textPromptTitle": {}, + "barbell": "Utezi", + "@barbell": { + "description": "Generated entry for translation for server strings" + }, + "calves": "Lisni mišići", + "@calves": { + "description": "Generated entry for translation for server strings" + }, + "textPromptSubheading": "Počni pritiskom gumba radnje", + "@textPromptSubheading": {}, + "body_weight": "Tjelesna težina", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "kilometers": "Kilometri", + "@kilometers": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "Kilometara na sat", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "lats": "Leđni mišići", + "@lats": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "Milja na sat", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "minutes": "Minute", + "@minutes": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Ploče", + "@plates": { + "description": "Generated entry for translation for server strings" + }, + "kg": "kg", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "lb": "lb", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "searchNamesInEnglish": "Također traži imena na engleskom jeziku", + "@searchNamesInEnglish": {}, + "language": "Jezik", + "@language": {}, + "aboutPageTitle": "Wger informacije", + "@aboutPageTitle": {}, + "abs": "Trbuh", + "@abs": { + "description": "Generated entry for translation for server strings" + }, + "gym_mat": "Podloga za treniranje", + "@gym_mat": { + "description": "Generated entry for translation for server strings" + }, + "incline_bench": "Nagnuta klupa", + "@incline_bench": { + "description": "Generated entry for translation for server strings" + }, + "baseNameEnglish": "Sve vježbe trebaju osnovno ime na engleskom jeziku", + "@baseNameEnglish": {}, + "next": "Sljedeće", + "@next": {}, + "contributeExercise": "Dodaj vježbu", + "@contributeExercise": {}, + "bench": "Klupa", + "@bench": { + "description": "Generated entry for translation for server strings" + }, + "dumbbell": "Ručni uteg", + "@dumbbell": { + "description": "Generated entry for translation for server strings" + }, + "biceps": "Bicepsi", + "@biceps": { + "description": "Generated entry for translation for server strings" + }, + "glutes": "Stražnjica", + "@glutes": { + "description": "Generated entry for translation for server strings" + }, + "hamstrings": "Tetive koljena", + "@hamstrings": { + "description": "Generated entry for translation for server strings" + }, + "kettlebell": "Kuglasti uteg", + "@kettlebell": { + "description": "Generated entry for translation for server strings" + }, + "legs": "Noge", + "@legs": { + "description": "Generated entry for translation for server strings" + }, + "miles": "Milje", + "@miles": { + "description": "Generated entry for translation for server strings" } } From 1fcdaeac6934f027612dc7d9e19cf70e052ae08f Mon Sep 17 00:00:00 2001 From: Dalton Scavassa Date: Fri, 26 May 2023 17:35:39 +0000 Subject: [PATCH 18/40] Translated using Weblate (Portuguese) Currently translated at 100.0% (229 of 229 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/pt/ --- lib/l10n/app_pt.arb | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 9281a56c..624e18af 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -29,7 +29,7 @@ "@invalidUsername": { "description": "Error message when the user enters an invalid username" }, - "customServerHint": "Digite o endereço do seu próprio servidor, caso contrário, o padrão será usado", + "customServerHint": "Digite o endereço do seu próprio servidor, ou então o padrão será usado", "@customServerHint": { "description": "Hint text for the form where the users can enter their own wger instance" }, @@ -715,5 +715,35 @@ } }, "cardio": "Cardio", - "@cardio": {} + "@cardio": {}, + "textPromptTitle": "Podemos começar?", + "@textPromptTitle": {}, + "textPromptSubheading": "Aperte o botão de ação para começar", + "@textPromptSubheading": {}, + "body_weight": "Peso Corporal", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "Quilômetros Por Hora", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "Milhas por Hora", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Pratos", + "@plates": { + "description": "Generated entry for translation for server strings" + }, + "kg": "kg", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "lb": "lb", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "searchNamesInEnglish": "Também buscar nomes em inglês", + "@searchNamesInEnglish": {} } From 0566a4a0d190de0c722e9d956ab993c51f860d69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 01:18:06 +0000 Subject: [PATCH 19/40] Bump rive from 0.11.0 to 0.11.1 Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.11.0 to 0.11.1. - [Release notes](https://github.com/rive-app/rive-flutter/releases) - [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/rive-app/rive-flutter/commits) --- updated-dependencies: - dependency-name: rive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index fac728b9..a106dcf5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -856,18 +856,18 @@ packages: dependency: "direct main" description: name: rive - sha256: "5755eb9dc0f4d12371e9774cf6a407137d52a95beea6d7fbbf4c4f79e561da53" + sha256: "8bf4cd46f625a6b9816210145ba1201a23cf95ba1ae53dad3aa3e0ad193e6b4a" url: "https://pub.dev" source: hosted - version: "0.11.0" + version: "0.11.1" rive_common: dependency: transitive description: name: rive_common - sha256: "89c6264706b18e2526ff220bd23f3ab25ef152d57ebed4b9e4f5d72aebba4f97" + sha256: "7153f296a9d58d1b02aaffaad938f65a92d820f8420c6c69134ecb2ed710f638" url: "https://pub.dev" source: hosted - version: "0.0.6" + version: "0.0.7" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b3141a30..6c5d77d3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: version: ^3.0.2 package_info_plus: ^3.1.2 provider: ^6.0.5 - rive: ^0.11.0 + rive: ^0.11.1 shared_preferences: ^2.1.1 table_calendar: ^3.0.8 url_launcher: ^6.1.11 From c07d1621bfb8811971928a65ee2f34bf66aa7d29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 01:18:24 +0000 Subject: [PATCH 20/40] Bump flutter_typeahead from 4.4.0 to 4.5.0 Bumps [flutter_typeahead](https://github.com/AbdulRahmanAlHamali/flutter_typeahead) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/releases) - [Changelog](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/blob/master/CHANGELOG.md) - [Commits](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/commits) --- updated-dependencies: - dependency-name: flutter_typeahead dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index fac728b9..50aaa4b4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -433,10 +433,10 @@ packages: dependency: "direct main" description: name: flutter_typeahead - sha256: "986143baa65734d02b494ffb8c4e22fc1065d272ded050e7229b81e37aed316e" + sha256: "5af4f54a3f051ff3b549b8f2b952e5ad3e5f60ee4717fd27406d1c64d3e24edd" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index b3141a30..63799c86 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: equatable: ^2.0.5 flutter_calendar_carousel: ^2.4.1 flutter_html: ^3.0.0-alpha.6 - flutter_typeahead: ^4.4.0 + flutter_typeahead: ^4.5.0 font_awesome_flutter: ^10.4.0 http: ^0.13.5 image_picker: ^0.8.7+3 From 3022a528a173cfd846e27d2de95a511027076b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9lian?= Date: Mon, 29 May 2023 17:11:07 +0000 Subject: [PATCH 21/40] Translated using Weblate (French) Currently translated at 100.0% (229 of 229 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/ --- lib/l10n/app_fr.arb | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index 431aa286..18e53ead 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -725,5 +725,35 @@ "seconds": "Secondes", "@seconds": {}, "until_failure": "Jusqu'à l'échec", - "@until_failure": {} + "@until_failure": {}, + "textPromptTitle": "Prêt à commencer ?", + "@textPromptTitle": {}, + "textPromptSubheading": "Cliquez sur le bouton pour commencer", + "@textPromptSubheading": {}, + "body_weight": "Poids corporel", + "@body_weight": { + "description": "Generated entry for translation for server strings" + }, + "kilometers_per_hour": "Kilomètres Par Heure", + "@kilometers_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "miles_per_hour": "Miles Par Heure", + "@miles_per_hour": { + "description": "Generated entry for translation for server strings" + }, + "plates": "Disques de poids", + "@plates": { + "description": "Generated entry for translation for server strings" + }, + "kg": "kg", + "@kg": { + "description": "Generated entry for translation for server strings" + }, + "lb": "lb", + "@lb": { + "description": "Generated entry for translation for server strings" + }, + "searchNamesInEnglish": "Chercher également en termes anglais", + "@searchNamesInEnglish": {} } From ec1463d1e9a5b2a0c70aeb332385ceed873fe9cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:28:10 +0000 Subject: [PATCH 22/40] Bump package_info_plus from 3.1.2 to 4.0.2 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages) from 3.1.2 to 4.0.2. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v4.0.2/packages) --- updated-dependencies: - dependency-name: package_info_plus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index fc91f8a7..6f702304 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -728,10 +728,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745" + sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "4.0.2" package_info_plus_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b60ea260..067e157e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,7 +46,7 @@ dependencies: intl: ^0.17.0 json_annotation: ^4.8.1 version: ^3.0.2 - package_info_plus: ^3.1.2 + package_info_plus: ^4.0.2 provider: ^6.0.5 rive: ^0.11.1 shared_preferences: ^2.1.1 From d8ae5834421834476fe0ac8a7137ff8b04f2579a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 01:22:08 +0000 Subject: [PATCH 23/40] Bump rive from 0.11.1 to 0.11.2 Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.11.1 to 0.11.2. - [Release notes](https://github.com/rive-app/rive-flutter/releases) - [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/rive-app/rive-flutter/commits) --- updated-dependencies: - dependency-name: rive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 6f702304..dc0d3469 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -856,18 +856,18 @@ packages: dependency: "direct main" description: name: rive - sha256: "8bf4cd46f625a6b9816210145ba1201a23cf95ba1ae53dad3aa3e0ad193e6b4a" + sha256: bb7a16bc6a88484fe3136890030b71776ffea368edd2a8368fe99d6430e4a802 url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.11.2" rive_common: dependency: transitive description: name: rive_common - sha256: "7153f296a9d58d1b02aaffaad938f65a92d820f8420c6c69134ecb2ed710f638" + sha256: "5a0dbf689527c51ee5430608181d81460c9c45ab6cc3bd52dd9bbb3d8c4455b6" url: "https://pub.dev" source: hosted - version: "0.0.7" + version: "0.0.9" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 067e157e..246fac86 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: version: ^3.0.2 package_info_plus: ^4.0.2 provider: ^6.0.5 - rive: ^0.11.1 + rive: ^0.11.2 shared_preferences: ^2.1.1 table_calendar: ^3.0.8 url_launcher: ^6.1.11 From 09468bcf1f991c98a5c38386e5d93f2fd64915b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 01:22:22 +0000 Subject: [PATCH 24/40] Bump flutter_typeahead from 4.5.0 to 4.6.1 Bumps [flutter_typeahead](https://github.com/AbdulRahmanAlHamali/flutter_typeahead) from 4.5.0 to 4.6.1. - [Release notes](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/releases) - [Changelog](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/blob/master/CHANGELOG.md) - [Commits](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/commits) --- updated-dependencies: - dependency-name: flutter_typeahead dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 12 ++++++++++-- pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 6f702304..c65b76b2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -433,10 +433,10 @@ packages: dependency: "direct main" description: name: flutter_typeahead - sha256: "5af4f54a3f051ff3b549b8f2b952e5ad3e5f60ee4717fd27406d1c64d3e24edd" + sha256: d72e7079d01b4ec109a12b01b06a85c09a41ae4531f8a0ca5ef9f759ce4e64a2 url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.6.1" flutter_web_plugins: dependency: transitive description: flutter @@ -804,6 +804,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + pointer_interceptor: + dependency: transitive + description: + name: pointer_interceptor + sha256: "6aa680b30d96dccef496933d00208ad25f07e047f644dc98ce03ec6141633a9a" + url: "https://pub.dev" + source: hosted + version: "0.9.3+4" pool: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 067e157e..e9e2f3b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: equatable: ^2.0.5 flutter_calendar_carousel: ^2.4.1 flutter_html: ^3.0.0-alpha.6 - flutter_typeahead: ^4.5.0 + flutter_typeahead: ^4.6.1 font_awesome_flutter: ^10.4.0 http: ^0.13.5 image_picker: ^0.8.7+3 From 84bdb56b651e9d36813f138228a7071389c8487a Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 19 May 2023 19:17:40 +0200 Subject: [PATCH 25/40] Rename some constants so they are the same as in the react app --- lib/helpers/consts.dart | 8 ++++++-- lib/helpers/misc.dart | 2 +- lib/providers/workout_plans.dart | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart index 4dcfb723..84f148b3 100644 --- a/lib/helpers/consts.dart +++ b/lib/helpers/consts.dart @@ -36,8 +36,12 @@ const DEFAULT_WEIGHT_UNIT = 1; /// Default impression for a workout session (neutral) const DEFAULT_IMPRESSION = 2; -/// Default weight unit is "repetition" -const DEFAULT_REPETITION_UNIT = 1; +// Weight and repetition units for the workout logs +const REP_UNIT_REPETITIONS = 1; +const REP_UNIT_TILL_FAILURE = 2; + +const WEIGHT_UNIT_KG = 1; +const WEIGHT_UNIT_LB = 2; /// Time to locally cache values such as ingredients, etc const DAYS_TO_CACHE = 20; diff --git a/lib/helpers/misc.dart b/lib/helpers/misc.dart index 805ec1ed..26c34cc2 100644 --- a/lib/helpers/misc.dart +++ b/lib/helpers/misc.dart @@ -42,7 +42,7 @@ String repText( // rather "8 repetitions". If there is weight we want to output "8 x 50kg", // since the repetitions are implied. If other units are used, we always // print them - if (repetitionUnitObj.id != DEFAULT_REPETITION_UNIT || weight == 0 || weight == null) { + if (repetitionUnitObj.id != REP_UNIT_REPETITIONS || weight == 0 || weight == null) { out.add(repetitionUnitObj.name); } } diff --git a/lib/providers/workout_plans.dart b/lib/providers/workout_plans.dart index f00048a4..47dcea35 100644 --- a/lib/providers/workout_plans.dart +++ b/lib/providers/workout_plans.dart @@ -85,7 +85,7 @@ class WorkoutPlansProvider with ChangeNotifier { /// Return the default weight unit (reps) RepetitionUnit get defaultRepetitionUnit { - return _repetitionUnit.firstWhere((element) => element.id == DEFAULT_REPETITION_UNIT); + return _repetitionUnit.firstWhere((element) => element.id == REP_UNIT_REPETITIONS); } List getPlans() { From fcead1288826d26ba7f3e32851a596fc08c6f554 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 5 Jun 2023 17:05:36 +0200 Subject: [PATCH 26/40] Remove manual workaround for missing locales --- l10n.yaml | 1 + lib/main.dart | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/l10n.yaml b/l10n.yaml index b1cc1414..3c41bfca 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -2,3 +2,4 @@ arb-dir: lib/l10n template-arb-file: app_en.arb output-localization-file: app_localizations.dart nullable-getter: false +preferred-supported-locales: [ en ] \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 90dadd90..54350763 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -158,21 +158,6 @@ class MyApp extends StatelessWidget { }, localizationsDelegates: AppLocalizations.localizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, - - // Workaround for https://github.com/flutter/flutter/issues/100857 - localeResolutionCallback: (deviceLocale, supportedLocales) { - if (deviceLocale != null) { - for (final supportedLocale in supportedLocales) { - // Since we currently don't support any country specific locales - // such as de-DE and de-AT, it's sufficient to just check it like - // this. Otherwise we will need more logic with .countryCode - if (supportedLocale.languageCode == deviceLocale.languageCode) { - return supportedLocale; - } - } - } - return const Locale('en'); - }, ), ), ); From ef1bc990e53e6dbb0e4e03ce7a334284a4ceb1c9 Mon Sep 17 00:00:00 2001 From: Github-actions Date: Mon, 5 Jun 2023 15:27:50 +0000 Subject: [PATCH 27/40] Automatic linting --- lib/screens/auth_screen.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart index e1dd7eb3..98f08072 100644 --- a/lib/screens/auth_screen.dart +++ b/lib/screens/auth_screen.dart @@ -246,13 +246,13 @@ class _AuthCardState extends State { textInputAction: TextInputAction.next, keyboardType: TextInputType.emailAddress, validator: (value) { - if (value==null || value.isEmpty) { + if (value == null || value.isEmpty) { return AppLocalizations.of(context).invalidUsername; } if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) { return AppLocalizations.of(context).usernameValidChars; } - + return null; }, inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))], From 38f0fc34e82eb49f0c6412f654f6f07fdd6a04ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 07:11:10 +0000 Subject: [PATCH 28/40] Bump flutter_html from 3.0.0-alpha.6 to 3.0.0-beta.2 Bumps [flutter_html](https://github.com/Sub6Resources/flutter_html) from 3.0.0-alpha.6 to 3.0.0-beta.2. - [Release notes](https://github.com/Sub6Resources/flutter_html/releases) - [Changelog](https://github.com/Sub6Resources/flutter_html/blob/master/CHANGELOG.md) - [Commits](https://github.com/Sub6Resources/flutter_html/compare/flutter_html-v3.0.0-alpha.6...flutter_html-v3.0.0-beta.2) --- updated-dependencies: - dependency-name: flutter_html dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 69ca24e7..3c2292ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -327,10 +327,10 @@ packages: dependency: "direct main" description: name: flutter_html - sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd" + sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee" url: "https://pub.dev" source: hosted - version: "3.0.0-alpha.6" + version: "3.0.0-beta.2" flutter_keyboard_visibility: dependency: transitive description: @@ -620,6 +620,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + list_counter: + dependency: transitive + description: + name: list_counter + sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237 + url: "https://pub.dev" + source: hosted + version: "1.0.2" logging: dependency: transitive description: @@ -708,14 +716,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - numerus: - dependency: transitive - description: - name: numerus - sha256: "436759d84f233b40107d0cc31cfa92d24e0960afeb2e506be70926d4cddffd9e" - url: "https://pub.dev" - source: hosted - version: "2.0.0" package_config: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c9124257..64570189 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: cupertino_icons: ^1.0.5 equatable: ^2.0.5 flutter_calendar_carousel: ^2.4.1 - flutter_html: ^3.0.0-alpha.6 + flutter_html: ^3.0.0-beta.2 flutter_typeahead: ^4.6.1 font_awesome_flutter: ^10.4.0 http: ^0.13.5 From 1a62f8f962f960f468d975dab7eb9c9d78d91f55 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 19 Apr 2023 16:29:17 +0200 Subject: [PATCH 29/40] Add pulseaudio This is needed to output the sound of the videos --- flatpak/flatpak_meta.json | 1 + 1 file changed, 1 insertion(+) diff --git a/flatpak/flatpak_meta.json b/flatpak/flatpak_meta.json index be92a836..5d408ead 100644 --- a/flatpak/flatpak_meta.json +++ b/flatpak/flatpak_meta.json @@ -23,6 +23,7 @@ "--share=network", "--socket=fallback-x11", "--socket=wayland", + "--socket=pulseaudio", "--device=dri" ] } \ No newline at end of file From c83f8feb76174ba0ae4d87f7b88eb688de4d5f24 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 6 Jun 2023 11:55:34 +0200 Subject: [PATCH 30/40] Update server translations --- lib/helpers/i18n.dart | 3 +++ lib/l10n/app_en.arb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lib/helpers/i18n.dart b/lib/helpers/i18n.dart index 9cf146fd..fc19f5e9 100644 --- a/lib/helpers/i18n.dart +++ b/lib/helpers/i18n.dart @@ -70,6 +70,9 @@ String getTranslation(String value, BuildContext context) { case 'Legs': return AppLocalizations.of(context).legs; + case 'Max Reps': + return AppLocalizations.of(context).max_reps; + case 'Miles': return AppLocalizations.of(context).miles; diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 7ee4c6df..a5cc6fbf 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -719,6 +719,10 @@ "@legs": { "description": "Generated entry for translation for server strings" }, + "max_reps": "Max Reps", + "@max_reps": { + "description": "Generated entry for translation for server strings" + }, "miles": "Miles", "@miles": { "description": "Generated entry for translation for server strings" From 04398545c2aae6f0a8e1346c62b20484b09222e0 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 6 Jun 2023 12:26:43 +0000 Subject: [PATCH 31/40] Translated using Weblate (Ukrainian) Currently translated at 100.0% (231 of 231 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/uk/ --- lib/l10n/app_uk.arb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 5aed2268..bd787a4f 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -745,5 +745,11 @@ "plates": "Пластини", "@plates": { "description": "Generated entry for translation for server strings" + }, + "verify": "Підтвердити", + "@verify": {}, + "max_reps": "Максимальна кількість повторень", + "@max_reps": { + "description": "Generated entry for translation for server strings" } } From 481ff898fa01c2ef5bf5744fbf7609549c1b63d4 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Thu, 8 Jun 2023 16:14:06 +0200 Subject: [PATCH 32/40] The field creation date in ingredients is now a datetime --- lib/models/body_weight/weight_entry.g.dart | 3 +- lib/models/exercises/base.g.dart | 23 +++--- lib/models/exercises/category.g.dart | 3 +- lib/models/exercises/image.g.dart | 3 +- lib/models/exercises/translation.g.dart | 8 ++- .../measurements/measurement_category.g.dart | 4 +- .../measurements/measurement_entry.g.dart | 3 +- lib/models/nutrition/image.g.dart | 3 +- lib/models/nutrition/ingredient.dart | 2 +- lib/models/nutrition/ingredient.g.dart | 5 +- .../nutrition/ingredient_weight_unit.g.dart | 6 +- lib/models/nutrition/log.g.dart | 9 ++- lib/models/nutrition/nutritional_plan.g.dart | 3 +- lib/models/nutrition/weight_unit.g.dart | 3 +- lib/models/user/profile.g.dart | 7 +- lib/models/workouts/repetition_unit.g.dart | 3 +- lib/models/workouts/session.g.dart | 12 +++- lib/models/workouts/weight_unit.g.dart | 3 +- lib/models/workouts/workout_plan.g.dart | 3 +- .../contribute_exercise_test.mocks.dart | 9 ++- .../nutrition/ingredient_10065_response.json | 4 +- .../nutrition/ingredient_58300_response.json | 4 +- .../nutrition/ingredient_59887_response.json | 4 +- test/gallery/gallery_form_test.mocks.dart | 12 ++-- test/gallery/gallery_screen_test.mocks.dart | 12 ++-- ...surement_categories_screen_test.mocks.dart | 12 ++-- .../measurement_provider_test.mocks.dart | 12 ++-- .../nutritional_meal_form_test.mocks.dart | 39 ++++++---- .../nutritional_plan_form_test.mocks.dart | 39 ++++++---- .../nutritional_plan_screen_test.mocks.dart | 30 +++++--- .../nutritional_plans_screen_test.mocks.dart | 30 +++++--- test/other/base_provider_test.mocks.dart | 9 ++- test/user/provider_test.mocks.dart | 12 ++-- test/weight/weight_provider_test.mocks.dart | 12 ++-- test/weight/weight_screen_test.mocks.dart | 15 ++-- test/workout/gym_mode_screen_test.mocks.dart | 36 ++++++---- ...epetition_unit_form_widget_test.mocks.dart | 39 ++++++---- .../weight_unit_form_widget_test.mocks.dart | 15 ++-- test/workout/workout_day_form_test.mocks.dart | 39 ++++++---- test/workout/workout_form_test.mocks.dart | 39 ++++++---- .../workout_plan_screen_test.mocks.dart | 12 ++-- .../workout_plans_screen_test.mocks.dart | 12 ++-- test/workout/workout_provider_test.mocks.dart | 12 ++-- test/workout/workout_set_form_test.mocks.dart | 72 ++++++++++++------- 44 files changed, 427 insertions(+), 210 deletions(-) diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index d1152d20..60ee02c9 100644 --- a/lib/models/body_weight/weight_entry.g.dart +++ b/lib/models/body_weight/weight_entry.g.dart @@ -18,7 +18,8 @@ WeightEntry _$WeightEntryFromJson(Map json) { ); } -Map _$WeightEntryToJson(WeightEntry instance) => { +Map _$WeightEntryToJson(WeightEntry instance) => + { 'id': instance.id, 'weight': numToString(instance.weight), 'date': toDate(instance.date), diff --git a/lib/models/exercises/base.g.dart b/lib/models/exercises/base.g.dart index 42f5bd9d..9e670e33 100644 --- a/lib/models/exercises/base.g.dart +++ b/lib/models/exercises/base.g.dart @@ -24,19 +24,26 @@ ExerciseBase _$ExerciseBaseFromJson(Map json) { return ExerciseBase( id: json['id'] as int?, uuid: json['uuid'] as String?, - creationDate: - json['creation_date'] == null ? null : DateTime.parse(json['creation_date'] as String), - updateDate: json['update_date'] == null ? null : DateTime.parse(json['update_date'] as String), + creationDate: json['creation_date'] == null + ? null + : DateTime.parse(json['creation_date'] as String), + updateDate: json['update_date'] == null + ? null + : DateTime.parse(json['update_date'] as String), variationId: json['variations'] as int?, ) ..categoryId = json['category'] as int - ..musclesIds = (json['muscles'] as List).map((e) => e as int).toList() - ..musclesSecondaryIds = - (json['muscles_secondary'] as List).map((e) => e as int).toList() - ..equipmentIds = (json['equipment'] as List).map((e) => e as int).toList(); + ..musclesIds = + (json['muscles'] as List).map((e) => e as int).toList() + ..musclesSecondaryIds = (json['muscles_secondary'] as List) + .map((e) => e as int) + .toList() + ..equipmentIds = + (json['equipment'] as List).map((e) => e as int).toList(); } -Map _$ExerciseBaseToJson(ExerciseBase instance) => { +Map _$ExerciseBaseToJson(ExerciseBase instance) => + { 'id': instance.id, 'uuid': instance.uuid, 'variations': instance.variationId, diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 915120d1..19383107 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -17,7 +17,8 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map json) { ); } -Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { +Map _$ExerciseCategoryToJson(ExerciseCategory instance) => + { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart index 6ef7c62e..1240dc38 100644 --- a/lib/models/exercises/image.g.dart +++ b/lib/models/exercises/image.g.dart @@ -20,7 +20,8 @@ ExerciseImage _$ExerciseImageFromJson(Map json) { ); } -Map _$ExerciseImageToJson(ExerciseImage instance) => { +Map _$ExerciseImageToJson(ExerciseImage instance) => + { 'id': instance.id, 'uuid': instance.uuid, 'exercise_base': instance.exerciseBaseId, diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart index cb5d3426..a725a476 100644 --- a/lib/models/exercises/translation.g.dart +++ b/lib/models/exercises/translation.g.dart @@ -22,15 +22,17 @@ Translation _$TranslationFromJson(Map json) { return Translation( id: json['id'] as int?, uuid: json['uuid'] as String?, - creationDate: - json['creation_date'] == null ? null : DateTime.parse(json['creation_date'] as String), + creationDate: json['creation_date'] == null + ? null + : DateTime.parse(json['creation_date'] as String), name: json['name'] as String, description: json['description'] as String, baseId: json['exercise_base'] as int?, )..languageId = json['language'] as int; } -Map _$TranslationToJson(Translation instance) => { +Map _$TranslationToJson(Translation instance) => + { 'id': instance.id, 'uuid': instance.uuid, 'language': instance.languageId, diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart index eb887b2e..ef4ebcd3 100644 --- a/lib/models/measurements/measurement_category.g.dart +++ b/lib/models/measurements/measurement_category.g.dart @@ -22,7 +22,9 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map json) { ); } -Map _$MeasurementCategoryToJson(MeasurementCategory instance) => { +Map _$MeasurementCategoryToJson( + MeasurementCategory instance) => + { 'id': instance.id, 'name': instance.name, 'unit': instance.unit, diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart index 7f6e346a..4b096960 100644 --- a/lib/models/measurements/measurement_entry.g.dart +++ b/lib/models/measurements/measurement_entry.g.dart @@ -20,7 +20,8 @@ MeasurementEntry _$MeasurementEntryFromJson(Map json) { ); } -Map _$MeasurementEntryToJson(MeasurementEntry instance) => { +Map _$MeasurementEntryToJson(MeasurementEntry instance) => + { 'id': instance.id, 'category': instance.category, 'date': toDate(instance.date), diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart index 0bd0771d..39272d16 100644 --- a/lib/models/nutrition/image.g.dart +++ b/lib/models/nutrition/image.g.dart @@ -38,7 +38,8 @@ IngredientImage _$IngredientImageFromJson(Map json) { ); } -Map _$IngredientImageToJson(IngredientImage instance) => { +Map _$IngredientImageToJson(IngredientImage instance) => + { 'id': instance.id, 'uuid': instance.uuid, 'ingredient_id': instance.ingredientId, diff --git a/lib/models/nutrition/ingredient.dart b/lib/models/nutrition/ingredient.dart index d4a3eaae..5fda5e26 100644 --- a/lib/models/nutrition/ingredient.dart +++ b/lib/models/nutrition/ingredient.dart @@ -34,7 +34,7 @@ class Ingredient { @JsonKey(required: true) final String name; - @JsonKey(required: true, name: 'creation_date', toJson: toDate) + @JsonKey(required: true, name: 'creation_date') final DateTime creationDate; /// Energy in kJ per 100g of product diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart index bb7edb7c..1da1c4db 100644 --- a/lib/models/nutrition/ingredient.g.dart +++ b/lib/models/nutrition/ingredient.g.dart @@ -43,11 +43,12 @@ Ingredient _$IngredientFromJson(Map json) { ); } -Map _$IngredientToJson(Ingredient instance) => { +Map _$IngredientToJson(Ingredient instance) => + { 'id': instance.id, 'code': instance.code, 'name': instance.name, - 'creation_date': toDate(instance.creationDate), + 'creation_date': instance.creationDate.toIso8601String(), 'energy': instance.energy, 'carbohydrates': numToString(instance.carbohydrates), 'carbohydrates_sugar': numToString(instance.carbohydratesSugar), diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart index f147a2ee..74b1f101 100644 --- a/lib/models/nutrition/ingredient_weight_unit.g.dart +++ b/lib/models/nutrition/ingredient_weight_unit.g.dart @@ -13,14 +13,16 @@ IngredientWeightUnit _$IngredientWeightUnitFromJson(Map json) { ); return IngredientWeightUnit( id: json['id'] as int, - weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map), + weightUnit: + WeightUnit.fromJson(json['weight_unit'] as Map), ingredient: Ingredient.fromJson(json['ingredient'] as Map), grams: json['grams'] as int, amount: (json['amount'] as num).toDouble(), ); } -Map _$IngredientWeightUnitToJson(IngredientWeightUnit instance) => +Map _$IngredientWeightUnitToJson( + IngredientWeightUnit instance) => { 'id': instance.id, 'weight_unit': instance.weightUnit, diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart index 61690155..39068768 100644 --- a/lib/models/nutrition/log.g.dart +++ b/lib/models/nutrition/log.g.dart @@ -9,7 +9,14 @@ part of 'log.dart'; Log _$LogFromJson(Map json) { $checkKeys( json, - requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'], + requiredKeys: const [ + 'id', + 'plan', + 'datetime', + 'ingredient', + 'weight_unit', + 'amount' + ], ); return Log( id: json['id'] as int?, diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart index 661a9f47..9b10d8a5 100644 --- a/lib/models/nutrition/nutritional_plan.g.dart +++ b/lib/models/nutrition/nutritional_plan.g.dart @@ -18,7 +18,8 @@ NutritionalPlan _$NutritionalPlanFromJson(Map json) { ); } -Map _$NutritionalPlanToJson(NutritionalPlan instance) => { +Map _$NutritionalPlanToJson(NutritionalPlan instance) => + { 'id': instance.id, 'description': instance.description, 'creation_date': toDate(instance.creationDate), diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart index 6f2b9607..74e1f0cf 100644 --- a/lib/models/nutrition/weight_unit.g.dart +++ b/lib/models/nutrition/weight_unit.g.dart @@ -17,7 +17,8 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => { +Map _$WeightUnitToJson(WeightUnit instance) => + { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart index fc05b9cf..d9147ebe 100644 --- a/lib/models/user/profile.g.dart +++ b/lib/models/user/profile.g.dart @@ -9,7 +9,12 @@ part of 'profile.dart'; Profile _$ProfileFromJson(Map json) { $checkKeys( json, - requiredKeys: const ['username', 'email_verified', 'is_trustworthy', 'email'], + requiredKeys: const [ + 'username', + 'email_verified', + 'is_trustworthy', + 'email' + ], ); return Profile( username: json['username'] as String, diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart index 33e6a815..115dc338 100644 --- a/lib/models/workouts/repetition_unit.g.dart +++ b/lib/models/workouts/repetition_unit.g.dart @@ -17,7 +17,8 @@ RepetitionUnit _$RepetitionUnitFromJson(Map json) { ); } -Map _$RepetitionUnitToJson(RepetitionUnit instance) => { +Map _$RepetitionUnitToJson(RepetitionUnit instance) => + { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart index 79f4fee4..e16affad 100644 --- a/lib/models/workouts/session.g.dart +++ b/lib/models/workouts/session.g.dart @@ -9,7 +9,14 @@ part of 'session.dart'; WorkoutSession _$WorkoutSessionFromJson(Map json) { $checkKeys( json, - requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end'], + requiredKeys: const [ + 'id', + 'workout', + 'date', + 'impression', + 'time_start', + 'time_end' + ], ); return WorkoutSession() ..id = json['id'] as int? @@ -21,7 +28,8 @@ WorkoutSession _$WorkoutSessionFromJson(Map json) { ..timeEnd = stringToTime(json['time_end'] as String?); } -Map _$WorkoutSessionToJson(WorkoutSession instance) => { +Map _$WorkoutSessionToJson(WorkoutSession instance) => + { 'id': instance.id, 'workout': instance.workoutId, 'date': toDate(instance.date), diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart index 6f2b9607..74e1f0cf 100644 --- a/lib/models/workouts/weight_unit.g.dart +++ b/lib/models/workouts/weight_unit.g.dart @@ -17,7 +17,8 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => { +Map _$WeightUnitToJson(WeightUnit instance) => + { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart index ac1d6fa9..ef156e3e 100644 --- a/lib/models/workouts/workout_plan.g.dart +++ b/lib/models/workouts/workout_plan.g.dart @@ -19,7 +19,8 @@ WorkoutPlan _$WorkoutPlanFromJson(Map json) { ); } -Map _$WorkoutPlanToJson(WorkoutPlan instance) => { +Map _$WorkoutPlanToJson(WorkoutPlan instance) => + { 'id': instance.id, 'creation_date': instance.creationDate.toIso8601String(), 'name': instance.name, diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart index ea2b2a42..b53a2b48 100644 --- a/test/exercises/contribute_exercise_test.mocks.dart +++ b/test/exercises/contribute_exercise_test.mocks.dart @@ -32,7 +32,8 @@ import 'package:wger/providers/user.dart' as _i15; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -85,7 +86,8 @@ class _FakeAlias_4 extends _i1.SmartFake implements _i6.Alias { /// A class which mocks [AddExerciseProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockAddExerciseProvider extends _i1.Mock implements _i7.AddExerciseProvider { +class MockAddExerciseProvider extends _i1.Mock + implements _i7.AddExerciseProvider { MockAddExerciseProvider() { _i1.throwOnMissingStub(this); } @@ -342,7 +344,8 @@ class MockAddExerciseProvider extends _i1.Mock implements _i7.AddExerciseProvide returnValueForMissingStub: _i13.Future.value(), ) as _i13.Future); @override - _i13.Future<_i4.Translation> addExerciseTranslation(_i4.Translation? exercise) => + _i13.Future<_i4.Translation> addExerciseTranslation( + _i4.Translation? exercise) => (super.noSuchMethod( Invocation.method( #addExerciseTranslation, diff --git a/test/fixtures/nutrition/ingredient_10065_response.json b/test/fixtures/nutrition/ingredient_10065_response.json index 920fbfa2..bba54a2c 100644 --- a/test/fixtures/nutrition/ingredient_10065_response.json +++ b/test/fixtures/nutrition/ingredient_10065_response.json @@ -2,8 +2,8 @@ "id": 10065, "code": "0043647440020", "name": "'Old Times' Orange Fine Cut Marmalade", - "creation_date": "2020-12-20", - "update_date": "2022-08-09", + "creation_date": "2020-12-20T01:00:00+01:00", + "update_date": "2022-08-09T10:23:11+02:00", "energy": 269, "protein": "0.000", "carbohydrates": "67.000", diff --git a/test/fixtures/nutrition/ingredient_58300_response.json b/test/fixtures/nutrition/ingredient_58300_response.json index 1dbe5c8d..9e84a276 100644 --- a/test/fixtures/nutrition/ingredient_58300_response.json +++ b/test/fixtures/nutrition/ingredient_58300_response.json @@ -2,8 +2,8 @@ "id": 58300, "code": "4071800000992", "name": "1688 Mehrkorn", - "creation_date": "2020-12-20", - "update_date": "2022-08-09", + "creation_date": "2020-12-20T01:00:00+02:00", + "update_date": "2022-08-09T18:55:00+02:00", "energy": 229, "protein": "7.680", "carbohydrates": "35.700", diff --git a/test/fixtures/nutrition/ingredient_59887_response.json b/test/fixtures/nutrition/ingredient_59887_response.json index 3aa08b42..a20b0940 100644 --- a/test/fixtures/nutrition/ingredient_59887_response.json +++ b/test/fixtures/nutrition/ingredient_59887_response.json @@ -2,8 +2,8 @@ "id": 59887, "code": "4311501354155", "name": "Baked Beans", - "creation_date": "2020-12-20", - "update_date": "2022-08-09", + "creation_date": "2020-12-20T23:10:54+01:00", + "update_date": "2022-08-09T13:32:41+01:00", "energy": 86, "protein": "4.400", "carbohydrates": "11.000", diff --git a/test/gallery/gallery_form_test.mocks.dart b/test/gallery/gallery_form_test.mocks.dart index fd2c1241..1ecca6ec 100644 --- a/test/gallery/gallery_form_test.mocks.dart +++ b/test/gallery/gallery_form_test.mocks.dart @@ -181,7 +181,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { returnValueForMissingStub: _i6.Future.value(), ) as _i6.Future); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -225,7 +226,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { #fetch, [uri], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -248,7 +250,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> patch( @@ -263,7 +266,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest( diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart index 628b8a40..f510a09c 100644 --- a/test/gallery/gallery_screen_test.mocks.dart +++ b/test/gallery/gallery_screen_test.mocks.dart @@ -181,7 +181,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { returnValueForMissingStub: _i6.Future.value(), ) as _i6.Future); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -225,7 +226,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { #fetch, [uri], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -248,7 +250,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> patch( @@ -263,7 +266,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: _i6.Future>.value({}), + returnValue: + _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest( diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart index 037234a4..5a591dbb 100644 --- a/test/measurements/measurement_categories_screen_test.mocks.dart +++ b/test/measurements/measurement_categories_screen_test.mocks.dart @@ -23,7 +23,8 @@ import 'package:wger/providers/measurement.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -33,7 +34,8 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi ); } -class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory { +class _FakeMeasurementCategory_1 extends _i1.SmartFake + implements _i3.MeasurementCategory { _FakeMeasurementCategory_1( Object parent, Invocation parentInvocation, @@ -46,7 +48,8 @@ class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.Measuremen /// A class which mocks [MeasurementProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider { +class MockMeasurementProvider extends _i1.Mock + implements _i4.MeasurementProvider { MockMeasurementProvider() { _i1.throwOnMissingStub(this); } @@ -119,7 +122,8 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide returnValueForMissingStub: _i5.Future.value(), ) as _i5.Future); @override - _i5.Future addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod( + _i5.Future addCategory(_i3.MeasurementCategory? category) => + (super.noSuchMethod( Invocation.method( #addCategory, [category], diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart index f09d9922..d8e08973 100644 --- a/test/measurements/measurement_provider_test.mocks.dart +++ b/test/measurements/measurement_provider_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/nutrition/nutritional_meal_form_test.mocks.dart b/test/nutrition/nutritional_meal_form_test.mocks.dart index 6c194374..78883d7a 100644 --- a/test/nutrition/nutritional_meal_form_test.mocks.dart +++ b/test/nutrition/nutritional_meal_form_test.mocks.dart @@ -25,7 +25,8 @@ import 'package:wger/providers/nutrition.dart' as _i7; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -35,7 +36,8 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi ); } -class _FakeNutritionalPlan_1 extends _i1.SmartFake implements _i3.NutritionalPlan { +class _FakeNutritionalPlan_1 extends _i1.SmartFake + implements _i3.NutritionalPlan { _FakeNutritionalPlan_1( Object parent, Invocation parentInvocation, @@ -78,7 +80,8 @@ class _FakeIngredient_4 extends _i1.SmartFake implements _i6.Ingredient { /// A class which mocks [NutritionPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansProvider { +class MockNutritionPlansProvider extends _i1.Mock + implements _i7.NutritionPlansProvider { MockNutritionPlansProvider() { _i1.throwOnMissingStub(this); } @@ -155,12 +158,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanSparse, @@ -169,12 +174,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanFull, [planId], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanFull, @@ -183,12 +190,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => + (super.noSuchMethod( Invocation.method( #addPlan, [planData], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #addPlan, @@ -286,7 +295,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i5.MealItem>); @override - _i8.Future deleteMealItem(_i5.MealItem? mealItem) => (super.noSuchMethod( + _i8.Future deleteMealItem(_i5.MealItem? mealItem) => + (super.noSuchMethod( Invocation.method( #deleteMealItem, [mealItem], @@ -295,7 +305,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod( + _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => + (super.noSuchMethod( Invocation.method( #fetchIngredient, [ingredientId], @@ -335,7 +346,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValue: _i8.Future>.value([]), ) as _i8.Future>); @override - _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod( + _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => + (super.noSuchMethod( Invocation.method( #searchIngredientWithCode, [code], @@ -386,7 +398,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => (super.noSuchMethod( + _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => + (super.noSuchMethod( Invocation.method( #fetchAndSetLogs, [plan], diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart index a5f620ed..447aa4eb 100644 --- a/test/nutrition/nutritional_plan_form_test.mocks.dart +++ b/test/nutrition/nutritional_plan_form_test.mocks.dart @@ -25,7 +25,8 @@ import 'package:wger/providers/nutrition.dart' as _i7; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -35,7 +36,8 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi ); } -class _FakeNutritionalPlan_1 extends _i1.SmartFake implements _i3.NutritionalPlan { +class _FakeNutritionalPlan_1 extends _i1.SmartFake + implements _i3.NutritionalPlan { _FakeNutritionalPlan_1( Object parent, Invocation parentInvocation, @@ -78,7 +80,8 @@ class _FakeIngredient_4 extends _i1.SmartFake implements _i6.Ingredient { /// A class which mocks [NutritionPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansProvider { +class MockNutritionPlansProvider extends _i1.Mock + implements _i7.NutritionPlansProvider { MockNutritionPlansProvider() { _i1.throwOnMissingStub(this); } @@ -155,12 +158,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanSparse, @@ -169,12 +174,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanFull, [planId], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanFull, @@ -183,12 +190,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => + (super.noSuchMethod( Invocation.method( #addPlan, [planData], ), - returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: + _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #addPlan, @@ -286,7 +295,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP )), ) as _i8.Future<_i5.MealItem>); @override - _i8.Future deleteMealItem(_i5.MealItem? mealItem) => (super.noSuchMethod( + _i8.Future deleteMealItem(_i5.MealItem? mealItem) => + (super.noSuchMethod( Invocation.method( #deleteMealItem, [mealItem], @@ -295,7 +305,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod( + _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => + (super.noSuchMethod( Invocation.method( #fetchIngredient, [ingredientId], @@ -335,7 +346,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValue: _i8.Future>.value([]), ) as _i8.Future>); @override - _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod( + _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => + (super.noSuchMethod( Invocation.method( #searchIngredientWithCode, [code], @@ -386,7 +398,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => (super.noSuchMethod( + _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => + (super.noSuchMethod( Invocation.method( #fetchAndSetLogs, [plan], diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart index ede5e175..f27e5298 100644 --- a/test/nutrition/nutritional_plan_screen_test.mocks.dart +++ b/test/nutrition/nutritional_plan_screen_test.mocks.dart @@ -65,7 +65,8 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response { ); } -class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i3.StreamedResponse { +class _FakeStreamedResponse_4 extends _i1.SmartFake + implements _i3.StreamedResponse { _FakeStreamedResponse_4( Object parent, Invocation parentInvocation, @@ -116,7 +117,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -160,7 +162,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -183,7 +186,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -198,7 +202,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( @@ -259,7 +264,8 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { returnValueForMissingStub: null, ); @override - set applicationVersion(_i6.PackageInfo? _applicationVersion) => super.noSuchMethod( + set applicationVersion(_i6.PackageInfo? _applicationVersion) => + super.noSuchMethod( Invocation.setter( #applicationVersion, _applicationVersion, @@ -378,7 +384,8 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { #serverUrl: serverUrl, }, ), - returnValue: _i5.Future>.value({}), + returnValue: _i5.Future>.value( + {}), ) as _i5.Future>); @override _i5.Future> login( @@ -395,7 +402,8 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { serverUrl, ], ), - returnValue: _i5.Future>.value({}), + returnValue: _i5.Future>.value( + {}), ) as _i5.Future>); @override _i5.Future getServerUrlFromPrefs() => (super.noSuchMethod( @@ -660,12 +668,14 @@ class MockClient extends _i1.Mock implements _i3.Client { returnValue: _i5.Future<_i9.Uint8List>.value(_i9.Uint8List(0)), ) as _i5.Future<_i9.Uint8List>); @override - _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) => (super.noSuchMethod( + _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) => + (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4( + returnValue: + _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4( this, Invocation.method( #send, diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart index d0c8b92d..5e0740dc 100644 --- a/test/nutrition/nutritional_plans_screen_test.mocks.dart +++ b/test/nutrition/nutritional_plans_screen_test.mocks.dart @@ -65,7 +65,8 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response { ); } -class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i2.StreamedResponse { +class _FakeStreamedResponse_4 extends _i1.SmartFake + implements _i2.StreamedResponse { _FakeStreamedResponse_4( Object parent, Invocation parentInvocation, @@ -108,7 +109,8 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { returnValueForMissingStub: null, ); @override - set applicationVersion(_i4.PackageInfo? _applicationVersion) => super.noSuchMethod( + set applicationVersion(_i4.PackageInfo? _applicationVersion) => + super.noSuchMethod( Invocation.setter( #applicationVersion, _applicationVersion, @@ -227,7 +229,8 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { #serverUrl: serverUrl, }, ), - returnValue: _i5.Future>.value({}), + returnValue: _i5.Future>.value( + {}), ) as _i5.Future>); @override _i5.Future> login( @@ -244,7 +247,8 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { serverUrl, ], ), - returnValue: _i5.Future>.value({}), + returnValue: _i5.Future>.value( + {}), ) as _i5.Future>); @override _i5.Future getServerUrlFromPrefs() => (super.noSuchMethod( @@ -355,7 +359,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -399,7 +404,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -422,7 +428,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -437,7 +444,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i2.Response> deleteRequest( @@ -660,12 +668,14 @@ class MockClient extends _i1.Mock implements _i2.Client { returnValue: _i5.Future<_i9.Uint8List>.value(_i9.Uint8List(0)), ) as _i5.Future<_i9.Uint8List>); @override - _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod( + _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => + (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4( + returnValue: + _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4( this, Invocation.method( #send, diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart index b4bacacd..4dca050e 100644 --- a/test/other/base_provider_test.mocks.dart +++ b/test/other/base_provider_test.mocks.dart @@ -31,7 +31,8 @@ class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response { ); } -class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse { +class _FakeStreamedResponse_1 extends _i1.SmartFake + implements _i2.StreamedResponse { _FakeStreamedResponse_1( Object parent, Invocation parentInvocation, @@ -236,12 +237,14 @@ class MockClient extends _i1.Mock implements _i2.Client { returnValue: _i3.Future<_i5.Uint8List>.value(_i5.Uint8List(0)), ) as _i3.Future<_i5.Uint8List>); @override - _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod( + _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => + (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1( + returnValue: + _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1( this, Invocation.method( #send, diff --git a/test/user/provider_test.mocks.dart b/test/user/provider_test.mocks.dart index 11199fbc..ca0652c2 100644 --- a/test/user/provider_test.mocks.dart +++ b/test/user/provider_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/weight/weight_provider_test.mocks.dart b/test/weight/weight_provider_test.mocks.dart index e60495f5..59888956 100644 --- a/test/weight/weight_provider_test.mocks.dart +++ b/test/weight/weight_provider_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart index 7de6b61d..f89f2247 100644 --- a/test/weight/weight_screen_test.mocks.dart +++ b/test/weight/weight_screen_test.mocks.dart @@ -22,7 +22,8 @@ import 'package:wger/providers/body_weight.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -45,7 +46,8 @@ class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry { /// A class which mocks [BodyWeightProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider { +class MockBodyWeightProvider extends _i1.Mock + implements _i4.BodyWeightProvider { MockBodyWeightProvider() { _i1.throwOnMissingStub(this); } @@ -99,7 +101,8 @@ class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider ), ) as _i3.WeightEntry); @override - _i3.WeightEntry? findByDate(DateTime? date) => (super.noSuchMethod(Invocation.method( + _i3.WeightEntry? findByDate(DateTime? date) => + (super.noSuchMethod(Invocation.method( #findByDate, [date], )) as _i3.WeightEntry?); @@ -109,10 +112,12 @@ class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider #fetchAndSetEntries, [], ), - returnValue: _i5.Future>.value(<_i3.WeightEntry>[]), + returnValue: + _i5.Future>.value(<_i3.WeightEntry>[]), ) as _i5.Future>); @override - _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => (super.noSuchMethod( + _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => + (super.noSuchMethod( Invocation.method( #addEntry, [entry], diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart index 81f8f7fe..0edbef4a 100644 --- a/test/workout/gym_mode_screen_test.mocks.dart +++ b/test/workout/gym_mode_screen_test.mocks.dart @@ -68,7 +68,8 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response { ); } -class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider { +class _FakeWgerBaseProvider_4 extends _i1.SmartFake + implements _i4.WgerBaseProvider { _FakeWgerBaseProvider_4( Object parent, Invocation parentInvocation, @@ -88,7 +89,8 @@ class _FakeExerciseBase_5 extends _i1.SmartFake implements _i5.ExerciseBase { ); } -class _FakeExerciseCategory_6 extends _i1.SmartFake implements _i6.ExerciseCategory { +class _FakeExerciseCategory_6 extends _i1.SmartFake + implements _i6.ExerciseCategory { _FakeExerciseCategory_6( Object parent, Invocation parentInvocation, @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -213,7 +216,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i10.Future>.value({}), + returnValue: + _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -236,7 +240,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i10.Future>.value({}), + returnValue: + _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future> patch( @@ -251,7 +256,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i10.Future>.value({}), + returnValue: + _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future<_i3.Response> deleteRequest( @@ -296,7 +302,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { ), ) as _i4.WgerBaseProvider); @override - set exerciseBases(List<_i5.ExerciseBase>? exercisesBases) => super.noSuchMethod( + set exerciseBases(List<_i5.ExerciseBase>? exercisesBases) => + super.noSuchMethod( Invocation.setter( #exerciseBases, exercisesBases, @@ -309,7 +316,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValue: <_i5.ExerciseBase>[], ) as List<_i5.ExerciseBase>); @override - set filteredExerciseBases(List<_i5.ExerciseBase>? newFilteredExercises) => super.noSuchMethod( + set filteredExerciseBases(List<_i5.ExerciseBase>? newFilteredExercises) => + super.noSuchMethod( Invocation.setter( #filteredExerciseBases, newFilteredExercises, @@ -317,7 +325,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValueForMissingStub: null, ); @override - Map> get exerciseBasesByVariation => (super.noSuchMethod( + Map> get exerciseBasesByVariation => + (super.noSuchMethod( Invocation.getter(#exerciseBasesByVariation), returnValue: >{}, ) as Map>); @@ -514,7 +523,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValueForMissingStub: _i10.Future.value(), ) as _i10.Future); @override - _i10.Future<_i5.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => (super.noSuchMethod( + _i10.Future<_i5.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetExerciseBase, [exerciseBaseId], @@ -528,7 +538,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { )), ) as _i10.Future<_i5.ExerciseBase>); @override - _i5.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => (super.noSuchMethod( + _i5.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => + (super.noSuchMethod( Invocation.method( #readExerciseBaseFromBaseInfo, [baseData], @@ -574,7 +585,8 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { #searchEnglish: searchEnglish, }, ), - returnValue: _i10.Future>.value(<_i5.ExerciseBase>[]), + returnValue: + _i10.Future>.value(<_i5.ExerciseBase>[]), ) as _i10.Future>); @override void addListener(_i12.VoidCallback? listener) => super.noSuchMethod( diff --git a/test/workout/repetition_unit_form_widget_test.mocks.dart b/test/workout/repetition_unit_form_widget_test.mocks.dart index af33fd82..8905eb0a 100644 --- a/test/workout/repetition_unit_form_widget_test.mocks.dart +++ b/test/workout/repetition_unit_form_widget_test.mocks.dart @@ -31,7 +31,8 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -51,7 +52,8 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake + implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -101,7 +103,8 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake + implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -124,7 +127,8 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock + implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -246,7 +250,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -260,7 +265,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -274,7 +280,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -288,7 +295,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -318,7 +326,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv base, ], ), - returnValue: _i12.Future>.value({}), + returnValue: + _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -428,7 +437,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => + (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -461,7 +471,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => + (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -483,12 +494,14 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => + (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: + _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/weight_unit_form_widget_test.mocks.dart b/test/workout/weight_unit_form_widget_test.mocks.dart index f3f638a2..a59c8efc 100644 --- a/test/workout/weight_unit_form_widget_test.mocks.dart +++ b/test/workout/weight_unit_form_widget_test.mocks.dart @@ -22,7 +22,8 @@ import 'package:wger/providers/body_weight.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -45,7 +46,8 @@ class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry { /// A class which mocks [BodyWeightProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider { +class MockBodyWeightProvider extends _i1.Mock + implements _i4.BodyWeightProvider { MockBodyWeightProvider() { _i1.throwOnMissingStub(this); } @@ -99,7 +101,8 @@ class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider ), ) as _i3.WeightEntry); @override - _i3.WeightEntry? findByDate(DateTime? date) => (super.noSuchMethod(Invocation.method( + _i3.WeightEntry? findByDate(DateTime? date) => + (super.noSuchMethod(Invocation.method( #findByDate, [date], )) as _i3.WeightEntry?); @@ -109,10 +112,12 @@ class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider #fetchAndSetEntries, [], ), - returnValue: _i5.Future>.value(<_i3.WeightEntry>[]), + returnValue: + _i5.Future>.value(<_i3.WeightEntry>[]), ) as _i5.Future>); @override - _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => (super.noSuchMethod( + _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => + (super.noSuchMethod( Invocation.method( #addEntry, [entry], diff --git a/test/workout/workout_day_form_test.mocks.dart b/test/workout/workout_day_form_test.mocks.dart index 9a50fe29..5bb1e2c0 100644 --- a/test/workout/workout_day_form_test.mocks.dart +++ b/test/workout/workout_day_form_test.mocks.dart @@ -31,7 +31,8 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -51,7 +52,8 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake + implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -101,7 +103,8 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake + implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -124,7 +127,8 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock + implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -246,7 +250,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -260,7 +265,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -274,7 +280,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -288,7 +295,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -318,7 +326,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv base, ], ), - returnValue: _i12.Future>.value({}), + returnValue: + _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -428,7 +437,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => + (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -461,7 +471,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => + (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -483,12 +494,14 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => + (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: + _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart index 6eda3025..b4115472 100644 --- a/test/workout/workout_form_test.mocks.dart +++ b/test/workout/workout_form_test.mocks.dart @@ -31,7 +31,8 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -51,7 +52,8 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake + implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -101,7 +103,8 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake + implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -124,7 +127,8 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock + implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -246,7 +250,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -260,7 +265,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -274,7 +280,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -288,7 +295,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -318,7 +326,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv base, ], ), - returnValue: _i12.Future>.value({}), + returnValue: + _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -428,7 +437,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => + (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -461,7 +471,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => + (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -483,12 +494,14 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProv returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => + (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: + _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/workout_plan_screen_test.mocks.dart b/test/workout/workout_plan_screen_test.mocks.dart index 3ddba809..e1374c17 100644 --- a/test/workout/workout_plan_screen_test.mocks.dart +++ b/test/workout/workout_plan_screen_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_plans_screen_test.mocks.dart b/test/workout/workout_plans_screen_test.mocks.dart index ef435464..c4329c45 100644 --- a/test/workout/workout_plans_screen_test.mocks.dart +++ b/test/workout/workout_plans_screen_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_provider_test.mocks.dart b/test/workout/workout_provider_test.mocks.dart index a42145cb..d32671f3 100644 --- a/test/workout/workout_provider_test.mocks.dart +++ b/test/workout/workout_provider_test.mocks.dart @@ -102,7 +102,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -146,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -169,7 +171,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -184,7 +187,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: _i5.Future>.value({}), + returnValue: + _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart index 3eb80a05..3ab5b92f 100644 --- a/test/workout/workout_set_form_test.mocks.dart +++ b/test/workout/workout_set_form_test.mocks.dart @@ -38,7 +38,8 @@ import 'package:wger/providers/workout_plans.dart' as _i21; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake + implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -58,7 +59,8 @@ class _FakeExerciseBase_1 extends _i1.SmartFake implements _i3.ExerciseBase { ); } -class _FakeExerciseCategory_2 extends _i1.SmartFake implements _i4.ExerciseCategory { +class _FakeExerciseCategory_2 extends _i1.SmartFake + implements _i4.ExerciseCategory { _FakeExerciseCategory_2( Object parent, Invocation parentInvocation, @@ -148,7 +150,8 @@ class _FakeWeightUnit_10 extends _i1.SmartFake implements _i10.WeightUnit { ); } -class _FakeRepetitionUnit_11 extends _i1.SmartFake implements _i11.RepetitionUnit { +class _FakeRepetitionUnit_11 extends _i1.SmartFake + implements _i11.RepetitionUnit { _FakeRepetitionUnit_11( Object parent, Invocation parentInvocation, @@ -198,7 +201,8 @@ class _FakeSetting_15 extends _i1.SmartFake implements _i15.Setting { ); } -class _FakeWorkoutSession_16 extends _i1.SmartFake implements _i16.WorkoutSession { +class _FakeWorkoutSession_16 extends _i1.SmartFake + implements _i16.WorkoutSession { _FakeWorkoutSession_16( Object parent, Invocation parentInvocation, @@ -235,7 +239,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { ), ) as _i2.WgerBaseProvider); @override - set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) => super.noSuchMethod( + set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) => + super.noSuchMethod( Invocation.setter( #exerciseBases, exercisesBases, @@ -248,7 +253,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValue: <_i3.ExerciseBase>[], ) as List<_i3.ExerciseBase>); @override - set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) => super.noSuchMethod( + set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) => + super.noSuchMethod( Invocation.setter( #filteredExerciseBases, newFilteredExercises, @@ -256,7 +262,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValueForMissingStub: null, ); @override - Map> get exerciseBasesByVariation => (super.noSuchMethod( + Map> get exerciseBasesByVariation => + (super.noSuchMethod( Invocation.getter(#exerciseBasesByVariation), returnValue: >{}, ) as Map>); @@ -453,7 +460,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => (super.noSuchMethod( + _i19.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetExerciseBase, [exerciseBaseId], @@ -467,7 +475,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { )), ) as _i19.Future<_i3.ExerciseBase>); @override - _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => (super.noSuchMethod( + _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => + (super.noSuchMethod( Invocation.method( #readExerciseBaseFromBaseInfo, [baseData], @@ -513,7 +522,8 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { #searchEnglish: searchEnglish, }, ), - returnValue: _i19.Future>.value(<_i3.ExerciseBase>[]), + returnValue: + _i19.Future>.value(<_i3.ExerciseBase>[]), ) as _i19.Future>); @override void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( @@ -590,7 +600,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => + (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -634,7 +645,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { #fetch, [uri], ), - returnValue: _i19.Future>.value({}), + returnValue: + _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -657,7 +669,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { uri, ], ), - returnValue: _i19.Future>.value({}), + returnValue: + _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future> patch( @@ -672,7 +685,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { uri, ], ), - returnValue: _i19.Future>.value({}), + returnValue: + _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future<_i9.Response> deleteRequest( @@ -703,7 +717,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock + implements _i21.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -825,7 +840,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i12.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -839,7 +855,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future<_i12.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => + (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -853,7 +870,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future<_i12.WorkoutPlan> addWorkout(_i12.WorkoutPlan? workout) => (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> addWorkout(_i12.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -867,7 +885,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future editWorkout(_i12.WorkoutPlan? workout) => (super.noSuchMethod( + _i19.Future editWorkout(_i12.WorkoutPlan? workout) => + (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -897,7 +916,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv base, ], ), - returnValue: _i19.Future>.value({}), + returnValue: + _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -1007,7 +1027,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv returnValue: _i19.Future>.value(<_i14.Set>[]), ) as _i19.Future>); @override - _i19.Future fetchComputedSettings(_i14.Set? workoutSet) => (super.noSuchMethod( + _i19.Future fetchComputedSettings(_i14.Set? workoutSet) => + (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -1040,7 +1061,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i15.Setting> addSetting(_i15.Setting? workoutSetting) => (super.noSuchMethod( + _i19.Future<_i15.Setting> addSetting(_i15.Setting? workoutSetting) => + (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -1062,12 +1084,14 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProv returnValue: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i16.WorkoutSession> addSession(_i16.WorkoutSession? session) => (super.noSuchMethod( + _i19.Future<_i16.WorkoutSession> addSession(_i16.WorkoutSession? session) => + (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: _i19.Future<_i16.WorkoutSession>.value(_FakeWorkoutSession_16( + returnValue: + _i19.Future<_i16.WorkoutSession>.value(_FakeWorkoutSession_16( this, Invocation.method( #addSession, From da038c4a4b86ea623a0a57e411f95ce4cd53457e Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Thu, 8 Jun 2023 16:14:18 +0200 Subject: [PATCH 33/40] Bump min sdk version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 64570189..e68fc604 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.5.4+31 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.17.0 <3.0.0' dependencies: flutter: From 3003409c5756acc5d85640f3b8790d914267921e Mon Sep 17 00:00:00 2001 From: Github-actions Date: Thu, 8 Jun 2023 14:15:55 +0000 Subject: [PATCH 34/40] Automatic linting --- lib/models/body_weight/weight_entry.g.dart | 3 +- lib/models/exercises/base.g.dart | 23 +++--- lib/models/exercises/category.g.dart | 3 +- lib/models/exercises/image.g.dart | 3 +- lib/models/exercises/translation.g.dart | 8 +-- .../measurements/measurement_category.g.dart | 4 +- .../measurements/measurement_entry.g.dart | 3 +- lib/models/nutrition/image.g.dart | 3 +- lib/models/nutrition/ingredient.g.dart | 3 +- .../nutrition/ingredient_weight_unit.g.dart | 6 +- lib/models/nutrition/log.g.dart | 9 +-- lib/models/nutrition/nutritional_plan.g.dart | 3 +- lib/models/nutrition/weight_unit.g.dart | 3 +- lib/models/user/profile.g.dart | 7 +- lib/models/workouts/repetition_unit.g.dart | 3 +- lib/models/workouts/session.g.dart | 12 +--- lib/models/workouts/weight_unit.g.dart | 3 +- lib/models/workouts/workout_plan.g.dart | 3 +- .../contribute_exercise_test.mocks.dart | 9 +-- test/gallery/gallery_form_test.mocks.dart | 12 ++-- test/gallery/gallery_screen_test.mocks.dart | 12 ++-- ...surement_categories_screen_test.mocks.dart | 12 ++-- .../measurement_provider_test.mocks.dart | 12 ++-- .../nutritional_meal_form_test.mocks.dart | 39 ++++------ .../nutritional_plan_form_test.mocks.dart | 39 ++++------ .../nutritional_plan_screen_test.mocks.dart | 30 +++----- .../nutritional_plans_screen_test.mocks.dart | 30 +++----- test/other/base_provider_test.mocks.dart | 9 +-- test/user/provider_test.mocks.dart | 12 ++-- test/weight/weight_provider_test.mocks.dart | 12 ++-- test/weight/weight_screen_test.mocks.dart | 15 ++-- test/workout/gym_mode_screen_test.mocks.dart | 36 ++++------ ...epetition_unit_form_widget_test.mocks.dart | 39 ++++------ .../weight_unit_form_widget_test.mocks.dart | 15 ++-- test/workout/workout_day_form_test.mocks.dart | 39 ++++------ test/workout/workout_form_test.mocks.dart | 39 ++++------ .../workout_plan_screen_test.mocks.dart | 12 ++-- .../workout_plans_screen_test.mocks.dart | 12 ++-- test/workout/workout_provider_test.mocks.dart | 12 ++-- test/workout/workout_set_form_test.mocks.dart | 72 +++++++------------ 40 files changed, 202 insertions(+), 419 deletions(-) diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index 60ee02c9..d1152d20 100644 --- a/lib/models/body_weight/weight_entry.g.dart +++ b/lib/models/body_weight/weight_entry.g.dart @@ -18,8 +18,7 @@ WeightEntry _$WeightEntryFromJson(Map json) { ); } -Map _$WeightEntryToJson(WeightEntry instance) => - { +Map _$WeightEntryToJson(WeightEntry instance) => { 'id': instance.id, 'weight': numToString(instance.weight), 'date': toDate(instance.date), diff --git a/lib/models/exercises/base.g.dart b/lib/models/exercises/base.g.dart index 9e670e33..42f5bd9d 100644 --- a/lib/models/exercises/base.g.dart +++ b/lib/models/exercises/base.g.dart @@ -24,26 +24,19 @@ ExerciseBase _$ExerciseBaseFromJson(Map json) { return ExerciseBase( id: json['id'] as int?, uuid: json['uuid'] as String?, - creationDate: json['creation_date'] == null - ? null - : DateTime.parse(json['creation_date'] as String), - updateDate: json['update_date'] == null - ? null - : DateTime.parse(json['update_date'] as String), + creationDate: + json['creation_date'] == null ? null : DateTime.parse(json['creation_date'] as String), + updateDate: json['update_date'] == null ? null : DateTime.parse(json['update_date'] as String), variationId: json['variations'] as int?, ) ..categoryId = json['category'] as int - ..musclesIds = - (json['muscles'] as List).map((e) => e as int).toList() - ..musclesSecondaryIds = (json['muscles_secondary'] as List) - .map((e) => e as int) - .toList() - ..equipmentIds = - (json['equipment'] as List).map((e) => e as int).toList(); + ..musclesIds = (json['muscles'] as List).map((e) => e as int).toList() + ..musclesSecondaryIds = + (json['muscles_secondary'] as List).map((e) => e as int).toList() + ..equipmentIds = (json['equipment'] as List).map((e) => e as int).toList(); } -Map _$ExerciseBaseToJson(ExerciseBase instance) => - { +Map _$ExerciseBaseToJson(ExerciseBase instance) => { 'id': instance.id, 'uuid': instance.uuid, 'variations': instance.variationId, diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 19383107..915120d1 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -17,8 +17,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map json) { ); } -Map _$ExerciseCategoryToJson(ExerciseCategory instance) => - { +Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart index 1240dc38..6ef7c62e 100644 --- a/lib/models/exercises/image.g.dart +++ b/lib/models/exercises/image.g.dart @@ -20,8 +20,7 @@ ExerciseImage _$ExerciseImageFromJson(Map json) { ); } -Map _$ExerciseImageToJson(ExerciseImage instance) => - { +Map _$ExerciseImageToJson(ExerciseImage instance) => { 'id': instance.id, 'uuid': instance.uuid, 'exercise_base': instance.exerciseBaseId, diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart index a725a476..cb5d3426 100644 --- a/lib/models/exercises/translation.g.dart +++ b/lib/models/exercises/translation.g.dart @@ -22,17 +22,15 @@ Translation _$TranslationFromJson(Map json) { return Translation( id: json['id'] as int?, uuid: json['uuid'] as String?, - creationDate: json['creation_date'] == null - ? null - : DateTime.parse(json['creation_date'] as String), + creationDate: + json['creation_date'] == null ? null : DateTime.parse(json['creation_date'] as String), name: json['name'] as String, description: json['description'] as String, baseId: json['exercise_base'] as int?, )..languageId = json['language'] as int; } -Map _$TranslationToJson(Translation instance) => - { +Map _$TranslationToJson(Translation instance) => { 'id': instance.id, 'uuid': instance.uuid, 'language': instance.languageId, diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart index ef4ebcd3..eb887b2e 100644 --- a/lib/models/measurements/measurement_category.g.dart +++ b/lib/models/measurements/measurement_category.g.dart @@ -22,9 +22,7 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map json) { ); } -Map _$MeasurementCategoryToJson( - MeasurementCategory instance) => - { +Map _$MeasurementCategoryToJson(MeasurementCategory instance) => { 'id': instance.id, 'name': instance.name, 'unit': instance.unit, diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart index 4b096960..7f6e346a 100644 --- a/lib/models/measurements/measurement_entry.g.dart +++ b/lib/models/measurements/measurement_entry.g.dart @@ -20,8 +20,7 @@ MeasurementEntry _$MeasurementEntryFromJson(Map json) { ); } -Map _$MeasurementEntryToJson(MeasurementEntry instance) => - { +Map _$MeasurementEntryToJson(MeasurementEntry instance) => { 'id': instance.id, 'category': instance.category, 'date': toDate(instance.date), diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart index 39272d16..0bd0771d 100644 --- a/lib/models/nutrition/image.g.dart +++ b/lib/models/nutrition/image.g.dart @@ -38,8 +38,7 @@ IngredientImage _$IngredientImageFromJson(Map json) { ); } -Map _$IngredientImageToJson(IngredientImage instance) => - { +Map _$IngredientImageToJson(IngredientImage instance) => { 'id': instance.id, 'uuid': instance.uuid, 'ingredient_id': instance.ingredientId, diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart index 1da1c4db..afb9c324 100644 --- a/lib/models/nutrition/ingredient.g.dart +++ b/lib/models/nutrition/ingredient.g.dart @@ -43,8 +43,7 @@ Ingredient _$IngredientFromJson(Map json) { ); } -Map _$IngredientToJson(Ingredient instance) => - { +Map _$IngredientToJson(Ingredient instance) => { 'id': instance.id, 'code': instance.code, 'name': instance.name, diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart index 74b1f101..f147a2ee 100644 --- a/lib/models/nutrition/ingredient_weight_unit.g.dart +++ b/lib/models/nutrition/ingredient_weight_unit.g.dart @@ -13,16 +13,14 @@ IngredientWeightUnit _$IngredientWeightUnitFromJson(Map json) { ); return IngredientWeightUnit( id: json['id'] as int, - weightUnit: - WeightUnit.fromJson(json['weight_unit'] as Map), + weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map), ingredient: Ingredient.fromJson(json['ingredient'] as Map), grams: json['grams'] as int, amount: (json['amount'] as num).toDouble(), ); } -Map _$IngredientWeightUnitToJson( - IngredientWeightUnit instance) => +Map _$IngredientWeightUnitToJson(IngredientWeightUnit instance) => { 'id': instance.id, 'weight_unit': instance.weightUnit, diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart index 39068768..61690155 100644 --- a/lib/models/nutrition/log.g.dart +++ b/lib/models/nutrition/log.g.dart @@ -9,14 +9,7 @@ part of 'log.dart'; Log _$LogFromJson(Map json) { $checkKeys( json, - requiredKeys: const [ - 'id', - 'plan', - 'datetime', - 'ingredient', - 'weight_unit', - 'amount' - ], + requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'], ); return Log( id: json['id'] as int?, diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart index 9b10d8a5..661a9f47 100644 --- a/lib/models/nutrition/nutritional_plan.g.dart +++ b/lib/models/nutrition/nutritional_plan.g.dart @@ -18,8 +18,7 @@ NutritionalPlan _$NutritionalPlanFromJson(Map json) { ); } -Map _$NutritionalPlanToJson(NutritionalPlan instance) => - { +Map _$NutritionalPlanToJson(NutritionalPlan instance) => { 'id': instance.id, 'description': instance.description, 'creation_date': toDate(instance.creationDate), diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart index 74e1f0cf..6f2b9607 100644 --- a/lib/models/nutrition/weight_unit.g.dart +++ b/lib/models/nutrition/weight_unit.g.dart @@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => - { +Map _$WeightUnitToJson(WeightUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart index d9147ebe..fc05b9cf 100644 --- a/lib/models/user/profile.g.dart +++ b/lib/models/user/profile.g.dart @@ -9,12 +9,7 @@ part of 'profile.dart'; Profile _$ProfileFromJson(Map json) { $checkKeys( json, - requiredKeys: const [ - 'username', - 'email_verified', - 'is_trustworthy', - 'email' - ], + requiredKeys: const ['username', 'email_verified', 'is_trustworthy', 'email'], ); return Profile( username: json['username'] as String, diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart index 115dc338..33e6a815 100644 --- a/lib/models/workouts/repetition_unit.g.dart +++ b/lib/models/workouts/repetition_unit.g.dart @@ -17,8 +17,7 @@ RepetitionUnit _$RepetitionUnitFromJson(Map json) { ); } -Map _$RepetitionUnitToJson(RepetitionUnit instance) => - { +Map _$RepetitionUnitToJson(RepetitionUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart index e16affad..79f4fee4 100644 --- a/lib/models/workouts/session.g.dart +++ b/lib/models/workouts/session.g.dart @@ -9,14 +9,7 @@ part of 'session.dart'; WorkoutSession _$WorkoutSessionFromJson(Map json) { $checkKeys( json, - requiredKeys: const [ - 'id', - 'workout', - 'date', - 'impression', - 'time_start', - 'time_end' - ], + requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end'], ); return WorkoutSession() ..id = json['id'] as int? @@ -28,8 +21,7 @@ WorkoutSession _$WorkoutSessionFromJson(Map json) { ..timeEnd = stringToTime(json['time_end'] as String?); } -Map _$WorkoutSessionToJson(WorkoutSession instance) => - { +Map _$WorkoutSessionToJson(WorkoutSession instance) => { 'id': instance.id, 'workout': instance.workoutId, 'date': toDate(instance.date), diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart index 74e1f0cf..6f2b9607 100644 --- a/lib/models/workouts/weight_unit.g.dart +++ b/lib/models/workouts/weight_unit.g.dart @@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => - { +Map _$WeightUnitToJson(WeightUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart index ef156e3e..ac1d6fa9 100644 --- a/lib/models/workouts/workout_plan.g.dart +++ b/lib/models/workouts/workout_plan.g.dart @@ -19,8 +19,7 @@ WorkoutPlan _$WorkoutPlanFromJson(Map json) { ); } -Map _$WorkoutPlanToJson(WorkoutPlan instance) => - { +Map _$WorkoutPlanToJson(WorkoutPlan instance) => { 'id': instance.id, 'creation_date': instance.creationDate.toIso8601String(), 'name': instance.name, diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart index b53a2b48..ea2b2a42 100644 --- a/test/exercises/contribute_exercise_test.mocks.dart +++ b/test/exercises/contribute_exercise_test.mocks.dart @@ -32,8 +32,7 @@ import 'package:wger/providers/user.dart' as _i15; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -86,8 +85,7 @@ class _FakeAlias_4 extends _i1.SmartFake implements _i6.Alias { /// A class which mocks [AddExerciseProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockAddExerciseProvider extends _i1.Mock - implements _i7.AddExerciseProvider { +class MockAddExerciseProvider extends _i1.Mock implements _i7.AddExerciseProvider { MockAddExerciseProvider() { _i1.throwOnMissingStub(this); } @@ -344,8 +342,7 @@ class MockAddExerciseProvider extends _i1.Mock returnValueForMissingStub: _i13.Future.value(), ) as _i13.Future); @override - _i13.Future<_i4.Translation> addExerciseTranslation( - _i4.Translation? exercise) => + _i13.Future<_i4.Translation> addExerciseTranslation(_i4.Translation? exercise) => (super.noSuchMethod( Invocation.method( #addExerciseTranslation, diff --git a/test/gallery/gallery_form_test.mocks.dart b/test/gallery/gallery_form_test.mocks.dart index 1ecca6ec..fd2c1241 100644 --- a/test/gallery/gallery_form_test.mocks.dart +++ b/test/gallery/gallery_form_test.mocks.dart @@ -181,8 +181,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { returnValueForMissingStub: _i6.Future.value(), ) as _i6.Future); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -226,8 +225,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { #fetch, [uri], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -250,8 +248,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> patch( @@ -266,8 +263,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest( diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart index f510a09c..628b8a40 100644 --- a/test/gallery/gallery_screen_test.mocks.dart +++ b/test/gallery/gallery_screen_test.mocks.dart @@ -181,8 +181,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { returnValueForMissingStub: _i6.Future.value(), ) as _i6.Future); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -226,8 +225,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { #fetch, [uri], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -250,8 +248,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future> patch( @@ -266,8 +263,7 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { uri, ], ), - returnValue: - _i6.Future>.value({}), + returnValue: _i6.Future>.value({}), ) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest( diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart index 5a591dbb..037234a4 100644 --- a/test/measurements/measurement_categories_screen_test.mocks.dart +++ b/test/measurements/measurement_categories_screen_test.mocks.dart @@ -23,8 +23,7 @@ import 'package:wger/providers/measurement.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -34,8 +33,7 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake ); } -class _FakeMeasurementCategory_1 extends _i1.SmartFake - implements _i3.MeasurementCategory { +class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory { _FakeMeasurementCategory_1( Object parent, Invocation parentInvocation, @@ -48,8 +46,7 @@ class _FakeMeasurementCategory_1 extends _i1.SmartFake /// A class which mocks [MeasurementProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockMeasurementProvider extends _i1.Mock - implements _i4.MeasurementProvider { +class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider { MockMeasurementProvider() { _i1.throwOnMissingStub(this); } @@ -122,8 +119,7 @@ class MockMeasurementProvider extends _i1.Mock returnValueForMissingStub: _i5.Future.value(), ) as _i5.Future); @override - _i5.Future addCategory(_i3.MeasurementCategory? category) => - (super.noSuchMethod( + _i5.Future addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod( Invocation.method( #addCategory, [category], diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart index d8e08973..f09d9922 100644 --- a/test/measurements/measurement_provider_test.mocks.dart +++ b/test/measurements/measurement_provider_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/nutrition/nutritional_meal_form_test.mocks.dart b/test/nutrition/nutritional_meal_form_test.mocks.dart index 78883d7a..6c194374 100644 --- a/test/nutrition/nutritional_meal_form_test.mocks.dart +++ b/test/nutrition/nutritional_meal_form_test.mocks.dart @@ -25,8 +25,7 @@ import 'package:wger/providers/nutrition.dart' as _i7; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -36,8 +35,7 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake ); } -class _FakeNutritionalPlan_1 extends _i1.SmartFake - implements _i3.NutritionalPlan { +class _FakeNutritionalPlan_1 extends _i1.SmartFake implements _i3.NutritionalPlan { _FakeNutritionalPlan_1( Object parent, Invocation parentInvocation, @@ -80,8 +78,7 @@ class _FakeIngredient_4 extends _i1.SmartFake implements _i6.Ingredient { /// A class which mocks [NutritionPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockNutritionPlansProvider extends _i1.Mock - implements _i7.NutritionPlansProvider { +class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansProvider { MockNutritionPlansProvider() { _i1.throwOnMissingStub(this); } @@ -158,14 +155,12 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanSparse, @@ -174,14 +169,12 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanFull, [planId], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanFull, @@ -190,14 +183,12 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => (super.noSuchMethod( Invocation.method( #addPlan, [planData], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #addPlan, @@ -295,8 +286,7 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i5.MealItem>); @override - _i8.Future deleteMealItem(_i5.MealItem? mealItem) => - (super.noSuchMethod( + _i8.Future deleteMealItem(_i5.MealItem? mealItem) => (super.noSuchMethod( Invocation.method( #deleteMealItem, [mealItem], @@ -305,8 +295,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => - (super.noSuchMethod( + _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod( Invocation.method( #fetchIngredient, [ingredientId], @@ -346,8 +335,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValue: _i8.Future>.value([]), ) as _i8.Future>); @override - _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => - (super.noSuchMethod( + _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod( Invocation.method( #searchIngredientWithCode, [code], @@ -398,8 +386,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => - (super.noSuchMethod( + _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => (super.noSuchMethod( Invocation.method( #fetchAndSetLogs, [plan], diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart index 447aa4eb..a5f620ed 100644 --- a/test/nutrition/nutritional_plan_form_test.mocks.dart +++ b/test/nutrition/nutritional_plan_form_test.mocks.dart @@ -25,8 +25,7 @@ import 'package:wger/providers/nutrition.dart' as _i7; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -36,8 +35,7 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake ); } -class _FakeNutritionalPlan_1 extends _i1.SmartFake - implements _i3.NutritionalPlan { +class _FakeNutritionalPlan_1 extends _i1.SmartFake implements _i3.NutritionalPlan { _FakeNutritionalPlan_1( Object parent, Invocation parentInvocation, @@ -80,8 +78,7 @@ class _FakeIngredient_4 extends _i1.SmartFake implements _i6.Ingredient { /// A class which mocks [NutritionPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockNutritionPlansProvider extends _i1.Mock - implements _i7.NutritionPlansProvider { +class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansProvider { MockNutritionPlansProvider() { _i1.throwOnMissingStub(this); } @@ -158,14 +155,12 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanSparse, @@ -174,14 +169,12 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanFull, [planId], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #fetchAndSetPlanFull, @@ -190,14 +183,12 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i3.NutritionalPlan>); @override - _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => - (super.noSuchMethod( + _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => (super.noSuchMethod( Invocation.method( #addPlan, [planData], ), - returnValue: - _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( + returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1( this, Invocation.method( #addPlan, @@ -295,8 +286,7 @@ class MockNutritionPlansProvider extends _i1.Mock )), ) as _i8.Future<_i5.MealItem>); @override - _i8.Future deleteMealItem(_i5.MealItem? mealItem) => - (super.noSuchMethod( + _i8.Future deleteMealItem(_i5.MealItem? mealItem) => (super.noSuchMethod( Invocation.method( #deleteMealItem, [mealItem], @@ -305,8 +295,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => - (super.noSuchMethod( + _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod( Invocation.method( #fetchIngredient, [ingredientId], @@ -346,8 +335,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValue: _i8.Future>.value([]), ) as _i8.Future>); @override - _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => - (super.noSuchMethod( + _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod( Invocation.method( #searchIngredientWithCode, [code], @@ -398,8 +386,7 @@ class MockNutritionPlansProvider extends _i1.Mock returnValueForMissingStub: _i8.Future.value(), ) as _i8.Future); @override - _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => - (super.noSuchMethod( + _i8.Future fetchAndSetLogs(_i3.NutritionalPlan? plan) => (super.noSuchMethod( Invocation.method( #fetchAndSetLogs, [plan], diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart index f27e5298..ede5e175 100644 --- a/test/nutrition/nutritional_plan_screen_test.mocks.dart +++ b/test/nutrition/nutritional_plan_screen_test.mocks.dart @@ -65,8 +65,7 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response { ); } -class _FakeStreamedResponse_4 extends _i1.SmartFake - implements _i3.StreamedResponse { +class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i3.StreamedResponse { _FakeStreamedResponse_4( Object parent, Invocation parentInvocation, @@ -117,8 +116,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -162,8 +160,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -186,8 +183,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -202,8 +198,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( @@ -264,8 +259,7 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { returnValueForMissingStub: null, ); @override - set applicationVersion(_i6.PackageInfo? _applicationVersion) => - super.noSuchMethod( + set applicationVersion(_i6.PackageInfo? _applicationVersion) => super.noSuchMethod( Invocation.setter( #applicationVersion, _applicationVersion, @@ -384,8 +378,7 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { #serverUrl: serverUrl, }, ), - returnValue: _i5.Future>.value( - {}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> login( @@ -402,8 +395,7 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider { serverUrl, ], ), - returnValue: _i5.Future>.value( - {}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future getServerUrlFromPrefs() => (super.noSuchMethod( @@ -668,14 +660,12 @@ class MockClient extends _i1.Mock implements _i3.Client { returnValue: _i5.Future<_i9.Uint8List>.value(_i9.Uint8List(0)), ) as _i5.Future<_i9.Uint8List>); @override - _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) => - (super.noSuchMethod( + _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) => (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: - _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4( + returnValue: _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4( this, Invocation.method( #send, diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart index 5e0740dc..d0c8b92d 100644 --- a/test/nutrition/nutritional_plans_screen_test.mocks.dart +++ b/test/nutrition/nutritional_plans_screen_test.mocks.dart @@ -65,8 +65,7 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response { ); } -class _FakeStreamedResponse_4 extends _i1.SmartFake - implements _i2.StreamedResponse { +class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i2.StreamedResponse { _FakeStreamedResponse_4( Object parent, Invocation parentInvocation, @@ -109,8 +108,7 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { returnValueForMissingStub: null, ); @override - set applicationVersion(_i4.PackageInfo? _applicationVersion) => - super.noSuchMethod( + set applicationVersion(_i4.PackageInfo? _applicationVersion) => super.noSuchMethod( Invocation.setter( #applicationVersion, _applicationVersion, @@ -229,8 +227,7 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { #serverUrl: serverUrl, }, ), - returnValue: _i5.Future>.value( - {}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> login( @@ -247,8 +244,7 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider { serverUrl, ], ), - returnValue: _i5.Future>.value( - {}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future getServerUrlFromPrefs() => (super.noSuchMethod( @@ -359,8 +355,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -404,8 +399,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -428,8 +422,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -444,8 +437,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i7.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i2.Response> deleteRequest( @@ -668,14 +660,12 @@ class MockClient extends _i1.Mock implements _i2.Client { returnValue: _i5.Future<_i9.Uint8List>.value(_i9.Uint8List(0)), ) as _i5.Future<_i9.Uint8List>); @override - _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => - (super.noSuchMethod( + _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: - _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4( + returnValue: _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4( this, Invocation.method( #send, diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart index 4dca050e..b4bacacd 100644 --- a/test/other/base_provider_test.mocks.dart +++ b/test/other/base_provider_test.mocks.dart @@ -31,8 +31,7 @@ class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response { ); } -class _FakeStreamedResponse_1 extends _i1.SmartFake - implements _i2.StreamedResponse { +class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse { _FakeStreamedResponse_1( Object parent, Invocation parentInvocation, @@ -237,14 +236,12 @@ class MockClient extends _i1.Mock implements _i2.Client { returnValue: _i3.Future<_i5.Uint8List>.value(_i5.Uint8List(0)), ) as _i3.Future<_i5.Uint8List>); @override - _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => - (super.noSuchMethod( + _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod( Invocation.method( #send, [request], ), - returnValue: - _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1( + returnValue: _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1( this, Invocation.method( #send, diff --git a/test/user/provider_test.mocks.dart b/test/user/provider_test.mocks.dart index ca0652c2..11199fbc 100644 --- a/test/user/provider_test.mocks.dart +++ b/test/user/provider_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/weight/weight_provider_test.mocks.dart b/test/weight/weight_provider_test.mocks.dart index 59888956..e60495f5 100644 --- a/test/weight/weight_provider_test.mocks.dart +++ b/test/weight/weight_provider_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart index f89f2247..7de6b61d 100644 --- a/test/weight/weight_screen_test.mocks.dart +++ b/test/weight/weight_screen_test.mocks.dart @@ -22,8 +22,7 @@ import 'package:wger/providers/body_weight.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -46,8 +45,7 @@ class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry { /// A class which mocks [BodyWeightProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockBodyWeightProvider extends _i1.Mock - implements _i4.BodyWeightProvider { +class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider { MockBodyWeightProvider() { _i1.throwOnMissingStub(this); } @@ -101,8 +99,7 @@ class MockBodyWeightProvider extends _i1.Mock ), ) as _i3.WeightEntry); @override - _i3.WeightEntry? findByDate(DateTime? date) => - (super.noSuchMethod(Invocation.method( + _i3.WeightEntry? findByDate(DateTime? date) => (super.noSuchMethod(Invocation.method( #findByDate, [date], )) as _i3.WeightEntry?); @@ -112,12 +109,10 @@ class MockBodyWeightProvider extends _i1.Mock #fetchAndSetEntries, [], ), - returnValue: - _i5.Future>.value(<_i3.WeightEntry>[]), + returnValue: _i5.Future>.value(<_i3.WeightEntry>[]), ) as _i5.Future>); @override - _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => - (super.noSuchMethod( + _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => (super.noSuchMethod( Invocation.method( #addEntry, [entry], diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart index 0edbef4a..81f8f7fe 100644 --- a/test/workout/gym_mode_screen_test.mocks.dart +++ b/test/workout/gym_mode_screen_test.mocks.dart @@ -68,8 +68,7 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response { ); } -class _FakeWgerBaseProvider_4 extends _i1.SmartFake - implements _i4.WgerBaseProvider { +class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider { _FakeWgerBaseProvider_4( Object parent, Invocation parentInvocation, @@ -89,8 +88,7 @@ class _FakeExerciseBase_5 extends _i1.SmartFake implements _i5.ExerciseBase { ); } -class _FakeExerciseCategory_6 extends _i1.SmartFake - implements _i6.ExerciseCategory { +class _FakeExerciseCategory_6 extends _i1.SmartFake implements _i6.ExerciseCategory { _FakeExerciseCategory_6( Object parent, Invocation parentInvocation, @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -216,8 +213,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i10.Future>.value({}), + returnValue: _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -240,8 +236,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i10.Future>.value({}), + returnValue: _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future> patch( @@ -256,8 +251,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i10.Future>.value({}), + returnValue: _i10.Future>.value({}), ) as _i10.Future>); @override _i10.Future<_i3.Response> deleteRequest( @@ -302,8 +296,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { ), ) as _i4.WgerBaseProvider); @override - set exerciseBases(List<_i5.ExerciseBase>? exercisesBases) => - super.noSuchMethod( + set exerciseBases(List<_i5.ExerciseBase>? exercisesBases) => super.noSuchMethod( Invocation.setter( #exerciseBases, exercisesBases, @@ -316,8 +309,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValue: <_i5.ExerciseBase>[], ) as List<_i5.ExerciseBase>); @override - set filteredExerciseBases(List<_i5.ExerciseBase>? newFilteredExercises) => - super.noSuchMethod( + set filteredExerciseBases(List<_i5.ExerciseBase>? newFilteredExercises) => super.noSuchMethod( Invocation.setter( #filteredExerciseBases, newFilteredExercises, @@ -325,8 +317,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValueForMissingStub: null, ); @override - Map> get exerciseBasesByVariation => - (super.noSuchMethod( + Map> get exerciseBasesByVariation => (super.noSuchMethod( Invocation.getter(#exerciseBasesByVariation), returnValue: >{}, ) as Map>); @@ -523,8 +514,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { returnValueForMissingStub: _i10.Future.value(), ) as _i10.Future); @override - _i10.Future<_i5.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => - (super.noSuchMethod( + _i10.Future<_i5.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => (super.noSuchMethod( Invocation.method( #fetchAndSetExerciseBase, [exerciseBaseId], @@ -538,8 +528,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { )), ) as _i10.Future<_i5.ExerciseBase>); @override - _i5.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => - (super.noSuchMethod( + _i5.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => (super.noSuchMethod( Invocation.method( #readExerciseBaseFromBaseInfo, [baseData], @@ -585,8 +574,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider { #searchEnglish: searchEnglish, }, ), - returnValue: - _i10.Future>.value(<_i5.ExerciseBase>[]), + returnValue: _i10.Future>.value(<_i5.ExerciseBase>[]), ) as _i10.Future>); @override void addListener(_i12.VoidCallback? listener) => super.noSuchMethod( diff --git a/test/workout/repetition_unit_form_widget_test.mocks.dart b/test/workout/repetition_unit_form_widget_test.mocks.dart index 8905eb0a..af33fd82 100644 --- a/test/workout/repetition_unit_form_widget_test.mocks.dart +++ b/test/workout/repetition_unit_form_widget_test.mocks.dart @@ -31,8 +31,7 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -52,8 +51,7 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake - implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -103,8 +101,7 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake - implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -127,8 +124,7 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock - implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -250,8 +246,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -265,8 +260,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -280,8 +274,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -295,8 +288,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -326,8 +318,7 @@ class MockWorkoutPlansProvider extends _i1.Mock base, ], ), - returnValue: - _i12.Future>.value({}), + returnValue: _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -437,8 +428,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => - (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -471,8 +461,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => - (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -494,14 +483,12 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => - (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: - _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/weight_unit_form_widget_test.mocks.dart b/test/workout/weight_unit_form_widget_test.mocks.dart index a59c8efc..f3f638a2 100644 --- a/test/workout/weight_unit_form_widget_test.mocks.dart +++ b/test/workout/weight_unit_form_widget_test.mocks.dart @@ -22,8 +22,7 @@ import 'package:wger/providers/body_weight.dart' as _i4; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -46,8 +45,7 @@ class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry { /// A class which mocks [BodyWeightProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockBodyWeightProvider extends _i1.Mock - implements _i4.BodyWeightProvider { +class MockBodyWeightProvider extends _i1.Mock implements _i4.BodyWeightProvider { MockBodyWeightProvider() { _i1.throwOnMissingStub(this); } @@ -101,8 +99,7 @@ class MockBodyWeightProvider extends _i1.Mock ), ) as _i3.WeightEntry); @override - _i3.WeightEntry? findByDate(DateTime? date) => - (super.noSuchMethod(Invocation.method( + _i3.WeightEntry? findByDate(DateTime? date) => (super.noSuchMethod(Invocation.method( #findByDate, [date], )) as _i3.WeightEntry?); @@ -112,12 +109,10 @@ class MockBodyWeightProvider extends _i1.Mock #fetchAndSetEntries, [], ), - returnValue: - _i5.Future>.value(<_i3.WeightEntry>[]), + returnValue: _i5.Future>.value(<_i3.WeightEntry>[]), ) as _i5.Future>); @override - _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => - (super.noSuchMethod( + _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => (super.noSuchMethod( Invocation.method( #addEntry, [entry], diff --git a/test/workout/workout_day_form_test.mocks.dart b/test/workout/workout_day_form_test.mocks.dart index 5bb1e2c0..9a50fe29 100644 --- a/test/workout/workout_day_form_test.mocks.dart +++ b/test/workout/workout_day_form_test.mocks.dart @@ -31,8 +31,7 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -52,8 +51,7 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake - implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -103,8 +101,7 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake - implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -127,8 +124,7 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock - implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -250,8 +246,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -265,8 +260,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -280,8 +274,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -295,8 +288,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -326,8 +318,7 @@ class MockWorkoutPlansProvider extends _i1.Mock base, ], ), - returnValue: - _i12.Future>.value({}), + returnValue: _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -437,8 +428,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => - (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -471,8 +461,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => - (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -494,14 +483,12 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => - (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: - _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart index b4115472..6eda3025 100644 --- a/test/workout/workout_form_test.mocks.dart +++ b/test/workout/workout_form_test.mocks.dart @@ -31,8 +31,7 @@ import 'package:wger/providers/workout_plans.dart' as _i11; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -52,8 +51,7 @@ class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit { ); } -class _FakeRepetitionUnit_2 extends _i1.SmartFake - implements _i4.RepetitionUnit { +class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit { _FakeRepetitionUnit_2( Object parent, Invocation parentInvocation, @@ -103,8 +101,7 @@ class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting { ); } -class _FakeWorkoutSession_7 extends _i1.SmartFake - implements _i9.WorkoutSession { +class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession { _FakeWorkoutSession_7( Object parent, Invocation parentInvocation, @@ -127,8 +124,7 @@ class _FakeLog_8 extends _i1.SmartFake implements _i10.Log { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock - implements _i11.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock implements _i11.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -250,8 +246,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -265,8 +260,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -280,8 +274,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -295,8 +288,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i12.Future<_i5.WorkoutPlan>); @override - _i12.Future editWorkout(_i5.WorkoutPlan? workout) => - (super.noSuchMethod( + _i12.Future editWorkout(_i5.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -326,8 +318,7 @@ class MockWorkoutPlansProvider extends _i1.Mock base, ], ), - returnValue: - _i12.Future>.value({}), + returnValue: _i12.Future>.value({}), ) as _i12.Future>); @override _i12.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -437,8 +428,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future>.value(<_i7.Set>[]), ) as _i12.Future>); @override - _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => - (super.noSuchMethod( + _i12.Future fetchComputedSettings(_i7.Set? workoutSet) => (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -471,8 +461,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => - (super.noSuchMethod( + _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) => (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -494,14 +483,12 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i12.Future.value(), ) as _i12.Future); @override - _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => - (super.noSuchMethod( + _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) => (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: - _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( + returnValue: _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7( this, Invocation.method( #addSession, diff --git a/test/workout/workout_plan_screen_test.mocks.dart b/test/workout/workout_plan_screen_test.mocks.dart index e1374c17..3ddba809 100644 --- a/test/workout/workout_plan_screen_test.mocks.dart +++ b/test/workout/workout_plan_screen_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_plans_screen_test.mocks.dart b/test/workout/workout_plans_screen_test.mocks.dart index c4329c45..ef435464 100644 --- a/test/workout/workout_plans_screen_test.mocks.dart +++ b/test/workout/workout_plans_screen_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_provider_test.mocks.dart b/test/workout/workout_provider_test.mocks.dart index d32671f3..a42145cb 100644 --- a/test/workout/workout_provider_test.mocks.dart +++ b/test/workout/workout_provider_test.mocks.dart @@ -102,8 +102,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -147,8 +146,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -171,8 +169,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future> patch( @@ -187,8 +184,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { uri, ], ), - returnValue: - _i5.Future>.value({}), + returnValue: _i5.Future>.value({}), ) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest( diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart index 3ab5b92f..3eb80a05 100644 --- a/test/workout/workout_set_form_test.mocks.dart +++ b/test/workout/workout_set_form_test.mocks.dart @@ -38,8 +38,7 @@ import 'package:wger/providers/workout_plans.dart' as _i21; // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class -class _FakeWgerBaseProvider_0 extends _i1.SmartFake - implements _i2.WgerBaseProvider { +class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider { _FakeWgerBaseProvider_0( Object parent, Invocation parentInvocation, @@ -59,8 +58,7 @@ class _FakeExerciseBase_1 extends _i1.SmartFake implements _i3.ExerciseBase { ); } -class _FakeExerciseCategory_2 extends _i1.SmartFake - implements _i4.ExerciseCategory { +class _FakeExerciseCategory_2 extends _i1.SmartFake implements _i4.ExerciseCategory { _FakeExerciseCategory_2( Object parent, Invocation parentInvocation, @@ -150,8 +148,7 @@ class _FakeWeightUnit_10 extends _i1.SmartFake implements _i10.WeightUnit { ); } -class _FakeRepetitionUnit_11 extends _i1.SmartFake - implements _i11.RepetitionUnit { +class _FakeRepetitionUnit_11 extends _i1.SmartFake implements _i11.RepetitionUnit { _FakeRepetitionUnit_11( Object parent, Invocation parentInvocation, @@ -201,8 +198,7 @@ class _FakeSetting_15 extends _i1.SmartFake implements _i15.Setting { ); } -class _FakeWorkoutSession_16 extends _i1.SmartFake - implements _i16.WorkoutSession { +class _FakeWorkoutSession_16 extends _i1.SmartFake implements _i16.WorkoutSession { _FakeWorkoutSession_16( Object parent, Invocation parentInvocation, @@ -239,8 +235,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { ), ) as _i2.WgerBaseProvider); @override - set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) => - super.noSuchMethod( + set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) => super.noSuchMethod( Invocation.setter( #exerciseBases, exercisesBases, @@ -253,8 +248,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValue: <_i3.ExerciseBase>[], ) as List<_i3.ExerciseBase>); @override - set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) => - super.noSuchMethod( + set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) => super.noSuchMethod( Invocation.setter( #filteredExerciseBases, newFilteredExercises, @@ -262,8 +256,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValueForMissingStub: null, ); @override - Map> get exerciseBasesByVariation => - (super.noSuchMethod( + Map> get exerciseBasesByVariation => (super.noSuchMethod( Invocation.getter(#exerciseBasesByVariation), returnValue: >{}, ) as Map>); @@ -460,8 +453,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => - (super.noSuchMethod( + _i19.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) => (super.noSuchMethod( Invocation.method( #fetchAndSetExerciseBase, [exerciseBaseId], @@ -475,8 +467,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { )), ) as _i19.Future<_i3.ExerciseBase>); @override - _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => - (super.noSuchMethod( + _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) => (super.noSuchMethod( Invocation.method( #readExerciseBaseFromBaseInfo, [baseData], @@ -522,8 +513,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider { #searchEnglish: searchEnglish, }, ), - returnValue: - _i19.Future>.value(<_i3.ExerciseBase>[]), + returnValue: _i19.Future>.value(<_i3.ExerciseBase>[]), ) as _i19.Future>); @override void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( @@ -600,8 +590,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { returnValueForMissingStub: null, ); @override - Map getDefaultHeaders({dynamic includeAuth = false}) => - (super.noSuchMethod( + Map getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod( Invocation.method( #getDefaultHeaders, [], @@ -645,8 +634,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { #fetch, [uri], ), - returnValue: - _i19.Future>.value({}), + returnValue: _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future> fetchPaginated(Uri? uri) => (super.noSuchMethod( @@ -669,8 +657,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { uri, ], ), - returnValue: - _i19.Future>.value({}), + returnValue: _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future> patch( @@ -685,8 +672,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { uri, ], ), - returnValue: - _i19.Future>.value({}), + returnValue: _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future<_i9.Response> deleteRequest( @@ -717,8 +703,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider { /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock - implements _i21.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock implements _i21.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @@ -840,8 +825,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i12.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => - (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod( Invocation.method( #fetchAndSetPlanSparse, [planId], @@ -855,8 +839,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future<_i12.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => - (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod( Invocation.method( #fetchAndSetWorkoutPlanFull, [workoutId], @@ -870,8 +853,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future<_i12.WorkoutPlan> addWorkout(_i12.WorkoutPlan? workout) => - (super.noSuchMethod( + _i19.Future<_i12.WorkoutPlan> addWorkout(_i12.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #addWorkout, [workout], @@ -885,8 +867,7 @@ class MockWorkoutPlansProvider extends _i1.Mock )), ) as _i19.Future<_i12.WorkoutPlan>); @override - _i19.Future editWorkout(_i12.WorkoutPlan? workout) => - (super.noSuchMethod( + _i19.Future editWorkout(_i12.WorkoutPlan? workout) => (super.noSuchMethod( Invocation.method( #editWorkout, [workout], @@ -916,8 +897,7 @@ class MockWorkoutPlansProvider extends _i1.Mock base, ], ), - returnValue: - _i19.Future>.value({}), + returnValue: _i19.Future>.value({}), ) as _i19.Future>); @override _i19.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( @@ -1027,8 +1007,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i19.Future>.value(<_i14.Set>[]), ) as _i19.Future>); @override - _i19.Future fetchComputedSettings(_i14.Set? workoutSet) => - (super.noSuchMethod( + _i19.Future fetchComputedSettings(_i14.Set? workoutSet) => (super.noSuchMethod( Invocation.method( #fetchComputedSettings, [workoutSet], @@ -1061,8 +1040,7 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValueForMissingStub: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i15.Setting> addSetting(_i15.Setting? workoutSetting) => - (super.noSuchMethod( + _i19.Future<_i15.Setting> addSetting(_i15.Setting? workoutSetting) => (super.noSuchMethod( Invocation.method( #addSetting, [workoutSetting], @@ -1084,14 +1062,12 @@ class MockWorkoutPlansProvider extends _i1.Mock returnValue: _i19.Future.value(), ) as _i19.Future); @override - _i19.Future<_i16.WorkoutSession> addSession(_i16.WorkoutSession? session) => - (super.noSuchMethod( + _i19.Future<_i16.WorkoutSession> addSession(_i16.WorkoutSession? session) => (super.noSuchMethod( Invocation.method( #addSession, [session], ), - returnValue: - _i19.Future<_i16.WorkoutSession>.value(_FakeWorkoutSession_16( + returnValue: _i19.Future<_i16.WorkoutSession>.value(_FakeWorkoutSession_16( this, Invocation.method( #addSession, From 20b80f3f5d4bf3f19fa566b6cd6b779b1aa5c176 Mon Sep 17 00:00:00 2001 From: Mirko Ferrati Date: Wed, 7 Jun 2023 21:56:51 +0000 Subject: [PATCH 35/40] Translated using Weblate (Italian) Currently translated at 68.3% (158 of 231 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/it/ --- lib/l10n/app_it.arb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb index 961ceb40..445bf8cc 100644 --- a/lib/l10n/app_it.arb +++ b/lib/l10n/app_it.arb @@ -584,5 +584,25 @@ "previous": "Precedente", "@previous": {}, "next": "Successivo", - "@next": {} + "@next": {}, + "gym_mat": "Materassino da palestra", + "@gym_mat": { + "description": "Generated entry for translation for server strings" + }, + "verifiedEmailInfo": "Un'email di verifica è stata inviata a {email}", + "@verifiedEmailInfo": { + "placeholders": { + "email": {} + } + }, + "oneNamePerLine": "Un nome per linea", + "@oneNamePerLine": {}, + "textPromptTitle": "Pronto a iniziare?", + "@textPromptTitle": {}, + "moreMeasurementEntries": "Aggiungi una nuova misura", + "@moreMeasurementEntries": { + "description": "Message shown when the user wants to add new measurement" + }, + "searchNamesInEnglish": "Cerca anche nei nomi in inglese", + "@searchNamesInEnglish": {} } From 6569fbf6bd03796141d4295c284da7159f90eb04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 01:15:56 +0000 Subject: [PATCH 36/40] Bump shared_preferences from 2.1.1 to 2.1.2 Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.1.2/packages/shared_preferences) --- updated-dependencies: - dependency-name: shared_preferences dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3c2292ce..156358c0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -880,10 +880,10 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022" + sha256: "396f85b8afc6865182610c0a2fc470853d56499f75f7499e2a73a9f0539d23d0" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" shared_preferences_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e68fc604..c227bfeb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: package_info_plus: ^4.0.2 provider: ^6.0.5 rive: ^0.11.2 - shared_preferences: ^2.1.1 + shared_preferences: ^2.1.2 table_calendar: ^3.0.8 url_launcher: ^6.1.11 flutter_barcode_scanner: ^2.0.0 From 9e9d62b42755da1affbe24cc149585201703851e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 01:16:12 +0000 Subject: [PATCH 37/40] Bump image_picker from 0.8.7+4 to 0.8.8 Bumps [image_picker](https://github.com/flutter/packages/tree/main/packages/image_picker) from 0.8.7+4 to 0.8.8. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/image_picker-v0.8.8/packages/image_picker) --- updated-dependencies: - dependency-name: image_picker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++---- pubspec.yaml | 2 +- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3c2292ce..e839d299 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -289,6 +289,38 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.4" + file_selector_linux: + dependency: transitive + description: + name: file_selector_linux + sha256: d17c5e450192cdc40b718804dfb4eaf79a71bed60ee9530703900879ba50baa3 + url: "https://pub.dev" + source: hosted + version: "0.9.1+3" + file_selector_macos: + dependency: transitive + description: + name: file_selector_macos + sha256: "6290eec24fc4cc62535fe609e0c6714d3c1306191dc8c3b0319eaecc09423a3a" + url: "https://pub.dev" + source: hosted + version: "0.9.2" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + sha256: "2a7f4bbf7bd2f022ecea85bfb1754e87f7dd403a9abc17a84a4fa2ddfe2abc0a" + url: "https://pub.dev" + source: hosted + version: "2.5.1" + file_selector_windows: + dependency: transitive + description: + name: file_selector_windows + sha256: ef246380b66d1fb9089fc65622c387bf3780bca79f533424c31d07f12c2c7fd8 + url: "https://pub.dev" + source: hosted + version: "0.9.2" fixnum: dependency: transitive description: @@ -523,10 +555,10 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "3da954c3b8906d82ecb50fd5e2b5401758f06d5678904eed6cbc06172283a263" + sha256: "6432178560d95303cc70d038363f892f5a05750dd27bc55220c7301af54d05e9" url: "https://pub.dev" source: hosted - version: "0.8.7+4" + version: "0.8.8" image_picker_android: dependency: transitive description: @@ -551,14 +583,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.8.7+3" + image_picker_linux: + dependency: transitive + description: + name: image_picker_linux + sha256: "1d8f9a97178d6b8a035f1d2765f17f8ca3d36a40d5594e742a481b1e002f20be" + url: "https://pub.dev" + source: hosted + version: "0.2.0" + image_picker_macos: + dependency: transitive + description: + name: image_picker_macos + sha256: ff094b36d6c06200808f733144a033e45b4e17d59524e1cf7d2af7e4cb94e1ab + url: "https://pub.dev" + source: hosted + version: "0.2.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8" + sha256: "7c7b96bb9413a9c28229e717e6fd1e3edd1cc5569c1778fcca060ecf729b65ee" url: "https://pub.dev" source: hosted - version: "2.6.3" + version: "2.8.0" + image_picker_windows: + dependency: transitive + description: + name: image_picker_windows + sha256: bf77b819eb62c487e6af53b9eb213adc12bd060ef7e43f3b1dd69c53cc24a61d + url: "https://pub.dev" + source: hosted + version: "0.2.0" integration_test: dependency: "direct dev" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index e68fc604..78806f73 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: flutter_typeahead: ^4.6.1 font_awesome_flutter: ^10.4.0 http: ^0.13.5 - image_picker: ^0.8.7+3 + image_picker: ^0.8.8 intl: ^0.17.0 json_annotation: ^4.8.1 version: ^3.0.2 From fbe9ccdd697888b3ce8fb3a1cec7d7c215f964db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 01:16:28 +0000 Subject: [PATCH 38/40] Bump cider from 0.1.5 to 0.1.6 Bumps [cider](https://github.com/f3ath/cider) from 0.1.5 to 0.1.6. - [Release notes](https://github.com/f3ath/cider/releases) - [Changelog](https://github.com/f3ath/cider/blob/master/CHANGELOG.md) - [Commits](https://github.com/f3ath/cider/compare/0.1.5...0.1.6) --- updated-dependencies: - dependency-name: cider dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3c2292ce..80bc1ad7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,10 +173,10 @@ packages: dependency: "direct dev" description: name: cider - sha256: "714a853bf92701b982496df0bd601c0cf2d882cfc1f2d41ae9aff2b20cee016a" + sha256: "74d96930575f97d83e0a3a5cd26d27d10c38961b1b41346eebe5baabf0f56940" url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.6" cli_util: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e68fc604..959d61df 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -70,7 +70,7 @@ dev_dependencies: mockito: ^5.4.0 network_image_mock: ^2.1.1 flutter_lints: ^2.0.1 - cider: ^0.1.5 + cider: ^0.1.6 flutter_icons: android: true From 583f85b024c98ed121a30c7279b381e4a4a7d03c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 01:17:15 +0000 Subject: [PATCH 39/40] Bump image_picker from 0.8.8 to 0.8.9 Bumps [image_picker](https://github.com/flutter/packages/tree/main/packages/image_picker) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/image_picker-v0.8.9/packages/image_picker) --- updated-dependencies: - dependency-name: image_picker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f6e06b55..1e7907bf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -555,10 +555,10 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "6432178560d95303cc70d038363f892f5a05750dd27bc55220c7301af54d05e9" + sha256: b6951e25b795d053a6ba03af5f710069c99349de9341af95155d52665cb4607c url: "https://pub.dev" source: hosted - version: "0.8.8" + version: "0.8.9" image_picker_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 6d75852f..5ee0de5e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: flutter_typeahead: ^4.6.1 font_awesome_flutter: ^10.4.0 http: ^0.13.5 - image_picker: ^0.8.8 + image_picker: ^0.8.9 intl: ^0.17.0 json_annotation: ^4.8.1 version: ^3.0.2 From 87799d808c23ccfae774d0452210a1b545d400ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 01:17:30 +0000 Subject: [PATCH 40/40] Bump rive from 0.11.2 to 0.11.3 Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.11.2 to 0.11.3. - [Release notes](https://github.com/rive-app/rive-flutter/releases) - [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/rive-app/rive-flutter/commits) --- updated-dependencies: - dependency-name: rive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f6e06b55..b41fd7bc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -920,18 +920,18 @@ packages: dependency: "direct main" description: name: rive - sha256: bb7a16bc6a88484fe3136890030b71776ffea368edd2a8368fe99d6430e4a802 + sha256: "55e1f8bf249444545a7c832830d2bbb9adae759193fb879294bc6018b9f0eedd" url: "https://pub.dev" source: hosted - version: "0.11.2" + version: "0.11.3" rive_common: dependency: transitive description: name: rive_common - sha256: "5a0dbf689527c51ee5430608181d81460c9c45ab6cc3bd52dd9bbb3d8c4455b6" + sha256: "7e17937b790bb2f631767b3d505da8c298309c0a6ab08cd317fa6fe081ed5b63" url: "https://pub.dev" source: hosted - version: "0.0.9" + version: "0.0.10" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 6d75852f..d314369d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: version: ^3.0.2 package_info_plus: ^4.0.2 provider: ^6.0.5 - rive: ^0.11.2 + rive: ^0.11.3 shared_preferences: ^2.1.2 table_calendar: ^3.0.8 url_launcher: ^6.1.11