Merge branch 'develop' into develop-fileMessagesWithText

lib/api/marianumcloud/autocomplete/autocompleteResponse.dart

@@ -18,7 +18,7 @@ class AutocompleteResponseObject {
   String label;
   String? icon;
   String? source;
-  List<String>? status;
+  String? status;
   String? subline;
   String? shareWithDisplayNameUniqe;
 

lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart

@@ -28,7 +28,7 @@ AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
       json['label'] as String,
       json['icon'] as String?,
       json['source'] as String?,
-      (json['status'] as List<dynamic>?)?.map((e) => e as String).toList(),
+      json['status'] as String?,
       json['subline'] as String?,
       json['shareWithDisplayNameUniqe'] as String?,
     );

lib/state/app/modules/app_modules.dart

@@ -31,7 +31,7 @@ class AppModule {
     var available = {
       Modules.timetable: AppModule(
         Modules.timetable,
-        name: 'Vertretung',
+        name: 'Stundenplan',
         icon: () => Icon(Icons.calendar_month),
         breakerArea: BreakerArea.timetable,
         create: Timetable.new,

lib/view/pages/files/fileElement.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 
-import 'package:better_open_file/better_open_file.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flowder/flowder.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:jiffy/jiffy.dart';
+import 'package:open_filex/open_filex.dart';
 import '../../../widget/infoDialog.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:path_provider/path_provider.dart';

lib/view/pages/talk/chatDetails/participants/participantsListView.dart

@@ -3,26 +3,28 @@ import 'package:flutter/material.dart';
 import '../../../../../api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart';
 import '../../../../../widget/userAvatar.dart';
 
-class ParticipantsListView extends StatefulWidget {
+class ParticipantsListView extends StatelessWidget {
   final GetParticipantsResponse participantsResponse;
   const ParticipantsListView(this.participantsResponse, {super.key});
 
   @override
-  State<ParticipantsListView> createState() => _ParticipantsListViewState();
-}
+  Widget build(BuildContext context) {
+    final participants = participantsResponse.data.map((participant) => ListTile(
+      leading: UserAvatar(id: participant.actorId),
+      title: Text(participant.displayName),
+      subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
+    )).toList();
 
-class _ParticipantsListViewState extends State<ParticipantsListView> {
-  @override
-  Widget build(BuildContext context) => Scaffold(
+    lastname(participant) => participant.title.toString().split(' ').last;
+    participants.sort((a, b) => lastname(a).compareTo(lastname(b)));
+
+    return Scaffold(
       appBar: AppBar(
         title: const Text('Teilnehmende'),
       ),
       body: ListView(
-        children: widget.participantsResponse.data.map((participant) => ListTile(
-            leading: UserAvatar(id: participant.actorId),
-            title: Text(participant.displayName),
-            subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
-          )).toList(),
+        children: participants,
       ),
     );
+  }
 }

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

@@ -1,4 +1,3 @@
-import 'package:better_open_file/better_open_file.dart';
 import 'package:bubble/bubble.dart';
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart' as emojis;
 import 'package:flowder/flowder.dart';
@@ -6,6 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jiffy/jiffy.dart';
+import 'package:open_filex/open_filex.dart';
 import '../../../../extensions/text.dart';
 import 'package:provider/provider.dart';
 

lib/view/settings/defaultSettings.dart

@@ -32,7 +32,7 @@ class DefaultSettings {
         hiddenModules: [],
       ),
       timetableSettings: TimetableSettings(
-        connectDoubleLessons: false,
+        connectDoubleLessons: true,
         timetableNameMode: TimetableNameMode.name
       ),
       talkSettings: TalkSettings(

lib/view/settings/settings.dart

@@ -246,7 +246,7 @@ class _SettingsState extends State<Settings> {
                       ListTile(
                         leading: const CenteredLeading(Icon(Icons.date_range_outlined)),
                         title: const Text('Infos zu Web-/ Untis'),
-                        subtitle: const Text('Für den Vertretungsplan'),
+                        subtitle: const Text('Für den Stundenplan'),
                         trailing: const Icon(Icons.arrow_right),
                         onTap: () => PrivacyInfo(providerText: 'Untis', imprintUrl: 'https://www.untis.at/impressum', privacyUrl: 'https://www.untis.at/datenschutz-wu-apps').showPopup(context)
                       ),

lib/widget/fileViewer.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:better_open_file/better_open_file.dart';
 import 'package:flutter/material.dart';
+import 'package:open_filex/open_filex.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
@@ -93,7 +93,7 @@ class _FileViewerState extends State<FileViewer> {
         );
 
       default:
-        OpenFile.open(widget.path).then((result) {
+        OpenFilex.open(widget.path).then((result) {
           Navigator.of(context).pop();
           if(result.type != ResultType.done) {
             showDialog(context: context, builder: (context) => AlertDialog(