From ef8acbe3c75e90f38f6f464d201415a348546018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 00:16:44 +0000 Subject: [PATCH 1/6] Bump shared_preferences from 2.5.2 to 2.5.3 Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.5.2 to 2.5.3. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.5.3/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 0e19b69f..179d88f5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1128,10 +1128,10 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a" + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.3" shared_preferences_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 476ae72e..389aabfa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,7 +61,7 @@ dependencies: path_provider: ^2.1.5 provider: ^6.1.2 rive: ^0.13.20 - shared_preferences: ^2.5.2 + shared_preferences: ^2.5.3 sqlite3_flutter_libs: ^0.5.31 table_calendar: ^3.0.8 url_launcher: ^6.3.1 From 45d671f4f936eb83c4dab257dd189825ecf9de66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 00:16:38 +0000 Subject: [PATCH 2/6] Bump video_player from 2.9.3 to 2.9.5 Bumps [video_player](https://github.com/flutter/packages/tree/main/packages/video_player) from 2.9.3 to 2.9.5. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/video_player-v2.9.5/packages/video_player) --- updated-dependencies: - dependency-name: video_player 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 179d88f5..d94e2afb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1461,10 +1461,10 @@ packages: dependency: "direct main" description: name: video_player - sha256: "48941c8b05732f9582116b1c01850b74dbee1d8520cd7e34ad4609d6df666845" + sha256: "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14" url: "https://pub.dev" source: hosted - version: "2.9.3" + version: "2.9.5" video_player_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 389aabfa..850a4ea7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -66,7 +66,7 @@ dependencies: table_calendar: ^3.0.8 url_launcher: ^6.3.1 version: ^3.0.2 - video_player: ^2.9.3 + video_player: ^2.9.5 logging: ^1.3.0 flutter_riverpod: ^2.6.1 From 6ce57af1316d20415ebac7839b9371026eebde37 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 31 Mar 2025 12:20:54 +0200 Subject: [PATCH 3/6] Exclude some files from the coverage report --- .github/workflows/ci.yml | 8 ++- dart_test.yaml | 2 +- lib/database/exercises/type_converters.dart | 56 --------------------- 3 files changed, 7 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57d410b4..9423e1a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,13 +26,17 @@ jobs: - run: flutter --version - name: Install sqlite3-dev - run: sudo apt install libsqlite3-dev + run: sudo apt install libsqlite3-dev lcov - name: Install app dependencies run: flutter pub get + # Removing some folders from the coverage since these files are not really + # part of the app code and just get in the way of the report - name: Test app - run: flutter test --coverage + run: | + flutter test --coverage + lcov --remove coverage/lcov.info 'lib/l10n/generated/*' 'lib/theme/*' - name: Coveralls uses: coverallsapp/github-action@v2 diff --git a/dart_test.yaml b/dart_test.yaml index 62bd2746..cfa1c9fd 100644 --- a/dart_test.yaml +++ b/dart_test.yaml @@ -1,2 +1,2 @@ tags: - golden: \ No newline at end of file + golden: { } \ No newline at end of file diff --git a/lib/database/exercises/type_converters.dart b/lib/database/exercises/type_converters.dart index b494aa2a..77d54559 100644 --- a/lib/database/exercises/type_converters.dart +++ b/lib/database/exercises/type_converters.dart @@ -1,67 +1,11 @@ import 'dart:convert'; import 'package:drift/drift.dart'; -import 'package:wger/models/exercises/alias.dart'; import 'package:wger/models/exercises/category.dart'; -import 'package:wger/models/exercises/comment.dart'; import 'package:wger/models/exercises/equipment.dart'; -import 'package:wger/models/exercises/exercise.dart'; -import 'package:wger/models/exercises/image.dart'; import 'package:wger/models/exercises/language.dart'; import 'package:wger/models/exercises/muscle.dart'; -import 'package:wger/models/exercises/translation.dart'; import 'package:wger/models/exercises/variation.dart'; -import 'package:wger/models/exercises/video.dart'; - -class ExerciseBaseConverter extends TypeConverter { - const ExerciseBaseConverter(); - - @override - Exercise fromSql(String fromDb) { - 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 videos = baseData['videos'].map((e) => Video.fromJson(e)).toList(); - - final List translations = []; - for (final exerciseData in baseData['translations']) { - final translation = Translation( - id: exerciseData['id'], - name: exerciseData['name'], - description: exerciseData['description'], - exerciseId: baseData['id'], - ); - translation.aliases = exerciseData['aliases'].map((e) => Alias.fromJson(e)).toList(); - translation.notes = exerciseData['notes'].map((e) => Comment.fromJson(e)).toList(); - translation.language = Language.fromJson(exerciseData['languageObj']); - translations.add(translation); - } - - final exerciseBase = Exercise( - id: baseData['id'], - uuid: baseData['uuid'], - created: null, - //creationDate: toDate(baseData['creation_date']), - musclesSecondary: musclesSecondary.cast(), - muscles: musclesPrimary.cast(), - equipment: equipment.cast(), - category: category, - images: images.cast(), - translations: translations, - videos: videos.cast