diff --git a/android/build.gradle b/android/build.gradle index ddb8ad0b..0069540f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,19 +17,19 @@ subprojects { afterEvaluate { project -> if (project.extensions.findByName("android") != null) { Integer pluginCompileSdk = project.android.compileSdk - if (pluginCompileSdk != null && pluginCompileSdk < 31) { + if (pluginCompileSdk != null && pluginCompileSdk < 34) { project.logger.error( "Warning: Overriding compileSdk version in Flutter plugin: " + project.name + " from " + pluginCompileSdk - + " to 31 (to work around https://issuetracker.google.com/issues/199180389)." + + " to 36 (to work around https://issuetracker.google.com/issues/199180389)." + "\nIf there is not a new version of " + project.name + ", consider filing an issue against " + project.name + " to increase their compileSdk to the latest (otherwise try updating to the latest version)." ) project.android { - compileSdk 34 + compileSdk 36 } } } diff --git a/android/gradle.properties b/android/gradle.properties index 399dfe11..f622fd8f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx2048M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index d5ce57cb..472e5d51 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index ed68c2f2..d7f1a044 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.6.0" apply false - id "org.jetbrains.kotlin.android" version "2.1.20" apply false + id "com.android.application" version "8.13.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.21" apply false } include ":app" diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart index bdbce348..16fdfbdd 100644 --- a/integration_test/3_gym_mode.dart +++ b/integration_test/3_gym_mode.dart @@ -1,15 +1,18 @@ +import 'package:clock/clock.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; import 'package:wger/providers/exercises.dart'; +import 'package:wger/providers/gym_state.dart'; import 'package:wger/providers/routines.dart'; import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/routine_screen.dart'; import 'package:wger/theme/theme.dart'; +import 'package:wger/widgets/routines/gym_mode/summary.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'; @@ -26,8 +29,6 @@ Widget createGymModeScreen({Locale? locale}) { when(mockExerciseProvider.findExerciseById(1)).thenReturn(exercises[0]); // bench press when(mockExerciseProvider.findExerciseById(6)).thenReturn(exercises[5]); // side raises - //when(mockExerciseProvider.findExerciseBaseById(2)).thenReturn(bases[1]); // crunches - //when(mockExerciseProvider.findExerciseBaseById(3)).thenReturn(bases[2]); // dead lift return MediaQuery( data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first).copyWith( @@ -71,3 +72,59 @@ Widget createGymModeScreen({Locale? locale}) { ), ); } + +Widget createGymModeResultsScreen({String locale = 'en'}) { + final controller = PageController(initialPage: 0); + + final key = GlobalKey(); + final routine = getTestRoutine(exercises: getScreenshotExercises()); + routine.sessions.first.session.date = clock.now(); + + final mockRoutinesProvider = MockRoutinesProvider(); + final mockExerciseProvider = MockExercisesProvider(); + + when(mockRoutinesProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) async => routine); + when(mockRoutinesProvider.findById(1)).thenAnswer((_) => routine); + + return riverpod.UncontrolledProviderScope( + container: riverpod.ProviderContainer.test( + overrides: [ + gymStateProvider.overrideWithValue( + GymModeState( + routine: routine, + dayId: routine.days.first.id!, + iteration: 1, + showExercisePages: true, + showTimerPages: true, + ), + ), + ], + ), + child: MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (context) => mockRoutinesProvider, + ), + ChangeNotifierProvider( + create: (context) => mockExerciseProvider, + ), + ], + child: MaterialApp( + locale: Locale(locale), + debugShowCheckedModeBanner: false, + localizationsDelegates: AppLocalizations.localizationsDelegates, + supportedLocales: AppLocalizations.supportedLocales, + navigatorKey: key, + theme: wgerLightTheme, + home: Scaffold( + body: PageView( + controller: controller, + children: [ + WorkoutSummary(controller), + ], + ), + ), + ), + ), + ); +} diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart index 3f307ec1..97a7b999 100644 --- a/integration_test/make_screenshots_test.dart +++ b/integration_test/make_screenshots_test.dart @@ -78,14 +78,16 @@ const languages = [ 'en-US', 'es-ES', + 'fa-IR', 'fr-FR', 'hi-IN', 'hr', 'it-IT', + 'iw-IL', 'ko-KR', 'nb-NO', - 'pl-PL', + 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', @@ -128,9 +130,19 @@ void main() { await takeScreenshot(tester, binding, language, '02 - workout detail'); }); - testWidgets('gym mode screen - $language', (WidgetTester tester) async { - await tester.pumpWidget(createGymModeScreen(locale: locale)); - await tester.tap(find.byType(TextButton)); + // testWidgets('gym mode screen - $language', (WidgetTester tester) async { + // await tester.pumpWidget(createGymModeScreen(locale: locale)); + // await tester.tap(find.byType(TextButton)); + // await tester.pumpAndSettle(); + // await tester.tap(find.byKey(const ValueKey('gym-mode-options-tile'))); + // await tester.pumpAndSettle(); + // await tester.tap(find.byKey(const ValueKey('gym-mode-option-show-exercises'))); + // await tester.pumpAndSettle(); + // await takeScreenshot(tester, binding, language, '03 - gym mode'); + // }); + + testWidgets('gym mode stats screen - $language', (WidgetTester tester) async { + await tester.pumpWidget(createGymModeResultsScreen(locale: languageCode)); await tester.pumpAndSettle(); await takeScreenshot(tester, binding, language, '03 - gym mode'); }); diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart index 6da378e2..bfe8ad6e 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 @@ -1227,7 +1259,10 @@ class $$ExercisesTableTableManager $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, - (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>), + ( + ExerciseTable, + BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>, + ), ExerciseTable, PrefetchHooks Function() > { @@ -1285,14 +1320,25 @@ typedef $$ExercisesTableProcessedTableManager = $$ExercisesTableAnnotationComposer, $$ExercisesTableCreateCompanionBuilder, $$ExercisesTableUpdateCompanionBuilder, - (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>), + ( + ExerciseTable, + BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>, + ), ExerciseTable, 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 +1348,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 +1367,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 +1386,6 @@ class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $Mus super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1354,7 +1403,10 @@ class $$MusclesTableTableManager $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, - (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>), + ( + MuscleTable, + BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>, + ), MuscleTable, PrefetchHooks Function() > { @@ -1374,8 +1426,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, @@ -1393,14 +1448,25 @@ typedef $$MusclesTableProcessedTableManager = $$MusclesTableAnnotationComposer, $$MusclesTableCreateCompanionBuilder, $$MusclesTableUpdateCompanionBuilder, - (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>), + ( + MuscleTable, + BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>, + ), MuscleTable, 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 +1476,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 +1495,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 +1514,6 @@ class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1462,7 +1531,10 @@ class $$EquipmentsTableTableManager $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, - (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>), + ( + EquipmentTable, + BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>, + ), EquipmentTable, PrefetchHooks Function() > { @@ -1504,7 +1576,10 @@ typedef $$EquipmentsTableProcessedTableManager = $$EquipmentsTableAnnotationComposer, $$EquipmentsTableCreateCompanionBuilder, $$EquipmentsTableUpdateCompanionBuilder, - (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>), + ( + EquipmentTable, + BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>, + ), EquipmentTable, PrefetchHooks Function() >; @@ -1515,7 +1590,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 +1604,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 +1624,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 +1643,6 @@ class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1578,7 +1660,10 @@ class $$CategoriesTableTableManager $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, - (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>), + ( + CategoryTable, + BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>, + ), CategoryTable, PrefetchHooks Function() > { @@ -1620,14 +1705,25 @@ typedef $$CategoriesTableProcessedTableManager = $$CategoriesTableAnnotationComposer, $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder, - (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>), + ( + CategoryTable, + BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>, + ), CategoryTable, 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 +1733,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 +1752,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 +1771,6 @@ class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $L super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumnWithTypeConverter get data => @@ -1689,7 +1788,10 @@ class $$LanguagesTableTableManager $$LanguagesTableAnnotationComposer, $$LanguagesTableCreateCompanionBuilder, $$LanguagesTableUpdateCompanionBuilder, - (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>), + ( + LanguagesTable, + BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>, + ), LanguagesTable, PrefetchHooks Function() > { @@ -1731,25 +1833,22 @@ typedef $$LanguagesTableProcessedTableManager = $$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); - $$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 a8bc8006..7dc02ac3 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/i18n.dart b/lib/helpers/i18n.dart index 8a270686..4da3c04d 100644 --- a/lib/helpers/i18n.dart +++ b/lib/helpers/i18n.dart @@ -9,126 +9,127 @@ import 'package:flutter/widgets.dart'; import 'package:logging/logging.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; -String getTranslation(String value, BuildContext context) { - final logger = Logger('getTranslation'); +String getServerStringTranslation(String value, BuildContext context) { + final logger = Logger('getServerStringTranslation'); + final i18n = AppLocalizations.of(context); switch (value) { case 'Abs': - return AppLocalizations.of(context).abs; + return i18n.abs; case 'Arms': - return AppLocalizations.of(context).arms; + return i18n.arms; case 'Back': - return AppLocalizations.of(context).back; + return i18n.back; case 'Barbell': - return AppLocalizations.of(context).barbell; + return i18n.barbell; case 'Bench': - return AppLocalizations.of(context).bench; + return i18n.bench; case 'Biceps': - return AppLocalizations.of(context).biceps; + return i18n.biceps; case 'Body Weight': - return AppLocalizations.of(context).body_weight; + return i18n.body_weight; case 'Calves': - return AppLocalizations.of(context).calves; + return i18n.calves; case 'Cardio': - return AppLocalizations.of(context).cardio; + return i18n.cardio; case 'Chest': - return AppLocalizations.of(context).chest; + return i18n.chest; case 'Dumbbell': - return AppLocalizations.of(context).dumbbell; + return i18n.dumbbell; case 'Glutes': - return AppLocalizations.of(context).glutes; + return i18n.glutes; case 'Gym mat': - return AppLocalizations.of(context).gym_mat; + return i18n.gym_mat; case 'Hamstrings': - return AppLocalizations.of(context).hamstrings; + return i18n.hamstrings; case 'Incline bench': - return AppLocalizations.of(context).incline_bench; + return i18n.incline_bench; case 'Kettlebell': - return AppLocalizations.of(context).kettlebell; + return i18n.kettlebell; case 'Kilometers': - return AppLocalizations.of(context).kilometers; + return i18n.kilometers; case 'Kilometers Per Hour': - return AppLocalizations.of(context).kilometers_per_hour; + return i18n.kilometers_per_hour; case 'Lats': - return AppLocalizations.of(context).lats; + return i18n.lats; case 'Legs': - return AppLocalizations.of(context).legs; + return i18n.legs; case 'Lower back': - return AppLocalizations.of(context).lower_back; + return i18n.lower_back; case 'Max Reps': - return AppLocalizations.of(context).max_reps; + return i18n.max_reps; case 'Miles': - return AppLocalizations.of(context).miles; + return i18n.miles; case 'Miles Per Hour': - return AppLocalizations.of(context).miles_per_hour; + return i18n.miles_per_hour; case 'Minutes': - return AppLocalizations.of(context).minutes; + return i18n.minutes; case 'Plates': - return AppLocalizations.of(context).plates; + return i18n.plates; case 'Pull-up bar': - return AppLocalizations.of(context).pull_up_bar; + return i18n.pull_up_bar; case 'Quads': - return AppLocalizations.of(context).quads; + return i18n.quads; case 'Repetitions': - return AppLocalizations.of(context).repetitions; + return i18n.repetitions; case 'Resistance band': - return AppLocalizations.of(context).resistance_band; + return i18n.resistance_band; case 'SZ-Bar': - return AppLocalizations.of(context).sz_bar; + return i18n.sz_bar; case 'Seconds': - return AppLocalizations.of(context).seconds; + return i18n.seconds; case 'Shoulders': - return AppLocalizations.of(context).shoulders; + return i18n.shoulders; case 'Swiss Ball': - return AppLocalizations.of(context).swiss_ball; + return i18n.swiss_ball; case 'Triceps': - return AppLocalizations.of(context).triceps; + return i18n.triceps; case 'Until Failure': - return AppLocalizations.of(context).until_failure; + return i18n.until_failure; case 'kg': - return AppLocalizations.of(context).kg; + return i18n.kg; case 'lb': - return AppLocalizations.of(context).lb; + return i18n.lb; case 'none (bodyweight exercise)': - return AppLocalizations.of(context).none__bodyweight_exercise_; + return i18n.none__bodyweight_exercise_; default: logger.warning('Could not translate the server string $value'); diff --git a/lib/helpers/json.dart b/lib/helpers/json.dart index 560e6958..91cd0756 100644 --- a/lib/helpers/json.dart +++ b/lib/helpers/json.dart @@ -23,6 +23,10 @@ num stringToNum(String? e) { return e == null ? 0 : num.parse(e); } +num? stringToNumNull(String? e) { + return e == null ? null : num.parse(e); +} + num stringOrIntToNum(dynamic e) { if (e is int) { return e.toDouble(); // Convert int to double (a type of num) @@ -30,10 +34,6 @@ num stringOrIntToNum(dynamic e) { return num.tryParse(e) ?? 0; } -num? stringToNumNull(String? e) { - return e == null ? null : num.parse(e); -} - String? numToString(num? e) { if (e == null) { return null; diff --git a/lib/helpers/misc.dart b/lib/helpers/misc.dart index f99b2364..3078e87d 100644 --- a/lib/helpers/misc.dart +++ b/lib/helpers/misc.dart @@ -18,50 +18,6 @@ import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:wger/helpers/consts.dart'; -import 'package:wger/models/workouts/repetition_unit.dart'; -import 'package:wger/models/workouts/weight_unit.dart'; - -/// Returns the text representation for a single setting, used in the gym mode -String repText( - num? repetitions, - RepetitionUnit? repetitionUnitObj, - num? weight, - WeightUnit? weightUnitObj, - num? rir, -) { - // TODO(x): how to (easily?) translate strings like the units or 'RiR' - - final List out = []; - - if (repetitions != null) { - out.add(formatNum(repetitions).toString()); - - // The default repetition unit is 'reps', which we don't show unless there - // is no weight defined so that we don't just output something like "8" but - // rather "8 repetitions". If there is weight we want to output "8 x 50kg", - // since the repetitions are implied. If other units are used, we always - // print them - if (repetitionUnitObj != null && repetitionUnitObj.id != REP_UNIT_REPETITIONS_ID || - weight == 0 || - weight == null) { - out.add(repetitionUnitObj!.name); - } - } - - if (weight != null && weight != 0) { - out.add('×'); - out.add(formatNum(weight).toString()); - out.add(weightUnitObj!.name); - } - - if (rir != null && rir != '') { - out.add('\n'); - out.add('($rir RiR)'); - } - - return out.join(' '); -} void launchURL(String url, BuildContext context) async { final scaffoldMessenger = ScaffoldMessenger.of(context); diff --git a/lib/helpers/uuid.dart b/lib/helpers/uuid.dart new file mode 100644 index 00000000..33790988 --- /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 b4f2f372..003c43ea 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -232,6 +232,9 @@ "@comment": { "description": "Comment, additional information" }, + "impressionGood": "Good", + "impressionNeutral": "Neutral", + "impressionBad": "Bad", "impression": "Impression", "@impression": { "description": "General impression (e.g. for a workout session) such as good, bad, etc." @@ -263,6 +266,33 @@ "@gymMode": { "description": "Label when starting the gym mode" }, + "gymModeShowExercises": "Show exercise overview pages", + "gymModeShowTimer": "Show timer between sets", + "gymModeTimerType": "Timer type", + "gymModeTimerTypeHelText": "If a set has pause time, a countdown is always used.", + "countdown": "Countdown", + "stopwatch": "Stopwatch", + "gymModeDefaultCountdownTime": "Default countdown time, in seconds", + "gymModeNotifyOnCountdownFinish": "Notify on countdown end", + "duration": "Duration", + "durationHoursMinutes": "{hours}h {minutes}m", + "@durationHoursMinutes": { + "description": "A duration, in hours and minutes", + "type": "text", + "placeholders": { + "hours": { + "type": "int" + }, + "minutes": { + "type": "int" + } + } + }, + "volume": "Volume", + "@volume": { + "description": "The volume of a workout or set, i.e. weight x reps" + }, + "workoutCompleted": "Workout completed", "plateCalculator": "Plates", "@plateCalculator": { "description": "Label used for the plate calculator in the gym mode" @@ -643,6 +673,19 @@ } } }, + "formMinMaxValues": "Please enter a value between {min} and {max}", + "@formMinMaxValues": { + "description": "Error message when the user needs to enter a value between min and max", + "type": "text", + "placeholders": { + "min": { + "type": "int" + }, + "max": { + "type": "int" + } + } + }, "enterMinCharacters": "Please enter at least {min} characters", "@enterMinCharacters": { "description": "Error message when the user hasn't entered the minimum amount characters in a form", @@ -845,6 +888,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!", @@ -1063,7 +1107,10 @@ "@indicatorAvg": { "description": "added for localization of Class Indicator's field text" }, - "endWorkout": "End Workout", + "endWorkout": "End workout", + "@endWorkout": { + "description": "Use the imperative, label on button to finish the current workout in gym mode" + }, "themeMode": "Theme mode", "darkMode": "Always dark mode", "lightMode": "Always light mode", diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index c7966369..681e7dbe 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 8d68fe3d..83ae0b81 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 e3959c06..cea2c699 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