MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Elias Müller
2023-02-20 13:32:14 +01:00
parent fea36b9a6d
commit edd8c1600a
27 changed files with 17 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/screen/pages/timetable/timetable.dart
View File

@ -1,18 +1,9 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRoomsResponse.dart';
import 'package:marianum_mobile/api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import 'package:marianum_mobile/data/timetable/timetableProps.dart';
import 'package:marianum_mobile/screen/pages/timetable/dayListView.dart';
import 'package:marianum_mobile/screen/pages/timetable/testTimetable.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:provider/provider.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
class Timetable extends StatefulWidget {
const Timetable({Key? key}) : super(key: key);

14
lib/screen/pages/timetable/timetableOld.dart
View File

@ -1,7 +1,5 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:provider/provider.dart';
@ -41,10 +39,10 @@ class _TimetableOldState extends State<TimetableOld> {
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
for (var day in data.timeTable.days) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
for (var element in day.entries) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
@ -57,7 +55,7 @@ class _TimetableOldState extends State<TimetableOld> {
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
}
laneEvents.add(
LaneEvents(
@ -65,7 +63,7 @@ class _TimetableOldState extends State<TimetableOld> {
events: tableEvents
)
);
});
}
return laneEvents;
@ -97,9 +95,9 @@ class CustomTableStyle extends TimetableStyle {
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;