ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into igc-tweaks

Browse source
This commit is contained in:
ggurdin 2024-06-26 13:26:00 -04:00 • committed by GitHub
commit 5ca912838f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pangea/matrix_event_wrappers/pangea_message_event.dart
View file

@ -568,10 +568,16 @@ class PangeaMessageEvent {
bool get hasUncompletedActivity {
if (l2Code == null) return false;
final List<PracticeActivityEvent> activities = practiceActivities(l2Code!);
if (activities.isEmpty) return false;
return !activities.every((activity) => activity.isComplete);
// for now, only show the button if the event has no completed activities
// TODO - revert this after adding logic to show next activity
for (final activity in activities) {
if (activity.isComplete) return false;
}
return true;
// if (activities.isEmpty) return false;
// return !activities.every((activity) => activity.isComplete);
}
String? get l2Code =>

19
lib/pangea/widgets/practice_activity/practice_activity_card.dart
View file

@ -62,19 +62,22 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
if (langCode == null) return;
final List<PracticeActivityEvent> activities =
widget.pangeaMessageEvent.practiceActivities(langCode!);
if (activities.isEmpty) return;
final List<PracticeActivityEvent> incompleteActivities =
activities.where((element) => !element.isComplete).toList();
debugPrint("total events: ${activities.length}");
debugPrint("incomplete practice events: ${incompleteActivities.length}");
// if an incomplete activity is found, show that
if (incompleteActivities.isNotEmpty) {
practiceEvent = incompleteActivities.first;
}
// if no incomplete activity is found, show the last activity
else if (activities.isNotEmpty) {
practiceEvent = activities.last;
}
// TODO update to show next activity
practiceEvent = activities.first;
// // if an incomplete activity is found, show that
// if (incompleteActivities.isNotEmpty) {
// practiceEvent = incompleteActivities.first;
// }
// // if no incomplete activity is found, show the last activity
// else if (activities.isNotEmpty) {
// practiceEvent = activities.last;
// }
setState(() {});
}