Skip to content

fix(learn): fix workshop progress bar calculation and deduplicate cha… #1826

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.

Sign up for GitHub

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

Open
rohanesor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(learn): fix workshop progress bar calculation and deduplicate cha… #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 35 additions & 21 deletions mobile-app/lib/models/learn/curriculum_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,27 +242,41 @@ class Block {
dashedName: dashedName,
description: finalDescription,
order: data['order'],
challenges: (data['challengeOrder'] as List)
.map<ChallengeOrder>(
(dynamic challenge) => ChallengeOrder(
id: challenge[0] ?? challenge['id'],
title: challenge[1] ?? challenge['title'],
),
)
.toList(),
challengeTiles: (data['challengeOrder'] as List)
.map<ChallengeListTile>(
(dynamic challenge) => ChallengeListTile(
id: challenge[0] ?? challenge['id'],
name: challenge[1] ?? challenge['title'],
dashedName: challenge[1] ??
challenge['title']
.toLowerCase()
.replaceAll(' ', '-')
.replaceAll(RegExp(r"[@':]"), ''),
),
)
.toList(),
challenges: () {
final Set<String> seenIds = {};
final List<ChallengeOrder> list = [];
for (dynamic challenge in (data['challengeOrder'] as List? ?? [])) {
final String id = challenge[0] ?? challenge['id'];
final String title = challenge[1] ?? challenge['title'];
if (!seenIds.contains(id)) {
seenIds.add(id);
list.add(ChallengeOrder(id: id, title: title));
}
}
return list;
}(),
challengeTiles: () {
final Set<String> seenIds = {};
final List<ChallengeListTile> list = [];
for (dynamic challenge in (data['challengeOrder'] as List? ?? [])) {
final String id = challenge[0] ?? challenge['id'];
final String title = challenge[1] ?? challenge['title'];
if (!seenIds.contains(id)) {
seenIds.add(id);
list.add(
ChallengeListTile(
id: id,
name: title,
dashedName: title
.toLowerCase()
.replaceAll(' ', '-')
.replaceAll(RegExp(r"[@':]"), ''),
),
);
}
}
return list;
}(),
);
}
}
Expand Down
16 changes: 11 additions & 5 deletions mobile-app/lib/ui/views/learn/widgets/pass/pass_widget_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ class PassWidgetView extends StatelessWidget {
Padding(
padding: const EdgeInsets.all(16.0),
child: LinearProgressIndicator(
value: completed / maxChallenges,
value: maxChallenges > 0
? (completed / maxChallenges)
.clamp(0.0, 1.0)
: 0.0,
minHeight: 7,
backgroundColor: const Color.fromRGBO(
0x3B, 0x3B, 0x4F, 1),
Expand All @@ -106,10 +109,13 @@ class PassWidgetView extends StatelessWidget {
Expanded(
child: Text(
context.t.completed_percent(
((completed * 100) /
maxChallenges)
.round()
.toString(),
maxChallenges > 0
? (((completed * 100) /
maxChallenges)
.clamp(0, 100)
.round()
.toString())
: '0',
),
textAlign: TextAlign.right,
),
Expand Down