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

edit design

Browse Source
This commit is contained in:
Martin Olischläger 2023-08-24 22:26:19 +02:00
parent 376472ab53
commit 1b9aa58fb4
9 changed files with 88 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/libraries/Dart_Packages.xml generated
View File

@ -460,7 +460,7 @@
<entry key="flutter">
<value>
<list>
<option value="/opt/flutter/packages/flutter/lib" />
<option value="/media/HDD/Sonstiges/flutter/packages/flutter/lib" />
</list>
</value>
</entry>
@ -523,7 +523,7 @@
<entry key="flutter_localizations">
<value>
<list>
<option value="/opt/flutter/packages/flutter_localizations/lib" />
<option value="/media/HDD/Sonstiges/flutter/packages/flutter_localizations/lib" />
</list>
</value>
</entry>
@ -551,14 +551,14 @@
<entry key="flutter_test">
<value>
<list>
<option value="/opt/flutter/packages/flutter_test/lib" />
<option value="/media/HDD/Sonstiges/flutter/packages/flutter_test/lib" />
</list>
</value>
</entry>
<entry key="flutter_web_plugins">
<value>
<list>
<option value="/opt/flutter/packages/flutter_web_plugins/lib" />
<option value="/media/HDD/Sonstiges/flutter/packages/flutter_web_plugins/lib" />
</list>
</value>
</entry>
@ -1076,7 +1076,7 @@
<entry key="sky_engine">
<value>
<list>
<option value="/opt/flutter/bin/cache/pkg/sky_engine/lib" />
<option value="/media/HDD/Sonstiges/flutter/bin/cache/pkg/sky_engine/lib" />
</list>
</value>
</entry>
@ -1600,11 +1600,11 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/xml-6.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/xml_annotation-2.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/yaml-3.1.2/lib" />
<root url="file:///opt/flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file:///opt/flutter/packages/flutter/lib" />
<root url="file:///opt/flutter/packages/flutter_localizations/lib" />
<root url="file:///opt/flutter/packages/flutter_test/lib" />
<root url="file:///opt/flutter/packages/flutter_web_plugins/lib" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file:///media/HDD/Sonstiges/flutter/packages/flutter/lib" />
<root url="file:///media/HDD/Sonstiges/flutter/packages/flutter_localizations/lib" />
<root url="file:///media/HDD/Sonstiges/flutter/packages/flutter_test/lib" />
<root url="file:///media/HDD/Sonstiges/flutter/packages/flutter_web_plugins/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />

40
.idea/libraries/Dart_SDK.xml generated
View File

@ -1,25 +1,27 @@
<component name="libraryTable">
<library name="Dart SDK">
<CLASSES>
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_gl" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/js_interop" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file:///media/HDD/Sonstiges/flutter/bin/cache/dart-sdk/lib/web_gl" />
</CLASSES>
<JAVADOC />
<SOURCES />

78
.idea/libraries/Flutter_Plugins.xml generated
View File

@ -1,51 +1,51 @@
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES>
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.18" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.38" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-15.1.0+1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_plugin-0.3.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.6" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.8" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/better_open_file-3.6.4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info-2.0.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.12" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-3.0.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-22.2.9" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_web-0.3.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.3+1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_web-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.7+4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.7" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-15.1.0+1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.38" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-1.0.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core-2.15.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.1.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-3.0.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.1.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging-14.6.6" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.5.5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core_web-2.7.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info-2.0.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.6" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_in_app_messaging-0.7.3+5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-9.0.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-22.2.9" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core-2.15.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-22.2.9" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.8" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.5.5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/better_open_file-3.6.4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.12" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-1.0.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.1.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.18" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.7+4" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core_web-2.7.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-9.0.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.1.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging-14.6.6" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.7" />
</CLASSES>
<JAVADOC />
<SOURCES />

6
client.iml
View File

@ -85,6 +85,12 @@
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/device_info_plus/.pub" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/device_info_plus/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/device_info_plus/build" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/example/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/example/.pub" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/example/build" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/build" />
<excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/firebase_core/.pub" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />

2
lib/app.dart
View File

@ -68,7 +68,7 @@ class _AppState extends State<App> {
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 [

2
lib/notification/notificationService.dart
View File

@ -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,

7
lib/theming/darkAppTheme.dart
View File

@ -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),
// ),
);
}

10
lib/view/pages/files/fileElement.dart
View File

@ -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<FileElement> {
);
}
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(),

2
lib/view/pages/talk/chatTextfield.dart
View File

@ -68,7 +68,7 @@ class _ChatTextfieldState extends State<ChatTextfield> {
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: <Widget>[
GestureDetector(