diff --git a/lib/theming/darkAppTheme.dart b/lib/theming/darkAppTheme.dart index d7bff6d..3206c71 100644 --- a/lib/theming/darkAppTheme.dart +++ b/lib/theming/darkAppTheme.dart @@ -10,10 +10,10 @@ class DarkAppTheme { colorScheme: const ColorScheme( brightness: Brightness.dark, - surface: Colors.black, + surface: Colors.black54, onSurface: Colors.white, - primary: Colors.white, + primary: marianumRed, onPrimary: Colors.white, secondary: Colors.grey, diff --git a/lib/view/pages/more/roomplan/roomplan.dart b/lib/view/pages/more/roomplan/roomplan.dart index 7ebd5cf..ecf73e3 100644 --- a/lib/view/pages/more/roomplan/roomplan.dart +++ b/lib/view/pages/more/roomplan/roomplan.dart @@ -16,7 +16,7 @@ class Roomplan extends StatelessWidget { imageProvider: Image.asset("assets/img/raumplan.jpg").image, minScale: 0.5, maxScale: 2.0, - backgroundDecoration: const BoxDecoration(color: Colors.white60), + backgroundDecoration: BoxDecoration(color: Theme.of(context).colorScheme.surface), ) ); } diff --git a/lib/view/pages/timetable/timetable.dart b/lib/view/pages/timetable/timetable.dart index 6a4b575..f33956f 100644 --- a/lib/view/pages/timetable/timetable.dart +++ b/lib/view/pages/timetable/timetable.dart @@ -1,6 +1,4 @@ -import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:syncfusion_flutter_calendar/calendar.dart'; @@ -55,10 +53,10 @@ class _TimetableState extends State { title: const Text("Stunden & Vertretungsplan"), actions: [ IconButton( - icon: const Icon(Icons.home_outlined), - onPressed: () { - controller.displayDate = DateTime.now().add(const Duration(days: 2)); - } + icon: const Icon(Icons.home_outlined), + onPressed: () { + controller.displayDate = DateTime.now().add(const Duration(days: 2)); + } ), ], ), @@ -102,7 +100,6 @@ class _TimetableState extends State { controller: controller, onViewChanged: (ViewChangedDetails details) { - log(details.visibleDates.toString()); WidgetsBinding.instance.addPostFrameCallback((timeStamp) { Provider.of(context, listen: false).updateWeek(details.visibleDates.first, details.visibleDates.last); }); @@ -112,7 +109,6 @@ class _TimetableState extends State { if(calendarTapDetails.appointments == null) return; Appointment tapped = calendarTapDetails.appointments!.first; AppointmentDetails.show(context, value, tapped); - log(tapped.id.toString()); }, firstDayOfWeek: DateTime.monday, diff --git a/lib/widget/fileViewer.dart b/lib/widget/fileViewer.dart index a87e8d8..6812c94 100644 --- a/lib/widget/fileViewer.dart +++ b/lib/widget/fileViewer.dart @@ -11,7 +11,8 @@ import 'placeholderView.dart'; class FileViewer extends StatelessWidget { final String path; final bool openExternal; - const FileViewer({super.key, required this.path, this.openExternal = false}); + final bool allowExternal; + const FileViewer({super.key, required this.path, this.openExternal = false, this.allowExternal = true}); @override @@ -19,15 +20,18 @@ class FileViewer extends StatelessWidget { AppBar appbar = AppBar( title: Text(path.split("/").last), actions: [ - IconButton(onPressed: () => ConfirmDialog( - title: "Extern öffnen", - content: "Möchtest du die Datei mit dem Systemdialog öffnen?", - onConfirm: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => FileViewer(path: path, openExternal: true))), - confirmButton: "Öffnen", - ).asDialog(context), icon: const Icon(Icons.open_in_new)) + Visibility( + visible: allowExternal, + child: IconButton(onPressed: () => ConfirmDialog( + title: "Extern öffnen", + content: "Möchtest du die Datei mit dem Systemdialog öffnen?", + onConfirm: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => FileViewer(path: path, openExternal: true))), + confirmButton: "Öffnen", + ).asDialog(context), icon: const Icon(Icons.open_in_new)), + ) ], ); - switch(openExternal ? "x" : path.split(".").last) { + switch(openExternal ? "" : path.split(".").last) { case "png": case "jpg": case "jpeg": @@ -36,7 +40,8 @@ class FileViewer extends StatelessWidget { backgroundColor: Colors.white, body: PhotoView( imageProvider: Image.file(File(path)).image, - backgroundDecoration: const BoxDecoration(color: Colors.white60), + backgroundDecoration: BoxDecoration(color: Theme.of(context).colorScheme.surface), + enableRotation: true, ) );