diff --git a/lib/branding.dart b/lib/branding.dart index a7cb6a78ecbf83bf8fdb66cb088f0535377fedda..ae3729d177e26c5460fa61d2328041226e7b1c56 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 885bd6efbfa0e195443f611651d9cbcbe80ff0f2..64c12789569ccdcc9260b7939bc324bd739a5119 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 7831b542b7e0b49f6533f4dc1cc5b8624e4596bd..1cd81799614a35d27eddb4a6866f067df890d42d 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 a2356e9bca550997d0e8e86a2bc8cbe2f18fd143..33eea008fd110be080718e16cf2cf322499a6606 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, + ), + ); + }), + ), + ], ), ], ),