centered file preview, made text copyable

android/app/build.gradle

@@ -28,6 +28,7 @@ android {
     ndkVersion "27.0.12077973"
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -64,5 +65,5 @@ flutter {
 
 dependencies {
     implementation 'com.android.support:multidex:2.0.1'
-    implementation 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.1.4' apply false
+    id "com.android.application" version '8.7.3' apply false
     id "org.jetbrains.kotlin.android" version "1.8.10" apply false
 }
 

lib/api/marianumcloud/talk/room/getRoomResponse.dart

@@ -110,6 +110,7 @@ enum GetRoomResponseObjectConversationType {
   @JsonValue(3) public,
   @JsonValue(4) changelog,
   @JsonValue(5) deleted,
+  @JsonValue(6) noteToSelf,
 }
 
 enum GetRoomResponseObjectParticipantNotificationLevel {

lib/api/marianumcloud/talk/room/getRoomResponse.g.dart

@@ -102,6 +102,7 @@ const _$GetRoomResponseObjectConversationTypeEnumMap = {
   GetRoomResponseObjectConversationType.public: 3,
   GetRoomResponseObjectConversationType.changelog: 4,
   GetRoomResponseObjectConversationType.deleted: 5,
+  GetRoomResponseObjectConversationType.noteToSelf: 6,
 };
 
 const _$GetRoomResponseObjectParticipantNotificationLevelEnumMap = {

lib/api/marianumcloud/talk/talkApi.dart

@@ -58,11 +58,9 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
       assembled?.headers = data.headers;
       return assembled;
     } catch (e) {
-      // TODO report error
-      log('Error assembling Talk API ${T.toString()} message: ${e.toString()} response on ${endpoint.path} with request body: $body and request headers: ${headers.toString()}');
+      var message = 'Error assembling Talk API ${T.toString()} message: ${e.toString()} response with request body: $body and request headers: ${headers.toString()}';
+      log(message);
+      throw Exception(message);
     }
-
-    throw Exception('Error assembling Talk API response');
   }
-
 }

lib/model/breakers/BreakerProps.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 import '../../api/apiResponse.dart';
@@ -12,6 +13,8 @@ class BreakerProps extends DataHolder {
   PackageInfo? packageInfo;
 
   String? isBlocked(BreakerArea? type) {
+    if(kDebugMode) return null;
+
     if(packageInfo == null) {
       PackageInfo.fromPlatform().then((value) => packageInfo = value);
       return null;

lib/state/app/modules/app_modules.dart

@@ -62,7 +62,7 @@ class AppModule {
       ),
       Modules.files: AppModule(
         Modules.files,
-        name: 'Files',
+        name: 'Dateien',
         icon: () => Icon(Icons.folder),
         breakerArea: BreakerArea.files,
         create: Files.new,

lib/view/pages/talk/components/chatBubble.dart

@@ -206,7 +206,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
             ),
           ),
           Visibility(
-            visible: !message.containsFile,
+            visible: widget.bubbleData.message != '{file}',
             child: ListTile(
               leading: const Icon(Icons.copy),
               title: const Text('Nachricht kopieren'),

lib/view/pages/talk/components/chatMessage.dart

@@ -21,39 +21,53 @@ class ChatMessage {
   ChatMessage({required this.originalMessage, this.originalData}) {
     if(originalData?.containsKey('file') ?? false) {
       file = originalData?['file'];
-      content = file?.name ?? 'Datei';
-    } else {
-      content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
     }
+    content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
   }
 
   Widget getWidget() {
 
-    if(file == null) {
-      return Linkify(
-        text: content,
-        onOpen: onOpen,
-      );
-    }
+    var contentWidget = Linkify(
+      text: content,
+      onOpen: onOpen,
+    );
 
-    return Padding(padding: const EdgeInsets.only(top: 5), child: CachedNetworkImage(
-      errorWidget: (context, url, error) => Row(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.center,
+    if(file == null) return contentWidget;
+
+    return Padding(
+        padding: const EdgeInsets.only(top: 5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const Icon(Icons.file_open_outlined, size: 35),
-            const SizedBox(width: 10),
-            Flexible(child: Text(file!.name, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.bold))),
-            const SizedBox(width: 10),
+            Row(
+              mainAxisSize: MainAxisSize.max,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                CachedNetworkImage(
+                  errorWidget: (context, url, error) => Row(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      const Icon(Icons.file_open_outlined, size: 35),
+                      const SizedBox(width: 10),
+                      Flexible(child: Text(file!.name, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.bold))),
+                      const SizedBox(width: 10),
+                    ],
+                  ),
+                  alignment: Alignment.center,
+                  placeholder: (context, url) => const Padding(padding: EdgeInsets.all(15), child: SizedBox(width: 50, child: LinearProgressIndicator())),
+                  fadeInDuration: Duration.zero,
+                  fadeOutDuration: Duration.zero,
+                  errorListener: (value) {},
+                  imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=100&y=-1&a=1',
+                )
+              ],
+            ),
+            SizedBox(height: 5),
+            contentWidget
           ],
-        ),
-      alignment: Alignment.center,
-      placeholder: (context, url) => const Padding(padding: EdgeInsets.all(15), child: SizedBox(width: 50, child: LinearProgressIndicator())),
-      fadeInDuration: Duration.zero,
-      fadeOutDuration: Duration.zero,
-      errorListener: (value) {},
-      imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=100&y=-1&a=1',
-    ));
+        )
+    );
   }
 
   Future<void> onOpen(LinkableElement link) async {

lib/view/pages/timetable/timetable.dart

@@ -123,6 +123,7 @@ class _TimetableState extends State<Timetable> {
 
           return RefreshIndicator(
               child: SfCalendar(
+                timeZone: 'W. Europe Standard Time',
                 view: CalendarView.workWeek,
                 dataSource: _buildTableEvents(value),
 
@@ -367,6 +368,9 @@ class _TimetableState extends State<Timetable> {
     // Any changes or no teacher at this element
     if(webuntisElement.code == 'irregular' || webuntisElement.te.first.id == 0) return const Color(0xff8F19B3).withAlpha(alpha);
 
+    // Teacher has changed
+    if(webuntisElement.te.any((element) => element.orgname != null)) return const Color(0xFF29639B).withAlpha(alpha);
+
     // Event was in the past
     if(endTime.isBefore(DateTime.now())) return Theme.of(context).primaryColor.withAlpha(alpha);
 

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.1.0+36
+version: 0.1.3+41
 
 environment:
   sdk: '>3.0.0'