diff --git a/AUTHORS.md b/AUTHORS.md index 4c2d018fc..cada050d6 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -22,6 +22,7 @@ - Miroslav Mazel - - artchiee - - Tejas Bir Singh - +- Youssef Ahmed - ## Translators @@ -56,7 +57,7 @@ - Norwegian Bokmål - Allan Nordhøy (98) - + - Japanese - Kosei TANAKA (97) @@ -66,5 +67,5 @@ - Nenza Nurfirmansyah (73) - Croatian - + - Sandi Milohaic diff --git a/lib/widgets/exercises/exercises.dart b/lib/widgets/exercises/exercises.dart index 44d2d2b08..1f2de2064 100644 --- a/lib/widgets/exercises/exercises.dart +++ b/lib/widgets/exercises/exercises.dart @@ -42,7 +42,8 @@ class ExerciseDetail extends StatelessWidget { @override Widget build(BuildContext context) { - _exercise = _exerciseBase.getExercise(Localizations.localeOf(context).languageCode); + _exercise = + _exerciseBase.getExercise(Localizations.localeOf(context).languageCode); return SingleChildScrollView( child: Column( @@ -156,7 +157,9 @@ class ExerciseDetail extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ const MuscleColorHelper(main: true), - ..._exerciseBase.muscles.map((e) => Text(e.nameTranslated(context))).toList(), + ..._exerciseBase.muscles + .map((e) => Text(e.nameTranslated(context))) + .toList(), ], ), ); @@ -219,7 +222,9 @@ class ExerciseDetail extends StatelessWidget { // TODO: add carousel for the other videos final List out = []; if (_exerciseBase.videos.isNotEmpty && !isDesktop) { - _exerciseBase.videos.map((v) => ExerciseVideoWidget(video: v)).forEach((element) { + _exerciseBase.videos + .map((v) => ExerciseVideoWidget(video: v)) + .forEach((element) { out.add(element); }); @@ -232,8 +237,8 @@ class ExerciseDetail extends StatelessWidget { final List out = []; if (_exercise.alias.isNotEmpty) { out.add(MutedText( - AppLocalizations.of(context) - .alsoKnownAs(_exercise.alias.map((e) => e.alias).toList().join(', ')), + AppLocalizations.of(context).alsoKnownAs( + _exercise.alias.map((e) => e.alias).toList().join(', ')), )); out.add(const SizedBox(height: PADDING)); } @@ -275,7 +280,8 @@ class MuscleRowWidget extends StatelessWidget { final List muscles; final List musclesSecondary; - const MuscleRowWidget({required this.muscles, required this.musclesSecondary}); + const MuscleRowWidget( + {required this.muscles, required this.musclesSecondary}); @override Widget build(BuildContext context) { @@ -319,7 +325,8 @@ class MuscleWidget extends StatelessWidget { this.isFront = true, }) { this.muscles = muscles.where((m) => m.isFront == isFront).toList(); - this.musclesSecondary = musclesSecondary.where((m) => m.isFront == isFront).toList(); + this.musclesSecondary = + musclesSecondary.where((m) => m.isFront == isFront).toList(); } @override @@ -330,10 +337,13 @@ class MuscleWidget extends StatelessWidget { children: [ SvgPicture.asset('assets/images/muscles/$background.svg'), ...muscles - .map((m) => SvgPicture.asset('assets/images/muscles/main/muscle-${m.id}.svg')) + .map((m) => SvgPicture.asset( + 'assets/images/muscles/main/muscle-${m.id}.svg')) .toList(), ...musclesSecondary - .map((m) => SvgPicture.asset('assets/images/muscles/secondary/muscle-${m.id}.svg')) + .where((m) => !muscles.contains(m)) + .map((m) => SvgPicture.asset( + 'assets/images/muscles/secondary/muscle-${m.id}.svg')) .toList(), ], );