Merge pull request #87 from refilc/master

master back to v5 dev
This commit is contained in:
Márton Kiss
2024-01-29 20:49:48 +01:00
committed by GitHub
3 changed files with 35 additions and 47 deletions

View File

@@ -173,7 +173,8 @@ class LiveCardStateA extends State<LiveCard> {
title: liveCard.currentLesson!.subject.renamedTo ??
liveCard.currentLesson!.subject.name.capital(),
titleItalic: liveCard.currentLesson!.subject.isRenamed &&
settingsProvider.renamedSubjectsEnabled,
settingsProvider.renamedSubjectsEnabled &&
settingsProvider.renamedSubjectsItalics,
subtitle: liveCard.currentLesson!.room,
icon: SubjectIcon.resolveVariant(
subject: liveCard.currentLesson!.subject, context: context),
@@ -183,6 +184,7 @@ class LiveCardStateA extends State<LiveCard> {
nextSubject: liveCard.nextLesson?.subject.renamedTo ??
liveCard.nextLesson?.subject.name.capital(),
nextSubjectItalic: liveCard.nextLesson?.subject.isRenamed == true &&
settingsProvider.renamedSubjectsEnabled &&
settingsProvider.renamedSubjectsItalics,
nextRoom: liveCard.nextLesson?.room,
progressMax: showMinutes ? maxTime / 60 : maxTime,