From 43308f671bcea1d7a92fdff3d439c610e45bb59b Mon Sep 17 00:00:00 2001
From: Theo Wiese <theo.wiese@student.reutlingen-university.de>
Date: Thu, 8 May 2025 13:24:35 +0200
Subject: [PATCH] Fix styling regressions from sdk upgrade
---
lib/branding.dart | 1 -
lib/timetable/lesson.dart | 3 ++-
lib/timetable/lesson_label.dart | 9 ++-----
lib/timetable/timetable.dart | 45 +++++++++++++++------------------
4 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/lib/branding.dart b/lib/branding.dart
index a7cb6a7..ae3729d 100644
--- a/lib/branding.dart
+++ b/lib/branding.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
const appName = 'onTime';
-// final scheme = ColorScheme.fromSwatch(primarySwatch: Colors.blue);
final scheme = ColorScheme.fromSeed(seedColor: Colors.pink);
const passedTimeOverlayColor = Colors.black26;
diff --git a/lib/timetable/lesson.dart b/lib/timetable/lesson.dart
index 885bd6e..64c1278 100644
--- a/lib/timetable/lesson.dart
+++ b/lib/timetable/lesson.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import '../context.dart';
-import '../util/simultaneous.dart';
import '../untis/lesson.dart';
+import '../util/simultaneous.dart';
import 'lesson_dialog.dart';
import 'lesson_label.dart';
@@ -60,6 +60,7 @@ class LessonWidget extends StatelessWidget {
horizontal: 4,
vertical: 8,
),
+ alignment: Alignment.center,
child: LessonLabel(lesson: lesson),
),
),
diff --git a/lib/timetable/lesson_label.dart b/lib/timetable/lesson_label.dart
index 7831b54..1cd8179 100644
--- a/lib/timetable/lesson_label.dart
+++ b/lib/timetable/lesson_label.dart
@@ -19,13 +19,8 @@ class LessonLabel extends StatelessWidget {
text: room,
style: const TextStyle(fontWeight: FontWeight.bold),
),
- const TextSpan(text: '\n\n'),
- WidgetSpan(
- child: Text(
- lecture.substring(0, lecture.length - 5),
- style: const TextStyle(overflow: TextOverflow.ellipsis),
- )),
- TextSpan(text: lecture.substring(lecture.length - 5)),
+ const TextSpan(text: '\n'),
+ TextSpan(text: lecture),
],
style: Theme.of(context).primaryTextTheme.bodySmall!,
),
diff --git a/lib/timetable/timetable.dart b/lib/timetable/timetable.dart
index a2356e9..33eea00 100644
--- a/lib/timetable/timetable.dart
+++ b/lib/timetable/timetable.dart
@@ -98,30 +98,27 @@ class _TimetableState extends State<Timetable> {
: ScrollDecelerationRate.fast,
),
children: [
- Padding(
- padding: const EdgeInsets.symmetric(vertical: 16),
- child: Stack(
- children: [
- ...Period.defaultPeriods.map(
- (period) => PeriodBackground(period),
- ),
- Row(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: List.generate(Timetable.weekdayCount, (index) {
- final lessons = getMergedLessonsOfDay(index);
- final date = getDateAtWeekdayIndex(index);
-
- return Expanded(
- child: WeekdayContent(
- date: date,
- lessons: lessons,
- appContext: widget.appContext,
- ),
- );
- }),
- ),
- ],
- ),
+ Stack(
+ children: [
+ ...Period.defaultPeriods.map(
+ (period) => PeriodBackground(period),
+ ),
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: List.generate(Timetable.weekdayCount, (index) {
+ final lessons = getMergedLessonsOfDay(index);
+ final date = getDateAtWeekdayIndex(index);
+
+ return Expanded(
+ child: WeekdayContent(
+ date: date,
+ lessons: lessons,
+ appContext: widget.appContext,
+ ),
+ );
+ }),
+ ),
+ ],
),
],
),
--
GitLab