From 8568aa56786d96c8dc36468606a56b0b6170a557 Mon Sep 17 00:00:00 2001 From: balint1414 Date: Fri, 17 Oct 2025 20:37:54 +0200 Subject: [PATCH] =?UTF-8?q?Holnapi=20=C3=B3r=C3=A1k=20megjelen=C3=ADt?= =?UTF-8?q?=C3=A9se,=20amennyibe=20nem=20lesz=20dolgozat=20(F=C3=A9lk?= =?UTF-8?q?=C3=A9sz)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firka/lib/ui/phone/widgets/lesson_big.dart | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/firka/lib/ui/phone/widgets/lesson_big.dart b/firka/lib/ui/phone/widgets/lesson_big.dart index fd837ce..2f3fc3f 100644 --- a/firka/lib/ui/phone/widgets/lesson_big.dart +++ b/firka/lib/ui/phone/widgets/lesson_big.dart @@ -2,7 +2,6 @@ import 'package:firka/helpers/api/model/test.dart'; import 'package:firka/helpers/extensions.dart'; import 'package:firka/helpers/ui/firka_card.dart'; import 'package:firka/l10n/app_localizations.dart'; -import 'package:firka/main.dart'; import 'package:firka/ui/model/style.dart'; import 'package:firka/ui/widget/firka_icon.dart'; import 'package:flutter/material.dart'; @@ -33,11 +32,13 @@ class LessonBigWidget extends StatelessWidget { lessons.where((lesson) => lesson.end.isAfter(now)).length; var hasPrevLesson = prevLesson != null; var hasNextLesson = nextLesson != null; + // TODO: holnapi órák száma kiszámolás + var lessonsTomorrow = 0; + var testsTomorrow = tests.where((test) => test.date.isAfter(now) && - test.date.isBefore(DateTime(now.year, now.month, now.day + 2))).length; + test.date.isBefore(DateTime(now.year, now.month, now.day + 2))).length; - logger.finest(testsTomorrow); if (lessonsLeft < 1){ return Column( crossAxisAlignment: CrossAxisAlignment.center, @@ -112,9 +113,13 @@ class LessonBigWidget extends StatelessWidget { ), SizedBox(width: 8), Text( - testsTomorrow == 0 + (lessonsTomorrow == 0 && testsTomorrow == 0) ? l10n.no_tests_tomorrow - : l10n.tests_tomorrow(testsTomorrow.toString()), + : (testsTomorrow > 1) + ? l10n.tests_tomorrow(testsTomorrow.toString()) + : (testsTomorrow < 1 && lessonsTomorrow > 0) + ? l10n.lessons_tomorrow(lessonsTomorrow.toString()) + : l10n.tests_tomorrow(testsTomorrow.toString()), textAlign: TextAlign.left, style: appStyle.fonts.B_16R.apply( color: appStyle.colors.textPrimary,