From 239e1a1caafb4d3821837af8f35cf0d7e484d0e2 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 20 May 2024 22:06:47 +0200 Subject: [PATCH] Consistently use "fibers" instead of "fibres" --- .../exercises/exercise_database.g.dart | 470 ++++++++++++++++++ .../ingredients/ingredients_database.g.dart | 108 ++++ lib/models/body_weight/weight_entry.g.dart | 2 +- lib/models/exercises/alias.g.dart | 4 +- lib/models/exercises/category.g.dart | 2 +- lib/models/exercises/comment.g.dart | 4 +- lib/models/exercises/equipment.g.dart | 2 +- lib/models/exercises/exercise.g.dart | 12 +- lib/models/exercises/exercise_api.g.dart | 8 +- lib/models/exercises/image.g.dart | 4 +- lib/models/exercises/ingredient_api.g.dart | 2 +- lib/models/exercises/language.g.dart | 2 +- lib/models/exercises/muscle.g.dart | 2 +- lib/models/exercises/translation.g.dart | 6 +- lib/models/exercises/variation.g.dart | 2 +- lib/models/exercises/video.g.dart | 12 +- lib/models/gallery/image.g.dart | 2 +- .../measurements/measurement_category.g.dart | 2 +- .../measurements/measurement_entry.g.dart | 4 +- lib/models/nutrition/image.g.dart | 8 +- lib/models/nutrition/ingredient.dart | 6 +- lib/models/nutrition/ingredient.g.dart | 8 +- .../nutrition/ingredient_weight_unit.g.dart | 4 +- lib/models/nutrition/log.dart | 2 +- lib/models/nutrition/log.g.dart | 10 +- lib/models/nutrition/meal.g.dart | 4 +- lib/models/nutrition/meal_item.dart | 2 +- lib/models/nutrition/meal_item.g.dart | 8 +- lib/models/nutrition/nutritional_goals.dart | 16 +- lib/models/nutrition/nutritional_plan.dart | 4 +- lib/models/nutrition/nutritional_values.dart | 18 +- lib/models/nutrition/weight_unit.g.dart | 2 +- lib/models/workouts/day.g.dart | 6 +- lib/models/workouts/log.g.dart | 12 +- lib/models/workouts/repetition_unit.g.dart | 2 +- lib/models/workouts/session.g.dart | 4 +- lib/models/workouts/set.g.dart | 8 +- lib/models/workouts/setting.g.dart | 14 +- lib/models/workouts/weight_unit.g.dart | 2 +- lib/models/workouts/workout_plan.g.dart | 2 +- lib/widgets/nutrition/charts.dart | 12 +- .../nutrition/macro_nutrients_table.dart | 4 +- .../nutrition/nutritional_diary_detail.dart | 6 +- linux/flutter/generated_plugin_registrant.cc | 4 - linux/flutter/generated_plugins.cmake | 1 - macos/Podfile.lock | 32 +- macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../nutritional_meal_item_form_test.dart | 2 +- .../nutritional_plan_model_test.dart | 2 +- test_data/nutritional_plans.dart | 14 +- 51 files changed, 723 insertions(+), 150 deletions(-) diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart index 3e09c0ef..b8cac494 100644 --- a/lib/database/exercises/exercise_database.g.dart +++ b/lib/database/exercises/exercise_database.g.dart @@ -954,6 +954,7 @@ class LanguagesCompanion extends UpdateCompanion { abstract class _$ExerciseDatabase extends GeneratedDatabase { _$ExerciseDatabase(QueryExecutor e) : super(e); + _$ExerciseDatabaseManager get managers => _$ExerciseDatabaseManager(this); late final $ExercisesTable exercises = $ExercisesTable(this); late final $MusclesTable muscles = $MusclesTable(this); late final $EquipmentsTable equipments = $EquipmentsTable(this); @@ -966,3 +967,472 @@ abstract class _$ExerciseDatabase extends GeneratedDatabase { List get allSchemaEntities => [exercises, muscles, equipments, categories, languages]; } + +typedef $$ExercisesTableInsertCompanionBuilder = ExercisesCompanion Function({ + required int id, + required String data, + required DateTime lastUpdate, + required DateTime lastFetched, + Value rowid, +}); +typedef $$ExercisesTableUpdateCompanionBuilder = ExercisesCompanion Function({ + Value id, + Value data, + Value lastUpdate, + Value lastFetched, + Value rowid, +}); + +class $$ExercisesTableTableManager extends RootTableManager< + _$ExerciseDatabase, + $ExercisesTable, + ExerciseTable, + $$ExercisesTableFilterComposer, + $$ExercisesTableOrderingComposer, + $$ExercisesTableProcessedTableManager, + $$ExercisesTableInsertCompanionBuilder, + $$ExercisesTableUpdateCompanionBuilder> { + $$ExercisesTableTableManager(_$ExerciseDatabase db, $ExercisesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$ExercisesTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$ExercisesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$ExercisesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value lastUpdate = const Value.absent(), + Value lastFetched = const Value.absent(), + Value rowid = const Value.absent(), + }) => + ExercisesCompanion( + id: id, + data: data, + lastUpdate: lastUpdate, + lastFetched: lastFetched, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required String data, + required DateTime lastUpdate, + required DateTime lastFetched, + Value rowid = const Value.absent(), + }) => + ExercisesCompanion.insert( + id: id, + data: data, + lastUpdate: lastUpdate, + lastFetched: lastFetched, + rowid: rowid, + ), + )); +} + +class $$ExercisesTableProcessedTableManager extends ProcessedTableManager< + _$ExerciseDatabase, + $ExercisesTable, + ExerciseTable, + $$ExercisesTableFilterComposer, + $$ExercisesTableOrderingComposer, + $$ExercisesTableProcessedTableManager, + $$ExercisesTableInsertCompanionBuilder, + $$ExercisesTableUpdateCompanionBuilder> { + $$ExercisesTableProcessedTableManager(super.$state); +} + +class $$ExercisesTableFilterComposer extends FilterComposer<_$ExerciseDatabase, $ExercisesTable> { + $$ExercisesTableFilterComposer(super.$state); + ColumnFilters get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get lastUpdate => $state.composableBuilder( + column: $state.table.lastUpdate, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get lastFetched => $state.composableBuilder( + column: $state.table.lastFetched, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get lastUpdate => $state.composableBuilder( + column: $state.table.lastUpdate, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get lastFetched => $state.composableBuilder( + column: $state.table.lastFetched, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$MusclesTableInsertCompanionBuilder = MusclesCompanion Function({ + required int id, + required Muscle data, + Value rowid, +}); +typedef $$MusclesTableUpdateCompanionBuilder = MusclesCompanion Function({ + Value id, + Value data, + Value rowid, +}); + +class $$MusclesTableTableManager extends RootTableManager< + _$ExerciseDatabase, + $MusclesTable, + MuscleTable, + $$MusclesTableFilterComposer, + $$MusclesTableOrderingComposer, + $$MusclesTableProcessedTableManager, + $$MusclesTableInsertCompanionBuilder, + $$MusclesTableUpdateCompanionBuilder> { + $$MusclesTableTableManager(_$ExerciseDatabase db, $MusclesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$MusclesTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$MusclesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$MusclesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value rowid = const Value.absent(), + }) => + MusclesCompanion( + id: id, + data: data, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required Muscle data, + Value rowid = const Value.absent(), + }) => + MusclesCompanion.insert( + id: id, + data: data, + rowid: rowid, + ), + )); +} + +class $$MusclesTableProcessedTableManager extends ProcessedTableManager< + _$ExerciseDatabase, + $MusclesTable, + MuscleTable, + $$MusclesTableFilterComposer, + $$MusclesTableOrderingComposer, + $$MusclesTableProcessedTableManager, + $$MusclesTableInsertCompanionBuilder, + $$MusclesTableUpdateCompanionBuilder> { + $$MusclesTableProcessedTableManager(super.$state); +} + +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)); + + ColumnWithTypeConverterFilters get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => + ColumnWithTypeConverterFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$EquipmentsTableInsertCompanionBuilder = EquipmentsCompanion Function({ + required int id, + required Equipment data, + Value rowid, +}); +typedef $$EquipmentsTableUpdateCompanionBuilder = EquipmentsCompanion Function({ + Value id, + Value data, + Value rowid, +}); + +class $$EquipmentsTableTableManager extends RootTableManager< + _$ExerciseDatabase, + $EquipmentsTable, + EquipmentTable, + $$EquipmentsTableFilterComposer, + $$EquipmentsTableOrderingComposer, + $$EquipmentsTableProcessedTableManager, + $$EquipmentsTableInsertCompanionBuilder, + $$EquipmentsTableUpdateCompanionBuilder> { + $$EquipmentsTableTableManager(_$ExerciseDatabase db, $EquipmentsTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$EquipmentsTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$EquipmentsTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$EquipmentsTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value rowid = const Value.absent(), + }) => + EquipmentsCompanion( + id: id, + data: data, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required Equipment data, + Value rowid = const Value.absent(), + }) => + EquipmentsCompanion.insert( + id: id, + data: data, + rowid: rowid, + ), + )); +} + +class $$EquipmentsTableProcessedTableManager extends ProcessedTableManager< + _$ExerciseDatabase, + $EquipmentsTable, + EquipmentTable, + $$EquipmentsTableFilterComposer, + $$EquipmentsTableOrderingComposer, + $$EquipmentsTableProcessedTableManager, + $$EquipmentsTableInsertCompanionBuilder, + $$EquipmentsTableUpdateCompanionBuilder> { + $$EquipmentsTableProcessedTableManager(super.$state); +} + +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)); + + ColumnWithTypeConverterFilters get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => + ColumnWithTypeConverterFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$CategoriesTableInsertCompanionBuilder = CategoriesCompanion Function({ + required int id, + required ExerciseCategory data, + Value rowid, +}); +typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ + Value id, + Value data, + Value rowid, +}); + +class $$CategoriesTableTableManager extends RootTableManager< + _$ExerciseDatabase, + $CategoriesTable, + CategoryTable, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableProcessedTableManager, + $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder> { + $$CategoriesTableTableManager(_$ExerciseDatabase db, $CategoriesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$CategoriesTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$CategoriesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$CategoriesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value rowid = const Value.absent(), + }) => + CategoriesCompanion( + id: id, + data: data, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required ExerciseCategory data, + Value rowid = const Value.absent(), + }) => + CategoriesCompanion.insert( + id: id, + data: data, + rowid: rowid, + ), + )); +} + +class $$CategoriesTableProcessedTableManager extends ProcessedTableManager< + _$ExerciseDatabase, + $CategoriesTable, + CategoryTable, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableProcessedTableManager, + $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder> { + $$CategoriesTableProcessedTableManager(super.$state); +} + +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)); + + ColumnWithTypeConverterFilters get data => + $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => + ColumnWithTypeConverterFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$LanguagesTableInsertCompanionBuilder = LanguagesCompanion Function({ + required int id, + required Language data, + Value rowid, +}); +typedef $$LanguagesTableUpdateCompanionBuilder = LanguagesCompanion Function({ + Value id, + Value data, + Value rowid, +}); + +class $$LanguagesTableTableManager extends RootTableManager< + _$ExerciseDatabase, + $LanguagesTable, + LanguagesTable, + $$LanguagesTableFilterComposer, + $$LanguagesTableOrderingComposer, + $$LanguagesTableProcessedTableManager, + $$LanguagesTableInsertCompanionBuilder, + $$LanguagesTableUpdateCompanionBuilder> { + $$LanguagesTableTableManager(_$ExerciseDatabase db, $LanguagesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$LanguagesTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$LanguagesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$LanguagesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value rowid = const Value.absent(), + }) => + LanguagesCompanion( + id: id, + data: data, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required Language data, + Value rowid = const Value.absent(), + }) => + LanguagesCompanion.insert( + id: id, + data: data, + rowid: rowid, + ), + )); +} + +class $$LanguagesTableProcessedTableManager extends ProcessedTableManager< + _$ExerciseDatabase, + $LanguagesTable, + LanguagesTable, + $$LanguagesTableFilterComposer, + $$LanguagesTableOrderingComposer, + $$LanguagesTableProcessedTableManager, + $$LanguagesTableInsertCompanionBuilder, + $$LanguagesTableUpdateCompanionBuilder> { + $$LanguagesTableProcessedTableManager(super.$state); +} + +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)); + + ColumnWithTypeConverterFilters get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => + ColumnWithTypeConverterFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +class _$ExerciseDatabaseManager { + final _$ExerciseDatabase _db; + _$ExerciseDatabaseManager(this._db); + $$ExercisesTableTableManager get exercises => $$ExercisesTableTableManager(_db, _db.exercises); + $$MusclesTableTableManager get muscles => $$MusclesTableTableManager(_db, _db.muscles); + $$EquipmentsTableTableManager get equipments => + $$EquipmentsTableTableManager(_db, _db.equipments); + $$CategoriesTableTableManager get categories => + $$CategoriesTableTableManager(_db, _db.categories); + $$LanguagesTableTableManager get languages => $$LanguagesTableTableManager(_db, _db.languages); +} diff --git a/lib/database/ingredients/ingredients_database.g.dart b/lib/database/ingredients/ingredients_database.g.dart index 66d22b63..8f47c420 100644 --- a/lib/database/ingredients/ingredients_database.g.dart +++ b/lib/database/ingredients/ingredients_database.g.dart @@ -212,6 +212,7 @@ class IngredientsCompanion extends UpdateCompanion { abstract class _$IngredientDatabase extends GeneratedDatabase { _$IngredientDatabase(QueryExecutor e) : super(e); + _$IngredientDatabaseManager get managers => _$IngredientDatabaseManager(this); late final $IngredientsTable ingredients = $IngredientsTable(this); @override Iterable> get allTables => @@ -219,3 +220,110 @@ abstract class _$IngredientDatabase extends GeneratedDatabase { @override List get allSchemaEntities => [ingredients]; } + +typedef $$IngredientsTableInsertCompanionBuilder = IngredientsCompanion Function({ + required int id, + required String data, + required DateTime lastUpdate, + Value rowid, +}); +typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion Function({ + Value id, + Value data, + Value lastUpdate, + Value rowid, +}); + +class $$IngredientsTableTableManager extends RootTableManager< + _$IngredientDatabase, + $IngredientsTable, + IngredientTable, + $$IngredientsTableFilterComposer, + $$IngredientsTableOrderingComposer, + $$IngredientsTableProcessedTableManager, + $$IngredientsTableInsertCompanionBuilder, + $$IngredientsTableUpdateCompanionBuilder> { + $$IngredientsTableTableManager(_$IngredientDatabase db, $IngredientsTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: $$IngredientsTableFilterComposer(ComposerState(db, table)), + orderingComposer: $$IngredientsTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$IngredientsTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value data = const Value.absent(), + Value lastUpdate = const Value.absent(), + Value rowid = const Value.absent(), + }) => + IngredientsCompanion( + id: id, + data: data, + lastUpdate: lastUpdate, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required int id, + required String data, + required DateTime lastUpdate, + Value rowid = const Value.absent(), + }) => + IngredientsCompanion.insert( + id: id, + data: data, + lastUpdate: lastUpdate, + rowid: rowid, + ), + )); +} + +class $$IngredientsTableProcessedTableManager extends ProcessedTableManager< + _$IngredientDatabase, + $IngredientsTable, + IngredientTable, + $$IngredientsTableFilterComposer, + $$IngredientsTableOrderingComposer, + $$IngredientsTableProcessedTableManager, + $$IngredientsTableInsertCompanionBuilder, + $$IngredientsTableUpdateCompanionBuilder> { + $$IngredientsTableProcessedTableManager(super.$state); +} + +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)); + + ColumnFilters get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get lastUpdate => $state.composableBuilder( + column: $state.table.lastUpdate, + builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); +} + +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)); + + ColumnOrderings get data => $state.composableBuilder( + column: $state.table.data, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get lastUpdate => $state.composableBuilder( + column: $state.table.lastUpdate, + builder: (column, joinBuilders) => ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +class _$IngredientDatabaseManager { + final _$IngredientDatabase _db; + _$IngredientDatabaseManager(this._db); + $$IngredientsTableTableManager get ingredients => + $$IngredientsTableTableManager(_db, _db.ingredients); +} diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index d1152d20..4120aaac 100644 --- a/lib/models/body_weight/weight_entry.g.dart +++ b/lib/models/body_weight/weight_entry.g.dart @@ -12,7 +12,7 @@ WeightEntry _$WeightEntryFromJson(Map json) { requiredKeys: const ['id', 'weight', 'date'], ); return WeightEntry( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), weight: stringToNum(json['weight'] as String?), date: json['date'] == null ? null : DateTime.parse(json['date'] as String), ); diff --git a/lib/models/exercises/alias.g.dart b/lib/models/exercises/alias.g.dart index a64a9b65..baafce48 100644 --- a/lib/models/exercises/alias.g.dart +++ b/lib/models/exercises/alias.g.dart @@ -12,8 +12,8 @@ Alias _$AliasFromJson(Map json) { requiredKeys: const ['id', 'alias'], ); return Alias( - id: json['id'] as int?, - exerciseId: json['exercise'] as int?, + id: (json['id'] as num?)?.toInt(), + exerciseId: (json['exercise'] as num?)?.toInt(), alias: json['alias'] as String, ); } diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 915120d1..098a0489 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -12,7 +12,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map json) { requiredKeys: const ['id', 'name'], ); return ExerciseCategory( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, ); } diff --git a/lib/models/exercises/comment.g.dart b/lib/models/exercises/comment.g.dart index b47ea138..77d23876 100644 --- a/lib/models/exercises/comment.g.dart +++ b/lib/models/exercises/comment.g.dart @@ -12,8 +12,8 @@ Comment _$CommentFromJson(Map json) { requiredKeys: const ['id', 'comment'], ); return Comment( - id: json['id'] as int, - exerciseId: json['exercise'] as int, + id: (json['id'] as num).toInt(), + exerciseId: (json['exercise'] as num).toInt(), comment: json['comment'] as String, ); } diff --git a/lib/models/exercises/equipment.g.dart b/lib/models/exercises/equipment.g.dart index 3948e1bb..2c8caa17 100644 --- a/lib/models/exercises/equipment.g.dart +++ b/lib/models/exercises/equipment.g.dart @@ -12,7 +12,7 @@ Equipment _$EquipmentFromJson(Map json) { requiredKeys: const ['id', 'name'], ); return Equipment( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, ); } diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart index 40ef9675..5c9fcd4a 100644 --- a/lib/models/exercises/exercise.g.dart +++ b/lib/models/exercises/exercise.g.dart @@ -23,14 +23,14 @@ Exercise _$ExerciseFromJson(Map json) { ], ); return Exercise( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), uuid: json['uuid'] as String?, created: json['created'] == null ? null : DateTime.parse(json['created'] as String), lastUpdate: json['last_update'] == null ? null : DateTime.parse(json['last_update'] as String), lastUpdateGlobal: json['last_update_global'] == null ? null : DateTime.parse(json['last_update_global'] as String), - variationId: json['variations'] as int?, + variationId: (json['variations'] as num?)?.toInt(), translations: (json['translations'] as List?) ?.map((e) => Translation.fromJson(e as Map)) .toList(), @@ -38,11 +38,11 @@ Exercise _$ExerciseFromJson(Map json) { ? null : ExerciseCategory.fromJson(json['categories'] as Map), ) - ..categoryId = json['category'] as int - ..musclesIds = (json['muscles'] as List).map((e) => e as int).toList() + ..categoryId = (json['category'] as num).toInt() + ..musclesIds = (json['muscles'] as List).map((e) => (e as num).toInt()).toList() ..musclesSecondaryIds = - (json['muscles_secondary'] as List).map((e) => e as int).toList() - ..equipmentIds = (json['equipment'] as List).map((e) => e as int).toList(); + (json['muscles_secondary'] as List).map((e) => (e as num).toInt()).toList() + ..equipmentIds = (json['equipment'] as List).map((e) => (e as num).toInt()).toList(); } Map _$ExerciseToJson(Exercise instance) => { diff --git a/lib/models/exercises/exercise_api.g.dart b/lib/models/exercises/exercise_api.g.dart index 2eead130..bc57aeb2 100644 --- a/lib/models/exercises/exercise_api.g.dart +++ b/lib/models/exercises/exercise_api.g.dart @@ -8,9 +8,9 @@ part of 'exercise_api.dart'; _$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map json) => _$ExerciseBaseDataImpl( - id: json['id'] as int, + id: (json['id'] as num).toInt(), uuid: json['uuid'] as String, - variationId: json['variations'] as int? ?? null, + variationId: (json['variations'] as num?)?.toInt() ?? null, created: DateTime.parse(json['created'] as String), lastUpdate: DateTime.parse(json['last_update'] as String), lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String), @@ -59,8 +59,8 @@ Map _$$ExerciseBaseDataImplToJson(_$ExerciseBaseDataImpl instan _$ExerciseSearchDetailsImpl _$$ExerciseSearchDetailsImplFromJson(Map json) => _$ExerciseSearchDetailsImpl( - translationId: json['id'] as int, - exerciseId: json['base_id'] as int, + translationId: (json['id'] as num).toInt(), + exerciseId: (json['base_id'] as num).toInt(), name: json['name'] as String, category: json['category'] as String, image: json['image'] as String?, diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart index 6ef7c62e..8b5599f3 100644 --- a/lib/models/exercises/image.g.dart +++ b/lib/models/exercises/image.g.dart @@ -12,9 +12,9 @@ ExerciseImage _$ExerciseImageFromJson(Map json) { requiredKeys: const ['id', 'uuid', 'exercise_base', 'image'], ); return ExerciseImage( - id: json['id'] as int, + id: (json['id'] as num).toInt(), uuid: json['uuid'] as String, - exerciseBaseId: json['exercise_base'] as int, + exerciseBaseId: (json['exercise_base'] as num).toInt(), url: json['image'] as String, isMain: json['is_main'] as bool? ?? false, ); diff --git a/lib/models/exercises/ingredient_api.g.dart b/lib/models/exercises/ingredient_api.g.dart index c962982d..6c7f76c2 100644 --- a/lib/models/exercises/ingredient_api.g.dart +++ b/lib/models/exercises/ingredient_api.g.dart @@ -9,7 +9,7 @@ part of 'ingredient_api.dart'; _$IngredientApiSearchDetailsImpl _$$IngredientApiSearchDetailsImplFromJson( Map json) => _$IngredientApiSearchDetailsImpl( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, image: json['image'] as String?, imageThumbnail: json['image_thumbnail'] as String?, diff --git a/lib/models/exercises/language.g.dart b/lib/models/exercises/language.g.dart index 1c538d97..28a31848 100644 --- a/lib/models/exercises/language.g.dart +++ b/lib/models/exercises/language.g.dart @@ -12,7 +12,7 @@ Language _$LanguageFromJson(Map json) { requiredKeys: const ['id', 'short_name', 'full_name'], ); return Language( - id: json['id'] as int, + id: (json['id'] as num).toInt(), shortName: json['short_name'] as String, fullName: json['full_name'] as String, ); diff --git a/lib/models/exercises/muscle.g.dart b/lib/models/exercises/muscle.g.dart index 6a809dc3..04319680 100644 --- a/lib/models/exercises/muscle.g.dart +++ b/lib/models/exercises/muscle.g.dart @@ -12,7 +12,7 @@ Muscle _$MuscleFromJson(Map json) { requiredKeys: const ['id', 'name', 'name_en', 'is_front'], ); return Muscle( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, nameEn: json['name_en'] as String, isFront: json['is_front'] as bool, diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart index 30a8f82c..ae8e15bf 100644 --- a/lib/models/exercises/translation.g.dart +++ b/lib/models/exercises/translation.g.dart @@ -20,14 +20,14 @@ Translation _$TranslationFromJson(Map json) { ], ); return Translation( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), uuid: json['uuid'] as String?, created: json['created'] == null ? null : DateTime.parse(json['created'] as String), name: json['name'] as String, description: json['description'] as String, - exerciseId: json['exercise_base'] as int?, + exerciseId: (json['exercise_base'] as num?)?.toInt(), ) - ..languageId = json['language'] as int + ..languageId = (json['language'] as num).toInt() ..notes = (json['notes'] as List) .map((e) => Comment.fromJson(e as Map)) .toList() diff --git a/lib/models/exercises/variation.g.dart b/lib/models/exercises/variation.g.dart index 859c407b..9b9901e2 100644 --- a/lib/models/exercises/variation.g.dart +++ b/lib/models/exercises/variation.g.dart @@ -12,7 +12,7 @@ Variation _$VariationFromJson(Map json) { requiredKeys: const ['id'], ); return Variation( - id: json['id'] as int, + id: (json['id'] as num).toInt(), ); } diff --git a/lib/models/exercises/video.g.dart b/lib/models/exercises/video.g.dart index 16219881..0d0cc875 100644 --- a/lib/models/exercises/video.g.dart +++ b/lib/models/exercises/video.g.dart @@ -25,17 +25,17 @@ Video _$VideoFromJson(Map json) { ], ); return Video( - id: json['id'] as int, + id: (json['id'] as num).toInt(), uuid: json['uuid'] as String, - base: json['exercise_base'] as int, - size: json['size'] as int, + base: (json['exercise_base'] as num).toInt(), + size: (json['size'] as num).toInt(), url: json['video'] as String, duration: stringToNum(json['duration'] as String?), - width: json['width'] as int, - height: json['height'] as int, + width: (json['width'] as num).toInt(), + height: (json['height'] as num).toInt(), codec: json['codec'] as String, codecLong: json['codec_long'] as String, - license: json['license'] as int, + license: (json['license'] as num).toInt(), licenseAuthor: json['license_author'] as String?, ); } diff --git a/lib/models/gallery/image.g.dart b/lib/models/gallery/image.g.dart index d87cc4e4..54ab9af5 100644 --- a/lib/models/gallery/image.g.dart +++ b/lib/models/gallery/image.g.dart @@ -12,7 +12,7 @@ Image _$ImageFromJson(Map json) { requiredKeys: const ['id', 'date', 'image'], ); return Image( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), date: DateTime.parse(json['date'] as String), url: json['image'] as String?, description: json['description'] as String? ?? '', diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart index eb887b2e..05ddd4c7 100644 --- a/lib/models/measurements/measurement_category.g.dart +++ b/lib/models/measurements/measurement_category.g.dart @@ -12,7 +12,7 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map json) { requiredKeys: const ['id', 'name', 'unit'], ); return MeasurementCategory( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), name: json['name'] as String, unit: json['unit'] as String, entries: (json['entries'] as List?) diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart index 7f6e346a..a162c6a8 100644 --- a/lib/models/measurements/measurement_entry.g.dart +++ b/lib/models/measurements/measurement_entry.g.dart @@ -12,8 +12,8 @@ MeasurementEntry _$MeasurementEntryFromJson(Map json) { requiredKeys: const ['id', 'category', 'date', 'value', 'notes'], ); return MeasurementEntry( - id: json['id'] as int?, - category: json['category'] as int, + id: (json['id'] as num?)?.toInt(), + category: (json['category'] as num).toInt(), date: DateTime.parse(json['date'] as String), value: json['value'] as num, notes: json['notes'] as String? ?? '', diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart index 0bd0771d..27f90272 100644 --- a/lib/models/nutrition/image.g.dart +++ b/lib/models/nutrition/image.g.dart @@ -24,12 +24,12 @@ IngredientImage _$IngredientImageFromJson(Map json) { ], ); return IngredientImage( - id: json['id'] as int, + id: (json['id'] as num).toInt(), uuid: json['uuid'] as String, - ingredientId: json['ingredient_id'] as int, + ingredientId: (json['ingredient_id'] as num).toInt(), image: json['image'] as String, - size: json['size'] as int, - licenseId: json['license'] as int, + size: (json['size'] as num).toInt(), + licenseId: (json['license'] as num).toInt(), author: json['license_author'] as String, authorUrl: json['license_author_url'] as String, title: json['license_title'] as String, diff --git a/lib/models/nutrition/ingredient.dart b/lib/models/nutrition/ingredient.dart index 59a3460f..91964d2f 100644 --- a/lib/models/nutrition/ingredient.dart +++ b/lib/models/nutrition/ingredient.dart @@ -62,8 +62,8 @@ class Ingredient { final num fatSaturated; /// g per 100g of product - @JsonKey(required: true, fromJson: stringToNum, toJson: numToString) - final num fibres; + @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'fibres') + final num fibers; /// g per 100g of product @JsonKey(required: true, fromJson: stringToNum, toJson: numToString) @@ -82,7 +82,7 @@ class Ingredient { required this.protein, required this.fat, required this.fatSaturated, - required this.fibres, + required this.fibers, required this.sodium, this.image, }); diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart index d0ea8cfa..2e8f1ae5 100644 --- a/lib/models/nutrition/ingredient.g.dart +++ b/lib/models/nutrition/ingredient.g.dart @@ -25,17 +25,17 @@ Ingredient _$IngredientFromJson(Map json) { ], ); return Ingredient( - id: json['id'] as int, + id: (json['id'] as num).toInt(), code: json['code'] as String?, name: json['name'] as String, created: DateTime.parse(json['created'] as String), - energy: json['energy'] as int, + energy: (json['energy'] as num).toInt(), carbohydrates: stringToNum(json['carbohydrates'] as String?), carbohydratesSugar: stringToNum(json['carbohydrates_sugar'] as String?), protein: stringToNum(json['protein'] as String?), fat: stringToNum(json['fat'] as String?), fatSaturated: stringToNum(json['fat_saturated'] as String?), - fibres: stringToNum(json['fibres'] as String?), + fibers: stringToNum(json['fibres'] as String?), sodium: stringToNum(json['sodium'] as String?), image: json['image'] == null ? null @@ -54,7 +54,7 @@ Map _$IngredientToJson(Ingredient instance) => json) { requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount'], ); return IngredientWeightUnit( - id: json['id'] as int, + id: (json['id'] as num).toInt(), weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map), ingredient: Ingredient.fromJson(json['ingredient'] as Map), - grams: json['grams'] as int, + grams: (json['grams'] as num).toInt(), amount: (json['amount'] as num).toDouble(), ); } diff --git a/lib/models/nutrition/log.dart b/lib/models/nutrition/log.dart index 730763cc..5eb2b256 100644 --- a/lib/models/nutrition/log.dart +++ b/lib/models/nutrition/log.dart @@ -95,7 +95,7 @@ class Log { out.carbohydratesSugar = ingredient.carbohydratesSugar * weight / 100; out.fat = ingredient.fat * weight / 100; out.fatSaturated = ingredient.fatSaturated * weight / 100; - out.fibres = ingredient.fibres * weight / 100; + out.fibers = ingredient.fibers * weight / 100; out.sodium = ingredient.sodium * weight / 100; return out; diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart index 61690155..dcb1d721 100644 --- a/lib/models/nutrition/log.g.dart +++ b/lib/models/nutrition/log.g.dart @@ -12,12 +12,12 @@ Log _$LogFromJson(Map json) { requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'], ); return Log( - id: json['id'] as int?, - mealId: json['meal'] as int?, - ingredientId: json['ingredient'] as int, - weightUnitId: json['weight_unit'] as int?, + id: (json['id'] as num?)?.toInt(), + mealId: (json['meal'] as num?)?.toInt(), + ingredientId: (json['ingredient'] as num).toInt(), + weightUnitId: (json['weight_unit'] as num?)?.toInt(), amount: stringToNum(json['amount'] as String?), - planId: json['plan'] as int, + planId: (json['plan'] as num).toInt(), datetime: DateTime.parse(json['datetime'] as String), comment: json['comment'] as String?, ); diff --git a/lib/models/nutrition/meal.g.dart b/lib/models/nutrition/meal.g.dart index 296d637e..2258775c 100644 --- a/lib/models/nutrition/meal.g.dart +++ b/lib/models/nutrition/meal.g.dart @@ -7,10 +7,10 @@ part of 'meal.dart'; // ************************************************************************** Meal _$MealFromJson(Map json) => Meal( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), time: stringToTime(json['time'] as String?), name: json['name'] as String?, - )..planId = json['plan'] as int; + )..planId = (json['plan'] as num).toInt(); Map _$MealToJson(Meal instance) => { 'id': instance.id, diff --git a/lib/models/nutrition/meal_item.dart b/lib/models/nutrition/meal_item.dart index d484283f..bed7395a 100644 --- a/lib/models/nutrition/meal_item.dart +++ b/lib/models/nutrition/meal_item.dart @@ -85,7 +85,7 @@ class MealItem { out.carbohydratesSugar = ingredient.carbohydratesSugar * weight / 100; out.fat = ingredient.fat * weight / 100; out.fatSaturated = ingredient.fatSaturated * weight / 100; - out.fibres = ingredient.fibres * weight / 100; + out.fibers = ingredient.fibers * weight / 100; out.sodium = ingredient.sodium * weight / 100; return out; diff --git a/lib/models/nutrition/meal_item.g.dart b/lib/models/nutrition/meal_item.g.dart index 514788cc..256f9cce 100644 --- a/lib/models/nutrition/meal_item.g.dart +++ b/lib/models/nutrition/meal_item.g.dart @@ -12,10 +12,10 @@ MealItem _$MealItemFromJson(Map json) { requiredKeys: const ['id', 'amount'], ); return MealItem( - id: json['id'] as int?, - mealId: json['meal'] as int?, - ingredientId: json['ingredient'] as int, - weightUnitId: json['weight_unit'] as int?, + id: (json['id'] as num?)?.toInt(), + mealId: (json['meal'] as num?)?.toInt(), + ingredientId: (json['ingredient'] as num).toInt(), + weightUnitId: (json['weight_unit'] as num?)?.toInt(), amount: stringToNum(json['amount'] as String?), ); } diff --git a/lib/models/nutrition/nutritional_goals.dart b/lib/models/nutrition/nutritional_goals.dart index 4a03ecbc..5d38580c 100644 --- a/lib/models/nutrition/nutritional_goals.dart +++ b/lib/models/nutrition/nutritional_goals.dart @@ -26,7 +26,7 @@ class NutritionalGoals { double? carbohydratesSugar = 0; double? fat = 0; double? fatSaturated = 0; - double? fibres = 0; + double? fibers = 0; double? sodium = 0; NutritionalGoals({ @@ -36,7 +36,7 @@ class NutritionalGoals { this.carbohydratesSugar, this.fat, this.fatSaturated, - this.fibres, + this.fibers, this.sodium, }) { // infer values where we can @@ -71,7 +71,7 @@ class NutritionalGoals { carbohydratesSugar: carbohydratesSugar != null ? carbohydratesSugar! / v : null, fat: fat != null ? fat! / v : null, fatSaturated: fatSaturated != null ? fatSaturated! / v : null, - fibres: fibres != null ? fibres! / v : null, + fibers: fibers != null ? fibers! / v : null, sodium: sodium != null ? sodium! / v : null, ); } @@ -91,7 +91,7 @@ class NutritionalGoals { carbohydratesSugar ?? 0, fat ?? 0, fatSaturated ?? 0, - fibres ?? 0, + fibers ?? 0, sodium ?? 0, ); } @@ -126,7 +126,7 @@ class NutritionalGoals { 'carbohydratesSugar' => carbohydratesSugar, 'fat' => fat, 'fatSaturated' => fatSaturated, - 'fibres' => fibres, + 'fibres' => fibers, 'sodium' => sodium, _ => 0, }; @@ -134,13 +134,13 @@ class NutritionalGoals { @override String toString() { - return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fibres, s: $sodium'; + return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fibers, s: $sodium'; } @override //ignore: avoid_equals_and_hash_code_on_mutable_classes int get hashCode => Object.hash( - energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibres, sodium); + energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibers, sodium); @override // ignore: avoid_equals_and_hash_code_on_mutable_classes @@ -155,7 +155,7 @@ class NutritionalGoals { other.carbohydratesSugar == carbohydratesSugar && other.fat == fat && other.fatSaturated == fatSaturated && - other.fibres == fibres && + other.fibers == fibers && other.sodium == sodium; } } diff --git a/lib/models/nutrition/nutritional_plan.dart b/lib/models/nutrition/nutritional_plan.dart index 2d1479fd..e7a0cc60 100644 --- a/lib/models/nutrition/nutritional_plan.dart +++ b/lib/models/nutrition/nutritional_plan.dart @@ -125,7 +125,7 @@ class NutritionalPlan { fat: goalFat?.toDouble(), protein: goalProtein?.toDouble(), carbohydrates: goalCarbohydrates?.toDouble(), - fibres: goalFibers?.toDouble(), + fibers: goalFibers?.toDouble(), ); } // if there are no set goals and no defined meals, the goals are still undefined @@ -141,7 +141,7 @@ class NutritionalPlan { carbohydrates: sumValues.carbohydrates, carbohydratesSugar: sumValues.carbohydratesSugar, fatSaturated: sumValues.fatSaturated, - fibres: sumValues.fibres, + fibers: sumValues.fibers, sodium: sumValues.sodium, ); } diff --git a/lib/models/nutrition/nutritional_values.dart b/lib/models/nutrition/nutritional_values.dart index 6365dd2d..838246c2 100644 --- a/lib/models/nutrition/nutritional_values.dart +++ b/lib/models/nutrition/nutritional_values.dart @@ -23,7 +23,7 @@ class NutritionalValues { double carbohydratesSugar = 0; double fat = 0; double fatSaturated = 0; - double fibres = 0; + double fibers = 0; double sodium = 0; NutritionalValues(); @@ -35,7 +35,7 @@ class NutritionalValues { this.carbohydratesSugar, this.fat, this.fatSaturated, - this.fibres, + this.fibers, this.sodium, ); @@ -51,7 +51,7 @@ class NutritionalValues { carbohydratesSugar += data.carbohydratesSugar; fat += data.fat; fatSaturated += data.fatSaturated; - fibres += data.fibres; + fibers += data.fibers; sodium += data.sodium; } @@ -63,7 +63,7 @@ class NutritionalValues { carbohydratesSugar + o.carbohydratesSugar, fat + o.fat, fatSaturated + o.fatSaturated, - fibres + o.fibres, + fibers + o.fibers, sodium + o.sodium, ); } @@ -76,7 +76,7 @@ class NutritionalValues { carbohydratesSugar / o, fat / o, fatSaturated / o, - fibres / o, + fibers / o, sodium / o, ); } @@ -91,7 +91,7 @@ class NutritionalValues { carbohydratesSugar == other.carbohydratesSugar && fat == other.fat && fatSaturated == other.fatSaturated && - fibres == other.fibres && + fibers == other.fibers && sodium == other.sodium; } @@ -103,7 +103,7 @@ class NutritionalValues { 'carbohydratesSugar' => carbohydratesSugar, 'fat' => fat, 'fatSaturated' => fatSaturated, - 'fibres' => fibres, + 'fibres' => fibers, 'sodium' => sodium, _ => 0, }; @@ -111,11 +111,11 @@ class NutritionalValues { @override String toString() { - return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fibres, s: $sodium'; + return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fibers, s: $sodium'; } @override //ignore: avoid_equals_and_hash_code_on_mutable_classes int get hashCode => Object.hash( - energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibres, sodium); + energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibers, sodium); } diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart index 6f2b9607..ba89171d 100644 --- a/lib/models/nutrition/weight_unit.g.dart +++ b/lib/models/nutrition/weight_unit.g.dart @@ -12,7 +12,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { requiredKeys: const ['id', 'name'], ); return WeightUnit( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, ); } diff --git a/lib/models/workouts/day.g.dart b/lib/models/workouts/day.g.dart index 0f1b6736..55db607c 100644 --- a/lib/models/workouts/day.g.dart +++ b/lib/models/workouts/day.g.dart @@ -12,10 +12,10 @@ Day _$DayFromJson(Map json) { requiredKeys: const ['id', 'training', 'description', 'day'], ); return Day() - ..id = json['id'] as int? - ..workoutId = json['training'] as int + ..id = (json['id'] as num?)?.toInt() + ..workoutId = (json['training'] as num).toInt() ..description = json['description'] as String - ..daysOfWeek = (json['day'] as List).map((e) => e as int).toList(); + ..daysOfWeek = (json['day'] as List).map((e) => (e as num).toInt()).toList(); } Map _$DayToJson(Day instance) => { diff --git a/lib/models/workouts/log.g.dart b/lib/models/workouts/log.g.dart index 1986d318..68f7fe3d 100644 --- a/lib/models/workouts/log.g.dart +++ b/lib/models/workouts/log.g.dart @@ -21,14 +21,14 @@ Log _$LogFromJson(Map json) { ], ); return Log( - id: json['id'] as int?, - exerciseBaseId: json['exercise_base'] as int, - workoutPlan: json['workout'] as int, - reps: json['reps'] as int, + id: (json['id'] as num?)?.toInt(), + exerciseBaseId: (json['exercise_base'] as num).toInt(), + workoutPlan: (json['workout'] as num).toInt(), + reps: (json['reps'] as num).toInt(), rir: json['rir'] as String?, - repetitionUnitId: json['repetition_unit'] as int, + repetitionUnitId: (json['repetition_unit'] as num).toInt(), weight: stringToNum(json['weight'] as String?), - weightUnitId: json['weight_unit'] as int, + weightUnitId: (json['weight_unit'] as num).toInt(), date: DateTime.parse(json['date'] as String), ); } diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart index 33e6a815..bd9ab9f2 100644 --- a/lib/models/workouts/repetition_unit.g.dart +++ b/lib/models/workouts/repetition_unit.g.dart @@ -12,7 +12,7 @@ RepetitionUnit _$RepetitionUnitFromJson(Map json) { requiredKeys: const ['id', 'name'], ); return RepetitionUnit( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, ); } diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart index 79f4fee4..919a8d83 100644 --- a/lib/models/workouts/session.g.dart +++ b/lib/models/workouts/session.g.dart @@ -12,8 +12,8 @@ WorkoutSession _$WorkoutSessionFromJson(Map json) { requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end'], ); return WorkoutSession() - ..id = json['id'] as int? - ..workoutId = json['workout'] as int + ..id = (json['id'] as num?)?.toInt() + ..workoutId = (json['workout'] as num).toInt() ..date = DateTime.parse(json['date'] as String) ..impression = stringToNum(json['impression'] as String?) ..notes = json['notes'] as String? ?? '' diff --git a/lib/models/workouts/set.g.dart b/lib/models/workouts/set.g.dart index 2548fc12..1e489fa2 100644 --- a/lib/models/workouts/set.g.dart +++ b/lib/models/workouts/set.g.dart @@ -12,11 +12,11 @@ Set _$SetFromJson(Map json) { requiredKeys: const ['id', 'sets', 'order', 'comment'], ); return Set( - day: json['exerciseday'] as int, - sets: json['sets'] as int, - order: json['order'] as int, + day: (json['exerciseday'] as num).toInt(), + sets: (json['sets'] as num).toInt(), + order: (json['order'] as num).toInt(), ) - ..id = json['id'] as int? + ..id = (json['id'] as num?)?.toInt() ..comment = json['comment'] as String? ?? ''; } diff --git a/lib/models/workouts/setting.g.dart b/lib/models/workouts/setting.g.dart index 904a1300..88b5b16f 100644 --- a/lib/models/workouts/setting.g.dart +++ b/lib/models/workouts/setting.g.dart @@ -23,13 +23,13 @@ Setting _$SettingFromJson(Map json) { ], ); return Setting( - id: json['id'] as int?, - setId: json['set'] as int, - order: json['order'] as int, - exerciseId: json['exercise_base'] as int, - repetitionUnitId: json['repetition_unit'] as int, - reps: json['reps'] as int?, - weightUnitId: json['weight_unit'] as int, + id: (json['id'] as num?)?.toInt(), + setId: (json['set'] as num).toInt(), + order: (json['order'] as num).toInt(), + exerciseId: (json['exercise_base'] as num).toInt(), + repetitionUnitId: (json['repetition_unit'] as num).toInt(), + reps: (json['reps'] as num?)?.toInt(), + weightUnitId: (json['weight_unit'] as num).toInt(), comment: json['comment'] as String, rir: json['rir'] as String?, )..weight = stringToNum(json['weight'] as String?); diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart index 6f2b9607..ba89171d 100644 --- a/lib/models/workouts/weight_unit.g.dart +++ b/lib/models/workouts/weight_unit.g.dart @@ -12,7 +12,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { requiredKeys: const ['id', 'name'], ); return WeightUnit( - id: json['id'] as int, + id: (json['id'] as num).toInt(), name: json['name'] as String, ); } diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart index ac1d6fa9..4c83ef35 100644 --- a/lib/models/workouts/workout_plan.g.dart +++ b/lib/models/workouts/workout_plan.g.dart @@ -12,7 +12,7 @@ WorkoutPlan _$WorkoutPlanFromJson(Map json) { requiredKeys: const ['id', 'creation_date', 'name', 'description'], ); return WorkoutPlan( - id: json['id'] as int?, + id: (json['id'] as num?)?.toInt(), creationDate: DateTime.parse(json['creation_date'] as String), name: json['name'] as String, description: json['description'] as String?, diff --git a/lib/widgets/nutrition/charts.dart b/lib/widgets/nutrition/charts.dart index ac607540..128a9726 100644 --- a/lib/widgets/nutrition/charts.dart +++ b/lib/widgets/nutrition/charts.dart @@ -100,7 +100,7 @@ class FlNutritionalPlanGoalWidgetState extends State 0) today.fat / goals.fat!, if (goals.energy != null && goals.energy! > 0) today.energy / goals.energy!, - if (goals.fibres != null && goals.fibres! > 0) today.fibres / goals.fibres!, + if (goals.fibers != null && goals.fibers! > 0) today.fibers / goals.fibers!, ].reduce(max); final normWidth = constraints.maxWidth / maxVal; @@ -132,13 +132,13 @@ class FlNutritionalPlanGoalWidgetState extends State -#include #include #include @@ -15,9 +14,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); - g_autoptr(FlPluginRegistrar) rive_common_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "RivePlugin"); - rive_plugin_register_with_registrar(rive_common_registrar); g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin"); sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index bec16405..74369f25 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_linux - rive_common sqlite3_flutter_libs url_launcher_linux ) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 89124fad..a623cf30 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -14,18 +14,18 @@ PODS: - 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.45.3+1)": + - "sqlite3/common (= 3.45.3+1)" + - "sqlite3/common (3.45.3+1)" + - "sqlite3/fts5 (3.45.3+1)": - sqlite3/common - - sqlite3/perf-threadsafe (3.45.0): + - "sqlite3/perf-threadsafe (3.45.3+1)": - sqlite3/common - - sqlite3/rtree (3.45.0): + - "sqlite3/rtree (3.45.3+1)": - sqlite3/common - sqlite3_flutter_libs (0.0.1): - FlutterMacOS - - sqlite3 (~> 3.45.0) + - "sqlite3 (~> 3.45.3+1)" - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -74,17 +74,17 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin SPEC CHECKSUMS: - file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 + file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2 flutter_zxing: ea030278aa2a051cd81a5b0053be9d0569d11c9a FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - rive_common: 0f0aadf670f0c6a7872dfe3e6186f112a5319108 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - sqlite3: f307b6291c4db7b5086c38d6237446b98a738581 - sqlite3_flutter_libs: 6b9913d8fbb718e5ebf23658aa6934a0fb509c0f - url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 - video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1 + package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + rive_common: cf5ab646aa576b2d742d0e2d528126fbf032c856 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a + sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5 + url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399 + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 9fda4bfb..f9cf0c71 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5dc152fa..ffa638a0 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@