From 65ba2275aeb119458eca5548991c5cfe7081ef60 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 23 Dec 2023 16:40:05 +0100 Subject: [PATCH] Run "dart format --line-length=100 ." to make the diff smaller --- flatpak/scripts/flatpak_packager.dart | 46 ++--- flatpak/scripts/flatpak_shared.dart | 55 ++---- flatpak/scripts/manifest_generator.dart | 18 +- integration_test/1_dashboard.dart | 9 +- integration_test/2_workout.dart | 3 +- integration_test/3_gym_mode.dart | 6 +- integration_test/4_measurements.dart | 3 +- integration_test/make_screenshots_test.dart | 27 +-- .../exercise_DB/exercise_database.dart | 12 +- .../exercise_DB/exercise_database.g.dart | 168 +++++++----------- lib/database/exercise_DB/type_converters.dart | 30 ++-- lib/exceptions/http_exception.dart | 5 +- lib/helpers/charts.dart | 4 +- lib/helpers/exercises/forms.dart | 6 +- lib/helpers/json.dart | 3 +- lib/helpers/misc.dart | 4 +- lib/helpers/platform.dart | 3 +- lib/helpers/ui.dart | 9 +- lib/main.dart | 32 ++-- lib/models/body_weight/weight_entry.dart | 3 +- lib/models/body_weight/weight_entry.g.dart | 3 +- lib/models/exercises/base.dart | 3 +- lib/models/exercises/base.g.dart | 25 +-- lib/models/exercises/category.dart | 3 +- lib/models/exercises/category.g.dart | 3 +- lib/models/exercises/comment.dart | 3 +- lib/models/exercises/equipment.dart | 3 +- lib/models/exercises/exercise_base_data.dart | 3 +- .../exercises/exercise_base_data.freezed.dart | 44 ++--- .../exercises/exercise_base_data.g.dart | 9 +- lib/models/exercises/exercise_model.dart | 3 +- .../exercises/exercise_model.freezed.dart | 30 +--- lib/models/exercises/exercise_model.g.dart | 3 +- lib/models/exercises/image.dart | 3 +- lib/models/exercises/image.g.dart | 3 +- lib/models/exercises/language.dart | 3 +- lib/models/exercises/muscle.dart | 3 +- lib/models/exercises/translation.dart | 3 +- lib/models/exercises/translation.g.dart | 10 +- lib/models/exercises/variation.dart | 3 +- .../measurements/measurement_category.g.dart | 4 +- .../measurements/measurement_entry.dart | 10 +- .../measurements/measurement_entry.g.dart | 3 +- lib/models/nutrition/image.dart | 3 +- lib/models/nutrition/image.g.dart | 3 +- lib/models/nutrition/ingredient.dart | 15 +- lib/models/nutrition/ingredient.g.dart | 3 +- .../nutrition/ingredient_weight_unit.g.dart | 6 +- lib/models/nutrition/log.dart | 8 +- lib/models/nutrition/log.g.dart | 9 +- lib/models/nutrition/meal.dart | 6 +- lib/models/nutrition/meal_item.dart | 3 +- lib/models/nutrition/nutritional_plan.dart | 27 +-- lib/models/nutrition/nutritional_plan.g.dart | 3 +- lib/models/nutrition/nutritional_values.dart | 4 +- lib/models/nutrition/weight_unit.dart | 3 +- lib/models/nutrition/weight_unit.g.dart | 3 +- lib/models/user/profile.dart | 3 +- lib/models/user/profile.g.dart | 7 +- lib/models/workouts/day.dart | 3 +- lib/models/workouts/log.dart | 7 +- lib/models/workouts/repetition_unit.dart | 3 +- lib/models/workouts/repetition_unit.g.dart | 3 +- lib/models/workouts/session.dart | 15 +- lib/models/workouts/session.g.dart | 12 +- lib/models/workouts/set.dart | 4 +- lib/models/workouts/setting.dart | 16 +- lib/models/workouts/weight_unit.dart | 3 +- lib/models/workouts/weight_unit.g.dart | 3 +- lib/models/workouts/workout_plan.dart | 10 +- lib/models/workouts/workout_plan.g.dart | 3 +- lib/providers/add_exercise.dart | 27 +-- lib/providers/auth.dart | 17 +- lib/providers/base_provider.dart | 3 +- lib/providers/body_weight.dart | 6 +- lib/providers/exercises.dart | 82 +++------ lib/providers/gallery.dart | 12 +- lib/providers/measurement.dart | 28 ++- lib/providers/nutrition.dart | 42 ++--- lib/providers/user.dart | 3 +- lib/providers/workout_plans.dart | 80 +++------ lib/screens/add_exercise_screen.dart | 22 +-- lib/screens/auth_screen.dart | 54 ++---- lib/screens/exercise_screen.dart | 7 +- lib/screens/exercises_screen.dart | 3 +- lib/screens/form_screen.dart | 3 +- lib/screens/home_tabs_screen.dart | 3 +- lib/screens/measurement_entries_screen.dart | 21 +-- lib/screens/nutritional_diary_screen.dart | 6 +- lib/screens/nutritional_plan_screen.dart | 14 +- lib/screens/nutritional_plans_screen.dart | 3 +- lib/screens/workout_plan_screen.dart | 14 +- lib/screens/workout_plans_screen.dart | 3 +- lib/theme/theme.dart | 8 +- .../add_exercise_dropdown_button.dart | 6 +- .../add_exercise_multiselect_button.dart | 11 +- .../add_exercise/add_exercise_text_area.dart | 6 +- .../mixins/image_picker_mixin.dart | 9 +- lib/widgets/add_exercise/preview_images.dart | 11 +- .../add_exercise/steps/step1basics.dart | 20 +-- .../add_exercise/steps/step2variations.dart | 20 +-- .../add_exercise/steps/step3description.dart | 3 +- .../add_exercise/steps/step4translations.dart | 10 +- .../add_exercise/steps/step5images.dart | 6 +- lib/widgets/core/about.dart | 22 +-- lib/widgets/core/app_bar.dart | 12 +- lib/widgets/core/core.dart | 3 +- lib/widgets/dashboard/calendar.dart | 23 +-- lib/widgets/dashboard/widgets.dart | 68 +++---- lib/widgets/exercises/exercises.dart | 27 +-- lib/widgets/exercises/filter_modal.dart | 9 +- lib/widgets/exercises/filter_row.dart | 13 +- lib/widgets/exercises/forms.dart | 6 +- lib/widgets/exercises/list_tile.dart | 10 +- lib/widgets/exercises/videos.dart | 3 +- lib/widgets/gallery/forms.dart | 9 +- lib/widgets/gallery/overview.dart | 15 +- lib/widgets/measurements/categories.dart | 3 +- lib/widgets/measurements/categories_card.dart | 4 +- lib/widgets/measurements/charts.dart | 19 +- lib/widgets/measurements/entries.dart | 10 +- lib/widgets/measurements/forms.dart | 47 ++--- lib/widgets/nutrition/charts.dart | 21 +-- lib/widgets/nutrition/forms.dart | 64 +++---- lib/widgets/nutrition/helpers.dart | 3 +- lib/widgets/nutrition/meal.dart | 40 ++--- .../nutrition/nutritional_diary_detail.dart | 70 +++----- .../nutrition/nutritional_plan_detail.dart | 67 +++---- .../nutrition/nutritional_plans_list.dart | 21 +-- lib/widgets/nutrition/widgets.dart | 50 ++---- lib/widgets/user/forms.dart | 10 +- lib/widgets/weight/entries_list.dart | 11 +- lib/widgets/weight/forms.dart | 15 +- lib/widgets/workouts/app_bar.dart | 3 +- lib/widgets/workouts/charts.dart | 16 +- lib/widgets/workouts/day.dart | 43 ++--- lib/widgets/workouts/forms.dart | 127 +++++-------- lib/widgets/workouts/gym_mode.dart | 104 ++++------- lib/widgets/workouts/log.dart | 16 +- lib/widgets/workouts/workout_plan_detail.dart | 3 +- lib/widgets/workouts/workout_plans_list.dart | 26 +-- test/auth/auth_provider_test.dart | 24 +-- test/auth/auth_screen_test.dart | 6 +- test/exercises/contribute_exercise_test.dart | 15 +- .../contribute_exercise_test.mocks.dart | 9 +- .../exercise_provider_load_test.dart | 13 +- test/exercises/exercise_provider_test.dart | 82 +++------ .../exercises_detail_widget_test.dart | 18 +- test/gallery/gallery_form_test.dart | 12 +- test/gallery/gallery_form_test.mocks.dart | 12 +- test/gallery/gallery_provider_test.dart | 3 +- test/gallery/gallery_screen_test.dart | 18 +- test/gallery/gallery_screen_test.mocks.dart | 12 +- .../measurement_categories_screen_test.dart | 31 +--- ...surement_categories_screen_test.mocks.dart | 12 +- .../measurement_category_test.dart | 9 +- .../measurement_entries_screen_test.dart | 23 +-- test/measurements/measurement_entry_test.dart | 6 +- .../measurement_provider_test.dart | 83 ++++----- .../measurement_provider_test.mocks.dart | 12 +- test/nutrition/nutrition_provider_test.dart | 9 +- test/nutrition/nutritional_diary_test.dart | 15 +- .../nutrition/nutritional_meal_form_test.dart | 3 +- .../nutritional_meal_form_test.mocks.dart | 39 ++-- .../nutritional_meal_item_form_test.dart | 46 ++--- .../nutrition/nutritional_plan_form_test.dart | 21 +-- .../nutritional_plan_form_test.mocks.dart | 39 ++-- .../nutritional_plan_model_test.dart | 9 +- .../nutritional_plan_screen_test.dart | 9 +- .../nutritional_plan_screen_test.mocks.dart | 30 ++-- .../nutritional_plans_screen_test.dart | 15 +- .../nutritional_plans_screen_test.mocks.dart | 30 ++-- .../nutritional_values_class_test.dart | 15 +- test/other/base_provider_test.dart | 33 ++-- test/other/base_provider_test.mocks.dart | 9 +- test/user/provider_test.mocks.dart | 12 +- test/utils.dart | 3 +- test/weight/weight_model_test.dart | 21 +-- test/weight/weight_provider_test.dart | 23 +-- test/weight/weight_provider_test.mocks.dart | 12 +- test/weight/weight_screen_test.dart | 15 +- test/weight/weight_screen_test.mocks.dart | 15 +- test/workout/gym_mode_screen_test.dart | 9 +- test/workout/gym_mode_screen_test.mocks.dart | 36 ++-- test/workout/plate_calculator_test.dart | 6 +- .../repetition_unit_form_widget_test.dart | 6 +- ...epetition_unit_form_widget_test.mocks.dart | 39 ++-- .../workout/weight_unit_form_widget_test.dart | 3 +- .../weight_unit_form_widget_test.mocks.dart | 15 +- test/workout/workout_day_form_test.dart | 15 +- test/workout/workout_day_form_test.mocks.dart | 39 ++-- test/workout/workout_form_test.dart | 47 ++--- test/workout/workout_form_test.mocks.dart | 39 ++-- test/workout/workout_plan_model_test.dart | 9 +- test/workout/workout_plan_screen_test.dart | 12 +- .../workout_plan_screen_test.mocks.dart | 12 +- test/workout/workout_plans_screen_test.dart | 27 +-- .../workout_plans_screen_test.mocks.dart | 12 +- test/workout/workout_provider_test.dart | 33 ++-- test/workout/workout_provider_test.mocks.dart | 12 +- test/workout/workout_set_form_test.dart | 15 +- test/workout/workout_set_form_test.mocks.dart | 72 +++----- test_data/body_weight.dart | 6 +- test_data/exercises.dart | 29 +-- test_data/measurements.dart | 21 +-- test_data/workouts.dart | 3 +- test_driver/screenshot_driver.dart | 3 +- 207 files changed, 1218 insertions(+), 2515 deletions(-) diff --git a/flatpak/scripts/flatpak_packager.dart b/flatpak/scripts/flatpak_packager.dart index 36b5e4a0e..5346a6056 100644 --- a/flatpak/scripts/flatpak_packager.dart +++ b/flatpak/scripts/flatpak_packager.dart @@ -18,8 +18,7 @@ void main(List arguments) async { 'You must run this script with a metadata file argument, using the --meta flag.'); } if (arguments.length == metaIndex + 1) { - throw Exception( - 'The --meta flag must be followed by the path to the metadata file.'); + throw Exception('The --meta flag must be followed by the path to the metadata file.'); } final metaFile = File(arguments[metaIndex + 1]); @@ -31,18 +30,14 @@ void main(List arguments) async { final fetchFromGithub = arguments.contains('--github'); - final outputDir = - Directory('${Directory.current.path}/flatpak_generator_exports'); + final outputDir = Directory('${Directory.current.path}/flatpak_generator_exports'); outputDir.createSync(); - final packageGenerator = - PackageGenerator(inputDir: metaFile.parent, meta: meta); + final packageGenerator = PackageGenerator(inputDir: metaFile.parent, meta: meta); packageGenerator.generatePackage( outputDir, - PackageGenerator.runningOnARM() - ? CPUArchitecture.aarch64 - : CPUArchitecture.x86_64, + PackageGenerator.runningOnARM() ? CPUArchitecture.aarch64 : CPUArchitecture.x86_64, fetchFromGithub, ); } @@ -54,8 +49,8 @@ class PackageGenerator { PackageGenerator({required this.inputDir, required this.meta}); - Future generatePackage(Directory outputDir, CPUArchitecture arch, - bool fetchReleasesFromGithub) async { + Future generatePackage( + Directory outputDir, CPUArchitecture arch, bool fetchReleasesFromGithub) async { final tempDir = outputDir.createTempSync('flutter_generator_temp'); final appId = meta.appId; @@ -90,8 +85,7 @@ class PackageGenerator { } final editedAppDataContent = AppDataModifier.replaceVersions( - origAppDataFile.readAsStringSync(), - await meta.getReleases(fetchReleasesFromGithub)); + origAppDataFile.readAsStringSync(), await meta.getReleases(fetchReleasesFromGithub)); final editedAppDataFile = File('${tempDir.path}/$appId.appdata.xml'); editedAppDataFile.writeAsStringSync(editedAppDataContent); @@ -107,21 +101,17 @@ class PackageGenerator { final destDir = Directory('${tempDir.path}/bin'); destDir.createSync(); - final baseFileName = - '${meta.lowercaseAppName}-linux-${arch.flatpakArchCode}'; + final baseFileName = '${meta.lowercaseAppName}-linux-${arch.flatpakArchCode}'; final packagePath = '${outputDir.absolute.path}/$baseFileName.tar.gz'; - Process.runSync( - 'cp', ['-r', '${buildDir.absolute.path}/.', destDir.absolute.path]); - Process.runSync('tar', ['-czvf', packagePath, '.'], - workingDirectory: tempDir.absolute.path); + Process.runSync('cp', ['-r', '${buildDir.absolute.path}/.', destDir.absolute.path]); + Process.runSync('tar', ['-czvf', packagePath, '.'], workingDirectory: tempDir.absolute.path); print('Generated $packagePath'); final preShasum = Process.runSync('shasum', ['-a', '256', packagePath]); final sha256 = preShasum.stdout.toString().split(' ').first; - final shaFile = await File('${outputDir.path}/$baseFileName.sha256') - .writeAsString(sha256); + final shaFile = await File('${outputDir.path}/$baseFileName.sha256').writeAsString(sha256); print('Generated ${shaFile.path}'); shaByArch.putIfAbsent(arch, () => sha256); @@ -138,21 +128,17 @@ class PackageGenerator { // updates releases in ${appName}.appdata.xml class AppDataModifier { - static String replaceVersions( - String origAppDataContent, List versions) { - final joinedReleases = versions - .map((v) => '\t\t') - .join('\n'); - final releasesSection = - '\n$joinedReleases\n\t'; //todo check this + static String replaceVersions(String origAppDataContent, List versions) { + final joinedReleases = + versions.map((v) => '\t\t').join('\n'); + final releasesSection = '\n$joinedReleases\n\t'; //todo check this if (origAppDataContent.contains('') .replaceFirst(RegExp(''), releasesSection) .replaceAll('<~>', '\n'); } else { - return origAppDataContent.replaceFirst( - '', '\n\t$releasesSection\n'); + return origAppDataContent.replaceFirst('', '\n\t$releasesSection\n'); } } } diff --git a/flatpak/scripts/flatpak_shared.dart b/flatpak/scripts/flatpak_shared.dart index 223387d2f..4e16b65ff 100644 --- a/flatpak/scripts/flatpak_shared.dart +++ b/flatpak/scripts/flatpak_shared.dart @@ -43,9 +43,8 @@ class Icon { _fileExtension = path.split('.').last; } - String getFilename(String appId) => (type == _symbolicType) - ? '$appId-symbolic.$_fileExtension' - : '$appId.$_fileExtension'; + String getFilename(String appId) => + (type == _symbolicType) ? '$appId-symbolic.$_fileExtension' : '$appId.$_fileExtension'; } class GithubReleases { @@ -74,8 +73,7 @@ class GithubReleases { final releaseJsonContent = (await http.get(Uri( scheme: 'https', host: 'api.github.com', - path: - '/repos/$githubReleaseOrganization/$githubReleaseProject/releases'))) + path: '/repos/$githubReleaseOrganization/$githubReleaseProject/releases'))) .body; final decodedJson = jsonDecode(releaseJsonContent) as List; @@ -86,10 +84,8 @@ class GithubReleases { await Future.forEach(decodedJson, (dynamic releaseDynamic) async { final releaseMap = releaseDynamic as Map; - final releaseDateAndTime = - DateTime.parse(releaseMap['published_at'] as String); - final releaseDateString = - releaseDateAndTime.toIso8601String().split('T').first; + final releaseDateAndTime = DateTime.parse(releaseMap['published_at'] as String); + final releaseDateString = releaseDateAndTime.toIso8601String().split('T').first; if (latestReleaseAssetDate == null || (latestReleaseAssetDate?.compareTo(releaseDateAndTime) == -1)) { @@ -100,8 +96,7 @@ class GithubReleases { } } - releases.add(Release( - version: releaseMap['name'] as String, date: releaseDateString)); + releases.add(Release(version: releaseMap['name'] as String, date: releaseDateString)); }); if (releases.isNotEmpty) { @@ -120,8 +115,7 @@ class GithubReleases { final downloadUrl = amMap['browser_download_url'] as String; final filename = amMap['name'] as String; final fileExtension = filename.substring(filename.indexOf('.') + 1); - final filenameWithoutExtension = - filename.substring(0, filename.indexOf('.')); + final filenameWithoutExtension = filename.substring(0, filename.indexOf('.')); final arch = filenameWithoutExtension.endsWith('aarch64') ? CPUArchitecture.aarch64 @@ -218,8 +212,7 @@ class FlatpakMeta { : _localReleases = localReleases, _localReleaseAssets = localReleaseAssets { if (githubReleaseOrganization != null && githubReleaseProject != null) { - _githubReleases = - GithubReleases(githubReleaseOrganization!, githubReleaseProject!); + _githubReleases = GithubReleases(githubReleaseOrganization!, githubReleaseProject!); } } @@ -232,15 +225,13 @@ class FlatpakMeta { return await _githubReleases!.getReleases(); } else { if (_localReleases == null) { - throw Exception( - 'Metadata must include releases if not fetching releases from Github.'); + throw Exception('Metadata must include releases if not fetching releases from Github.'); } return _localReleases!; } } - Future?> getReleaseAssets( - bool fetchReleasesFromGithub) async { + Future?> getReleaseAssets(bool fetchReleasesFromGithub) async { if (fetchReleasesFromGithub) { if (_githubReleases == null) { throw Exception( @@ -249,8 +240,7 @@ class FlatpakMeta { return _githubReleases!.getLatestReleaseAssets(); } else { if (_localReleases == null) { - throw Exception( - 'Metadata must include releases if not fetching releases from Github.'); + throw Exception('Metadata must include releases if not fetching releases from Github.'); } return _localReleaseAssets; } @@ -262,17 +252,13 @@ class FlatpakMeta { return FlatpakMeta( appId: json['appId'] as String, lowercaseAppName: json['lowercaseAppName'] as String, - githubReleaseOrganization: - json['githubReleaseOrganization'] as String?, + githubReleaseOrganization: json['githubReleaseOrganization'] as String?, githubReleaseProject: json['githubReleaseProject'] as String?, localReleases: (json['localReleases'] as List?)?.map((dynamic r) { final rMap = r as Map; - return Release( - version: rMap['version'] as String, - date: rMap['date'] as String); + return Release(version: rMap['version'] as String, date: rMap['date'] as String); }).toList(), - localReleaseAssets: - (json['localReleaseAssets'] as List?)?.map((dynamic ra) { + localReleaseAssets: (json['localReleaseAssets'] as List?)?.map((dynamic ra) { final raMap = ra as Map; final archString = raMap['arch'] as String; final arch = (archString == CPUArchitecture.x86_64.flatpakArchCode) @@ -284,10 +270,8 @@ class FlatpakMeta { throw Exception( 'Architecture must be either "${CPUArchitecture.x86_64.flatpakArchCode}" or "${CPUArchitecture.aarch64.flatpakArchCode}"'); } - final tarballPath = - '${jsonFile.parent.path}/${raMap['tarballPath'] as String}'; - final preShasum = - Process.runSync('shasum', ['-a', '256', tarballPath]); + final tarballPath = '${jsonFile.parent.path}/${raMap['tarballPath'] as String}'; + final preShasum = Process.runSync('shasum', ['-a', '256', tarballPath]); final shasum = preShasum.stdout.toString().split(' ').first; if (preShasum.exitCode != 0) { throw Exception(preShasum.stderr); @@ -302,17 +286,14 @@ class FlatpakMeta { appDataPath: json['appDataPath'] as String, desktopPath: json['desktopPath'] as String, icons: (json['icons'] as Map).entries.map((mapEntry) { - return Icon( - type: mapEntry.key as String, path: mapEntry.value as String); + return Icon(type: mapEntry.key as String, path: mapEntry.value as String); }).toList(), freedesktopRuntime: json['freedesktopRuntime'] as String, buildCommandsAfterUnpack: (json['buildCommandsAfterUnpack'] as List?) ?.map((dynamic bc) => bc as String) .toList(), extraModules: json['extraModules'] as List?, - finishArgs: (json['finishArgs'] as List) - .map((dynamic fa) => fa as String) - .toList()); + finishArgs: (json['finishArgs'] as List).map((dynamic fa) => fa as String).toList()); } catch (e) { throw Exception('Could not parse JSON file, due to this error:\n$e'); } diff --git a/flatpak/scripts/manifest_generator.dart b/flatpak/scripts/manifest_generator.dart index 6d152ba03..da27f8609 100644 --- a/flatpak/scripts/manifest_generator.dart +++ b/flatpak/scripts/manifest_generator.dart @@ -14,8 +14,7 @@ void main(List arguments) async { 'You must run this script with a metadata file argument, using the --meta flag.'); } if (arguments.length == metaIndex + 1) { - throw Exception( - 'The --meta flag must be followed by the path to the metadata file.'); + throw Exception('The --meta flag must be followed by the path to the metadata file.'); } final metaFile = File(arguments[metaIndex + 1]); @@ -27,20 +26,17 @@ void main(List arguments) async { final fetchFromGithub = arguments.contains('--github'); - final outputDir = - Directory('${Directory.current.path}/flatpak_generator_exports'); + final outputDir = Directory('${Directory.current.path}/flatpak_generator_exports'); outputDir.createSync(); final manifestGenerator = FlatpakManifestGenerator(meta); - final manifestContent = - await manifestGenerator.generateFlatpakManifest(fetchFromGithub); + final manifestContent = await manifestGenerator.generateFlatpakManifest(fetchFromGithub); final manifestPath = '${outputDir.path}/${meta.appId}.json'; final manifestFile = File(manifestPath); manifestFile.writeAsStringSync(manifestContent); print('Generated $manifestPath'); - final flathubJsonContent = - await manifestGenerator.generateFlathubJson(fetchFromGithub); + final flathubJsonContent = await manifestGenerator.generateFlathubJson(fetchFromGithub); if (flathubJsonContent != null) { final flathubJsonPath = '${outputDir.path}/flathub.json'; final flathubJsonFile = File(flathubJsonPath); @@ -119,8 +115,7 @@ class FlatpakManifestGenerator { const encoder = JsonEncoder.withIndent(' '); - final onlyArchListInput = - fetchFromGithub ? _githubArchSupport! : _localArchSupport!; + final onlyArchListInput = fetchFromGithub ? _githubArchSupport! : _localArchSupport!; final onlyArchList = List.empty(growable: true); for (final e in onlyArchListInput.entries) { @@ -136,8 +131,7 @@ class FlatpakManifestGenerator { } } - void _lazyGenerateArchSupportMap( - bool fetchFromGithub, List assets) { + void _lazyGenerateArchSupportMap(bool fetchFromGithub, List assets) { if (fetchFromGithub) { if (_githubArchSupport == null) { _githubArchSupport = { diff --git a/integration_test/1_dashboard.dart b/integration_test/1_dashboard.dart index 8c7de80b9..315788584 100644 --- a/integration_test/1_dashboard.dart +++ b/integration_test/1_dashboard.dart @@ -34,20 +34,17 @@ Widget createDashboardScreen({locale = 'en'}) { } ] }; - when(mockWorkoutProvider.fetchSessionData()) - .thenAnswer((a) => Future.value(logs)); + when(mockWorkoutProvider.fetchSessionData()).thenAnswer((a) => Future.value(logs)); final mockNutritionProvider = MockNutritionPlansProvider(); - when(mockNutritionProvider.currentPlan) - .thenAnswer((realInvocation) => getNutritionalPlan()); + when(mockNutritionProvider.currentPlan).thenAnswer((realInvocation) => getNutritionalPlan()); when(mockNutritionProvider.items).thenReturn([getNutritionalPlan()]); final mockWeightProvider = MockBodyWeightProvider(); when(mockWeightProvider.items).thenReturn(getWeightEntries()); final mockMeasurementProvider = MockMeasurementProvider(); - when(mockMeasurementProvider.categories) - .thenReturn(getMeasurementCategories()); + when(mockMeasurementProvider.categories).thenReturn(getMeasurementCategories()); return MultiProvider( providers: [ diff --git a/integration_test/2_workout.dart b/integration_test/2_workout.dart index 5354ba7d8..3b6f4fa92 100644 --- a/integration_test/2_workout.dart +++ b/integration_test/2_workout.dart @@ -15,8 +15,7 @@ Widget createWorkoutDetailScreen({locale = 'en'}) { final mockWorkoutProvider = MockWorkoutPlansProvider(); final workout = getWorkout(); when(mockWorkoutProvider.activePlan).thenReturn(workout); - when(mockWorkoutProvider.fetchAndSetWorkoutPlanFull(1)) - .thenAnswer((_) => Future.value(workout)); + when(mockWorkoutProvider.fetchAndSetWorkoutPlanFull(1)).thenAnswer((_) => Future.value(workout)); return MultiProvider( providers: [ diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart index addc9b32c..8ffcbdc20 100644 --- a/integration_test/3_gym_mode.dart +++ b/integration_test/3_gym_mode.dart @@ -20,10 +20,8 @@ Widget createGymModeScreen({locale = 'en'}) { final mockExerciseProvider = MockExercisesProvider(); - when(mockExerciseProvider.findExerciseBaseById(1)) - .thenReturn(bases[0]); // bench press - when(mockExerciseProvider.findExerciseBaseById(6)) - .thenReturn(bases[5]); // side raises + when(mockExerciseProvider.findExerciseBaseById(1)).thenReturn(bases[0]); // bench press + when(mockExerciseProvider.findExerciseBaseById(6)).thenReturn(bases[5]); // side raises //when(mockExerciseProvider.findExerciseBaseById(2)).thenReturn(bases[1]); // crunches //when(mockExerciseProvider.findExerciseBaseById(3)).thenReturn(bases[2]); // dead lift diff --git a/integration_test/4_measurements.dart b/integration_test/4_measurements.dart index 4ba6832b1..668618ef7 100644 --- a/integration_test/4_measurements.dart +++ b/integration_test/4_measurements.dart @@ -11,8 +11,7 @@ import '../test_data/measurements.dart'; Widget createMeasurementScreen({locale = 'en'}) { final mockMeasurementProvider = MockMeasurementProvider(); - when(mockMeasurementProvider.categories) - .thenReturn(getMeasurementCategories()); + when(mockMeasurementProvider.categories).thenReturn(getMeasurementCategories()); return MultiProvider( providers: [ diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart index 5b1877ae3..14891f96d 100644 --- a/integration_test/make_screenshots_test.dart +++ b/integration_test/make_screenshots_test.dart @@ -11,14 +11,12 @@ import '4_measurements.dart'; import '5_nutritional_plan.dart'; import '6_weight.dart'; -Future takeScreenshot( - tester, binding, String language, String name) async { +Future takeScreenshot(tester, binding, String language, String name) async { if (Platform.isAndroid) { await binding.convertFlutterSurfaceToImage(); await tester.pumpAndSettle(); } - final filename = - 'fastlane/metadata/android/$language/images/phoneScreenshots/$name.png'; + final filename = 'fastlane/metadata/android/$language/images/phoneScreenshots/$name.png'; await binding.takeScreenshot(filename); } @@ -62,10 +60,8 @@ void main() { await takeScreenshot(tester, binding, language, '01 - dashboard'); }); - testWidgets('workout detail screen - $language', - (WidgetTester tester) async { - await tester - .pumpWidget(createWorkoutDetailScreen(locale: languageCode)); + testWidgets('workout detail screen - $language', (WidgetTester tester) async { + await tester.pumpWidget(createWorkoutDetailScreen(locale: languageCode)); await tester.tap(find.byType(TextButton)); await tester.pumpAndSettle(); await takeScreenshot(tester, binding, language, '02 - workout detail'); @@ -78,24 +74,19 @@ void main() { await takeScreenshot(tester, binding, language, '03 - gym mode'); }); - testWidgets('measurement screen - $language', - (WidgetTester tester) async { + testWidgets('measurement screen - $language', (WidgetTester tester) async { await tester.pumpWidget(createMeasurementScreen(locale: languageCode)); await takeScreenshot(tester, binding, language, '04 - measurements'); }); - testWidgets('nutritional plan detail - $language', - (WidgetTester tester) async { - await tester - .pumpWidget(createNutritionalPlanScreen(locale: languageCode)); + testWidgets('nutritional plan detail - $language', (WidgetTester tester) async { + await tester.pumpWidget(createNutritionalPlanScreen(locale: languageCode)); await tester.tap(find.byType(TextButton)); await tester.pumpAndSettle(); - await takeScreenshot( - tester, binding, language, '05 - nutritional plan'); + await takeScreenshot(tester, binding, language, '05 - nutritional plan'); }); - testWidgets('body weight screen - $language', - (WidgetTester tester) async { + testWidgets('body weight screen - $language', (WidgetTester tester) async { await tester.pumpWidget(createWeightScreen(locale: languageCode)); await tester.pumpAndSettle(); await takeScreenshot(tester, binding, language, '06 - weight'); diff --git a/lib/database/exercise_DB/exercise_database.dart b/lib/database/exercise_DB/exercise_database.dart index 0a913b802..c8e0a8e89 100644 --- a/lib/database/exercise_DB/exercise_database.dart +++ b/lib/database/exercise_DB/exercise_database.dart @@ -17,16 +17,12 @@ part 'exercise_database.g.dart'; @DataClassName('ExerciseTable') class ExerciseTableItems extends Table { IntColumn get id => integer().autoIncrement()(); - TextColumn get exercisebase => - text().map(const ExerciseBaseConverter()).nullable()(); + TextColumn get exercisebase => text().map(const ExerciseBaseConverter()).nullable()(); TextColumn get muscle => text().map(const MuscleConverter()).nullable()(); - TextColumn get category => - text().map(const ExerciseCategoryConverter()).nullable()(); - TextColumn get variation => - text().map(const VariationConverter()).nullable()(); + TextColumn get category => text().map(const ExerciseCategoryConverter()).nullable()(); + TextColumn get variation => text().map(const VariationConverter()).nullable()(); TextColumn get language => text().map(const LanguageConverter()).nullable()(); - TextColumn get equipment => - text().map(const EquipmentConverter()).nullable()(); + TextColumn get equipment => text().map(const EquipmentConverter()).nullable()(); DateTimeColumn get expiresIn => dateTime().nullable()(); } diff --git a/lib/database/exercise_DB/exercise_database.g.dart b/lib/database/exercise_DB/exercise_database.g.dart index 636c8d938..6880d80df 100644 --- a/lib/database/exercise_DB/exercise_database.g.dart +++ b/lib/database/exercise_DB/exercise_database.g.dart @@ -11,76 +11,55 @@ class $ExerciseTableItemsTable extends ExerciseTableItems $ExerciseTableItemsTable(this.attachedDatabase, [this._alias]); static const VerificationMeta _idMeta = const VerificationMeta('id'); @override - late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, hasAutoIncrement: true, type: DriftSqlType.int, requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); - static const VerificationMeta _exercisebaseMeta = - const VerificationMeta('exercisebase'); + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + static const VerificationMeta _exercisebaseMeta = const VerificationMeta('exercisebase'); @override - late final GeneratedColumnWithTypeConverter - exercisebase = GeneratedColumn('exercisebase', aliasedName, true, + late final GeneratedColumnWithTypeConverter exercisebase = + GeneratedColumn('exercisebase', aliasedName, true, type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $ExerciseTableItemsTable.$converterexercisebasen); + .withConverter($ExerciseTableItemsTable.$converterexercisebasen); static const VerificationMeta _muscleMeta = const VerificationMeta('muscle'); @override - late final GeneratedColumnWithTypeConverter muscle = - GeneratedColumn('muscle', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter($ExerciseTableItemsTable.$convertermusclen); - static const VerificationMeta _categoryMeta = - const VerificationMeta('category'); + late final GeneratedColumnWithTypeConverter muscle = GeneratedColumn( + 'muscle', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false) + .withConverter($ExerciseTableItemsTable.$convertermusclen); + static const VerificationMeta _categoryMeta = const VerificationMeta('category'); @override - late final GeneratedColumnWithTypeConverter - category = GeneratedColumn('category', aliasedName, true, + late final GeneratedColumnWithTypeConverter category = + GeneratedColumn('category', aliasedName, true, type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $ExerciseTableItemsTable.$convertercategoryn); - static const VerificationMeta _variationMeta = - const VerificationMeta('variation'); + .withConverter($ExerciseTableItemsTable.$convertercategoryn); + static const VerificationMeta _variationMeta = const VerificationMeta('variation'); @override late final GeneratedColumnWithTypeConverter variation = GeneratedColumn('variation', aliasedName, true, type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $ExerciseTableItemsTable.$convertervariationn); - static const VerificationMeta _languageMeta = - const VerificationMeta('language'); + .withConverter($ExerciseTableItemsTable.$convertervariationn); + static const VerificationMeta _languageMeta = const VerificationMeta('language'); @override - late final GeneratedColumnWithTypeConverter language = - GeneratedColumn('language', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $ExerciseTableItemsTable.$converterlanguagen); - static const VerificationMeta _equipmentMeta = - const VerificationMeta('equipment'); + late final GeneratedColumnWithTypeConverter language = GeneratedColumn( + 'language', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false) + .withConverter($ExerciseTableItemsTable.$converterlanguagen); + static const VerificationMeta _equipmentMeta = const VerificationMeta('equipment'); @override late final GeneratedColumnWithTypeConverter equipment = GeneratedColumn('equipment', aliasedName, true, type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $ExerciseTableItemsTable.$converterequipmentn); - static const VerificationMeta _expiresInMeta = - const VerificationMeta('expiresIn'); + .withConverter($ExerciseTableItemsTable.$converterequipmentn); + static const VerificationMeta _expiresInMeta = const VerificationMeta('expiresIn'); @override late final GeneratedColumn expiresIn = GeneratedColumn( 'expires_in', aliasedName, true, type: DriftSqlType.dateTime, requiredDuringInsert: false); @override - List get $columns => [ - id, - exercisebase, - muscle, - category, - variation, - language, - equipment, - expiresIn - ]; + List get $columns => + [id, exercisebase, muscle, category, variation, language, equipment, expiresIn]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -101,8 +80,8 @@ class $ExerciseTableItemsTable extends ExerciseTableItems context.handle(_languageMeta, const VerificationResult.success()); context.handle(_equipmentMeta, const VerificationResult.success()); if (data.containsKey('expires_in')) { - context.handle(_expiresInMeta, - expiresIn.isAcceptableOrUnknown(data['expires_in']!, _expiresInMeta)); + context.handle( + _expiresInMeta, expiresIn.isAcceptableOrUnknown(data['expires_in']!, _expiresInMeta)); } return context; } @@ -113,26 +92,20 @@ class $ExerciseTableItemsTable extends ExerciseTableItems ExerciseTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ExerciseTable( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - exercisebase: $ExerciseTableItemsTable.$converterexercisebasen.fromSql( - attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}exercisebase'])), + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + exercisebase: $ExerciseTableItemsTable.$converterexercisebasen.fromSql(attachedDatabase + .typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}exercisebase'])), muscle: $ExerciseTableItemsTable.$convertermusclen.fromSql( - attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}muscle'])), - category: $ExerciseTableItemsTable.$convertercategoryn.fromSql( - attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}category'])), - variation: $ExerciseTableItemsTable.$convertervariationn.fromSql( - attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}variation'])), - language: $ExerciseTableItemsTable.$converterlanguagen.fromSql( - attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}language'])), - equipment: $ExerciseTableItemsTable.$converterequipmentn.fromSql( - attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}equipment'])), + attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}muscle'])), + category: $ExerciseTableItemsTable.$convertercategoryn.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}category'])), + variation: $ExerciseTableItemsTable.$convertervariationn.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}variation'])), + language: $ExerciseTableItemsTable.$converterlanguagen.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}language'])), + equipment: $ExerciseTableItemsTable.$converterequipmentn.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}equipment'])), expiresIn: attachedDatabase.typeMapping .read(DriftSqlType.dateTime, data['${effectivePrefix}expires_in']), ); @@ -143,28 +116,23 @@ class $ExerciseTableItemsTable extends ExerciseTableItems return $ExerciseTableItemsTable(attachedDatabase, alias); } - static TypeConverter $converterexercisebase = - const ExerciseBaseConverter(); + static TypeConverter $converterexercisebase = const ExerciseBaseConverter(); static TypeConverter $converterexercisebasen = NullAwareTypeConverter.wrap($converterexercisebase); - static TypeConverter $convertermuscle = - const MuscleConverter(); + static TypeConverter $convertermuscle = const MuscleConverter(); static TypeConverter $convertermusclen = NullAwareTypeConverter.wrap($convertermuscle); static TypeConverter $convertercategory = const ExerciseCategoryConverter(); static TypeConverter $convertercategoryn = NullAwareTypeConverter.wrap($convertercategory); - static TypeConverter $convertervariation = - const VariationConverter(); + static TypeConverter $convertervariation = const VariationConverter(); static TypeConverter $convertervariationn = NullAwareTypeConverter.wrap($convertervariation); - static TypeConverter $converterlanguage = - const LanguageConverter(); + static TypeConverter $converterlanguage = const LanguageConverter(); static TypeConverter $converterlanguagen = NullAwareTypeConverter.wrap($converterlanguage); - static TypeConverter $converterequipment = - const EquipmentConverter(); + static TypeConverter $converterequipment = const EquipmentConverter(); static TypeConverter $converterequipmentn = NullAwareTypeConverter.wrap($converterequipment); } @@ -224,31 +192,18 @@ class ExerciseTable extends DataClass implements Insertable { ExerciseTableItemsCompanion toCompanion(bool nullToAbsent) { return ExerciseTableItemsCompanion( id: Value(id), - exercisebase: exercisebase == null && nullToAbsent - ? const Value.absent() - : Value(exercisebase), - muscle: - muscle == null && nullToAbsent ? const Value.absent() : Value(muscle), - category: category == null && nullToAbsent - ? const Value.absent() - : Value(category), - variation: variation == null && nullToAbsent - ? const Value.absent() - : Value(variation), - language: language == null && nullToAbsent - ? const Value.absent() - : Value(language), - equipment: equipment == null && nullToAbsent - ? const Value.absent() - : Value(equipment), - expiresIn: expiresIn == null && nullToAbsent - ? const Value.absent() - : Value(expiresIn), + exercisebase: + exercisebase == null && nullToAbsent ? const Value.absent() : Value(exercisebase), + muscle: muscle == null && nullToAbsent ? const Value.absent() : Value(muscle), + category: category == null && nullToAbsent ? const Value.absent() : Value(category), + variation: variation == null && nullToAbsent ? const Value.absent() : Value(variation), + language: language == null && nullToAbsent ? const Value.absent() : Value(language), + equipment: equipment == null && nullToAbsent ? const Value.absent() : Value(equipment), + expiresIn: expiresIn == null && nullToAbsent ? const Value.absent() : Value(expiresIn), ); } - factory ExerciseTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ExerciseTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return ExerciseTable( id: serializer.fromJson(json['id']), @@ -287,8 +242,7 @@ class ExerciseTable extends DataClass implements Insertable { Value expiresIn = const Value.absent()}) => ExerciseTable( id: id ?? this.id, - exercisebase: - exercisebase.present ? exercisebase.value : this.exercisebase, + exercisebase: exercisebase.present ? exercisebase.value : this.exercisebase, muscle: muscle.present ? muscle.value : this.muscle, category: category.present ? category.value : this.category, variation: variation.present ? variation.value : this.variation, @@ -312,8 +266,8 @@ class ExerciseTable extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, exercisebase, muscle, category, variation, - language, equipment, expiresIn); + int get hashCode => + Object.hash(id, exercisebase, muscle, category, variation, language, equipment, expiresIn); @override bool operator ==(Object other) => identical(this, other) || @@ -409,8 +363,7 @@ class ExerciseTableItemsCompanion extends UpdateCompanion { if (exercisebase.present) { final converter = $ExerciseTableItemsTable.$converterexercisebasen; - map['exercisebase'] = - Variable(converter.toSql(exercisebase.value)); + map['exercisebase'] = Variable(converter.toSql(exercisebase.value)); } if (muscle.present) { final converter = $ExerciseTableItemsTable.$convertermusclen; @@ -461,8 +414,7 @@ class ExerciseTableItemsCompanion extends UpdateCompanion { abstract class _$ExerciseDatabase extends GeneratedDatabase { _$ExerciseDatabase(QueryExecutor e) : super(e); - late final $ExerciseTableItemsTable exerciseTableItems = - $ExerciseTableItemsTable(this); + late final $ExerciseTableItemsTable exerciseTableItems = $ExerciseTableItemsTable(this); @override Iterable> get allTables => allSchemaEntities.whereType>(); diff --git a/lib/database/exercise_DB/type_converters.dart b/lib/database/exercise_DB/type_converters.dart index fa4f33788..c6e2bd308 100644 --- a/lib/database/exercise_DB/type_converters.dart +++ b/lib/database/exercise_DB/type_converters.dart @@ -44,14 +44,10 @@ class ExerciseBaseConverter extends TypeConverter { final Map baseData = json.decode(fromDb); final category = ExerciseCategory.fromJson(baseData['categories']); - final musclesPrimary = - baseData['muscless'].map((e) => Muscle.fromJson(e)).toList(); - final musclesSecondary = - baseData['musclesSecondary'].map((e) => Muscle.fromJson(e)).toList(); - final equipment = - baseData['equipments'].map((e) => Equipment.fromJson(e)).toList(); - final images = - baseData['images'].map((e) => ExerciseImage.fromJson(e)).toList(); + final musclesPrimary = baseData['muscless'].map((e) => Muscle.fromJson(e)).toList(); + final musclesSecondary = baseData['musclesSecondary'].map((e) => Muscle.fromJson(e)).toList(); + final equipment = baseData['equipments'].map((e) => Equipment.fromJson(e)).toList(); + final images = baseData['images'].map((e) => ExerciseImage.fromJson(e)).toList(); final videos = baseData['videos'].map((e) => Video.fromJson(e)).toList(); final List exercises = []; @@ -62,14 +58,10 @@ class ExerciseBaseConverter extends TypeConverter { description: exerciseData['description'], baseId: baseData['id'], ); - exercise.aliases = exerciseData['aliases'] - .map((e) => Alias.fromJson(e)) - .toList() - .cast(); - exercise.notes = exerciseData['notes'] - .map((e) => Comment.fromJson(e)) - .toList() - .cast(); + exercise.aliases = + exerciseData['aliases'].map((e) => Alias.fromJson(e)).toList().cast(); + exercise.notes = + exerciseData['notes'].map((e) => Comment.fromJson(e)).toList().cast(); exercise.language = Language.fromJson(exerciseData['languageObj']); exercises.add(exercise); } @@ -124,14 +116,12 @@ class EquipmentConverter extends TypeConverter { } } -class ExerciseCategoryConverter - extends TypeConverter { +class ExerciseCategoryConverter extends TypeConverter { const ExerciseCategoryConverter(); @override ExerciseCategory fromSql(String fromDb) { - return ExerciseCategory.fromJson( - json.decode(fromDb) as Map); + return ExerciseCategory.fromJson(json.decode(fromDb) as Map); } @override diff --git a/lib/exceptions/http_exception.dart b/lib/exceptions/http_exception.dart index 777efa2b3..b442e34a2 100644 --- a/lib/exceptions/http_exception.dart +++ b/lib/exceptions/http_exception.dart @@ -26,10 +26,7 @@ class WgerHttpException implements Exception { /// JSON. Will use the response as-is if it fails. WgerHttpException(dynamic responseBody) { if (responseBody == null) { - errors = { - 'unknown_error': - 'An unknown error occurred, no further information available' - }; + errors = {'unknown_error': 'An unknown error occurred, no further information available'}; } else { try { errors = {'unknown_error': json.decode(responseBody)}; diff --git a/lib/helpers/charts.dart b/lib/helpers/charts.dart index 9b7584377..64a0b6e84 100644 --- a/lib/helpers/charts.dart +++ b/lib/helpers/charts.dart @@ -1,7 +1,5 @@ double chartGetInterval(DateTime first, DateTime last, {divider = 3}) { final dayDiff = last.difference(first); - return dayDiff.inMilliseconds == 0 - ? 1000 - : dayDiff.inMilliseconds.abs() / divider; + return dayDiff.inMilliseconds == 0 ? 1000 : dayDiff.inMilliseconds.abs() / divider; } diff --git a/lib/helpers/exercises/forms.dart b/lib/helpers/exercises/forms.dart index 6e05d93c8..25d92bde4 100644 --- a/lib/helpers/exercises/forms.dart +++ b/lib/helpers/exercises/forms.dart @@ -14,8 +14,7 @@ String? validateName(String? name, BuildContext context) { } if (name.length < MIN_CHARS_NAME || name.length > MAX_CHARS_NAME) { - return AppLocalizations.of(context) - .enterCharacters(MIN_CHARS_NAME, MAX_CHARS_NAME); + return AppLocalizations.of(context).enterCharacters(MIN_CHARS_NAME, MAX_CHARS_NAME); } return null; @@ -27,8 +26,7 @@ String? validateDescription(String? name, BuildContext context) { } if (name.length < MIN_CHARS_DESCRIPTION) { - return AppLocalizations.of(context) - .enterMinCharacters(MIN_CHARS_DESCRIPTION); + return AppLocalizations.of(context).enterMinCharacters(MIN_CHARS_DESCRIPTION); } return null; diff --git a/lib/helpers/json.dart b/lib/helpers/json.dart index 291414a7b..7bc3ba442 100644 --- a/lib/helpers/json.dart +++ b/lib/helpers/json.dart @@ -60,6 +60,5 @@ String? timeToString(TimeOfDay? time) { if (time == null) { return null; } - return const DefaultMaterialLocalizations() - .formatTimeOfDay(time, alwaysUse24HourFormat: true); + return const DefaultMaterialLocalizations().formatTimeOfDay(time, alwaysUse24HourFormat: true); } diff --git a/lib/helpers/misc.dart b/lib/helpers/misc.dart index 4c24a6df6..26c34cc28 100644 --- a/lib/helpers/misc.dart +++ b/lib/helpers/misc.dart @@ -42,9 +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 != REP_UNIT_REPETITIONS || - weight == 0 || - weight == null) { + if (repetitionUnitObj.id != REP_UNIT_REPETITIONS || weight == 0 || weight == null) { out.add(repetitionUnitObj.name); } } diff --git a/lib/helpers/platform.dart b/lib/helpers/platform.dart index 6d8573783..82b0484d7 100644 --- a/lib/helpers/platform.dart +++ b/lib/helpers/platform.dart @@ -21,5 +21,4 @@ import 'package:flutter/foundation.dart'; // Note: we're not using Platform.isAndroid etc because during tests these would+ // always take the value of the current platform. TargetPlatform is always Android // during tests, but can be changed to check for correct UI switches, etc. -final isDesktop = [TargetPlatform.linux, TargetPlatform.macOS] - .contains(defaultTargetPlatform); +final isDesktop = [TargetPlatform.linux, TargetPlatform.macOS].contains(defaultTargetPlatform); diff --git a/lib/helpers/ui.dart b/lib/helpers/ui.dart index 39dfabe5e..626e42e63 100644 --- a/lib/helpers/ui.dart +++ b/lib/helpers/ui.dart @@ -49,8 +49,7 @@ void showErrorDialog(dynamic exception, BuildContext context) { ); } -void showHttpExceptionErrorDialog( - WgerHttpException exception, BuildContext context) async { +void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext context) async { log('showHttpExceptionErrorDialog: '); log(exception.toString()); log('-------------------'); @@ -59,8 +58,7 @@ void showHttpExceptionErrorDialog( for (final key in exception.errors!.keys) { // Error headers // Ensure that the error heading first letter is capitalized. - final String errorHeaderMsg = - key[0].toUpperCase() + key.substring(1, key.length); + final String errorHeaderMsg = key[0].toUpperCase() + key.substring(1, key.length); errorList.add( Text( @@ -131,8 +129,7 @@ dynamic showDeleteDialog( ), onPressed: () { exerciseData[exercise]!.removeWhere((el) => el.id == log.id); - Provider.of(context, listen: false) - .deleteLog( + Provider.of(context, listen: false).deleteLog( log, ); diff --git a/lib/main.dart b/lib/main.dart index d8872aae3..98f809326 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,21 +81,19 @@ class MyApp extends StatelessWidget { create: (ctx) => AuthProvider(), ), ChangeNotifierProxyProvider( - create: (context) => ExercisesProvider(WgerBaseProvider( - Provider.of(context, listen: false))), + create: (context) => ExercisesProvider( + WgerBaseProvider(Provider.of(context, listen: false))), update: (context, base, previous) => previous ?? ExercisesProvider(WgerBaseProvider(base)), ), - ChangeNotifierProxyProvider2( + ChangeNotifierProxyProvider2( create: (context) => WorkoutPlansProvider( WgerBaseProvider(Provider.of(context, listen: false)), Provider.of(context, listen: false), [], ), update: (context, auth, exercises, previous) => - previous ?? - WorkoutPlansProvider(WgerBaseProvider(auth), exercises, []), + previous ?? WorkoutPlansProvider(WgerBaseProvider(auth), exercises, []), ), ChangeNotifierProxyProvider( create: (context) => NutritionPlansProvider( @@ -116,8 +114,7 @@ class MyApp extends StatelessWidget { create: (context) => UserProvider( WgerBaseProvider(Provider.of(context, listen: false)), ), - update: (context, base, previous) => - previous ?? UserProvider(WgerBaseProvider(base)), + update: (context, base, previous) => previous ?? UserProvider(WgerBaseProvider(base)), ), ChangeNotifierProxyProvider( create: (context) => BodyWeightProvider( @@ -127,10 +124,9 @@ class MyApp extends StatelessWidget { previous ?? BodyWeightProvider(WgerBaseProvider(base)), ), ChangeNotifierProxyProvider( - create: (context) => GalleryProvider( - Provider.of(context, listen: false), []), - update: (context, auth, previous) => - previous ?? GalleryProvider(auth, []), + create: (context) => + GalleryProvider(Provider.of(context, listen: false), []), + update: (context, auth, previous) => previous ?? GalleryProvider(auth, []), ), ChangeNotifierProxyProvider( create: (context) => AddExerciseProvider( @@ -153,8 +149,7 @@ class MyApp extends StatelessWidget { : FutureBuilder( future: auth.tryAutoLogin(), builder: (ctx, authResultSnapshot) => - authResultSnapshot.connectionState == - ConnectionState.waiting + authResultSnapshot.connectionState == ConnectionState.waiting ? SplashScreen() : AuthScreen(), ), @@ -164,10 +159,8 @@ class MyApp extends StatelessWidget { GalleryScreen.routeName: (ctx) => const GalleryScreen(), GymModeScreen.routeName: (ctx) => GymModeScreen(), HomeTabsScreen.routeName: (ctx) => HomeTabsScreen(), - MeasurementCategoriesScreen.routeName: (ctx) => - MeasurementCategoriesScreen(), - MeasurementEntriesScreen.routeName: (ctx) => - MeasurementEntriesScreen(), + MeasurementCategoriesScreen.routeName: (ctx) => MeasurementCategoriesScreen(), + MeasurementEntriesScreen.routeName: (ctx) => MeasurementEntriesScreen(), NutritionScreen.routeName: (ctx) => NutritionScreen(), NutritionalDiaryScreen.routeName: (ctx) => NutritionalDiaryScreen(), NutritionalPlanScreen.routeName: (ctx) => NutritionalPlanScreen(), @@ -175,8 +168,7 @@ class MyApp extends StatelessWidget { WorkoutPlanScreen.routeName: (ctx) => WorkoutPlanScreen(), WorkoutPlansScreen.routeName: (ctx) => WorkoutPlansScreen(), ExercisesScreen.routeName: (ctx) => const ExercisesScreen(), - ExerciseDetailScreen.routeName: (ctx) => - const ExerciseDetailScreen(), + ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(), AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(), AboutPage.routeName: (ctx) => const AboutPage(), }, diff --git a/lib/models/body_weight/weight_entry.dart b/lib/models/body_weight/weight_entry.dart index 4ab714e7b..1fbb5dbf1 100644 --- a/lib/models/body_weight/weight_entry.dart +++ b/lib/models/body_weight/weight_entry.dart @@ -45,7 +45,6 @@ class WeightEntry { } // Boilerplate - factory WeightEntry.fromJson(Map json) => - _$WeightEntryFromJson(json); + factory WeightEntry.fromJson(Map json) => _$WeightEntryFromJson(json); Map toJson() => _$WeightEntryToJson(this); } diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index 60ee02c9b..d1152d20e 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.dart b/lib/models/exercises/base.dart index cc00a1e30..69f027d5f 100644 --- a/lib/models/exercises/base.dart +++ b/lib/models/exercises/base.dart @@ -162,8 +162,7 @@ class ExerciseBase extends Equatable { } // Boilerplate - factory ExerciseBase.fromJson(Map json) => - _$ExerciseBaseFromJson(json); + factory ExerciseBase.fromJson(Map json) => _$ExerciseBaseFromJson(json); Map toJson() => _$ExerciseBaseToJson(this); diff --git a/lib/models/exercises/base.g.dart b/lib/models/exercises/base.g.dart index c04a91937..e86a248c5 100644 --- a/lib/models/exercises/base.g.dart +++ b/lib/models/exercises/base.g.dart @@ -24,32 +24,24 @@ ExerciseBase _$ExerciseBaseFromJson(Map json) { return ExerciseBase( id: json['id'] as int?, uuid: json['uuid'] as String?, - created: json['created'] == null - ? null - : DateTime.parse(json['created'] as String), - lastUpdate: json['last_update'] == null - ? null - : DateTime.parse(json['last_update'] as String), + created: json['created'] == null ? null : DateTime.parse(json['created'] as String), + lastUpdate: json['last_update'] == null ? null : DateTime.parse(json['last_update'] as String), variationId: json['variations'] as int?, category: json['categories'] == null ? null : ExerciseCategory.fromJson(json['categories'] as Map), ) ..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() ..translations = (json['translations'] as List) .map((e) => Translation.fromJson(e as Map)) .toList(); } -Map _$ExerciseBaseToJson(ExerciseBase instance) => - { +Map _$ExerciseBaseToJson(ExerciseBase instance) => { 'id': instance.id, 'uuid': instance.uuid, 'variations': instance.variationId, @@ -60,8 +52,7 @@ Map _$ExerciseBaseToJson(ExerciseBase instance) => 'muscles': instance.musclesIds, 'muscless': instance.muscles.map((e) => e.toJson()).toList(), 'muscles_secondary': instance.musclesSecondaryIds, - 'musclesSecondary': - instance.musclesSecondary.map((e) => e.toJson()).toList(), + 'musclesSecondary': instance.musclesSecondary.map((e) => e.toJson()).toList(), 'equipment': instance.equipmentIds, 'equipments': instance.equipment.map((e) => e.toJson()).toList(), 'images': instance.images.map((e) => e.toJson()).toList(), diff --git a/lib/models/exercises/category.dart b/lib/models/exercises/category.dart index 13a256454..5e3d9304d 100644 --- a/lib/models/exercises/category.dart +++ b/lib/models/exercises/category.dart @@ -40,8 +40,7 @@ class ExerciseCategory extends Equatable { } // Boilerplate - factory ExerciseCategory.fromJson(Map json) => - _$ExerciseCategoryFromJson(json); + factory ExerciseCategory.fromJson(Map json) => _$ExerciseCategoryFromJson(json); Map toJson() => _$ExerciseCategoryToJson(this); @override diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 19383107b..915120d13 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/comment.dart b/lib/models/exercises/comment.dart index abbfd1db8..3a28a9121 100644 --- a/lib/models/exercises/comment.dart +++ b/lib/models/exercises/comment.dart @@ -38,7 +38,6 @@ class Comment { }); // Boilerplate - factory Comment.fromJson(Map json) => - _$CommentFromJson(json); + factory Comment.fromJson(Map json) => _$CommentFromJson(json); Map toJson() => _$CommentToJson(this); } diff --git a/lib/models/exercises/equipment.dart b/lib/models/exercises/equipment.dart index 7e420e938..09ca9356d 100644 --- a/lib/models/exercises/equipment.dart +++ b/lib/models/exercises/equipment.dart @@ -35,8 +35,7 @@ class Equipment extends Equatable { }); // Boilerplate - factory Equipment.fromJson(Map json) => - _$EquipmentFromJson(json); + factory Equipment.fromJson(Map json) => _$EquipmentFromJson(json); Map toJson() => _$EquipmentToJson(this); @override diff --git a/lib/models/exercises/exercise_base_data.dart b/lib/models/exercises/exercise_base_data.dart index 769b146b2..34a421b34 100644 --- a/lib/models/exercises/exercise_base_data.dart +++ b/lib/models/exercises/exercise_base_data.dart @@ -25,6 +25,5 @@ class ExerciseBaseData with _$ExerciseBaseData { required List