Merge branch 'wger-project:master' into master

2026-02-18 00:17:48 +01:00 · 2024-11-01 17:20:49 +05:30
parent c315a26491 c664ccedfa
commit 08f16a25f7
12 changed files with 626 additions and 364 deletions
--- 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
--- 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
--- 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 = {
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter

-@UIApplicationMain
+@main
@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
--- a/lib/database/exercises/exercise_database.g.dart
+++ b/lib/database/exercises/exercise_database.g.dart
@@ -1078,51 +1078,69 @@ typedef $$ExercisesTableUpdateCompanionBuilder = ExercisesCompanion Function({
 });

 class $$ExercisesTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $ExercisesTable> {
-  $$ExercisesTableFilterComposer(super.$state);
-  ColumnFilters<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

-  ColumnFilters<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => ColumnFilters(column));

-  ColumnFilters<DateTime> get lastUpdate => $state.composableBuilder(
-      column: $state.table.lastUpdate,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<DateTime> get lastUpdate => $composableBuilder(
+      column: $table.lastUpdate, builder: (column) => ColumnFilters(column));

-  ColumnFilters<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<DateTime> get lastFetched => $composableBuilder(
+      column: $table.lastFetched, builder: (column) => ColumnFilters(column));
 }

 class $$ExercisesTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $ExercisesTable> {
-  $$ExercisesTableOrderingComposer(super.$state);
-  ColumnOrderings<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<DateTime> get lastUpdate => $state.composableBuilder(
-      column: $state.table.lastUpdate,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<DateTime> get lastUpdate => $composableBuilder(
+      column: $table.lastUpdate, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<DateTime> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get lastUpdate => $composableBuilder(
+      column: $table.lastUpdate, builder: (column) => column);
+
+  GeneratedColumn<DateTime> 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<int> id = const Value.absent(),
            Value<String> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

  ColumnWithTypeConverterFilters<Muscle, Muscle, String> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Muscle, String> 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<int> id = const Value.absent(),
            Value<Muscle> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

  ColumnWithTypeConverterFilters<Equipment, Equipment, String> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Equipment, String> 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<int> id = const Value.absent(),
            Value<Equipment> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

  ColumnWithTypeConverterFilters<ExerciseCategory, ExerciseCategory, String>
-      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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<ExerciseCategory, String> 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<int> id = const Value.absent(),
            Value<ExerciseCategory> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

  ColumnWithTypeConverterFilters<Language, Language, String> 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Language, String> 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<int> id = const Value.absent(),
            Value<Language> data = const Value.absent(),
@@ -1604,6 +1721,7 @@ typedef $$LanguagesTableProcessedTableManager = ProcessedTableManager<
    LanguagesTable,
    $$LanguagesTableFilterComposer,
    $$LanguagesTableOrderingComposer,
+    $$LanguagesTableAnnotationComposer,
    $$LanguagesTableCreateCompanionBuilder,
    $$LanguagesTableUpdateCompanionBuilder,
    (
--- 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<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnFilters(column));

-  ColumnFilters<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => ColumnFilters(column));

-  ColumnFilters<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<DateTime> get lastFetched => $composableBuilder(
+      column: $table.lastFetched, builder: (column) => ColumnFilters(column));
 }

 class $$IngredientsTableOrderingComposer
-    extends OrderingComposer<_$IngredientDatabase, $IngredientsTable> {
-  $$IngredientsTableOrderingComposer(super.$state);
-  ColumnOrderings<int> 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<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => ColumnOrderings(column));

-  ColumnOrderings<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<DateTime> 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<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  GeneratedColumn<DateTime> 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<int> id = const Value.absent(),
            Value<String> data = const Value.absent(),
@@ -360,6 +382,7 @@ typedef $$IngredientsTableProcessedTableManager = ProcessedTableManager<
    IngredientTable,
    $$IngredientsTableFilterComposer,
    $$IngredientsTableOrderingComposer,
+    $$IngredientsTableAnnotationComposer,
    $$IngredientsTableCreateCompanionBuilder,
    $$IngredientsTableUpdateCompanionBuilder,
    (
--- 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<String> get authorsGlobal => throw _privateConstructorUsedError;

+  /// Serializes this ExerciseApiData to a JSON map.
  Map<String, dynamic> 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<ExerciseApiData> 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<Muscle> get muscles;
-  @override // ignore: invalid_annotation_target
+  List<Muscle> get muscles; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary;
-  @override // ignore: invalid_annotation_target
-  List<Equipment> get equipment;
-  @override // ignore: invalid_annotation_target
+  List<Muscle> get musclesSecondary; // ignore: invalid_annotation_target
+  @override
+  List<Equipment> get equipment; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'exercises')
  List<Translation> get translations;
  @override
  List<ExerciseImage> get images;
  @override
-  List<Video> get videos;
-  @override // ignore: invalid_annotation_target
+  List<Video> get videos; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'author_history')
-  List<String> get authors;
-  @override // ignore: invalid_annotation_target
+  List<String> get authors; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'total_authors_history')
  List<String> get authorsGlobal;
+
+  /// Create a copy of ExerciseApiData
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -587,8 +600,12 @@ mixin _$ExerciseSearchDetails {
  @JsonKey(name: 'image_thumbnail')
  String? get imageThumbnail => throw _privateConstructorUsedError;

+  /// Serializes this ExerciseSearchDetails to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $ExerciseSearchDetailsCopyWith<ExerciseSearchDetails> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -619,6 +636,8 @@ class _$ExerciseSearchDetailsCopyWithImpl<$Res,
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -685,6 +704,8 @@ class __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>
      $Res Function(_$ExerciseSearchDetailsImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -779,12 +800,14 @@ class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
                other.imageThumbnail == imageThumbnail));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, translationId, exerciseId, name,
      category, image, imageThumbnail);

-  @JsonKey(ignore: true)
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ExerciseSearchDetailsImplCopyWith<_$ExerciseSearchDetailsImpl>
@@ -812,10 +835,11 @@ abstract class _ExerciseSearchDetails implements ExerciseSearchDetails {
  factory _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =
      _$ExerciseSearchDetailsImpl.fromJson;

-  @override // ignore: invalid_annotation_target
+// ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'id')
-  int get translationId;
-  @override // ignore: invalid_annotation_target
+  int get translationId; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'base_id')
  int get exerciseId;
  @override
@@ -823,12 +847,15 @@ abstract class _ExerciseSearchDetails implements ExerciseSearchDetails {
  @override
  String get category;
  @override
-  String? get image;
-  @override // ignore: invalid_annotation_target
+  String? get image; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'image_thumbnail')
  String? get imageThumbnail;
+
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ExerciseSearchDetailsImplCopyWith<_$ExerciseSearchDetailsImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -842,8 +869,12 @@ mixin _$ExerciseSearchEntry {
  String get value => throw _privateConstructorUsedError;
  ExerciseSearchDetails get data => throw _privateConstructorUsedError;

+  /// Serializes this ExerciseSearchEntry to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $ExerciseSearchEntryCopyWith<ExerciseSearchEntry> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -869,6 +900,8 @@ class _$ExerciseSearchEntryCopyWithImpl<$Res, $Val extends ExerciseSearchEntry>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -887,6 +920,8 @@ class _$ExerciseSearchEntryCopyWithImpl<$Res, $Val extends ExerciseSearchEntry>
    ) as $Val);
  }

+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @override
  @pragma('vm:prefer-inline')
  $ExerciseSearchDetailsCopyWith<$Res> get data {
@@ -918,6 +953,8 @@ class __$$ExerciseSearchEntryImplCopyWithImpl<$Res>
      $Res Function(_$ExerciseSearchEntryImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -964,11 +1001,13 @@ class _$ExerciseSearchEntryImpl implements _ExerciseSearchEntry {
            (identical(other.data, data) || other.data == data));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, value, data);

-  @JsonKey(ignore: true)
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
@@ -995,8 +1034,11 @@ abstract class _ExerciseSearchEntry implements ExerciseSearchEntry {
  String get value;
  @override
  ExerciseSearchDetails get data;
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -1010,8 +1052,12 @@ mixin _$ExerciseApiSearch {
  List<ExerciseSearchEntry> get suggestions =>
      throw _privateConstructorUsedError;

+  /// Serializes this ExerciseApiSearch to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $ExerciseApiSearchCopyWith<ExerciseApiSearch> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -1035,6 +1081,8 @@ class _$ExerciseApiSearchCopyWithImpl<$Res, $Val extends ExerciseApiSearch>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -1068,6 +1116,8 @@ class __$$ExerciseApiSearchImplCopyWithImpl<$Res>
      $Res Function(_$ExerciseApiSearchImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -1114,12 +1164,14 @@ class _$ExerciseApiSearchImpl implements _ExerciseApiSearch {
                .equals(other._suggestions, _suggestions));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(
      runtimeType, const DeepCollectionEquality().hash(_suggestions));

-  @JsonKey(ignore: true)
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
@@ -1144,8 +1196,11 @@ abstract class _ExerciseApiSearch implements ExerciseApiSearch {

  @override
  List<ExerciseSearchEntry> get suggestions;
+
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/models/exercises/ingredient_api.freezed.dart
+++ b/lib/models/exercises/ingredient_api.freezed.dart
@@ -28,8 +28,12 @@ mixin _$IngredientApiSearchDetails {
  @JsonKey(name: 'image_thumbnail')
  String? get imageThumbnail => throw _privateConstructorUsedError;

+  /// Serializes this IngredientApiSearchDetails to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $IngredientApiSearchDetailsCopyWith<IngredientApiSearchDetails>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -59,6 +63,8 @@ class _$IngredientApiSearchDetailsCopyWithImpl<$Res,
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -114,6 +120,8 @@ class __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>
      $Res Function(_$IngredientApiSearchDetailsImpl) _then)
      : super(_value, _then);

+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -184,11 +192,13 @@ class _$IngredientApiSearchDetailsImpl implements _IngredientApiSearchDetails {
                other.imageThumbnail == imageThumbnail));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, id, name, image, imageThumbnail);

-  @JsonKey(ignore: true)
+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$IngredientApiSearchDetailsImplCopyWith<_$IngredientApiSearchDetailsImpl>
@@ -221,12 +231,15 @@ abstract class _IngredientApiSearchDetails
  @override
  String get name;
  @override
-  String? get image;
-  @override // ignore: invalid_annotation_target
+  String? get image; // ignore: invalid_annotation_target
+  @override
  @JsonKey(name: 'image_thumbnail')
  String? get imageThumbnail;
+
+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$IngredientApiSearchDetailsImplCopyWith<_$IngredientApiSearchDetailsImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -241,8 +254,12 @@ mixin _$IngredientApiSearchEntry {
  String get value => throw _privateConstructorUsedError;
  IngredientApiSearchDetails get data => throw _privateConstructorUsedError;

+  /// Serializes this IngredientApiSearchEntry to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $IngredientApiSearchEntryCopyWith<IngredientApiSearchEntry> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -269,6 +286,8 @@ class _$IngredientApiSearchEntryCopyWithImpl<$Res,
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -287,6 +306,8 @@ class _$IngredientApiSearchEntryCopyWithImpl<$Res,
    ) as $Val);
  }

+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @override
  @pragma('vm:prefer-inline')
  $IngredientApiSearchDetailsCopyWith<$Res> get data {
@@ -321,6 +342,8 @@ class __$$IngredientApiSearchEntryImplCopyWithImpl<$Res>
      $Res Function(_$IngredientApiSearchEntryImpl) _then)
      : super(_value, _then);

+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -367,11 +390,13 @@ class _$IngredientApiSearchEntryImpl implements _IngredientApiSearchEntry {
            (identical(other.data, data) || other.data == data));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, value, data);

-  @JsonKey(ignore: true)
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl>
@@ -399,8 +424,11 @@ abstract class _IngredientApiSearchEntry implements IngredientApiSearchEntry {
  String get value;
  @override
  IngredientApiSearchDetails get data;
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -414,8 +442,12 @@ mixin _$IngredientApiSearch {
  List<IngredientApiSearchEntry> get suggestions =>
      throw _privateConstructorUsedError;

+  /// Serializes this IngredientApiSearch to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $IngredientApiSearchCopyWith<IngredientApiSearch> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -439,6 +471,8 @@ class _$IngredientApiSearchCopyWithImpl<$Res, $Val extends IngredientApiSearch>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -472,6 +506,8 @@ class __$$IngredientApiSearchImplCopyWithImpl<$Res>
      $Res Function(_$IngredientApiSearchImpl) _then)
      : super(_value, _then);

+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -518,12 +554,14 @@ class _$IngredientApiSearchImpl implements _IngredientApiSearch {
                .equals(other._suggestions, _suggestions));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(
      runtimeType, const DeepCollectionEquality().hash(_suggestions));

-  @JsonKey(ignore: true)
+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
@@ -548,8 +586,11 @@ abstract class _IngredientApiSearch implements IngredientApiSearch {

  @override
  List<IngredientApiSearchEntry> get suggestions;
+
+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -14,18 +14,21 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - "sqlite3 (3.46.1+1)":
+    - "sqlite3/common (= 3.46.1+1)"
+  - "sqlite3/common (3.46.1+1)"
+  - "sqlite3/dbstatvtab (3.46.1+1)":
    - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - "sqlite3/fts5 (3.46.1+1)":
    - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - "sqlite3/perf-threadsafe (3.46.1+1)":
+    - sqlite3/common
+  - "sqlite3/rtree (3.46.1+1)":
    - sqlite3/common
  - sqlite3_flutter_libs (0.0.1):
    - FlutterMacOS
-    - "sqlite3 (~> 3.45.3+1)"
+    - "sqlite3 (~> 3.46.0+1)"
+    - sqlite3/dbstatvtab
    - sqlite3/fts5
    - sqlite3/perf-threadsafe
    - sqlite3/rtree
@@ -77,15 +80,15 @@ SPEC CHECKSUMS:
  file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
  flutter_zxing: ea030278aa2a051cd81a5b0053be9d0569d11c9a
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
+  package_info_plus: d2f71247aab4b6521434f887276093acc70d214c
  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  rive_common: cf5ab646aa576b2d742d0e2d528126fbf032c856
+  rive_common: 0f0aadf670f0c6a7872dfe3e6186f112a5319108
  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5
+  sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
+  sqlite3_flutter_libs: 5ca46c1a04eddfbeeb5b16566164aa7ad1616e7b
  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3

 PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0

-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
--- a/macos/Runner/AppDelegate.swift
+++ b/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS

-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
    return true
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,23 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "67.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.4.1"
+    version: "6.7.0"
  analyzer_plugin:
    dependency: transitive
    description:
@@ -45,10 +50,10 @@ packages:
    dependency: transitive
    description:
      name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
  async:
    dependency: transitive
    description:
@@ -109,10 +114,10 @@ packages:
    dependency: transitive
    description:
      name: build_runner_core
-      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
      url: "https://pub.dev"
    source: hosted
-    version: "7.3.1"
+    version: "7.3.2"
  built_collection:
    dependency: transitive
    description:
@@ -133,26 +138,26 @@ packages:
    dependency: transitive
    description:
      name: camera
-      sha256: "2170a943dcb67be2af2c6bcda8775e74b41d4c02d6a4eb10bdc832ee185c4eea"
+      sha256: "26ff41045772153f222ffffecba711a206f670f5834d40ebf5eed3811692f167"
      url: "https://pub.dev"
    source: hosted
-    version: "0.11.0+1"
+    version: "0.11.0+2"
  camera_android_camerax:
    dependency: transitive
    description:
      name: camera_android_camerax
-      sha256: "7c03940cb8c92eb5b184952674a07cc4a73c6ba2b3568aad70255ad4cb913660"
+      sha256: e3627fdc2132d89212b8a8676679f5b07008c7e3d8ae00cea775c3397f9e742b
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.7+1"
+    version: "0.6.10"
  camera_avfoundation:
    dependency: transitive
    description:
      name: camera_avfoundation
-      sha256: "95c2f40b4d06cdb0fd2ad893c762d1f2c931a5e370793ec34c939eb4fcbf96bb"
+      sha256: "0d04cec8715b59fb6dc60eefb47e69024f51233c570e475b886dc9290568bca7"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.17"
+    version: "0.9.17+4"
  camera_platform_interface:
    dependency: transitive
    description:
@@ -165,10 +170,10 @@ packages:
    dependency: transitive
    description:
      name: camera_web
-      sha256: b9235ec0a2ce949daec546f1f3d86f05c3921ed31c7d9ab6b7c03214d152fc2d
+      sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
  carousel_slider:
    dependency: "direct main"
    description:
@@ -181,10 +186,10 @@ packages:
    dependency: transitive
    description:
      name: change
-      sha256: c92878d5d4f4960bda62201b5cae63f5d0aaaefc0377e856251920418070b96f
+      sha256: "65db7f966dc7e786687f49900a94c5f08b0eb9ca8c4a3e7eed3a55e980b455e2"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3"
+    version: "0.7.4"
  characters:
    dependency: transitive
    description:
@@ -221,10 +226,10 @@ packages:
    dependency: transitive
    description:
      name: cli_util
-      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
  clock:
    dependency: "direct main"
    description:
@@ -237,10 +242,10 @@ packages:
    dependency: transitive
    description:
      name: code_builder
-      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.10.0"
+    version: "4.10.1"
  collection:
    dependency: "direct main"
    description:
@@ -253,10 +258,10 @@ packages:
    dependency: transitive
    description:
      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
  cross_file:
    dependency: transitive
    description:
@@ -269,10 +274,10 @@ packages:
    dependency: transitive
    description:
      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
  csslib:
    dependency: transitive
    description:
@@ -293,26 +298,26 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.6"
+    version: "2.3.7"
  drift:
    dependency: "direct main"
    description:
      name: drift
-      sha256: d6ff1ec6a0f3fa097dda6b776cf601f1f3d88b53b287288e09c1306f394fb1b3
+      sha256: df027d168a2985a2e9da900adeba2ab0136f0d84436592cf3cd5135f82c8579c
      url: "https://pub.dev"
    source: hosted
-    version: "2.20.3"
+    version: "2.21.0"
  drift_dev:
    dependency: "direct dev"
    description:
      name: drift_dev
-      sha256: "3ee987578ca2281b5ff91eadd757cd6dd36001458d6e33784f990d67ff38f756"
+      sha256: "623649abe932fc17bd32e578e7e05f7ac5e7dd0b33e6c8669a0634105d1389bf"
      url: "https://pub.dev"
    source: hosted
-    version: "2.20.3"
+    version: "2.21.2"
  equatable:
    dependency: "direct main"
    description:
@@ -333,10 +338,10 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  file:
    dependency: transitive
    description:
@@ -349,18 +354,18 @@ packages:
    dependency: transitive
    description:
      name: file_selector_linux
-      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
+      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.2+1"
+    version: "0.9.3"
  file_selector_macos:
    dependency: transitive
    description:
      name: file_selector_macos
-      sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
+      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.4"
+    version: "0.9.4+2"
  file_selector_platform_interface:
    dependency: transitive
    description:
@@ -373,18 +378,18 @@ packages:
    dependency: transitive
    description:
      name: file_selector_windows
-      sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
+      sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.3+1"
+    version: "0.9.3+3"
  fixnum:
    dependency: transitive
    description:
      name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  fl_chart:
    dependency: "direct main"
    description:
@@ -508,10 +513,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
+      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.20"
+    version: "2.0.23"
  flutter_staggered_grid_view:
    dependency: "direct main"
    description:
@@ -574,10 +579,10 @@ packages:
    dependency: "direct dev"
    description:
      name: freezed
-      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
+      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.2"
+    version: "2.5.7"
  freezed_annotation:
    dependency: "direct main"
    description:
@@ -627,10 +632,10 @@ packages:
    dependency: transitive
    description:
      name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  html:
    dependency: transitive
    description:
@@ -667,10 +672,10 @@ packages:
    dependency: transitive
    description:
      name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
      url: "https://pub.dev"
    source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
  image_picker:
    dependency: "direct main"
    description:
@@ -683,26 +688,26 @@ packages:
    dependency: transitive
    description:
      name: image_picker_android
-      sha256: ff39a10ab4f48f4ac70776d0494a97bf073cd2570892cd46bc8a5cac162c25db
+      sha256: "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32"
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.12+4"
+    version: "0.8.12+17"
  image_picker_for_web:
    dependency: transitive
    description:
      name: image_picker_for_web
-      sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50"
+      sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  image_picker_ios:
    dependency: transitive
    description:
      name: image_picker_ios
-      sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447"
+      sha256: "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.12"
+    version: "0.8.12+1"
  image_picker_linux:
    dependency: transitive
    description:
@@ -824,10 +829,18 @@ packages:
    dependency: transitive
    description:
      name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
  markdown:
    dependency: transitive
    description:
@@ -872,10 +885,10 @@ packages:
    dependency: transitive
    description:
      name: mime
-      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
  mockito:
    dependency: "direct dev"
    description:
@@ -920,10 +933,10 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
+      sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998
      url: "https://pub.dev"
    source: hosted
-    version: "8.0.3"
+    version: "8.1.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
@@ -944,10 +957,10 @@ packages:
    dependency: transitive
    description:
      name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
  path_provider:
    dependency: "direct main"
    description:
@@ -960,10 +973,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.7"
+    version: "2.2.12"
  path_provider_foundation:
    dependency: transitive
    description:
@@ -1024,10 +1037,10 @@ packages:
    dependency: transitive
    description:
      name: pointer_interceptor
-      sha256: d0a8e660d1204eaec5bd34b34cc92174690e076d2e4f893d9d68c486a13b07c4
+      sha256: "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523"
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.1+1"
+    version: "0.10.1+2"
  pointer_interceptor_ios:
    dependency: transitive
    description:
@@ -1136,18 +1149,18 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
  shared_preferences_linux:
    dependency: transitive
    description:
@@ -1237,26 +1250,26 @@ packages:
    dependency: transitive
    description:
      name: sqlite3
-      sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb"
+      sha256: bb174b3ec2527f9c5f680f73a89af8149dd99782fbb56ea88ad0807c5638f2ed
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.6"
+    version: "2.4.7"
  sqlite3_flutter_libs:
    dependency: "direct main"
    description:
      name: sqlite3_flutter_libs
-      sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1"
+      sha256: "7ae52b23366e5295005022e62fa093f64bfe190810223ea0ebf733a4cd140bce"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.24"
+    version: "0.5.26"
  sqlparser:
    dependency: transitive
    description:
      name: sqlparser
-      sha256: "852cf80f9e974ac8e1b613758a8aa640215f7701352b66a7f468e95711eb570b"
+      sha256: d77749237609784e337ec36c979d41f6f38a7b279df98622ae23929c8eb954a4
      url: "https://pub.dev"
    source: hosted
-    version: "0.38.1"
+    version: "0.39.2"
  stack_trace:
    dependency: transitive
    description:
@@ -1333,10 +1346,10 @@ packages:
    dependency: transitive
    description:
      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
  url_launcher:
    dependency: "direct main"
    description:
@@ -1349,34 +1362,34 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      sha256: "0dea215895a4d254401730ca0ba8204b29109a34a99fb06ae559a2b60988d2de"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.3"
+    version: "6.3.13"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -1397,10 +1410,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
  vector_graphics:
    dependency: transitive
    description:
@@ -1461,34 +1474,34 @@ packages:
    dependency: transitive
    description:
      name: video_player_android
-      sha256: fdc0331ce9f808cc2714014cb8126bd6369943affefd54f8fdab0ea0bb617b7f
+      sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.2"
+    version: "2.7.16"
  video_player_avfoundation:
    dependency: transitive
    description:
      name: video_player_avfoundation
-      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
+      sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f
      url: "https://pub.dev"
    source: hosted
-    version: "2.6.1"
+    version: "2.6.2"
  video_player_platform_interface:
    dependency: transitive
    description:
      name: video_player_platform_interface
-      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
+      sha256: "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb"
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.2"
+    version: "6.2.3"
  video_player_web:
    dependency: transitive
    description:
      name: video_player_web
-      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
+      sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
  vm_service:
    dependency: transitive
    description:
@@ -1541,18 +1554,18 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
      url: "https://pub.dev"
    source: hosted
-    version: "5.5.4"
+    version: "5.7.2"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
  xml:
    dependency: transitive
    description:
@@ -1570,5 +1583,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"