feat: added mapper function to LazyConsumer (#1374)

NIAEFEUP · Oct 31, 2024 · 905fcd7 · 905fcd7
2 parents 0a8755d + 044f823
commit 905fcd7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/packages/uni_app/lib/view/home/widgets/schedule_card.dart b/packages/uni_app/lib/view/home/widgets/schedule_card.dart
@@ -49,6 +49,9 @@ class ScheduleCard extends GenericCard {
         ),
       ),
       contentLoadingWidget: const ScheduleCardShimmer().build(context),
+      mapper: (lectures) => lectures
+          .where((lecture) => lecture.endTime.isAfter(DateTime.now()))
+          .toList(),
     );
   }
 
@@ -71,16 +74,8 @@ class ScheduleCard extends GenericCard {
     for (final dayLectures
         in lecturesByDay.sublist(0, min(2, lecturesByDay.length))) {
       final day = dayLectures.key;
-      final lectures = dayLectures.value
-          .where(
-            (element) =>
-                // Hide finished lectures from today
-                element.startTime.weekday != DateTime.now().weekday ||
-                element.endTime.isAfter(DateTime.now()),
-          )
-          .toList();
-
-      if (lectures.isEmpty) {
+
+      if (dayLectures.value.isEmpty) {
         continue;
       }
 
@@ -91,11 +86,11 @@ class ScheduleCard extends GenericCard {
         ),
       );
 
-      for (final lecture in lectures) {
+      for (final lecture in dayLectures.value) {
         rows.add(createRowFromLecture(context, lecture));
       }
 
-      if (lectures.length >= 2) {
+      if (dayLectures.value.length >= 2) {
         break;
       }
     }

diff --git a/packages/uni_app/lib/view/lazy_consumer.dart b/packages/uni_app/lib/view/lazy_consumer.dart
@@ -28,13 +28,17 @@ class LazyConsumer<T1 extends StateProviderNotifier<T2>, T2>
     required this.hasContent,
     required this.onNullContent,
     this.contentLoadingWidget,
+    this.mapper,
     super.key,
   });
 
   final Widget Function(BuildContext, T2) builder;
   final bool Function(T2) hasContent;
   final Widget onNullContent;
   final Widget? contentLoadingWidget;
+  final T2 Function(T2)? mapper;
+
+  static T2 _defaultMapper<T2>(T2 value) => value;
 
   @override
   Widget build(BuildContext context) {
@@ -89,8 +93,11 @@ class LazyConsumer<T1 extends StateProviderNotifier<T2>, T2>
   }
 
   Widget requestDependantWidget(BuildContext context, T1 provider) {
-    final showContent =
-        provider.state != null && hasContent(provider.state as T2);
+    final mappedState = provider.state != null
+        ? (mapper ?? _defaultMapper)(provider.state as T2)
+        : null;
+
+    final showContent = provider.state != null && hasContent(mappedState as T2);
 
     if (provider.requestStatus == RequestStatus.busy && !showContent) {
       return loadingWidget(context);
@@ -99,7 +106,7 @@ class LazyConsumer<T1 extends StateProviderNotifier<T2>, T2>
     }
 
     return showContent
-        ? builder(context, provider.state as T2)
+        ? builder(context, mappedState)
         : Center(
             child: Padding(
               padding: const EdgeInsets.symmetric(vertical: 10),