better loading indicators for timetables, talk and files

lib/view/pages/files/fileElement.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:dio/dio.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flowder/flowder.dart';
 import 'package:flutter/foundation.dart';
@@ -12,6 +13,7 @@ import 'package:path_provider/path_provider.dart';
 
 import '../../../api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart';
 import '../../../api/marianumcloud/webdav/webdavApi.dart';
+import '../../../model/accountData.dart';
 import '../../../model/endpointData.dart';
 import '../../../widget/centeredLeading.dart';
 import '../../../widget/confirmDialog.dart';
@@ -41,6 +43,7 @@ class FileElement extends StatefulWidget {
       file: File(local),
       progress: ProgressImplementation(),
       deleteOnCancel: true,
+      client: Dio(BaseOptions(headers: AccountData().authHeaders())),
       onDone: () {
         //Future<OpenResult> result = OpenFile.open(local); // TODO legacy - refactor: remove onDone parameter
         Navigator.of(context).push(MaterialPageRoute(builder: (context) => FileViewer(path: local)));
@@ -52,7 +55,7 @@ class FileElement extends StatefulWidget {
     );
 
     return await Flowder.download(
-      '${await WebdavApi.webdavConnectString}$encodedPath',
+      '${WebdavApi.buildWebdavUrl()}$encodedPath',
       options,
     );
   }

lib/view/pages/files/files.dart

@@ -164,9 +164,9 @@ class _FilesViewState extends State<_FilesView> {
         child: const Icon(Icons.add),
       ),
       body: LoadableStateConsumer<FilesBloc, FilesState>(
+        isReady: (state) => state.listing != null,
         child: (state, _) {
-          final listing = state.listing;
-          if (listing == null) return const SizedBox.shrink();
+          final listing = state.listing!;
           if (listing.files.isEmpty) {
             return const PlaceholderView(icon: Icons.folder_off_rounded, text: 'Der Ordner ist leer');
           }

lib/view/pages/talk/chatView.dart

@@ -4,11 +4,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../../api/marianumcloud/talk/chat/getChatResponse.dart';
 import '../../../api/marianumcloud/talk/room/getRoomResponse.dart';
 import '../../../extensions/dateTime.dart';
+import '../../../state/app/infrastructure/loadableState/view/loadable_state_consumer.dart';
 import '../../../state/app/modules/chat/bloc/chat_bloc.dart';
 import '../../../state/app/modules/chat/bloc/chat_state.dart';
 import '../../../theming/appTheme.dart';
 import '../../../widget/clickableAppBar.dart';
-import '../../../widget/loadingSpinner.dart';
 import '../../../widget/userAvatar.dart';
 import 'chatDetails/chatInfo.dart';
 import 'components/chatBubble.dart';
@@ -33,108 +33,103 @@ class _ChatViewState extends State<ChatView> {
     context.read<ChatBloc>().setToken(widget.room.token);
   }
 
+  List<Widget> _buildMessages(GetChatResponse response) {
+    final messages = <Widget>[];
+    var lastDate = DateTime.now();
+    for (final element in response.sortByTimestamp()) {
+      final elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000);
+
+      if (element.systemMessage.contains('reaction')) continue;
+      if (element.systemMessage.contains('poll_voted')) continue;
+      final commonRead = int.parse(response.headers?['x-chat-last-common-read'] ?? '0');
+
+      if (!elementDate.isSameDay(lastDate)) {
+        lastDate = elementDate;
+        messages.add(ChatBubble(
+          context: context,
+          isSender: false,
+          bubbleData: GetChatResponseObject.getDateDummy(element.timestamp),
+          chatData: widget.room,
+          refetch: ({bool renew = false}) => _refresh(),
+        ));
+      }
+
+      messages.add(ChatBubble(
+        context: context,
+        isSender: element.actorId == widget.selfId &&
+            element.messageType == GetRoomResponseObjectMessageType.comment,
+        bubbleData: element,
+        chatData: widget.room,
+        refetch: ({bool renew = false}) => _refresh(),
+        isRead: element.id <= commonRead,
+        selfId: widget.selfId,
+      ));
+    }
+
+    if (response.data.length >= 200) {
+      messages.insert(0, ChatBubble(
+        context: context,
+        isSender: false,
+        bubbleData: GetChatResponseObject.getTextDummy(
+          'Zurzeit können in dieser App nur die letzten 200 vergangenen Nachrichten angezeigt werden. '
+          'Um ältere Nachrichten abzurufen verwende die Webversion unter https://cloud.marianum-fulda.de',
+        ),
+        chatData: widget.room,
+        refetch: ({bool renew = false}) => _refresh(),
+      ));
+    }
+
+    return messages;
+  }
+
   @override
-  Widget build(BuildContext context) => BlocBuilder<ChatBloc, dynamic>(
-      builder: (context, _) {
-        final state = context.watch<ChatBloc>().state.data ?? const ChatState();
-        final response = state.chatResponse;
-        final isLoading = response == null;
-
-        final messages = <Widget>[];
-
-        if (response != null) {
-          var lastDate = DateTime.now();
-          for (final element in response.sortByTimestamp()) {
-            final elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000);
-
-            if (element.systemMessage.contains('reaction')) continue;
-            if (element.systemMessage.contains('poll_voted')) continue;
-            final commonRead = int.parse(response.headers?['x-chat-last-common-read'] ?? '0');
-
-            if (!elementDate.isSameDay(lastDate)) {
-              lastDate = elementDate;
-              messages.add(ChatBubble(
-                context: context,
-                isSender: false,
-                bubbleData: GetChatResponseObject.getDateDummy(element.timestamp),
-                chatData: widget.room,
-                refetch: ({bool renew = false}) => _refresh(),
-              ));
-            }
-
-            messages.add(ChatBubble(
-              context: context,
-              isSender: element.actorId == widget.selfId &&
-                  element.messageType == GetRoomResponseObjectMessageType.comment,
-              bubbleData: element,
-              chatData: widget.room,
-              refetch: ({bool renew = false}) => _refresh(),
-              isRead: element.id <= commonRead,
-              selfId: widget.selfId,
-            ));
-          }
-
-          if (response.data.length >= 200) {
-            messages.insert(0, ChatBubble(
-              context: context,
-              isSender: false,
-              bubbleData: GetChatResponseObject.getTextDummy(
-                'Zurzeit können in dieser App nur die letzten 200 vergangenen Nachrichten angezeigt werden. '
-                'Um ältere Nachrichten abzurufen verwende die Webversion unter https://cloud.marianum-fulda.de',
-              ),
-              chatData: widget.room,
-              refetch: ({bool renew = false}) => _refresh(),
-            ));
-          }
-        }
-
-        return Scaffold(
-          backgroundColor: const Color(0xffefeae2),
-          appBar: ClickableAppBar(
-            onTap: () => TalkNavigator.pushSplitView(context, ChatInfo(widget.room)),
-            appBar: AppBar(
-              title: Row(
-                children: [
-                  widget.avatar,
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Text(widget.room.displayName, overflow: TextOverflow.ellipsis, maxLines: 1),
-                  ),
-                ],
-              ),
+  Widget build(BuildContext context) => Scaffold(
+        backgroundColor: const Color(0xffefeae2),
+        appBar: ClickableAppBar(
+          onTap: () => TalkNavigator.pushSplitView(context, ChatInfo(widget.room)),
+          appBar: AppBar(
+            title: Row(
+              children: [
+                widget.avatar,
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Text(widget.room.displayName, overflow: TextOverflow.ellipsis, maxLines: 1),
+                ),
+              ],
             ),
           ),
-          body: Container(
-            decoration: BoxDecoration(
-              image: DecorationImage(
-                image: const AssetImage('assets/background/chat.png'),
-                scale: 1.5,
-                opacity: 1,
-                repeat: ImageRepeat.repeat,
-                invertColors: AppTheme.isDarkMode(context),
-              ),
+        ),
+        body: Container(
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: const AssetImage('assets/background/chat.png'),
+              scale: 1.5,
+              opacity: 1,
+              repeat: ImageRepeat.repeat,
+              invertColors: AppTheme.isDarkMode(context),
             ),
-            child: isLoading
-                ? const LoadingSpinner()
-                : Column(
-                    children: [
-                      Expanded(
-                        child: ListView(
-                          reverse: true,
-                          controller: _listController,
-                          children: messages.reversed.toList(),
-                        ),
-                      ),
-                      Container(
-                        color: Theme.of(context).colorScheme.surface,
-                        child: TalkNavigator.isSecondaryVisible(context)
-                            ? ChatTextfield(widget.room.token, selfId: widget.selfId)
-                            : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)),
-                      ),
-                    ],
-                  ),
           ),
-        );
-      },
-    );
+          child: Column(
+            children: [
+              Expanded(
+                child: LoadableStateConsumer<ChatBloc, ChatState>(
+                  isReady: (state) =>
+                      state.chatResponse != null && state.currentToken == widget.room.token,
+                  child: (state, _) => ListView(
+                    reverse: true,
+                    controller: _listController,
+                    children: _buildMessages(state.chatResponse!).reversed.toList(),
+                  ),
+                ),
+              ),
+              Container(
+                color: Theme.of(context).colorScheme.surface,
+                child: TalkNavigator.isSecondaryVisible(context)
+                    ? ChatTextfield(widget.room.token, selfId: widget.selfId)
+                    : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)),
+              ),
+            ],
+          ),
+        ),
+      );
 }

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

@@ -63,7 +63,8 @@ class ChatMessage {
               fadeInDuration: Duration.zero,
               fadeOutDuration: Duration.zero,
               errorListener: (value) {},
-              imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=130&y=-1&a=1',
+              httpHeaders: AccountData().authHeaders(),
+              imageUrl: 'https://${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=130&y=-1&a=1',
             ),
             if(originalMessage != '{file}') ...[
               SizedBox(height: 5),