Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rendering of muscles in MuscleWidget #422

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- Miroslav Mazel - <https://gitlab.com/12people>
- artchiee - <https://github.com/artchiee>
- Tejas Bir Singh - <https://github.com/tejasbirsingh>
- Youssef Ahmed - <https://github.com/thisisyoussef>

## Translators

Expand Down Expand Up @@ -56,7 +57,7 @@
- Norwegian Bokmål

- Allan Nordhøy <epost@anotheragency.no> (98)

- Japanese

- Kosei TANAKA <wms784.app@gmail.com> (97)
Expand All @@ -66,5 +67,5 @@
- Nenza Nurfirmansyah <nnurfirmansyah@gmail.com> (73)

- Croatian

- Sandi Milohaic <sandi.milohanic@gmail.com>
28 changes: 19 additions & 9 deletions lib/widgets/exercises/exercises.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(),
],
),
);
Expand Down Expand Up @@ -219,7 +222,9 @@ class ExerciseDetail extends StatelessWidget {
// TODO: add carousel for the other videos
final List<Widget> 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);
});

Expand All @@ -232,8 +237,8 @@ class ExerciseDetail extends StatelessWidget {
final List<Widget> 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));
}
Expand Down Expand Up @@ -275,7 +280,8 @@ class MuscleRowWidget extends StatelessWidget {
final List<Muscle> muscles;
final List<Muscle> musclesSecondary;

const MuscleRowWidget({required this.muscles, required this.musclesSecondary});
const MuscleRowWidget(
{required this.muscles, required this.musclesSecondary});

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -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
Expand All @@ -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(),
],
);
Expand Down