From c664ccedfadc830fd202544c8b6f139ddae1548d Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 29 Oct 2024 19:05:20 +0100 Subject: [PATCH] Update generated files --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/Podfile.lock | 45 +- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/AppDelegate.swift | 2 +- .../exercises/exercise_database.g.dart | 398 ++++++++++++------ .../ingredients/ingredients_database.g.dart | 87 ++-- .../exercises/exercise_api.freezed.dart | 133 ++++-- .../exercises/ingredient_api.freezed.dart | 69 ++- macos/Podfile.lock | 27 +- macos/Runner/AppDelegate.swift | 2 +- pubspec.lock | 221 +++++----- 12 files changed, 626 insertions(+), 364 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 6b665338..4cf0c849 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0cdb23fc..36cfa724 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -17,23 +17,28 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS + - pointer_interceptor_ios (0.0.1): + - Flutter - rive_common (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (3.45.0): - - sqlite3/common (= 3.45.0) - - sqlite3/common (3.45.0) - - sqlite3/fts5 (3.45.0): + - sqlite3 (3.47.0): + - sqlite3/common (= 3.47.0) + - sqlite3/common (3.47.0) + - sqlite3/dbstatvtab (3.47.0): - sqlite3/common - - sqlite3/perf-threadsafe (3.45.0): + - sqlite3/fts5 (3.47.0): - sqlite3/common - - sqlite3/rtree (3.45.0): + - sqlite3/perf-threadsafe (3.47.0): + - sqlite3/common + - sqlite3/rtree (3.47.0): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - - sqlite3 (~> 3.45.0) + - sqlite3 (~> 3.47.0) + - sqlite3/dbstatvtab - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -53,6 +58,7 @@ DEPENDENCIES: - integration_test (from `.symlinks/plugins/integration_test/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`) - rive_common (from `.symlinks/plugins/rive_common/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`) @@ -82,6 +88,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" + pointer_interceptor_ios: + :path: ".symlinks/plugins/pointer_interceptor_ios/ios" rive_common: :path: ".symlinks/plugins/rive_common/ios" shared_preferences_foundation: @@ -94,22 +102,23 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/video_player_avfoundation/darwin" SPEC CHECKSUMS: - camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb + camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6 - image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 - integration_test: 13825b8a9334a850581300559b8839134b124670 - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 + integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 + package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1 rive_common: 3a4c254c6e4db7e4b9e05daeb3d1f47ae4f7bf76 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - sqlite3: f307b6291c4db7b5086c38d6237446b98a738581 - sqlite3_flutter_libs: aeb4d37509853dfa79d9b59386a2dac5dd079428 - url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b - video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + sqlite3: 0aa20658a9b238a3b1ff7175eb7bdd863b0ab4fd + sqlite3_flutter_libs: b55ef23cfafea5318ae5081e0bf3fbbce8417c94 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 -COCOAPODS: 1.14.3 +COCOAPODS: 1.16.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index eaa06d26..3209bb17 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b52b2e69..e67b2808 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { - $$ExercisesTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $ExercisesTable> { + $$ExercisesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); - ColumnFilters get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnFilters get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnFilters(column)); - ColumnFilters get lastUpdate => $state.composableBuilder( - column: $state.table.lastUpdate, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnFilters get lastUpdate => $composableBuilder( + column: $table.lastUpdate, builder: (column) => ColumnFilters(column)); - ColumnFilters get lastFetched => $state.composableBuilder( - column: $state.table.lastFetched, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnFilters get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => ColumnFilters(column)); } class $$ExercisesTableOrderingComposer - extends OrderingComposer<_$ExerciseDatabase, $ExercisesTable> { - $$ExercisesTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $ExercisesTable> { + $$ExercisesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get lastUpdate => $state.composableBuilder( - column: $state.table.lastUpdate, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get lastUpdate => $composableBuilder( + column: $table.lastUpdate, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get lastFetched => $state.composableBuilder( - column: $state.table.lastFetched, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => ColumnOrderings(column)); +} + +class $$ExercisesTableAnnotationComposer + extends Composer<_$ExerciseDatabase, $ExercisesTable> { + $$ExercisesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get data => + $composableBuilder(column: $table.data, builder: (column) => column); + + GeneratedColumn get lastUpdate => $composableBuilder( + column: $table.lastUpdate, builder: (column) => column); + + GeneratedColumn get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => column); } class $$ExercisesTableTableManager extends RootTableManager< @@ -1131,6 +1149,7 @@ class $$ExercisesTableTableManager extends RootTableManager< ExerciseTable, $$ExercisesTableFilterComposer, $$ExercisesTableOrderingComposer, + $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, ( @@ -1143,10 +1162,12 @@ class $$ExercisesTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$ExercisesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$ExercisesTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$ExercisesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$ExercisesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$ExercisesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -1188,6 +1209,7 @@ typedef $$ExercisesTableProcessedTableManager = ProcessedTableManager< ExerciseTable, $$ExercisesTableFilterComposer, $$ExercisesTableOrderingComposer, + $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, ( @@ -1208,33 +1230,53 @@ typedef $$MusclesTableUpdateCompanionBuilder = MusclesCompanion Function({ }); class $$MusclesTableFilterComposer - extends FilterComposer<_$ExerciseDatabase, $MusclesTable> { - $$MusclesTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $MusclesTable> { + $$MusclesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters get data => - $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + $composableBuilder( + column: $table.data, + builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$MusclesTableOrderingComposer - extends OrderingComposer<_$ExerciseDatabase, $MusclesTable> { - $$MusclesTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $MusclesTable> { + $$MusclesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); +} + +class $$MusclesTableAnnotationComposer + extends Composer<_$ExerciseDatabase, $MusclesTable> { + $$MusclesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumnWithTypeConverter get data => + $composableBuilder(column: $table.data, builder: (column) => column); } class $$MusclesTableTableManager extends RootTableManager< @@ -1243,6 +1285,7 @@ class $$MusclesTableTableManager extends RootTableManager< MuscleTable, $$MusclesTableFilterComposer, $$MusclesTableOrderingComposer, + $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, ( @@ -1255,10 +1298,12 @@ class $$MusclesTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$MusclesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$MusclesTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$MusclesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$MusclesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$MusclesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -1292,6 +1337,7 @@ typedef $$MusclesTableProcessedTableManager = ProcessedTableManager< MuscleTable, $$MusclesTableFilterComposer, $$MusclesTableOrderingComposer, + $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, ( @@ -1312,33 +1358,53 @@ typedef $$EquipmentsTableUpdateCompanionBuilder = EquipmentsCompanion Function({ }); class $$EquipmentsTableFilterComposer - extends FilterComposer<_$ExerciseDatabase, $EquipmentsTable> { - $$EquipmentsTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $EquipmentsTable> { + $$EquipmentsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters get data => - $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + $composableBuilder( + column: $table.data, + builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$EquipmentsTableOrderingComposer - extends OrderingComposer<_$ExerciseDatabase, $EquipmentsTable> { - $$EquipmentsTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $EquipmentsTable> { + $$EquipmentsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); +} + +class $$EquipmentsTableAnnotationComposer + extends Composer<_$ExerciseDatabase, $EquipmentsTable> { + $$EquipmentsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumnWithTypeConverter get data => + $composableBuilder(column: $table.data, builder: (column) => column); } class $$EquipmentsTableTableManager extends RootTableManager< @@ -1347,6 +1413,7 @@ class $$EquipmentsTableTableManager extends RootTableManager< EquipmentTable, $$EquipmentsTableFilterComposer, $$EquipmentsTableOrderingComposer, + $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, ( @@ -1359,10 +1426,12 @@ class $$EquipmentsTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$EquipmentsTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$EquipmentsTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$EquipmentsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$EquipmentsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$EquipmentsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -1396,6 +1465,7 @@ typedef $$EquipmentsTableProcessedTableManager = ProcessedTableManager< EquipmentTable, $$EquipmentsTableFilterComposer, $$EquipmentsTableOrderingComposer, + $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, ( @@ -1416,33 +1486,53 @@ typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ }); class $$CategoriesTableFilterComposer - extends FilterComposer<_$ExerciseDatabase, $CategoriesTable> { - $$CategoriesTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $CategoriesTable> { + $$CategoriesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters - get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$CategoriesTableOrderingComposer - extends OrderingComposer<_$ExerciseDatabase, $CategoriesTable> { - $$CategoriesTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $CategoriesTable> { + $$CategoriesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); +} + +class $$CategoriesTableAnnotationComposer + extends Composer<_$ExerciseDatabase, $CategoriesTable> { + $$CategoriesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumnWithTypeConverter get data => + $composableBuilder(column: $table.data, builder: (column) => column); } class $$CategoriesTableTableManager extends RootTableManager< @@ -1451,6 +1541,7 @@ class $$CategoriesTableTableManager extends RootTableManager< CategoryTable, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, ( @@ -1463,10 +1554,12 @@ class $$CategoriesTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$CategoriesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$CategoriesTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$CategoriesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CategoriesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CategoriesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -1500,6 +1593,7 @@ typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager< CategoryTable, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, ( @@ -1520,33 +1614,53 @@ typedef $$LanguagesTableUpdateCompanionBuilder = LanguagesCompanion Function({ }); class $$LanguagesTableFilterComposer - extends FilterComposer<_$ExerciseDatabase, $LanguagesTable> { - $$LanguagesTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $LanguagesTable> { + $$LanguagesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters get data => - $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + $composableBuilder( + column: $table.data, + builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$LanguagesTableOrderingComposer - extends OrderingComposer<_$ExerciseDatabase, $LanguagesTable> { - $$LanguagesTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$ExerciseDatabase, $LanguagesTable> { + $$LanguagesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); +} + +class $$LanguagesTableAnnotationComposer + extends Composer<_$ExerciseDatabase, $LanguagesTable> { + $$LanguagesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumnWithTypeConverter get data => + $composableBuilder(column: $table.data, builder: (column) => column); } class $$LanguagesTableTableManager extends RootTableManager< @@ -1555,6 +1669,7 @@ class $$LanguagesTableTableManager extends RootTableManager< LanguagesTable, $$LanguagesTableFilterComposer, $$LanguagesTableOrderingComposer, + $$LanguagesTableAnnotationComposer, $$LanguagesTableCreateCompanionBuilder, $$LanguagesTableUpdateCompanionBuilder, ( @@ -1567,10 +1682,12 @@ class $$LanguagesTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$LanguagesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$LanguagesTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$LanguagesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$LanguagesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$LanguagesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -1604,6 +1721,7 @@ typedef $$LanguagesTableProcessedTableManager = ProcessedTableManager< LanguagesTable, $$LanguagesTableFilterComposer, $$LanguagesTableOrderingComposer, + $$LanguagesTableAnnotationComposer, $$LanguagesTableCreateCompanionBuilder, $$LanguagesTableUpdateCompanionBuilder, ( diff --git a/lib/database/ingredients/ingredients_database.g.dart b/lib/database/ingredients/ingredients_database.g.dart index 1f5deb86..4723b653 100644 --- a/lib/database/ingredients/ingredients_database.g.dart +++ b/lib/database/ingredients/ingredients_database.g.dart @@ -263,41 +263,60 @@ typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion }); class $$IngredientsTableFilterComposer - extends FilterComposer<_$IngredientDatabase, $IngredientsTable> { - $$IngredientsTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$IngredientDatabase, $IngredientsTable> { + $$IngredientsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); - ColumnFilters get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnFilters get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnFilters(column)); - ColumnFilters get lastFetched => $state.composableBuilder( - column: $state.table.lastFetched, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnFilters get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => ColumnFilters(column)); } class $$IngredientsTableOrderingComposer - extends OrderingComposer<_$IngredientDatabase, $IngredientsTable> { - $$IngredientsTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$IngredientDatabase, $IngredientsTable> { + $$IngredientsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get data => $state.composableBuilder( - column: $state.table.data, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get lastFetched => $state.composableBuilder( - column: $state.table.lastFetched, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + ColumnOrderings get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => ColumnOrderings(column)); +} + +class $$IngredientsTableAnnotationComposer + extends Composer<_$IngredientDatabase, $IngredientsTable> { + $$IngredientsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get data => + $composableBuilder(column: $table.data, builder: (column) => column); + + GeneratedColumn get lastFetched => $composableBuilder( + column: $table.lastFetched, builder: (column) => column); } class $$IngredientsTableTableManager extends RootTableManager< @@ -306,6 +325,7 @@ class $$IngredientsTableTableManager extends RootTableManager< IngredientTable, $$IngredientsTableFilterComposer, $$IngredientsTableOrderingComposer, + $$IngredientsTableAnnotationComposer, $$IngredientsTableCreateCompanionBuilder, $$IngredientsTableUpdateCompanionBuilder, ( @@ -319,10 +339,12 @@ class $$IngredientsTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$IngredientsTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$IngredientsTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$IngredientsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$IngredientsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$IngredientsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value data = const Value.absent(), @@ -360,6 +382,7 @@ typedef $$IngredientsTableProcessedTableManager = ProcessedTableManager< IngredientTable, $$IngredientsTableFilterComposer, $$IngredientsTableOrderingComposer, + $$IngredientsTableAnnotationComposer, $$IngredientsTableCreateCompanionBuilder, $$IngredientsTableUpdateCompanionBuilder, ( diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart index eccd726d..7d3c3129 100644 --- a/lib/models/exercises/exercise_api.freezed.dart +++ b/lib/models/exercises/exercise_api.freezed.dart @@ -53,8 +53,12 @@ mixin _$ExerciseApiData { @JsonKey(name: 'total_authors_history') List get authorsGlobal => throw _privateConstructorUsedError; + /// Serializes this ExerciseApiData to a JSON map. Map toJson() => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + + /// Create a copy of ExerciseApiData + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $ExerciseApiDataCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -93,6 +97,8 @@ class _$ExerciseApiDataCopyWithImpl<$Res, $Val extends ExerciseApiData> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of ExerciseApiData + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -211,6 +217,8 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res> $Res Function(_$ExerciseBaseDataImpl) _then) : super(_value, _then); + /// Create a copy of ExerciseApiData + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -464,7 +472,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData { .equals(other._authorsGlobal, _authorsGlobal)); } - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) @override int get hashCode => Object.hash( runtimeType, @@ -484,7 +492,9 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData { const DeepCollectionEquality().hash(_authors), const DeepCollectionEquality().hash(_authorsGlobal)); - @JsonKey(ignore: true) + /// Create a copy of ExerciseApiData + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith => @@ -526,43 +536,46 @@ abstract class _ExerciseBaseData implements ExerciseApiData { @override int get id; @override - String get uuid; - @override // ignore: invalid_annotation_target + String get uuid; // ignore: invalid_annotation_target + @override @JsonKey(name: 'variations') - int? get variationId; - @override // ignore: invalid_annotation_target + int? get variationId; // ignore: invalid_annotation_target + @override @JsonKey(name: 'created') - DateTime get created; - @override // ignore: invalid_annotation_target + DateTime get created; // ignore: invalid_annotation_target + @override @JsonKey(name: 'last_update') - DateTime get lastUpdate; - @override // ignore: invalid_annotation_target + DateTime get lastUpdate; // ignore: invalid_annotation_target + @override @JsonKey(name: 'last_update_global') DateTime get lastUpdateGlobal; @override ExerciseCategory get category; @override - List get muscles; - @override // ignore: invalid_annotation_target + List get muscles; // ignore: invalid_annotation_target + @override @JsonKey(name: 'muscles_secondary') - List get musclesSecondary; - @override // ignore: invalid_annotation_target - List get equipment; - @override // ignore: invalid_annotation_target + List get musclesSecondary; // ignore: invalid_annotation_target + @override + List get equipment; // ignore: invalid_annotation_target + @override @JsonKey(name: 'exercises') List get translations; @override List get images; @override - List