devbeni/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

fix: change "Hide breaks & empty lessons" to "Hide breaks"

Browse Source 
closes #52
This commit is contained in:
4831c0
2025-09-07 11:22:22 +02:00
parent 1738a38b4f
commit c85a428a7b
2 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firka/lib/l10n

Submodule firka/lib/l10n updated: 8863705053...1370e9bcba

142
firka/lib/ui/phone/widgets/lesson.dart
View File

@@ -154,19 +154,20 @@ class LessonWidget extends StatelessWidget {
var breakMins = nextLesson!.start.difference(lesson.end).inMinutes;
var seqSchedule = week.getAllSeqs(lesson);
if (data.settings
.group("settings")
.subGroup("timetable_toast")
.boolean("breaks")) {
if (breakMins > 45) {
final breakEnd = lesson.end.add(Duration(minutes: breakMins));
final emptyClass = seqSchedule.firstWhereOrNull((lesson2) =>
lesson2.start.isAfter(lesson.end) &&
lesson2.end.isBefore(breakEnd));
if (breakMins > 45) {
final breakEnd = lesson.end.add(Duration(minutes: breakMins));
final emptyClass = seqSchedule.firstWhereOrNull((lesson2) =>
lesson2.start.isAfter(lesson.end) &&
lesson2.end.isBefore(breakEnd));
if (emptyClass != null) {
final preBreak = emptyClass.start.difference(lesson.end).inMinutes;
final postBreak = breakEnd.difference(emptyClass.end).inMinutes;
if (emptyClass != null) {
final preBreak = emptyClass.start.difference(lesson.end).inMinutes;
final postBreak = breakEnd.difference(emptyClass.end).inMinutes;
if (data.settings
.group("settings")
.subGroup("timetable_toast")
.boolean("breaks")) {
elements.add(FirkaCard(
color: appStyle.colors.cardTranslucent,
shadow: false,
@@ -182,42 +183,49 @@ class LessonWidget extends StatelessWidget {
.apply(color: appStyle.colors.textTertiary))
],
));
elements.add(FirkaCard(
left: [
Card(
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsets.all(4),
child: Text(emptyClass.lessonNumber.toString(),
style: appStyle.fonts.B_12R
.apply(color: appStyle.colors.secondary)),
),
}
elements.add(FirkaCard(
left: [
Card(
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsets.all(4),
child: Text(emptyClass.lessonNumber.toString(),
style: appStyle.fonts.B_12R
.apply(color: appStyle.colors.secondary)),
),
Card(
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsetsGeometry.all(4),
child: FirkaIconWidget(
FirkaIconType.majesticonsLocal, 'cupFilled',
color: appStyle.colors.accent, size: 24),
),
),
Card(
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsetsGeometry.all(4),
child: FirkaIconWidget(
FirkaIconType.majesticonsLocal, 'cupFilled',
color: appStyle.colors.accent, size: 24),
),
SizedBox(width: 8),
Text(data.l10n.empty_class,
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary)),
],
right: [
Text(
isDismissed
? data.l10n.class_dismissed
: "${emptyClass.start.toLocal().format(data.l10n, FormatMode.hmm)} - ${emptyClass.end.toLocal().format(data.l10n, FormatMode.hmm)}",
style: appStyle.fonts.B_14R
.apply(color: appStyle.colors.textPrimary))
],
));
),
SizedBox(width: 8),
Text(data.l10n.empty_class,
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary)),
],
right: [
Text(
isDismissed
? data.l10n.class_dismissed
: "${emptyClass.start.toLocal().format(data.l10n, FormatMode.hmm)} - ${emptyClass.end.toLocal().format(data.l10n, FormatMode.hmm)}",
style: appStyle.fonts.B_14R
.apply(color: appStyle.colors.textPrimary))
],
));
if (data.settings
.group("settings")
.subGroup("timetable_toast")
.boolean("breaks")) {
elements.add(FirkaCard(
color: appStyle.colors.cardTranslucent,
shadow: false,
@@ -233,24 +241,11 @@ class LessonWidget extends StatelessWidget {
.apply(color: appStyle.colors.textTertiary))
],
));
} else {
elements.add(FirkaCard(
color: appStyle.colors.cardTranslucent,
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$breakMins ${breakMins == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
.apply(color: appStyle.colors.textTertiary))
],
));
}
} else {
} else if (data.settings
.group("settings")
.subGroup("timetable_toast")
.boolean("breaks")) {
elements.add(FirkaCard(
color: appStyle.colors.cardTranslucent,
shadow: false,
@@ -267,8 +262,27 @@ class LessonWidget extends StatelessWidget {
],
));
}
elements.add(SizedBox(height: 4));
} else if (data.settings
.group("settings")
.subGroup("timetable_toast")
.boolean("breaks")) {
elements.add(FirkaCard(
color: appStyle.colors.cardTranslucent,
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$breakMins ${breakMins == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
.apply(color: appStyle.colors.textTertiary))
],
));
}
elements.add(SizedBox(height: 4));
}
return Column(