Only highlight soon upcoming events (#1682)

Fixes #128 ![image](https://github.com/SharezoneApp/sharezone-app/assets/29801805/cd320d56-34be-4223-a848-2861545e2368) --------- Co-authored-by: nilsreichardt <[email protected]>
SharezoneApp · Jul 16, 2024 · b34ff46 · b34ff46
1 parent 9dd1f42
commit b34ff46
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 2 deletions.
diff --git a/app/lib/calendrical_events/page/past_calendrical_events_page.dart b/app/lib/calendrical_events/page/past_calendrical_events_page.dart
@@ -164,6 +164,7 @@ class _SharezonePlusAd extends StatelessWidget {
     return EventView(
       groupID: 'groupId',
       dateText: dateText,
+      upcomingSoon: false,
       title: title,
       courseName: courseName,
       event: CalendricalEvent(

diff --git a/app/lib/timetable/src/widgets/events/calender_event_card.dart b/app/lib/timetable/src/widgets/events/calender_event_card.dart
@@ -51,8 +51,9 @@ class CalenderEventCard extends StatelessWidget {
                 _Title(title: view.title),
                 const SizedBox(height: 6),
                 Text(view.dateText,
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.error))
+                    style: view.upcomingSoon
+                        ? const TextStyle(color: Colors.red)
+                        : null),
               ],
             ),
           ),

diff --git a/app/lib/timetable/src/widgets/events/event_view.dart b/app/lib/timetable/src/widgets/events/event_view.dart
@@ -15,6 +15,7 @@ class EventView {
   final String? courseName;
   final String groupID, dateText, title;
   final Design? design;
+  final bool upcomingSoon;
 
   // Wird nur für die Weitergabe an die Event-Edit
   // und das Event-Sheet verwendet, weil diese noch
@@ -25,6 +26,7 @@ class EventView {
     required this.groupID,
     this.courseName,
     required this.dateText,
+    required this.upcomingSoon,
     required this.title,
     required this.event,
     this.design,
@@ -38,6 +40,7 @@ class EventView {
       groupID: event.groupID,
       courseName: info?.name,
       dateText: DateParser(event.date).toYMMMd,
+      upcomingSoon: event.date.isBefore(Date.today().addDays(14)),
       title: event.title,
       design: info?.design,
       event: event,

diff --git a/...l_events/page/goldens/past_calendrical_events_page_with_plus__dark.iphone11.png b/...l_events/page/goldens/past_calendrical_events_page_with_plus__dark.iphone11.png
diff --git a/...ical_events/page/goldens/past_calendrical_events_page_with_plus__dark.phone.png b/...ical_events/page/goldens/past_calendrical_events_page_with_plus__dark.phone.png
diff --git a/...s/page/goldens/past_calendrical_events_page_with_plus__dark.phone_landscape.png b/...s/page/goldens/past_calendrical_events_page_with_plus__dark.phone_landscape.png
diff --git a/.../page/goldens/past_calendrical_events_page_with_plus__dark.tablet_landscape.png b/.../page/goldens/past_calendrical_events_page_with_plus__dark.tablet_landscape.png
diff --git a/...s/page/goldens/past_calendrical_events_page_with_plus__dark.tablet_portrait.png b/...s/page/goldens/past_calendrical_events_page_with_plus__dark.tablet_portrait.png
diff --git a/...vents/page/goldens/past_calendrical_events_page_without_plus__dark.iphone11.png b/...vents/page/goldens/past_calendrical_events_page_without_plus__dark.iphone11.png
diff --git a/...l_events/page/goldens/past_calendrical_events_page_without_plus__dark.phone.png b/...l_events/page/goldens/past_calendrical_events_page_without_plus__dark.phone.png
diff --git a/...age/goldens/past_calendrical_events_page_without_plus__dark.phone_landscape.png b/...age/goldens/past_calendrical_events_page_without_plus__dark.phone_landscape.png
diff --git a/...ge/goldens/past_calendrical_events_page_without_plus__dark.tablet_landscape.png b/...ge/goldens/past_calendrical_events_page_without_plus__dark.tablet_landscape.png
diff --git a/...age/goldens/past_calendrical_events_page_without_plus__dark.tablet_portrait.png b/...age/goldens/past_calendrical_events_page_without_plus__dark.tablet_portrait.png
diff --git a/...vents/page/goldens/past_calendrical_events_page_without_plus_light.iphone11.png b/...vents/page/goldens/past_calendrical_events_page_without_plus_light.iphone11.png
diff --git a/...l_events/page/goldens/past_calendrical_events_page_without_plus_light.phone.png b/...l_events/page/goldens/past_calendrical_events_page_without_plus_light.phone.png
diff --git a/...age/goldens/past_calendrical_events_page_without_plus_light.phone_landscape.png b/...age/goldens/past_calendrical_events_page_without_plus_light.phone_landscape.png
diff --git a/...ge/goldens/past_calendrical_events_page_without_plus_light.tablet_landscape.png b/...ge/goldens/past_calendrical_events_page_without_plus_light.tablet_landscape.png
diff --git a/...age/goldens/past_calendrical_events_page_without_plus_light.tablet_portrait.png b/...age/goldens/past_calendrical_events_page_without_plus_light.tablet_portrait.png
diff --git a/app/test_goldens/calendrical_events/page/past_calendrical_events_page_test.dart b/app/test_goldens/calendrical_events/page/past_calendrical_events_page_test.dart
@@ -43,6 +43,7 @@ void main() {
         random.nextInt(12) + 1,
         random.nextInt(28) + 1,
       ).toIso8601String(),
+      upcomingSoon: true,
       event: MockCalendricalEvent(),
       groupID: '${random.nextInt(1000)}',
       courseName: 'Course ${random.nextInt(1000)}',