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

Removed zooming from timetable

Browse Source
This commit is contained in:
Elias Müller 2024-03-10 17:39:49 +01:00
parent 7e8e49c2dd
commit 0b7908ec28
4 changed files with 43 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/storage/timetable/timetableSettings.dart
View File

@ -4,9 +4,7 @@ part 'timetableSettings.g.dart';
@JsonSerializable()
class TimetableSettings {
double zoom;
TimetableSettings({required this.zoom});
TimetableSettings();
factory TimetableSettings.fromJson(Map<String, dynamic> json) => _$TimetableSettingsFromJson(json);
Map<String, dynamic> toJson() => _$TimetableSettingsToJson(this);

8
lib/storage/timetable/timetableSettings.g.dart
View File

@ -7,11 +7,7 @@ part of 'timetableSettings.dart';
// **************************************************************************
TimetableSettings _$TimetableSettingsFromJson(Map<String, dynamic> json) =>
TimetableSettings(
zoom: (json['zoom'] as num).toDouble(),
);
TimetableSettings();
Map<String, dynamic> _$TimetableSettingsToJson(TimetableSettings instance) =>
<String, dynamic>{
'zoom': instance.zoom,
};
<String, dynamic>{};

95
lib/view/pages/timetable/timetable.dart
View File

@ -34,16 +34,11 @@ enum CalendarActions { addEvent, viewEvents }
class _TimetableState extends State<Timetable> {
CalendarController controller = CalendarController();
late Timer updateTimings;
double elementScale = 40;
double baseElementScale = 40;
late final SettingsProvider settings;
@override
void initState() {
settings = Provider.of<SettingsProvider>(context, listen: false);
elementScale = baseElementScale = settings.val().timetableSettings.zoom;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<TimetableProps>(context, listen: false).run();
@ -132,62 +127,50 @@ class _TimetableState extends State<Timetable> {
GetHolidaysResponse holidays = value.getHolidaysResponse;
return RefreshIndicator(
child: GestureDetector(
onScaleStart: (details) => baseElementScale = elementScale,
onScaleUpdate: (details) {
setState(() {
elementScale = (baseElementScale * details.scale).clamp(40, 80);
child: SfCalendar(
view: CalendarView.workWeek,
dataSource: _buildTableEvents(value),
maxDate: DateTime.now().add(const Duration(days: 7)).nextWeekday(DateTime.saturday),
minDate: DateTime.now().subtract(const Duration (days: 14)).nextWeekday(DateTime.sunday),
controller: controller,
onViewChanged: (ViewChangedDetails details) {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<TimetableProps>(context, listen: false).updateWeek(details.visibleDates.first, details.visibleDates.last);
});
},
onScaleEnd: (details) {
settings.val(write: true).timetableSettings.zoom = elementScale;
onTap: (calendarTapDetails) {
if(calendarTapDetails.appointments == null) return;
Appointment tapped = calendarTapDetails.appointments!.first;
AppointmentDetails.show(context, value, tapped);
},
child: SfCalendar(
view: CalendarView.workWeek,
dataSource: _buildTableEvents(value),
maxDate: DateTime.now().add(const Duration(days: 7)).nextWeekday(DateTime.saturday),
minDate: DateTime.now().subtract(const Duration (days: 14)).nextWeekday(DateTime.sunday),
controller: controller,
onViewChanged: (ViewChangedDetails details) {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<TimetableProps>(context, listen: false).updateWeek(details.visibleDates.first, details.visibleDates.last);
});
},
onTap: (calendarTapDetails) {
if(calendarTapDetails.appointments == null) return;
Appointment tapped = calendarTapDetails.appointments!.first;
AppointmentDetails.show(context, value, tapped);
},
firstDayOfWeek: DateTime.monday,
specialRegions: _buildSpecialTimeRegions(holidays),
timeSlotViewSettings: TimeSlotViewSettings(
startHour: 07.5,
endHour: 16.5,
timeInterval: const Duration(minutes: 30),
timeFormat: "HH:mm",
dayFormat: "EE",
timeIntervalHeight: elementScale,
),
timeRegionBuilder: (BuildContext context, TimeRegionDetails timeRegionDetails) => TimeRegionComponent(details: timeRegionDetails),
appointmentBuilder: (BuildContext context, CalendarAppointmentDetails details) => AppointmentComponent(
details: details,
crossedOut: _isCrossedOut(details)
),
headerHeight: 0,
selectionDecoration: const BoxDecoration(),
allowAppointmentResize: false,
allowDragAndDrop: false,
allowViewNavigation: false,
firstDayOfWeek: DateTime.monday,
specialRegions: _buildSpecialTimeRegions(holidays),
timeSlotViewSettings: const TimeSlotViewSettings(
startHour: 07.5,
endHour: 16.5,
timeInterval: Duration(minutes: 30),
timeFormat: "HH:mm",
dayFormat: "EE",
timeIntervalHeight: 40,
),
timeRegionBuilder: (BuildContext context, TimeRegionDetails timeRegionDetails) => TimeRegionComponent(details: timeRegionDetails),
appointmentBuilder: (BuildContext context, CalendarAppointmentDetails details) => AppointmentComponent(
details: details,
crossedOut: _isCrossedOut(details)
),
headerHeight: 0,
selectionDecoration: const BoxDecoration(),
allowAppointmentResize: false,
allowDragAndDrop: false,
allowViewNavigation: false,
),
onRefresh: () async {
Provider.of<TimetableProps>(context, listen: false).run(renew: true);

4
lib/view/settings/defaultSettings.dart
View File

@ -22,9 +22,7 @@ class DefaultSettings {
askedForPreferredGradeSystem: false,
inputs: []
),
timetableSettings: TimetableSettings(
zoom: 40,
),
timetableSettings: TimetableSettings(),
talkSettings: TalkSettings(
sortFavoritesToTop: true,
sortUnreadToTop: false,