diff --git a/AUTHORS.md b/AUTHORS.md index e8e7ac60..d886c6d7 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -32,6 +32,7 @@ - sizzlesloth - - Arya Singh - - Xianglin Zeng - +- Sangharsh Sulke - ## Translators diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart index 158c41e4..d9b894fc 100644 --- a/lib/database/exercises/exercise_database.g.dart +++ b/lib/database/exercises/exercise_database.g.dart @@ -3,30 +3,25 @@ part of 'exercise_database.dart'; // ignore_for_file: type=lint -class $ExercisesTable extends Exercises - with TableInfo<$ExercisesTable, ExerciseTable> { +class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, ExerciseTable> { @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( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override - late final GeneratedColumn data = GeneratedColumn( - 'data', aliasedName, false, + late final GeneratedColumn data = GeneratedColumn('data', aliasedName, false, 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', aliasedName, false, 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', aliasedName, false, @@ -49,24 +44,19 @@ class $ExercisesTable extends Exercises 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_update')) { context.handle( - _lastUpdateMeta, - lastUpdate.isAcceptableOrUnknown( - data['last_update']!, _lastUpdateMeta)); + _lastUpdateMeta, lastUpdate.isAcceptableOrUnknown(data['last_update']!, _lastUpdateMeta)); } else if (isInserting) { context.missing(_lastUpdateMeta); } if (data.containsKey('last_fetched')) { - context.handle( - _lastFetchedMeta, - lastFetched.isAcceptableOrUnknown( - data['last_fetched']!, _lastFetchedMeta)); + context.handle(_lastFetchedMeta, + lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta)); } else if (isInserting) { context.missing(_lastFetchedMeta); } @@ -79,10 +69,8 @@ class $ExercisesTable extends Exercises 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'])!, lastFetched: attachedDatabase.typeMapping @@ -106,10 +94,7 @@ class ExerciseTable extends DataClass implements Insertable { /// 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}); + {required this.id, required this.data, required this.lastUpdate, required this.lastFetched}); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -129,8 +114,7 @@ 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']), @@ -150,11 +134,7 @@ class ExerciseTable extends DataClass implements Insertable { }; } - ExerciseTable copyWith( - {int? id, - String? data, - DateTime? lastUpdate, - DateTime? lastFetched}) => + ExerciseTable copyWith({int? id, String? data, DateTime? lastUpdate, DateTime? lastFetched}) => ExerciseTable( id: id ?? this.id, data: data ?? this.data, @@ -165,10 +145,8 @@ class ExerciseTable extends DataClass implements Insertable { return ExerciseTable( id: data.id.present ? data.id.value : this.id, data: data.data.present ? data.data.value : this.data, - lastUpdate: - data.lastUpdate.present ? data.lastUpdate.value : this.lastUpdate, - lastFetched: - data.lastFetched.present ? data.lastFetched.value : this.lastFetched, + lastUpdate: data.lastUpdate.present ? data.lastUpdate.value : this.lastUpdate, + lastFetched: data.lastFetched.present ? data.lastFetched.value : this.lastFetched, ); } @@ -290,15 +268,14 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { $MusclesTable(this.attachedDatabase, [this._alias]); static const VerificationMeta _idMeta = const VerificationMeta('id'); @override - late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override - late final GeneratedColumnWithTypeConverter data = - GeneratedColumn('data', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true) - .withConverter($MusclesTable.$converterdata); + late final GeneratedColumnWithTypeConverter data = GeneratedColumn( + 'data', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($MusclesTable.$converterdata); @override List get $columns => [id, data]; @override @@ -326,10 +303,9 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> { MuscleTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return MuscleTable( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: $MusclesTable.$converterdata.fromSql(attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}data'])!), + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + data: $MusclesTable.$converterdata.fromSql( + attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!), ); } @@ -362,8 +338,7 @@ class MuscleTable extends DataClass implements Insertable { ); } - factory MuscleTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory MuscleTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return MuscleTable( id: serializer.fromJson(json['id']), @@ -434,8 +409,7 @@ class MusclesCompanion extends UpdateCompanion { }); } - MusclesCompanion copyWith( - {Value? id, Value? data, Value? rowid}) { + MusclesCompanion copyWith({Value? id, Value? data, Value? rowid}) { return MusclesCompanion( id: id ?? this.id, data: data ?? this.data, @@ -450,8 +424,7 @@ 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); @@ -470,23 +443,21 @@ class MusclesCompanion extends UpdateCompanion { } } -class $EquipmentsTable extends Equipments - with TableInfo<$EquipmentsTable, EquipmentTable> { +class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, EquipmentTable> { @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( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override - late final GeneratedColumnWithTypeConverter data = - GeneratedColumn('data', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true) - .withConverter($EquipmentsTable.$converterdata); + late final GeneratedColumnWithTypeConverter data = GeneratedColumn( + 'data', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($EquipmentsTable.$converterdata); @override List get $columns => [id, data]; @override @@ -514,10 +485,9 @@ class $EquipmentsTable extends Equipments EquipmentTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return EquipmentTable( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: $EquipmentsTable.$converterdata.fromSql(attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}data'])!), + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + data: $EquipmentsTable.$converterdata.fromSql( + attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!), ); } @@ -526,8 +496,7 @@ class $EquipmentsTable extends Equipments return $EquipmentsTable(attachedDatabase, alias); } - static TypeConverter $converterdata = - const EquipmentConverter(); + static TypeConverter $converterdata = const EquipmentConverter(); } class EquipmentTable extends DataClass implements Insertable { @@ -539,8 +508,7 @@ class EquipmentTable extends DataClass implements Insertable { final map = {}; map['id'] = Variable(id); { - map['data'] = - Variable($EquipmentsTable.$converterdata.toSql(data)); + map['data'] = Variable($EquipmentsTable.$converterdata.toSql(data)); } return map; } @@ -552,8 +520,7 @@ class EquipmentTable extends DataClass implements Insertable { ); } - factory EquipmentTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory EquipmentTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return EquipmentTable( id: serializer.fromJson(json['id']), @@ -594,9 +561,7 @@ class EquipmentTable extends DataClass implements Insertable { @override bool operator ==(Object other) => identical(this, other) || - (other is EquipmentTable && - other.id == this.id && - other.data == this.data); + (other is EquipmentTable && other.id == this.id && other.data == this.data); } class EquipmentsCompanion extends UpdateCompanion { @@ -626,8 +591,7 @@ 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, @@ -642,8 +606,7 @@ 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); @@ -662,16 +625,14 @@ class EquipmentsCompanion extends UpdateCompanion { } } -class $CategoriesTable extends Categories - with TableInfo<$CategoriesTable, CategoryTable> { +class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, CategoryTable> { @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( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override @@ -706,10 +667,9 @@ class $CategoriesTable extends Categories CategoryTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CategoryTable( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: $CategoriesTable.$converterdata.fromSql(attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}data'])!), + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + data: $CategoriesTable.$converterdata.fromSql( + attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!), ); } @@ -718,8 +678,7 @@ class $CategoriesTable extends Categories return $CategoriesTable(attachedDatabase, alias); } - static TypeConverter $converterdata = - const ExerciseCategoryConverter(); + static TypeConverter $converterdata = const ExerciseCategoryConverter(); } class CategoryTable extends DataClass implements Insertable { @@ -731,8 +690,7 @@ class CategoryTable extends DataClass implements Insertable { final map = {}; map['id'] = Variable(id); { - map['data'] = - Variable($CategoriesTable.$converterdata.toSql(data)); + map['data'] = Variable($CategoriesTable.$converterdata.toSql(data)); } return map; } @@ -744,8 +702,7 @@ class CategoryTable extends DataClass implements Insertable { ); } - factory CategoryTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory CategoryTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return CategoryTable( id: serializer.fromJson(json['id']), @@ -786,9 +743,7 @@ class CategoryTable extends DataClass implements Insertable { @override bool operator ==(Object other) => identical(this, other) || - (other is CategoryTable && - other.id == this.id && - other.data == this.data); + (other is CategoryTable && other.id == this.id && other.data == this.data); } class CategoriesCompanion extends UpdateCompanion { @@ -818,8 +773,7 @@ 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, @@ -834,8 +788,7 @@ 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); @@ -854,23 +807,21 @@ class CategoriesCompanion extends UpdateCompanion { } } -class $LanguagesTable extends Languages - with TableInfo<$LanguagesTable, LanguagesTable> { +class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, LanguagesTable> { @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( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override - late final GeneratedColumnWithTypeConverter data = - GeneratedColumn('data', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true) - .withConverter($LanguagesTable.$converterdata); + late final GeneratedColumnWithTypeConverter data = GeneratedColumn( + 'data', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($LanguagesTable.$converterdata); @override List get $columns => [id, data]; @override @@ -898,10 +849,9 @@ class $LanguagesTable extends Languages LanguagesTable map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return LanguagesTable( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - data: $LanguagesTable.$converterdata.fromSql(attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}data'])!), + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, + data: $LanguagesTable.$converterdata.fromSql( + attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!), ); } @@ -910,8 +860,7 @@ class $LanguagesTable extends Languages return $LanguagesTable(attachedDatabase, alias); } - static TypeConverter $converterdata = - const LanguageConverter(); + static TypeConverter $converterdata = const LanguageConverter(); } class LanguagesTable extends DataClass implements Insertable { @@ -923,8 +872,7 @@ class LanguagesTable extends DataClass implements Insertable { final map = {}; map['id'] = Variable(id); { - map['data'] = - Variable($LanguagesTable.$converterdata.toSql(data)); + map['data'] = Variable($LanguagesTable.$converterdata.toSql(data)); } return map; } @@ -936,8 +884,7 @@ class LanguagesTable extends DataClass implements Insertable { ); } - factory LanguagesTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory LanguagesTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return LanguagesTable( id: serializer.fromJson(json['id']), @@ -978,9 +925,7 @@ class LanguagesTable extends DataClass implements Insertable { @override bool operator ==(Object other) => identical(this, other) || - (other is LanguagesTable && - other.id == this.id && - other.data == this.data); + (other is LanguagesTable && other.id == this.id && other.data == this.data); } class LanguagesCompanion extends UpdateCompanion { @@ -1010,8 +955,7 @@ 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, @@ -1026,8 +970,7 @@ 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); @@ -1077,8 +1020,7 @@ typedef $$ExercisesTableUpdateCompanionBuilder = ExercisesCompanion Function({ Value rowid, }); -class $$ExercisesTableFilterComposer - extends Composer<_$ExerciseDatabase, $ExercisesTable> { +class $$ExercisesTableFilterComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> { $$ExercisesTableFilterComposer({ required super.$db, required super.$table, @@ -1086,21 +1028,20 @@ class $$ExercisesTableFilterComposer 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> { +class $$ExercisesTableOrderingComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> { $$ExercisesTableOrderingComposer({ required super.$db, required super.$table, @@ -1108,21 +1049,20 @@ class $$ExercisesTableOrderingComposer 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> { +class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> { $$ExercisesTableAnnotationComposer({ required super.$db, required super.$table, @@ -1130,17 +1070,16 @@ class $$ExercisesTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + 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 extends RootTableManager< @@ -1152,20 +1091,15 @@ class $$ExercisesTableTableManager extends RootTableManager< $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, - ( - ExerciseTable, - BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable> - ), + (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>), ExerciseTable, PrefetchHooks Function()> { $$ExercisesTableTableManager(_$ExerciseDatabase db, $ExercisesTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$ExercisesTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$ExercisesTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$ExercisesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$ExercisesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ExercisesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -1196,9 +1130,8 @@ class $$ExercisesTableTableManager extends RootTableManager< lastFetched: lastFetched, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -1212,10 +1145,7 @@ typedef $$ExercisesTableProcessedTableManager = ProcessedTableManager< $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, - ( - ExerciseTable, - BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable> - ), + (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>), ExerciseTable, PrefetchHooks Function()>; typedef $$MusclesTableCreateCompanionBuilder = MusclesCompanion Function({ @@ -1229,8 +1159,7 @@ typedef $$MusclesTableUpdateCompanionBuilder = MusclesCompanion Function({ Value rowid, }); -class $$MusclesTableFilterComposer - extends Composer<_$ExerciseDatabase, $MusclesTable> { +class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $MusclesTable> { $$MusclesTableFilterComposer({ required super.$db, required super.$table, @@ -1238,17 +1167,14 @@ class $$MusclesTableFilterComposer 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, - builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnWithTypeConverterFilters get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column)); } -class $$MusclesTableOrderingComposer - extends Composer<_$ExerciseDatabase, $MusclesTable> { +class $$MusclesTableOrderingComposer extends Composer<_$ExerciseDatabase, $MusclesTable> { $$MusclesTableOrderingComposer({ required super.$db, required super.$table, @@ -1256,15 +1182,14 @@ class $$MusclesTableOrderingComposer 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> { +class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $MusclesTable> { $$MusclesTableAnnotationComposer({ required super.$db, required super.$table, @@ -1272,8 +1197,7 @@ class $$MusclesTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => $composableBuilder(column: $table.data, builder: (column) => column); @@ -1288,20 +1212,15 @@ class $$MusclesTableTableManager extends RootTableManager< $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, - ( - MuscleTable, - BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable> - ), + (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>), MuscleTable, PrefetchHooks Function()> { $$MusclesTableTableManager(_$ExerciseDatabase db, $MusclesTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$MusclesTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$MusclesTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$MusclesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$MusclesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$MusclesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -1324,9 +1243,8 @@ class $$MusclesTableTableManager extends RootTableManager< data: data, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -1340,10 +1258,7 @@ typedef $$MusclesTableProcessedTableManager = ProcessedTableManager< $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, - ( - MuscleTable, - BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable> - ), + (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>), MuscleTable, PrefetchHooks Function()>; typedef $$EquipmentsTableCreateCompanionBuilder = EquipmentsCompanion Function({ @@ -1357,8 +1272,7 @@ typedef $$EquipmentsTableUpdateCompanionBuilder = EquipmentsCompanion Function({ Value rowid, }); -class $$EquipmentsTableFilterComposer - extends Composer<_$ExerciseDatabase, $EquipmentsTable> { +class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> { $$EquipmentsTableFilterComposer({ required super.$db, required super.$table, @@ -1366,17 +1280,14 @@ class $$EquipmentsTableFilterComposer 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, - builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnWithTypeConverterFilters get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column)); } -class $$EquipmentsTableOrderingComposer - extends Composer<_$ExerciseDatabase, $EquipmentsTable> { +class $$EquipmentsTableOrderingComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> { $$EquipmentsTableOrderingComposer({ required super.$db, required super.$table, @@ -1384,15 +1295,14 @@ class $$EquipmentsTableOrderingComposer 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> { +class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> { $$EquipmentsTableAnnotationComposer({ required super.$db, required super.$table, @@ -1400,8 +1310,7 @@ class $$EquipmentsTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => $composableBuilder(column: $table.data, builder: (column) => column); @@ -1416,20 +1325,15 @@ class $$EquipmentsTableTableManager extends RootTableManager< $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, - ( - EquipmentTable, - BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable> - ), + (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>), EquipmentTable, PrefetchHooks Function()> { $$EquipmentsTableTableManager(_$ExerciseDatabase db, $EquipmentsTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$EquipmentsTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$EquipmentsTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$EquipmentsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$EquipmentsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$EquipmentsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -1452,9 +1356,8 @@ class $$EquipmentsTableTableManager extends RootTableManager< data: data, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -1468,10 +1371,7 @@ typedef $$EquipmentsTableProcessedTableManager = ProcessedTableManager< $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, - ( - EquipmentTable, - BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable> - ), + (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>), EquipmentTable, PrefetchHooks Function()>; typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ @@ -1485,8 +1385,7 @@ typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ Value rowid, }); -class $$CategoriesTableFilterComposer - extends Composer<_$ExerciseDatabase, $CategoriesTable> { +class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> { $$CategoriesTableFilterComposer({ required super.$db, required super.$table, @@ -1494,17 +1393,15 @@ class $$CategoriesTableFilterComposer 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, - builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnWithTypeConverterFilters get data => + $composableBuilder( + column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column)); } -class $$CategoriesTableOrderingComposer - extends Composer<_$ExerciseDatabase, $CategoriesTable> { +class $$CategoriesTableOrderingComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> { $$CategoriesTableOrderingComposer({ required super.$db, required super.$table, @@ -1512,15 +1409,14 @@ class $$CategoriesTableOrderingComposer 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> { +class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> { $$CategoriesTableAnnotationComposer({ required super.$db, required super.$table, @@ -1528,8 +1424,7 @@ class $$CategoriesTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => $composableBuilder(column: $table.data, builder: (column) => column); @@ -1544,20 +1439,15 @@ class $$CategoriesTableTableManager extends RootTableManager< $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, - ( - CategoryTable, - BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable> - ), + (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>), CategoryTable, PrefetchHooks Function()> { $$CategoriesTableTableManager(_$ExerciseDatabase db, $CategoriesTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$CategoriesTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$CategoriesTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$CategoriesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$CategoriesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$CategoriesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -1580,9 +1470,8 @@ class $$CategoriesTableTableManager extends RootTableManager< data: data, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -1596,10 +1485,7 @@ typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager< $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, - ( - CategoryTable, - BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable> - ), + (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>), CategoryTable, PrefetchHooks Function()>; typedef $$LanguagesTableCreateCompanionBuilder = LanguagesCompanion Function({ @@ -1613,8 +1499,7 @@ typedef $$LanguagesTableUpdateCompanionBuilder = LanguagesCompanion Function({ Value rowid, }); -class $$LanguagesTableFilterComposer - extends Composer<_$ExerciseDatabase, $LanguagesTable> { +class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> { $$LanguagesTableFilterComposer({ required super.$db, required super.$table, @@ -1622,17 +1507,14 @@ class $$LanguagesTableFilterComposer 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, - builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnWithTypeConverterFilters get data => $composableBuilder( + column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column)); } -class $$LanguagesTableOrderingComposer - extends Composer<_$ExerciseDatabase, $LanguagesTable> { +class $$LanguagesTableOrderingComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> { $$LanguagesTableOrderingComposer({ required super.$db, required super.$table, @@ -1640,15 +1522,14 @@ class $$LanguagesTableOrderingComposer 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> { +class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> { $$LanguagesTableAnnotationComposer({ required super.$db, required super.$table, @@ -1656,8 +1537,7 @@ class $$LanguagesTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => $composableBuilder(column: $table.data, builder: (column) => column); @@ -1672,20 +1552,15 @@ class $$LanguagesTableTableManager extends RootTableManager< $$LanguagesTableAnnotationComposer, $$LanguagesTableCreateCompanionBuilder, $$LanguagesTableUpdateCompanionBuilder, - ( - LanguagesTable, - BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable> - ), + (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>), LanguagesTable, PrefetchHooks Function()> { $$LanguagesTableTableManager(_$ExerciseDatabase db, $LanguagesTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$LanguagesTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$LanguagesTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$LanguagesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$LanguagesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$LanguagesTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -1708,9 +1583,8 @@ class $$LanguagesTableTableManager extends RootTableManager< data: data, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -1724,24 +1598,18 @@ typedef $$LanguagesTableProcessedTableManager = ProcessedTableManager< $$LanguagesTableAnnotationComposer, $$LanguagesTableCreateCompanionBuilder, $$LanguagesTableUpdateCompanionBuilder, - ( - LanguagesTable, - BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable> - ), + (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>), LanguagesTable, PrefetchHooks Function()>; class $ExerciseDatabaseManager { final _$ExerciseDatabase _db; $ExerciseDatabaseManager(this._db); - $$ExercisesTableTableManager get exercises => - $$ExercisesTableTableManager(_db, _db.exercises); - $$MusclesTableTableManager get muscles => - $$MusclesTableTableManager(_db, _db.muscles); + $$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); + $$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 4723b653..63633c83 100644 --- a/lib/database/ingredients/ingredients_database.g.dart +++ b/lib/database/ingredients/ingredients_database.g.dart @@ -3,24 +3,20 @@ part of 'ingredients_database.dart'; // ignore_for_file: type=lint -class $IngredientsTable extends Ingredients - with TableInfo<$IngredientsTable, IngredientTable> { +class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, IngredientTable> { @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( - 'id', aliasedName, false, + late final GeneratedColumn id = GeneratedColumn('id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); static const VerificationMeta _dataMeta = const VerificationMeta('data'); @override - late final GeneratedColumn data = GeneratedColumn( - 'data', aliasedName, false, + late final GeneratedColumn data = GeneratedColumn('data', aliasedName, false, 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', aliasedName, false, @@ -43,16 +39,13 @@ class $IngredientsTable extends Ingredients 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)); + context.handle(_lastFetchedMeta, + lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta)); } else if (isInserting) { context.missing(_lastFetchedMeta); } @@ -65,10 +58,8 @@ class $IngredientsTable extends Ingredients 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'])!, ); @@ -86,8 +77,7 @@ 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 = {}; @@ -105,8 +95,7 @@ class IngredientTable extends DataClass implements Insertable { ); } - factory IngredientTable.fromJson(Map json, - {ValueSerializer? serializer}) { + factory IngredientTable.fromJson(Map json, {ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return IngredientTable( id: serializer.fromJson(json['id']), @@ -124,8 +113,7 @@ class IngredientTable extends DataClass implements Insertable { }; } - IngredientTable copyWith({int? id, String? data, DateTime? lastFetched}) => - IngredientTable( + IngredientTable copyWith({int? id, String? data, DateTime? lastFetched}) => IngredientTable( id: id ?? this.id, data: data ?? this.data, lastFetched: lastFetched ?? this.lastFetched, @@ -134,8 +122,7 @@ class IngredientTable extends DataClass implements Insertable { return IngredientTable( id: data.id.present ? data.id.value : this.id, data: data.data.present ? data.data.value : this.data, - lastFetched: - data.lastFetched.present ? data.lastFetched.value : this.lastFetched, + lastFetched: data.lastFetched.present ? data.lastFetched.value : this.lastFetched, ); } @@ -194,10 +181,7 @@ class IngredientsCompanion extends UpdateCompanion { } IngredientsCompanion copyWith( - {Value? id, - Value? data, - Value? lastFetched, - Value? rowid}) { + {Value? id, Value? data, Value? lastFetched, Value? rowid}) { return IngredientsCompanion( id: id ?? this.id, data: data ?? this.data, @@ -247,23 +231,20 @@ abstract class _$IngredientDatabase extends GeneratedDatabase { List get allSchemaEntities => [ingredients]; } -typedef $$IngredientsTableCreateCompanionBuilder = IngredientsCompanion - Function({ +typedef $$IngredientsTableCreateCompanionBuilder = IngredientsCompanion Function({ required int id, required String data, required DateTime lastFetched, Value rowid, }); -typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion - Function({ +typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion Function({ Value id, Value data, Value lastFetched, Value rowid, }); -class $$IngredientsTableFilterComposer - extends Composer<_$IngredientDatabase, $IngredientsTable> { +class $$IngredientsTableFilterComposer extends Composer<_$IngredientDatabase, $IngredientsTable> { $$IngredientsTableFilterComposer({ required super.$db, required super.$table, @@ -271,18 +252,17 @@ class $$IngredientsTableFilterComposer 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> { +class $$IngredientsTableOrderingComposer extends Composer<_$IngredientDatabase, $IngredientsTable> { $$IngredientsTableOrderingComposer({ required super.$db, required super.$table, @@ -290,14 +270,14 @@ class $$IngredientsTableOrderingComposer 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 @@ -309,14 +289,13 @@ class $$IngredientsTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + 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 extends RootTableManager< @@ -328,21 +307,15 @@ class $$IngredientsTableTableManager extends RootTableManager< $$IngredientsTableAnnotationComposer, $$IngredientsTableCreateCompanionBuilder, $$IngredientsTableUpdateCompanionBuilder, - ( - IngredientTable, - BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable> - ), + (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>), IngredientTable, PrefetchHooks Function()> { - $$IngredientsTableTableManager( - _$IngredientDatabase db, $IngredientsTable table) + $$IngredientsTableTableManager(_$IngredientDatabase db, $IngredientsTable table) : super(TableManagerState( db: db, table: table, - createFilteringComposer: () => - $$IngredientsTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$IngredientsTableOrderingComposer($db: db, $table: table), + createFilteringComposer: () => $$IngredientsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => $$IngredientsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$IngredientsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ @@ -369,9 +342,8 @@ class $$IngredientsTableTableManager extends RootTableManager< lastFetched: lastFetched, rowid: rowid, ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), + withReferenceMapper: (p0) => + p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), prefetchHooksCallback: null, )); } @@ -385,10 +357,7 @@ typedef $$IngredientsTableProcessedTableManager = ProcessedTableManager< $$IngredientsTableAnnotationComposer, $$IngredientsTableCreateCompanionBuilder, $$IngredientsTableUpdateCompanionBuilder, - ( - IngredientTable, - BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable> - ), + (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>), IngredientTable, PrefetchHooks Function()>; diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart index 562c4a33..919112cd 100644 --- a/lib/helpers/consts.dart +++ b/lib/helpers/consts.dart @@ -62,6 +62,7 @@ const PREFS_LAST_UPDATED_LANGUAGES = 'lastUpdatedLanguages'; const PREFS_INGREDIENTS = 'ingredientData'; const PREFS_WORKOUT_UNITS = 'workoutUnits'; const PREFS_USER = 'userData'; +const PREFS_USER_DARK_THEME = 'userDarkMode'; const PREFS_LAST_SERVER = 'lastServer'; const DEFAULT_ANIMATION_DURATION = Duration(milliseconds: 200); diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 33108f7d..4ea1e223 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -912,5 +912,9 @@ "indicatorAvg": "avg", "@indicatorAvg": { "description": "added for localization of Class Indicator's field text" - } + }, + "themeMode": "Theme mode", + "darkMode": "Always dark mode", + "lightMode": "Always light mode", + "systemMode": "System settings" } diff --git a/lib/main.dart b/lib/main.dart index ac4abfe1..c331f46a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -134,46 +134,48 @@ class MyApp extends StatelessWidget { ), ], child: Consumer( - builder: (ctx, auth, _) => MaterialApp( - title: 'wger', - theme: wgerLightTheme, - darkTheme: wgerDarkTheme, - highContrastTheme: wgerLightThemeHc, - highContrastDarkTheme: wgerDarkThemeHc, - themeMode: ThemeMode.system, - home: auth.isAuth - ? const HomeTabsScreen() - : FutureBuilder( - future: auth.tryAutoLogin(), - builder: (ctx, authResultSnapshot) => - authResultSnapshot.connectionState == ConnectionState.waiting - ? const SplashScreen() - : const AuthScreen(), - ), - routes: { - DashboardScreen.routeName: (ctx) => const DashboardScreen(), - FormScreen.routeName: (ctx) => const FormScreen(), - GalleryScreen.routeName: (ctx) => const GalleryScreen(), - GymModeScreen.routeName: (ctx) => const GymModeScreen(), - HomeTabsScreen.routeName: (ctx) => const HomeTabsScreen(), - MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(), - MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(), - NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(), - NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(), - NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(), - LogMealsScreen.routeName: (ctx) => const LogMealsScreen(), - LogMealScreen.routeName: (ctx) => const LogMealScreen(), - WeightScreen.routeName: (ctx) => const WeightScreen(), - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), - WorkoutPlansScreen.routeName: (ctx) => const WorkoutPlansScreen(), - ExercisesScreen.routeName: (ctx) => const ExercisesScreen(), - ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(), - AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(), - AboutPage.routeName: (ctx) => const AboutPage(), - SettingsPage.routeName: (ctx) => const SettingsPage(), - }, - localizationsDelegates: AppLocalizations.localizationsDelegates, - supportedLocales: AppLocalizations.supportedLocales, + builder: (ctx, auth, _) => Consumer( + builder: (ctx, user, _) => MaterialApp( + title: 'wger', + theme: wgerLightTheme, + darkTheme: wgerDarkTheme, + highContrastTheme: wgerLightThemeHc, + highContrastDarkTheme: wgerDarkThemeHc, + themeMode: user.themeMode, + home: auth.isAuth + ? const HomeTabsScreen() + : FutureBuilder( + future: auth.tryAutoLogin(), + builder: (ctx, authResultSnapshot) => + authResultSnapshot.connectionState == ConnectionState.waiting + ? const SplashScreen() + : const AuthScreen(), + ), + routes: { + DashboardScreen.routeName: (ctx) => const DashboardScreen(), + FormScreen.routeName: (ctx) => const FormScreen(), + GalleryScreen.routeName: (ctx) => const GalleryScreen(), + GymModeScreen.routeName: (ctx) => const GymModeScreen(), + HomeTabsScreen.routeName: (ctx) => const HomeTabsScreen(), + MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(), + MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(), + NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(), + NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(), + NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(), + LogMealsScreen.routeName: (ctx) => const LogMealsScreen(), + LogMealScreen.routeName: (ctx) => const LogMealScreen(), + WeightScreen.routeName: (ctx) => const WeightScreen(), + WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + WorkoutPlansScreen.routeName: (ctx) => const WorkoutPlansScreen(), + ExercisesScreen.routeName: (ctx) => const ExercisesScreen(), + ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(), + AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(), + AboutPage.routeName: (ctx) => const AboutPage(), + SettingsPage.routeName: (ctx) => const SettingsPage(), + }, + localizationsDelegates: AppLocalizations.localizationsDelegates, + supportedLocales: AppLocalizations.supportedLocales, + ), ), ), ); diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index e4ebbbdc..4120aaac 100644 --- a/lib/models/body_weight/weight_entry.g.dart +++ b/lib/models/body_weight/weight_entry.g.dart @@ -18,8 +18,7 @@ WeightEntry _$WeightEntryFromJson(Map json) { ); } -Map _$WeightEntryToJson(WeightEntry instance) => - { +Map _$WeightEntryToJson(WeightEntry instance) => { 'id': instance.id, 'weight': numToString(instance.weight), 'date': toDate(instance.date), diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 911e6db1..098a0489 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -17,8 +17,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map json) { ); } -Map _$ExerciseCategoryToJson(ExerciseCategory instance) => - { +Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart index 0b985ab2..5c9fcd4a 100644 --- a/lib/models/exercises/exercise.g.dart +++ b/lib/models/exercises/exercise.g.dart @@ -25,12 +25,8 @@ Exercise _$ExerciseFromJson(Map json) { return Exercise( 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), + 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), @@ -43,15 +39,10 @@ Exercise _$ExerciseFromJson(Map json) { : ExerciseCategory.fromJson(json['categories'] as Map), ) ..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 num).toInt()) - .toList() - ..equipmentIds = (json['equipment'] as List) - .map((e) => (e as num).toInt()) - .toList(); + ..musclesIds = (json['muscles'] as List).map((e) => (e as num).toInt()).toList() + ..musclesSecondaryIds = + (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) => { @@ -65,7 +56,6 @@ Map _$ExerciseToJson(Exercise instance) => { 'categories': instance.category?.toJson(), 'muscles': instance.musclesIds, 'muscles_secondary': instance.musclesSecondaryIds, - 'musclesSecondary': - instance.musclesSecondary.map((e) => e.toJson()).toList(), + 'musclesSecondary': instance.musclesSecondary.map((e) => e.toJson()).toList(), 'equipment': instance.equipmentIds, }; diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart index 7d3c3129..35787a1f 100644 --- a/lib/models/exercises/exercise_api.freezed.dart +++ b/lib/models/exercises/exercise_api.freezed.dart @@ -21,14 +21,11 @@ ExerciseApiData _$ExerciseApiDataFromJson(Map json) { /// @nodoc mixin _$ExerciseApiData { int get id => throw _privateConstructorUsedError; - String get uuid => - throw _privateConstructorUsedError; // ignore: invalid_annotation_target + String get uuid => throw _privateConstructorUsedError; // ignore: invalid_annotation_target @JsonKey(name: 'variations') - int? get variationId => - throw _privateConstructorUsedError; // ignore: invalid_annotation_target + int? get variationId => throw _privateConstructorUsedError; // ignore: invalid_annotation_target @JsonKey(name: 'created') - DateTime get created => - throw _privateConstructorUsedError; // ignore: invalid_annotation_target + DateTime get created => throw _privateConstructorUsedError; // ignore: invalid_annotation_target @JsonKey(name: 'last_update') DateTime get lastUpdate => throw _privateConstructorUsedError; // ignore: invalid_annotation_target @@ -45,8 +42,7 @@ mixin _$ExerciseApiData { @JsonKey(name: 'exercises') List get translations => throw _privateConstructorUsedError; List get images => throw _privateConstructorUsedError; - List