diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 47280b6..01bb18b 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -460,7 +460,7 @@
-
+
@@ -523,7 +523,7 @@
-
+
@@ -551,14 +551,14 @@
-
+
-
+
@@ -1076,7 +1076,7 @@
-
+
@@ -1600,11 +1600,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 563d1c4..80361ab 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index f0c7d53..0091b0c 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -1,51 +1,51 @@
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client.iml b/client.iml
index 2fa4042..04279fd 100644
--- a/client.iml
+++ b/client.iml
@@ -85,6 +85,12 @@
+
+
+
+
+
+
diff --git a/lib/app.dart b/lib/app.dart
index f12a0db..dcb0833 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -68,7 +68,7 @@ class _AppState extends State {
navBarStyle: NavBarStyle.style6,
backgroundColor: Theme.of(context).colorScheme.surface,
decoration: const NavBarDecoration(
- border: Border.symmetric(vertical: BorderSide.none, horizontal: BorderSide(color: Colors.grey, width: 1))
+ border: Border(top: BorderSide(width: 1, color: Colors.grey)),
),
screenTransitionAnimation: const ScreenTransitionAnimation(animateTabTransition: true, curve: Curves.ease, duration: Duration(milliseconds: 200)),
screens: const [
diff --git a/lib/notification/notificationService.dart b/lib/notification/notificationService.dart
index ab43f17..b5845b6 100644
--- a/lib/notification/notificationService.dart
+++ b/lib/notification/notificationService.dart
@@ -64,7 +64,7 @@ class NotificationService {
);
}
- void showToast({required String message, required BuildContext context, ToastGravity gravity = ToastGravity.BOTTOM}) {
+ void showToast({required String message, required BuildContext context, ToastGravity gravity = ToastGravity.TOP}) {
Fluttertoast.showToast(
msg: message,
gravity: gravity,
diff --git a/lib/theming/darkAppTheme.dart b/lib/theming/darkAppTheme.dart
index 3206c71..cb3d4ba 100644
--- a/lib/theming/darkAppTheme.dart
+++ b/lib/theming/darkAppTheme.dart
@@ -40,8 +40,9 @@ class DarkAppTheme {
backgroundColor: MaterialStateProperty.all(Colors.white),
)
),
- checkboxTheme: CheckboxThemeData(
- fillColor: MaterialStateProperty.all(marianumRed),
- ),
+ // checkboxTheme: CheckboxThemeData(
+ // fillColor: MaterialStateColor.resolveWith((states) {states.})
+ // //fillColor: MaterialStateProperty.all(marianumRed),
+ // ),
);
}
\ No newline at end of file
diff --git a/lib/view/pages/files/fileElement.dart b/lib/view/pages/files/fileElement.dart
index 268ec7c..974cf40 100644
--- a/lib/view/pages/files/fileElement.dart
+++ b/lib/view/pages/files/fileElement.dart
@@ -6,6 +6,7 @@ import 'package:flowder/flowder.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
+import 'package:marianum_mobile/widget/centeredLeading.dart';
import 'package:path_provider/path_provider.dart';
import '../../../api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart';
@@ -77,16 +78,15 @@ class _FileElementState extends State {
);
}
return widget.file.isDirectory
- ? Text("${widget.file.sort} geändert ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}")
- : Text("${widget.file.sort} ${filesize(widget.file.size)}, ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}");
+ ? Text("geändert ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}")
+ : Text("${filesize(widget.file.size)}, ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}");
}
@override
Widget build(BuildContext context) {
return ListTile(
- leading: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [Icon(widget.file.isDirectory ? Icons.folder_outlined : Icons.description_outlined)],
+ leading: CenteredLeading(
+ Icon(widget.file.isDirectory ? Icons.folder_outlined : Icons.description_outlined)
),
title: Text(widget.file.name),
subtitle: getSubtitle(),
diff --git a/lib/view/pages/talk/chatTextfield.dart b/lib/view/pages/talk/chatTextfield.dart
index 3f1ad50..4fb7741 100644
--- a/lib/view/pages/talk/chatTextfield.dart
+++ b/lib/view/pages/talk/chatTextfield.dart
@@ -68,7 +68,7 @@ class _ChatTextfieldState extends State {
child: Container(
padding: const EdgeInsets.only(left: 10, bottom: 1, top: 1, right: 10),
width: double.infinity,
- color: Theme.of(context).colorScheme.secondary,
+ color: Theme.of(context).primaryColor,
child: Row(
children: [
GestureDetector(