From a000481cd9276e0fe3d99d1c7551cf1d284a74f4 Mon Sep 17 00:00:00 2001
From: balint1414 <ropoli.balint.1414@gmail.com>
Date: Sun, 12 Oct 2025 17:26:57 +0200
Subject: [PATCH] =?UTF-8?q?=C3=93rarend=20fix:=20Sz=C3=BCnetek=20megjelen?=
 =?UTF-8?q?=C3=ADt=C3=A9se?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firka/lib/helpers/ui/common_bottom_sheets.dart    | 1 +
 firka/lib/ui/phone/pages/home/home_timetable.dart | 7 ++++++-
 firka/lib/ui/phone/widgets/lesson.dart            | 6 +++---
 firka/lib/ui/phone/widgets/tt_day.dart            | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/firka/lib/helpers/ui/common_bottom_sheets.dart b/firka/lib/helpers/ui/common_bottom_sheets.dart
index 7b4f22c..deb5e07 100644
--- a/firka/lib/helpers/ui/common_bottom_sheets.dart
+++ b/firka/lib/helpers/ui/common_bottom_sheets.dart
@@ -579,6 +579,7 @@ Future<void> showGradeBottomSheet(
                           LessonWidget(
                             data,
                             [],
+                            [], 
                             -1,
                             Lesson(
                                 uid: "-1",
diff --git a/firka/lib/ui/phone/pages/home/home_timetable.dart b/firka/lib/ui/phone/pages/home/home_timetable.dart
index f39e8c1..320b774 100644
--- a/firka/lib/ui/phone/pages/home/home_timetable.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable.dart
@@ -401,6 +401,11 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
                 lesson.start.isAfter(date) &&
                 lesson.end.isBefore(date.add(Duration(hours: 24))))
             .toList();
+        final lessonsOnDay = lessons!
+            .where((lesson) =>
+                lesson.start.getMidnight().millisecondsSinceEpoch ==
+                date.getMidnight().millisecondsSinceEpoch)
+            .toList();
         final eventsOnDate = events!
             .where((lesson) =>
                 lesson.start.isAfter(date.subtract(Duration(seconds: 1))) &&
@@ -413,7 +418,7 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
             .toList();
 
         ttDays.add(TimeTableDayWidget(widget.data, date, lessons!,
-            lessonsOnDate, eventsOnDate, testsOnDate));
+            lessonsOnDate, eventsOnDate, testsOnDate, lessonsOnDay));
       }
 
       List<Widget> ttEmptyCards = List.empty(growable: true);
diff --git a/firka/lib/ui/phone/widgets/lesson.dart b/firka/lib/ui/phone/widgets/lesson.dart
index fe4e349..5d1df3a 100644
--- a/firka/lib/ui/phone/widgets/lesson.dart
+++ b/firka/lib/ui/phone/widgets/lesson.dart
@@ -18,13 +18,14 @@ import 'bubble_test.dart';
 class LessonWidget extends StatelessWidget {
   final AppInitialization data;
   final List<Lesson> week;
+  final List<Lesson> day;
   final int? lessonNo;
   final Lesson lesson;
   final Test? test;
   final Lesson? nextLesson;
   final bool? placeholderMode;
 
-  const LessonWidget(this.data, this.week, this.lessonNo, this.lesson,
+  const LessonWidget(this.data, this.week, this.day, this.lessonNo, this.lesson,
       this.test, this.nextLesson,
       {super.key, this.placeholderMode});
 
@@ -46,9 +47,8 @@ class LessonWidget extends StatelessWidget {
       showBreak =
           timeNow().isAfter(lesson.start) && timeNow().isBefore(lesson.end) ||
               timeNow().isAfter(week.last.end) ||
-              lesson.start.getMidnight() != timeNow().getMidnight();
+              lesson.start.getMidnight() != timeNow().getMidnight() || timeNow().isAfter(day.last.end);
     }
-
     var accent = appStyle.colors.accent;
     var secondary = appStyle.colors.secondary;
     var bgColor = appStyle.colors.a15p;
diff --git a/firka/lib/ui/phone/widgets/tt_day.dart b/firka/lib/ui/phone/widgets/tt_day.dart
index 5556a32..bcc7db1 100644
--- a/firka/lib/ui/phone/widgets/tt_day.dart
+++ b/firka/lib/ui/phone/widgets/tt_day.dart
@@ -16,9 +16,10 @@ class TimeTableDayWidget extends StatelessWidget {
   final List<Lesson> lessons;
   final List<Lesson> events;
   final List<Test> tests;
+  final List<Lesson> day; 
 
   const TimeTableDayWidget(
-      this.data, this.date, this.week, this.lessons, this.events, this.tests,
+      this.data, this.date, this.week, this.lessons, this.events, this.tests, this.day,
       {super.key});
 
   @override
@@ -63,6 +64,7 @@ class TimeTableDayWidget extends StatelessWidget {
         ttBody.add(LessonWidget(
             data,
             week,
+            day,
             lessons.getLessonNo(lesson),
             lesson,
             tests.firstWhereOrNull(