diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index a3f3cdc0..4ea9daf3 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1,6 +1,6 @@ { "@@last_modified": "2020-11-11T15:04:05.523531", - "userProfile": "User profile", + "userProfile": "Your profile", "login": "Log in", "@login": { "description": "Text for login button" diff --git a/lib/models/exercises/muscle.dart b/lib/models/exercises/muscle.dart index 8121f340..ace8ad47 100644 --- a/lib/models/exercises/muscle.dart +++ b/lib/models/exercises/muscle.dart @@ -29,12 +29,16 @@ class Muscle extends Equatable { @JsonKey(required: true) final String name; + @JsonKey(required: true, name: 'name_en') + final String nameEn; + @JsonKey(name: 'is_front', required: true) final bool isFront; const Muscle({ required this.id, required this.name, + required this.nameEn, required this.isFront, }); diff --git a/lib/models/exercises/muscle.g.dart b/lib/models/exercises/muscle.g.dart index 89bcb1ab..6a809dc3 100644 --- a/lib/models/exercises/muscle.g.dart +++ b/lib/models/exercises/muscle.g.dart @@ -9,11 +9,12 @@ part of 'muscle.dart'; Muscle _$MuscleFromJson(Map json) { $checkKeys( json, - requiredKeys: const ['id', 'name', 'is_front'], + requiredKeys: const ['id', 'name', 'name_en', 'is_front'], ); return Muscle( id: json['id'] as int, name: json['name'] as String, + nameEn: json['name_en'] as String, isFront: json['is_front'] as bool, ); } @@ -21,5 +22,6 @@ Muscle _$MuscleFromJson(Map json) { Map _$MuscleToJson(Muscle instance) => { 'id': instance.id, 'name': instance.name, + 'name_en': instance.nameEn, 'is_front': instance.isFront, }; diff --git a/test/exercises/exercise_provider_test.dart b/test/exercises/exercise_provider_test.dart index cee3d8d8..a7def15d 100644 --- a/test/exercises/exercise_provider_test.dart +++ b/test/exercises/exercise_provider_test.dart @@ -62,7 +62,7 @@ void main() { ); const category1 = ExerciseCategory(id: 1, name: 'Arms'); - const muscle1 = Muscle(id: 1, name: 'Biceps brachii', isFront: true); + const muscle1 = Muscle(id: 1, name: 'Biceps brachii', nameEn: 'Biceps', isFront: true); const equipment1 = Equipment(id: 1, name: 'Barbell'); const language1 = Language(id: 1, shortName: 'de', fullName: 'Deutsch'); diff --git a/test/exercises/exercises_detail_widget_test.dart b/test/exercises/exercises_detail_widget_test.dart index 2b02a058..b378c318 100644 --- a/test/exercises/exercises_detail_widget_test.dart +++ b/test/exercises/exercises_detail_widget_test.dart @@ -55,7 +55,7 @@ void main() { expect(find.text('Muscles'), findsNWidgets(2), reason: 'One header, one sub header'); expect(find.text('Flutterus maximus'), findsOneWidget, reason: 'Muscles'); - expect(find.text('Biceps'), findsOneWidget, reason: 'Muscles'); + expect(find.text('Biceps brachii'), findsOneWidget, reason: 'Muscles'); expect(find.text('Secondary muscles'), findsOneWidget); expect( @@ -63,7 +63,7 @@ void main() { findsNWidgets(2), reason: 'Two diagrams, one for front, one for the back', ); - expect(find.text('Booty'), findsOneWidget, reason: 'Secondary muscles'); + expect(find.text('Gluteus maximus'), findsOneWidget, reason: 'Secondary muscles'); expect(find.text('Description'), findsOneWidget, reason: 'Description header'); expect(find.text('Lorem ipsum etc'), findsOneWidget, reason: 'Description'); expect(find.text('Variations'), findsNothing); diff --git a/test/fixtures/exercises/exercisebaseinfo_response.json b/test/fixtures/exercises/exercisebaseinfo_response.json index ba63beba..80403a88 100644 --- a/test/fixtures/exercises/exercisebaseinfo_response.json +++ b/test/fixtures/exercises/exercisebaseinfo_response.json @@ -9,6 +9,7 @@ { "id": 11, "name": "Biceps femoris", + "name_en": "Biceps", "is_front": false, "image_url_main": "/static/images/muscles/main/muscle-11.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-11.svg" @@ -16,6 +17,7 @@ { "id": 13, "name": "Brachialis", + "name_en": "", "is_front": true, "image_url_main": "/static/images/muscles/main/muscle-13.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-13.svg" @@ -23,6 +25,7 @@ { "id": 14, "name": "Obliquus externus abdominis", + "name_en": "", "is_front": true, "image_url_main": "/static/images/muscles/main/muscle-14.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-14.svg" @@ -32,6 +35,7 @@ { "id": 2, "name": "Anterior deltoid", + "name_en": "Shoulders", "is_front": true, "image_url_main": "/static/images/muscles/main/muscle-2.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-2.svg" @@ -39,6 +43,7 @@ { "id": 9, "name": "Trapezius", + "name_en": "", "is_front": false, "image_url_main": "/static/images/muscles/main/muscle-9.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-9.svg" diff --git a/test/fixtures/exercises/muscles_entries.json b/test/fixtures/exercises/muscles_entries.json index 53d7b7db..1d107b0a 100644 --- a/test/fixtures/exercises/muscles_entries.json +++ b/test/fixtures/exercises/muscles_entries.json @@ -6,6 +6,7 @@ { "id": 2, "name": "Anterior deltoid", + "name_en": "Shoulders", "is_front": true, "image_url_main": "/static/images/muscles/main/muscle-2.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-2.svg" @@ -13,6 +14,7 @@ { "id": 1, "name": "Biceps brachii", + "name_en": "Biceps", "is_front": true, "image_url_main": "/static/images/muscles/main/muscle-1.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-1.svg" @@ -20,6 +22,7 @@ { "id": 4, "name": "Biceps femoris", + "name_en": "Hamstrings", "is_front": false, "image_url_main": "/static/images/muscles/main/muscle-11.svg", "image_url_secondary": "/static/images/muscles/secondary/muscle-11.svg" diff --git a/test_data/exercises.dart b/test_data/exercises.dart index b59d4295..88257463 100644 --- a/test_data/exercises.dart +++ b/test_data/exercises.dart @@ -27,9 +27,9 @@ const tLanguage1 = Language(id: 1, shortName: 'de', fullName: 'Deutsch'); const tLanguage2 = Language(id: 2, shortName: 'en', fullName: 'English'); const tLanguage3 = Language(id: 3, shortName: 'fr', fullName: 'Français'); -const tMuscle1 = Muscle(id: 1, name: 'Flutterus maximus', isFront: true); -const tMuscle2 = Muscle(id: 2, name: 'Biceps', isFront: true); -const tMuscle3 = Muscle(id: 3, name: 'Booty', isFront: false); +const tMuscle1 = Muscle(id: 1, name: 'Flutterus maximus', nameEn: 'Flutterus', isFront: true); +const tMuscle2 = Muscle(id: 2, name: 'Biceps brachii', nameEn: 'Biceps', isFront: true); +const tMuscle3 = Muscle(id: 3, name: 'Gluteus maximus', nameEn: 'Booty', isFront: false); const tCategory1 = ExerciseCategory(id: 1, name: 'Arms'); const tCategory2 = ExerciseCategory(id: 2, name: 'Legs');