Load English name of muscles as well

This commit is contained in:
Roland Geider
2022-06-21 12:40:33 +02:00
parent 8e233fbed1
commit 2aa9bc20e1
8 changed files with 22 additions and 8 deletions

View File

@@ -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"

View File

@@ -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,
});

View File

@@ -9,11 +9,12 @@ part of 'muscle.dart';
Muscle _$MuscleFromJson(Map<String, dynamic> 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<String, dynamic> json) {
Map<String, dynamic> _$MuscleToJson(Muscle instance) => <String, dynamic>{
'id': instance.id,
'name': instance.name,
'name_en': instance.nameEn,
'is_front': instance.isFront,
};

View File

@@ -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');

View File

@@ -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);

View File

@@ -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"

View File

@@ -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"

View File

@@ -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');