diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart index 76431f08f..6c3bd9d0c 100644 --- a/integration_test/3_gym_mode.dart +++ b/integration_test/3_gym_mode.dart @@ -9,7 +9,7 @@ import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/routine_screen.dart'; import 'package:wger/theme/theme.dart'; -import '../test/routine/gym_mode_screen_test.mocks.dart'; +import '../test/routine/gym_mode/gym_mode_test.mocks.dart'; import '../test_data/exercises.dart'; import '../test_data/routines.dart'; diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart index 6da378e2d..a07b1092e 100644 --- a/lib/database/exercises/exercise_database.g.dart +++ b/lib/database/exercises/exercise_database.g.dart @@ -7,9 +7,7 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise @override final GeneratedDatabase attachedDatabase; final String? _alias; - $ExercisesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -28,7 +26,9 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise type: DriftSqlType.string, requiredDuringInsert: true, ); - static const VerificationMeta _lastUpdateMeta = const VerificationMeta('lastUpdate'); + static const VerificationMeta _lastUpdateMeta = const VerificationMeta( + 'lastUpdate', + ); @override late final GeneratedColumn lastUpdate = GeneratedColumn( 'last_update', @@ -37,7 +37,9 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise type: DriftSqlType.dateTime, requiredDuringInsert: true, ); - static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched'); + static const VerificationMeta _lastFetchedMeta = const VerificationMeta( + 'lastFetched', + ); @override late final GeneratedColumn lastFetched = GeneratedColumn( 'last_fetched', @@ -46,17 +48,13 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise type: DriftSqlType.dateTime, requiredDuringInsert: true, ); - @override List get $columns => [id, data, lastUpdate, lastFetched]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'exercises'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -70,7 +68,10 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise context.missing(_idMeta); } if (data.containsKey('data')) { - context.handle(_dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta)); + context.handle( + _dataMeta, + this.data.isAcceptableOrUnknown(data['data']!, _dataMeta), + ); } else if (isInserting) { context.missing(_dataMeta); } @@ -85,7 +86,10 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise if (data.containsKey('last_fetched')) { context.handle( _lastFetchedMeta, - lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta), + lastFetched.isAcceptableOrUnknown( + data['last_fetched']!, + _lastFetchedMeta, + ), ); } else if (isInserting) { context.missing(_lastFetchedMeta); @@ -95,13 +99,18 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise @override Set get $primaryKey => const {}; - @override ExerciseTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ExerciseTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + data: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, lastUpdate: attachedDatabase.typeMapping.read( DriftSqlType.dateTime, data['${effectivePrefix}last_update'], @@ -128,14 +137,12 @@ class ExerciseTable extends DataClass implements Insertable { /// when the exercise itself was last updated in `lastUpdate`, we can save /// ourselves a lot of requests if we don't check too often final DateTime lastFetched; - const ExerciseTable({ required this.id, required this.data, required this.lastUpdate, required this.lastFetched, }); - @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -155,7 +162,10 @@ class ExerciseTable extends DataClass implements Insertable { ); } - factory ExerciseTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory ExerciseTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ExerciseTable( id: serializer.fromJson(json['id']), @@ -164,7 +174,6 @@ class ExerciseTable extends DataClass implements Insertable { lastFetched: serializer.fromJson(json['lastFetched']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -176,14 +185,17 @@ class ExerciseTable extends DataClass implements Insertable { }; } - ExerciseTable copyWith({int? id, String? data, DateTime? lastUpdate, DateTime? lastFetched}) => - ExerciseTable( - id: id ?? this.id, - data: data ?? this.data, - lastUpdate: lastUpdate ?? this.lastUpdate, - lastFetched: lastFetched ?? this.lastFetched, - ); - + ExerciseTable copyWith({ + int? id, + String? data, + DateTime? lastUpdate, + DateTime? lastFetched, + }) => ExerciseTable( + id: id ?? this.id, + data: data ?? this.data, + lastUpdate: lastUpdate ?? this.lastUpdate, + lastFetched: lastFetched ?? this.lastFetched, + ); ExerciseTable copyWithCompanion(ExercisesCompanion data) { return ExerciseTable( id: data.id.present ? data.id.value : this.id, @@ -206,7 +218,6 @@ class ExerciseTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data, lastUpdate, lastFetched); - @override bool operator ==(Object other) => identical(this, other) || @@ -223,7 +234,6 @@ class ExercisesCompanion extends UpdateCompanion { final Value lastUpdate; final Value lastFetched; final Value rowid; - const ExercisesCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), @@ -231,7 +241,6 @@ class ExercisesCompanion extends UpdateCompanion { this.lastFetched = const Value.absent(), this.rowid = const Value.absent(), }); - ExercisesCompanion.insert({ required int id, required String data, @@ -242,7 +251,6 @@ class ExercisesCompanion extends UpdateCompanion { data = Value(data), lastUpdate = Value(lastUpdate), lastFetched = Value(lastFetched); - static Insertable custom({ Expression? id, Expression? data, @@ -313,9 +321,7 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { @override final GeneratedDatabase attachedDatabase; final String? _alias; - $MusclesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -333,17 +339,13 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { type: DriftSqlType.string, requiredDuringInsert: true, ).withConverter($MusclesTable.$converterdata); - @override List get $columns => [id, data]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'muscles'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -361,14 +363,19 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { @override Set get $primaryKey => const {}; - @override MuscleTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return MuscleTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, data: $MusclesTable.$converterdata.fromSql( - attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, ), ); } @@ -384,9 +391,7 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { class MuscleTable extends DataClass implements Insertable { final int id; final Muscle data; - const MuscleTable({required this.id, required this.data}); - @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -401,14 +406,16 @@ class MuscleTable extends DataClass implements Insertable { return MusclesCompanion(id: Value(id), data: Value(data)); } - factory MuscleTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory MuscleTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return MuscleTable( id: serializer.fromJson(json['id']), data: serializer.fromJson(json['data']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -420,7 +427,6 @@ class MuscleTable extends DataClass implements Insertable { MuscleTable copyWith({int? id, Muscle? data}) => MuscleTable(id: id ?? this.id, data: data ?? this.data); - MuscleTable copyWithCompanion(MusclesCompanion data) { return MuscleTable( id: data.id.present ? data.id.value : this.id, @@ -439,7 +445,6 @@ class MuscleTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data); - @override bool operator ==(Object other) => identical(this, other) || @@ -450,20 +455,17 @@ class MusclesCompanion extends UpdateCompanion { final Value id; final Value data; final Value rowid; - const MusclesCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), this.rowid = const Value.absent(), }); - MusclesCompanion.insert({ required int id, required Muscle data, this.rowid = const Value.absent(), }) : id = Value(id), data = Value(data); - static Insertable custom({ Expression? id, Expression? data, @@ -476,8 +478,16 @@ class MusclesCompanion extends UpdateCompanion { }); } - MusclesCompanion copyWith({Value? id, Value? data, Value? rowid}) { - return MusclesCompanion(id: id ?? this.id, data: data ?? this.data, rowid: rowid ?? this.rowid); + MusclesCompanion copyWith({ + Value? id, + Value? data, + Value? rowid, + }) { + return MusclesCompanion( + id: id ?? this.id, + data: data ?? this.data, + rowid: rowid ?? this.rowid, + ); } @override @@ -487,7 +497,9 @@ class MusclesCompanion extends UpdateCompanion { map['id'] = Variable(id.value); } if (data.present) { - map['data'] = Variable($MusclesTable.$converterdata.toSql(data.value)); + map['data'] = Variable( + $MusclesTable.$converterdata.toSql(data.value), + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -510,9 +522,7 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip @override final GeneratedDatabase attachedDatabase; final String? _alias; - $EquipmentsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -530,17 +540,13 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip type: DriftSqlType.string, requiredDuringInsert: true, ).withConverter($EquipmentsTable.$converterdata); - @override List get $columns => [id, data]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'equipments'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -558,14 +564,19 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip @override Set get $primaryKey => const {}; - @override EquipmentTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return EquipmentTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, data: $EquipmentsTable.$converterdata.fromSql( - attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, ), ); } @@ -581,15 +592,15 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip class EquipmentTable extends DataClass implements Insertable { final int id; final Equipment data; - const EquipmentTable({required this.id, required this.data}); - @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); { - map['data'] = Variable($EquipmentsTable.$converterdata.toSql(data)); + map['data'] = Variable( + $EquipmentsTable.$converterdata.toSql(data), + ); } return map; } @@ -598,14 +609,16 @@ class EquipmentTable extends DataClass implements Insertable { return EquipmentsCompanion(id: Value(id), data: Value(data)); } - factory EquipmentTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory EquipmentTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return EquipmentTable( id: serializer.fromJson(json['id']), data: serializer.fromJson(json['data']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -617,7 +630,6 @@ class EquipmentTable extends DataClass implements Insertable { EquipmentTable copyWith({int? id, Equipment? data}) => EquipmentTable(id: id ?? this.id, data: data ?? this.data); - EquipmentTable copyWithCompanion(EquipmentsCompanion data) { return EquipmentTable( id: data.id.present ? data.id.value : this.id, @@ -636,7 +648,6 @@ class EquipmentTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data); - @override bool operator ==(Object other) => identical(this, other) || @@ -647,20 +658,17 @@ class EquipmentsCompanion extends UpdateCompanion { final Value id; final Value data; final Value rowid; - const EquipmentsCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), this.rowid = const Value.absent(), }); - EquipmentsCompanion.insert({ required int id, required Equipment data, this.rowid = const Value.absent(), }) : id = Value(id), data = Value(data); - static Insertable custom({ Expression? id, Expression? data, @@ -673,7 +681,11 @@ class EquipmentsCompanion extends UpdateCompanion { }); } - EquipmentsCompanion copyWith({Value? id, Value? data, Value? rowid}) { + EquipmentsCompanion copyWith({ + Value? id, + Value? data, + Value? rowid, + }) { return EquipmentsCompanion( id: id ?? this.id, data: data ?? this.data, @@ -688,7 +700,9 @@ class EquipmentsCompanion extends UpdateCompanion { map['id'] = Variable(id.value); } if (data.present) { - map['data'] = Variable($EquipmentsTable.$converterdata.toSql(data.value)); + map['data'] = Variable( + $EquipmentsTable.$converterdata.toSql(data.value), + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -711,9 +725,7 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ @override final GeneratedDatabase attachedDatabase; final String? _alias; - $CategoriesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -732,17 +744,13 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ type: DriftSqlType.string, requiredDuringInsert: true, ).withConverter($CategoriesTable.$converterdata); - @override List get $columns => [id, data]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'categories'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -760,14 +768,19 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ @override Set get $primaryKey => const {}; - @override CategoryTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CategoryTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, data: $CategoriesTable.$converterdata.fromSql( - attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, ), ); } @@ -783,15 +796,15 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ class CategoryTable extends DataClass implements Insertable { final int id; final ExerciseCategory data; - const CategoryTable({required this.id, required this.data}); - @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); { - map['data'] = Variable($CategoriesTable.$converterdata.toSql(data)); + map['data'] = Variable( + $CategoriesTable.$converterdata.toSql(data), + ); } return map; } @@ -800,14 +813,16 @@ class CategoryTable extends DataClass implements Insertable { return CategoriesCompanion(id: Value(id), data: Value(data)); } - factory CategoryTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory CategoryTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return CategoryTable( id: serializer.fromJson(json['id']), data: serializer.fromJson(json['data']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -819,7 +834,6 @@ class CategoryTable extends DataClass implements Insertable { CategoryTable copyWith({int? id, ExerciseCategory? data}) => CategoryTable(id: id ?? this.id, data: data ?? this.data); - CategoryTable copyWithCompanion(CategoriesCompanion data) { return CategoryTable( id: data.id.present ? data.id.value : this.id, @@ -838,7 +852,6 @@ class CategoryTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data); - @override bool operator ==(Object other) => identical(this, other) || @@ -849,20 +862,17 @@ class CategoriesCompanion extends UpdateCompanion { final Value id; final Value data; final Value rowid; - const CategoriesCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), this.rowid = const Value.absent(), }); - CategoriesCompanion.insert({ required int id, required ExerciseCategory data, this.rowid = const Value.absent(), }) : id = Value(id), data = Value(data); - static Insertable custom({ Expression? id, Expression? data, @@ -875,7 +885,11 @@ class CategoriesCompanion extends UpdateCompanion { }); } - CategoriesCompanion copyWith({Value? id, Value? data, Value? rowid}) { + CategoriesCompanion copyWith({ + Value? id, + Value? data, + Value? rowid, + }) { return CategoriesCompanion( id: id ?? this.id, data: data ?? this.data, @@ -890,7 +904,9 @@ class CategoriesCompanion extends UpdateCompanion { map['id'] = Variable(id.value); } if (data.present) { - map['data'] = Variable($CategoriesTable.$converterdata.toSql(data.value)); + map['data'] = Variable( + $CategoriesTable.$converterdata.toSql(data.value), + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -913,9 +929,7 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language @override final GeneratedDatabase attachedDatabase; final String? _alias; - $LanguagesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -933,17 +947,13 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language type: DriftSqlType.string, requiredDuringInsert: true, ).withConverter($LanguagesTable.$converterdata); - @override List get $columns => [id, data]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'languages'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -961,14 +971,19 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language @override Set get $primaryKey => const {}; - @override LanguagesTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return LanguagesTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, data: $LanguagesTable.$converterdata.fromSql( - attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, ), ); } @@ -984,15 +999,15 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language class LanguagesTable extends DataClass implements Insertable { final int id; final Language data; - const LanguagesTable({required this.id, required this.data}); - @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); { - map['data'] = Variable($LanguagesTable.$converterdata.toSql(data)); + map['data'] = Variable( + $LanguagesTable.$converterdata.toSql(data), + ); } return map; } @@ -1001,14 +1016,16 @@ class LanguagesTable extends DataClass implements Insertable { return LanguagesCompanion(id: Value(id), data: Value(data)); } - factory LanguagesTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory LanguagesTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return LanguagesTable( id: serializer.fromJson(json['id']), data: serializer.fromJson(json['data']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -1020,7 +1037,6 @@ class LanguagesTable extends DataClass implements Insertable { LanguagesTable copyWith({int? id, Language? data}) => LanguagesTable(id: id ?? this.id, data: data ?? this.data); - LanguagesTable copyWithCompanion(LanguagesCompanion data) { return LanguagesTable( id: data.id.present ? data.id.value : this.id, @@ -1039,7 +1055,6 @@ class LanguagesTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data); - @override bool operator ==(Object other) => identical(this, other) || @@ -1050,20 +1065,17 @@ class LanguagesCompanion extends UpdateCompanion { final Value id; final Value data; final Value rowid; - const LanguagesCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), this.rowid = const Value.absent(), }); - LanguagesCompanion.insert({ required int id, required Language data, this.rowid = const Value.absent(), }) : id = Value(id), data = Value(data); - static Insertable custom({ Expression? id, Expression? data, @@ -1076,7 +1088,11 @@ class LanguagesCompanion extends UpdateCompanion { }); } - LanguagesCompanion copyWith({Value? id, Value? data, Value? rowid}) { + LanguagesCompanion copyWith({ + Value? id, + Value? data, + Value? rowid, + }) { return LanguagesCompanion( id: id ?? this.id, data: data ?? this.data, @@ -1091,7 +1107,9 @@ class LanguagesCompanion extends UpdateCompanion { map['id'] = Variable(id.value); } if (data.present) { - map['data'] = Variable($LanguagesTable.$converterdata.toSql(data.value)); + map['data'] = Variable( + $LanguagesTable.$converterdata.toSql(data.value), + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -1112,18 +1130,15 @@ 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); late final $CategoriesTable categories = $CategoriesTable(this); late final $LanguagesTable languages = $LanguagesTable(this); - @override Iterable> get allTables => allSchemaEntities.whereType>(); - @override List get allSchemaEntities => [ exercises, @@ -1159,18 +1174,25 @@ class $$ExercisesTableFilterComposer extends Composer<_$ExerciseDatabase, $Exerc super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); - - ColumnFilters get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnFilters(column)); + ColumnFilters get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnFilters(column), + ); - ColumnFilters get lastUpdate => - $composableBuilder(column: $table.lastUpdate, builder: (column) => ColumnFilters(column)); + ColumnFilters get lastUpdate => $composableBuilder( + column: $table.lastUpdate, + builder: (column) => ColumnFilters(column), + ); - ColumnFilters get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnFilters(column)); + ColumnFilters get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => ColumnFilters(column), + ); } class $$ExercisesTableOrderingComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> { @@ -1181,18 +1203,25 @@ class $$ExercisesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Exe super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get lastUpdate => - $composableBuilder(column: $table.lastUpdate, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get lastUpdate => $composableBuilder( + column: $table.lastUpdate, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => ColumnOrderings(column), + ); } class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> { @@ -1203,17 +1232,20 @@ class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $E super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumn get data => $composableBuilder(column: $table.data, builder: (column) => column); - GeneratedColumn get lastUpdate => - $composableBuilder(column: $table.lastUpdate, builder: (column) => column); + GeneratedColumn get lastUpdate => $composableBuilder( + column: $table.lastUpdate, + builder: (column) => column, + ); - GeneratedColumn get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => column); + GeneratedColumn get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => column, + ); } class $$ExercisesTableTableManager @@ -1290,9 +1322,17 @@ typedef $$ExercisesTableProcessedTableManager = PrefetchHooks Function() >; typedef $$MusclesTableCreateCompanionBuilder = - MusclesCompanion Function({required int id, required Muscle data, Value rowid}); + MusclesCompanion Function({ + required int id, + required Muscle data, + Value rowid, + }); typedef $$MusclesTableUpdateCompanionBuilder = - MusclesCompanion Function({Value id, Value data, Value rowid}); + MusclesCompanion Function({ + Value id, + Value data, + Value rowid, + }); class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $MusclesTable> { $$MusclesTableFilterComposer({ @@ -1302,9 +1342,10 @@ class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $Muscles super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnWithTypeConverterFilters get data => $composableBuilder( column: $table.data, @@ -1320,12 +1361,15 @@ class $$MusclesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Muscl super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); } class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $MusclesTable> { @@ -1336,7 +1380,6 @@ class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $Mus super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1374,8 +1417,11 @@ class $$MusclesTableTableManager Value rowid = const Value.absent(), }) => MusclesCompanion(id: id, data: data, rowid: rowid), createCompanionCallback: - ({required int id, required Muscle data, Value rowid = const Value.absent()}) => - MusclesCompanion.insert(id: id, data: data, rowid: rowid), + ({ + required int id, + required Muscle data, + Value rowid = const Value.absent(), + }) => MusclesCompanion.insert(id: id, data: data, rowid: rowid), withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, @@ -1398,9 +1444,17 @@ typedef $$MusclesTableProcessedTableManager = PrefetchHooks Function() >; typedef $$EquipmentsTableCreateCompanionBuilder = - EquipmentsCompanion Function({required int id, required Equipment data, Value rowid}); + EquipmentsCompanion Function({ + required int id, + required Equipment data, + Value rowid, + }); typedef $$EquipmentsTableUpdateCompanionBuilder = - EquipmentsCompanion Function({Value id, Value data, Value rowid}); + EquipmentsCompanion Function({ + Value id, + Value data, + Value rowid, + }); class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> { $$EquipmentsTableFilterComposer({ @@ -1410,9 +1464,10 @@ class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $Equi super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnWithTypeConverterFilters get data => $composableBuilder( column: $table.data, @@ -1428,12 +1483,15 @@ class $$EquipmentsTableOrderingComposer extends Composer<_$ExerciseDatabase, $Eq super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); } class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> { @@ -1444,7 +1502,6 @@ class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1515,7 +1572,11 @@ typedef $$CategoriesTableCreateCompanionBuilder = Value rowid, }); typedef $$CategoriesTableUpdateCompanionBuilder = - CategoriesCompanion Function({Value id, Value data, Value rowid}); + CategoriesCompanion Function({ + Value id, + Value data, + Value rowid, + }); class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> { $$CategoriesTableFilterComposer({ @@ -1525,9 +1586,10 @@ class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $Cate super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnWithTypeConverterFilters get data => $composableBuilder( @@ -1544,12 +1606,15 @@ class $$CategoriesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Ca super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); } class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> { @@ -1560,7 +1625,6 @@ class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1625,9 +1689,17 @@ typedef $$CategoriesTableProcessedTableManager = PrefetchHooks Function() >; typedef $$LanguagesTableCreateCompanionBuilder = - LanguagesCompanion Function({required int id, required Language data, Value rowid}); + LanguagesCompanion Function({ + required int id, + required Language data, + Value rowid, + }); typedef $$LanguagesTableUpdateCompanionBuilder = - LanguagesCompanion Function({Value id, Value data, Value rowid}); + LanguagesCompanion Function({ + Value id, + Value data, + Value rowid, + }); class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> { $$LanguagesTableFilterComposer({ @@ -1637,9 +1709,10 @@ class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $Langu super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnWithTypeConverterFilters get data => $composableBuilder( column: $table.data, @@ -1655,12 +1728,15 @@ class $$LanguagesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Lan super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); } class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> { @@ -1671,7 +1747,6 @@ class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $L super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1738,18 +1813,12 @@ typedef $$LanguagesTableProcessedTableManager = 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 a8bc80069..7dc02ac32 100644 --- a/lib/database/ingredients/ingredients_database.g.dart +++ b/lib/database/ingredients/ingredients_database.g.dart @@ -7,9 +7,7 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In @override final GeneratedDatabase attachedDatabase; final String? _alias; - $IngredientsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( @@ -28,7 +26,9 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In type: DriftSqlType.string, requiredDuringInsert: true, ); - static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched'); + static const VerificationMeta _lastFetchedMeta = const VerificationMeta( + 'lastFetched', + ); @override late final GeneratedColumn lastFetched = GeneratedColumn( 'last_fetched', @@ -37,17 +37,13 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In type: DriftSqlType.dateTime, requiredDuringInsert: true, ); - @override List get $columns => [id, data, lastFetched]; - @override String get aliasedName => _alias ?? actualTableName; - @override String get actualTableName => $name; static const String $name = 'ingredients'; - @override VerificationContext validateIntegrity( Insertable instance, { @@ -61,14 +57,20 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In context.missing(_idMeta); } if (data.containsKey('data')) { - context.handle(_dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta)); + context.handle( + _dataMeta, + this.data.isAcceptableOrUnknown(data['data']!, _dataMeta), + ); } else if (isInserting) { context.missing(_dataMeta); } if (data.containsKey('last_fetched')) { context.handle( _lastFetchedMeta, - lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta), + lastFetched.isAcceptableOrUnknown( + data['last_fetched']!, + _lastFetchedMeta, + ), ); } else if (isInserting) { context.missing(_lastFetchedMeta); @@ -78,13 +80,18 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In @override Set get $primaryKey => const {}; - @override IngredientTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return IngredientTable( - id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + data: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}data'], + )!, lastFetched: attachedDatabase.typeMapping.read( DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'], @@ -104,9 +111,11 @@ class IngredientTable extends DataClass implements Insertable { /// The date when the ingredient was last fetched from the server final DateTime lastFetched; - - const IngredientTable({required this.id, required this.data, required this.lastFetched}); - + const IngredientTable({ + required this.id, + required this.data, + required this.lastFetched, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -117,10 +126,17 @@ class IngredientTable extends DataClass implements Insertable { } IngredientsCompanion toCompanion(bool nullToAbsent) { - return IngredientsCompanion(id: Value(id), data: Value(data), lastFetched: Value(lastFetched)); + return IngredientsCompanion( + id: Value(id), + data: Value(data), + lastFetched: Value(lastFetched), + ); } - factory IngredientTable.fromJson(Map json, {ValueSerializer? serializer}) { + factory IngredientTable.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return IngredientTable( id: serializer.fromJson(json['id']), @@ -128,7 +144,6 @@ class IngredientTable extends DataClass implements Insertable { lastFetched: serializer.fromJson(json['lastFetched']), ); } - @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; @@ -144,7 +159,6 @@ class IngredientTable extends DataClass implements Insertable { data: data ?? this.data, lastFetched: lastFetched ?? this.lastFetched, ); - IngredientTable copyWithCompanion(IngredientsCompanion data) { return IngredientTable( id: data.id.present ? data.id.value : this.id, @@ -165,7 +179,6 @@ class IngredientTable extends DataClass implements Insertable { @override int get hashCode => Object.hash(id, data, lastFetched); - @override bool operator ==(Object other) => identical(this, other) || @@ -180,14 +193,12 @@ class IngredientsCompanion extends UpdateCompanion { final Value data; final Value lastFetched; final Value rowid; - const IngredientsCompanion({ this.id = const Value.absent(), this.data = const Value.absent(), this.lastFetched = const Value.absent(), this.rowid = const Value.absent(), }); - IngredientsCompanion.insert({ required int id, required String data, @@ -196,7 +207,6 @@ class IngredientsCompanion extends UpdateCompanion { }) : id = Value(id), data = Value(data), lastFetched = Value(lastFetched); - static Insertable custom({ Expression? id, Expression? data, @@ -257,14 +267,11 @@ 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 => allSchemaEntities.whereType>(); - @override List get allSchemaEntities => [ingredients]; } @@ -292,15 +299,20 @@ class $$IngredientsTableFilterComposer extends Composer<_$IngredientDatabase, $I super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); - ColumnFilters get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); - - ColumnFilters get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnFilters(column)); + ColumnFilters get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnFilters(column), + ); - ColumnFilters get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnFilters(column)); + ColumnFilters get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => ColumnFilters(column), + ); } class $$IngredientsTableOrderingComposer extends Composer<_$IngredientDatabase, $IngredientsTable> { @@ -311,15 +323,20 @@ class $$IngredientsTableOrderingComposer extends Composer<_$IngredientDatabase, super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get id => - $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get data => - $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get data => $composableBuilder( + column: $table.data, + builder: (column) => ColumnOrderings(column), + ); - ColumnOrderings get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => ColumnOrderings(column), + ); } class $$IngredientsTableAnnotationComposer @@ -331,14 +348,15 @@ class $$IngredientsTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumn get data => $composableBuilder(column: $table.data, builder: (column) => column); - GeneratedColumn get lastFetched => - $composableBuilder(column: $table.lastFetched, builder: (column) => column); + GeneratedColumn get lastFetched => $composableBuilder( + column: $table.lastFetched, + builder: (column) => column, + ); } class $$IngredientsTableTableManager @@ -359,8 +377,10 @@ class $$IngredientsTableTableManager IngredientTable, PrefetchHooks Function() > { - $$IngredientsTableTableManager(_$IngredientDatabase db, $IngredientsTable table) - : super( + $$IngredientsTableTableManager( + _$IngredientDatabase db, + $IngredientsTable table, + ) : super( TableManagerState( db: db, table: table, @@ -374,8 +394,12 @@ class $$IngredientsTableTableManager Value data = const Value.absent(), Value lastFetched = const Value.absent(), Value rowid = const Value.absent(), - }) => - IngredientsCompanion(id: id, data: data, lastFetched: lastFetched, rowid: rowid), + }) => IngredientsCompanion( + id: id, + data: data, + lastFetched: lastFetched, + rowid: rowid, + ), createCompanionCallback: ({ required int id, @@ -412,9 +436,7 @@ typedef $$IngredientsTableProcessedTableManager = class $IngredientDatabaseManager { final _$IngredientDatabase _db; - $IngredientDatabaseManager(this._db); - $$IngredientsTableTableManager get ingredients => $$IngredientsTableTableManager(_db, _db.ingredients); } diff --git a/lib/helpers/uuid.dart b/lib/helpers/uuid.dart new file mode 100644 index 000000000..337909883 --- /dev/null +++ b/lib/helpers/uuid.dart @@ -0,0 +1,45 @@ +/* + * This file is part of wger Workout Manager . + * Copyright (c) 2020, 2025 wger Team + * + * wger Workout Manager is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import 'dart:math'; +import 'dart:typed_data'; + +String uuidV4() { + final rnd = Random.secure(); + final bytes = Uint8List(16); + for (var i = 0; i < 16; i++) { + bytes[i] = rnd.nextInt(256); + } + + // Set version to 4 -> xxxx0100 + bytes[6] = (bytes[6] & 0x0F) | 0x40; + + // Set variant to RFC4122 -> 10xxxxxx + bytes[8] = (bytes[8] & 0x3F) | 0x80; + + return _bytesToUuid(bytes); +} + +String _bytesToUuid(Uint8List bytes) { + final sb = StringBuffer(); + for (var i = 0; i < bytes.length; i++) { + sb.write(bytes[i].toRadixString(16).padLeft(2, '0')); + if (i == 3 || i == 5 || i == 7 || i == 9) sb.write('-'); + } + return sb.toString(); +} diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index b4f2f3721..afc95c7cd 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -263,6 +263,8 @@ "@gymMode": { "description": "Label when starting the gym mode" }, + "gymModeShowExercises": "Show exercise overview pages", + "gymModeShowTimer": "Show timer between sets", "plateCalculator": "Plates", "@plateCalculator": { "description": "Label used for the plate calculator in the gym mode" @@ -845,6 +847,7 @@ "fitInWeek": "Fit in week", "fitInWeekHelp": "If enabled, the days will repeat in a weekly cycle, otherwise the days will follow sequentially without regards to the start of a new week.", "addSuperset": "Add superset", + "superset": "Superset", "setHasProgression": "Set has progression", "setHasProgressionWarning": "Please note that at the moment it is not possible to edit all settings for a set on the mobile application or configure automatic progression. For now, please use the web application.", "setHasNoExercises": "This set has no exercises yet!", diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index c79663698..681e7dbea 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -8,7 +8,10 @@ part of 'category.dart'; ExerciseCategory _$ExerciseCategoryFromJson(Map json) { $checkKeys(json, requiredKeys: const ['id', 'name']); - return ExerciseCategory(id: (json['id'] as num).toInt(), name: json['name'] as String); + return ExerciseCategory( + id: (json['id'] as num).toInt(), + name: json['name'] as String, + ); } Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart index 8d68fe3d7..83ae0b819 100644 --- a/lib/models/exercises/exercise.g.dart +++ b/lib/models/exercises/exercise.g.dart @@ -38,7 +38,9 @@ Exercise _$ExerciseFromJson(Map json) { .toList(), category: json['categories'] == null ? null - : ExerciseCategory.fromJson(json['categories'] as Map), + : ExerciseCategory.fromJson( + json['categories'] as Map, + ), ) ..categoryId = (json['category'] as num).toInt() ..musclesIds = (json['muscles'] as List).map((e) => (e as num).toInt()).toList() diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart index e3959c069..cea2c699a 100644 --- a/lib/models/exercises/exercise_api.freezed.dart +++ b/lib/models/exercises/exercise_api.freezed.dart @@ -11,117 +11,61 @@ part of 'exercise_api.dart'; // dart format off T _$identity(T value) => value; - -ExerciseApiData _$ExerciseApiDataFromJson(Map json) { - return _ExerciseBaseData.fromJson( +ExerciseApiData _$ExerciseApiDataFromJson( + Map json +) { + return _ExerciseBaseData.fromJson( json - ); + ); } /// @nodoc mixin _$ExerciseApiData { - int get id; - - String get uuid; // ignore: invalid_annotation_target - @JsonKey(name: 'variations') int? get variationId; // ignore: invalid_annotation_target - @JsonKey(name: 'created') DateTime get created; // ignore: invalid_annotation_target - @JsonKey(name: 'last_update') DateTime get lastUpdate; // ignore: invalid_annotation_target - @JsonKey(name: 'last_update_global') DateTime get lastUpdateGlobal; - - ExerciseCategory get category; - - List get muscles; // ignore: invalid_annotation_target - @JsonKey(name: 'muscles_secondary') List< - Muscle> get musclesSecondary; // ignore: invalid_annotation_target - List get equipment; // ignore: invalid_annotation_target - @JsonKey(name: 'translations', defaultValue: []) List get translations; - - List get images; - - List