chore: improve edits of replies, more future loading dialogs (#74)

Author: Feichtmeier

lib/chat_master/view/chat_space_filter.dart

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:matrix/matrix.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../common/view/ui_constants.dart';
 import '../../common/chat_model.dart';
 import '../../common/search_model.dart';
 import '../../common/view/chat_avatar.dart';
+import '../../common/view/ui_constants.dart';
 
 class ChatSpaceFilter extends StatelessWidget with WatchItMixin {
   const ChatSpaceFilter({super.key});
@@ -20,8 +19,9 @@ class ChatSpaceFilter extends StatelessWidget with WatchItMixin {
         watchStream(
           (ChatModel m) => m.spacesStream,
           initialValue: chatModel.spaces,
+          preserveState: false,
         ).data ??
-        <Room>[];
+        chatModel.spaces;
 
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: kMediumPlusPadding),

lib/chat_room/create_or_edit/chat_create_or_edit_room_dialog.dart

@@ -320,7 +320,7 @@ class _ChatCreateOrEditRoomDialogState
                     ),
                   ),
                 ),
-                if (_existingGroup && widget.room!.canChangePowerLevel)
+                if (_existingGroup)
                   SliverPadding(
                     padding: const EdgeInsets.symmetric(
                       horizontal: kBigPadding,

lib/chat_room/create_or_edit/chat_room_history_visibility_drop_down.dart

@@ -4,6 +4,7 @@ import 'package:matrix/matrix.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 import '../../common/chat_model.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/app_localizations.dart';
 import '../../l10n/l10n.dart';
@@ -46,7 +47,12 @@ class ChatRoomHistoryVisibilityDropDown extends StatelessWidget
         onSelected: canChangeHistoryVisibility
             ? (v) => showFutureLoadingDialog(
                 context: context,
-                future: () => room.setHistoryVisibility(v),
+                future: () =>
+                    di<ChatModel>().setHistoryVisibility(room: room, value: v),
+                onError: (e) {
+                  showSnackBar(context, content: Text(e.toString()));
+                  return e;
+                },
               )
             : null,
         itemBuilder: (context) => HistoryVisibility.values

lib/chat_room/create_or_edit/chat_room_join_rules_drop_down.dart

@@ -5,6 +5,7 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../common/chat_model.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/app_localizations.dart';
 import '../../l10n/l10n.dart';
@@ -47,7 +48,12 @@ class ChatRoomJoinRulesDropDown extends StatelessWidget with WatchItMixin {
         onSelected: canChangeJoinRules
             ? (v) => showFutureLoadingDialog(
                 context: context,
-                future: () => room.setJoinRules(v),
+                onError: (e) {
+                  showErrorSnackBar(context, e);
+                  return e;
+                },
+                future: () =>
+                    di<ChatModel>().setJoinRules(room: room, value: v),
               )
             : null,
         itemBuilder: (context) => JoinRules.values

lib/chat_room/create_or_edit/chat_room_permissions.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../common/chat_model.dart';
 import '../../common/view/build_context_x.dart';
-import '../../common/view/confirm.dart';
 import '../../common/view/snackbars.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/l10n.dart';
@@ -23,6 +23,16 @@ class ChatPermissionsSettingsView extends StatelessWidget with WatchItMixin {
     final l10n = context.l10n;
     final chatModel = di<ChatModel>();
 
+    final canChangePowerLevel =
+        watchStream(
+          (ChatModel m) => m
+              .getJoinedRoomUpdate(room.id)
+              .map((_) => room.canChangePowerLevel),
+          initialValue: room.canChangePowerLevel,
+          preserveState: false,
+        ).data ??
+        room.canChangePowerLevel;
+
     final powerLevelsContent =
         watchStream(
           (ChatModel m) => m.getPermissionsStream(room),
@@ -63,20 +73,21 @@ class ChatPermissionsSettingsView extends StatelessWidget with WatchItMixin {
             children: [
               for (final entry in powerLevels.entries)
                 _ChatRoomPermissionTile(
+                  canEdit: canChangePowerLevel,
                   permissionKey: entry.key,
                   permission: entry.value,
-                  onChanged: (level) => chatModel.editPowerLevel(
-                    room: room,
-                    key: entry.key,
-                    newLevel: level,
-                    onFail: () =>
-                        showSnackBar(context, content: Text(l10n.noPermission)),
-                    onCustomPermissionsChosen: () => _showPermissionChooser(
-                      context,
-                      currentLevel: entry.value,
+                  onChanged: (level) => showFutureLoadingDialog(
+                    context: context,
+                    onError: (e) {
+                      showSnackBar(context, content: Text(e.toString()));
+                      return e;
+                    },
+                    future: () => chatModel.editPowerLevel(
+                      room: room,
+                      key: entry.key,
+                      newLevel: level,
                     ),
                   ),
-                  canEdit: room.canChangePowerLevel,
                 ),
             ],
           ),
@@ -93,19 +104,22 @@ class ChatPermissionsSettingsView extends StatelessWidget with WatchItMixin {
             return Padding(
               padding: const EdgeInsets.only(bottom: kMediumPadding),
               child: _ChatRoomPermissionTile(
+                canEdit: canChangePowerLevel,
                 permissionKey: key,
                 permission: value,
                 category: 'notifications',
-                canEdit: room.canChangePowerLevel,
-                onChanged: (level) => chatModel.editPowerLevel(
-                  room: room,
-                  key: key,
-                  onFail: () =>
-                      showSnackBar(context, content: Text(l10n.noPermission)),
-                  onCustomPermissionsChosen: () =>
-                      _showPermissionChooser(context, currentLevel: value),
-                  newLevel: level,
-                  category: 'notifications',
+                onChanged: (level) => showFutureLoadingDialog(
+                  context: context,
+                  onError: (e) {
+                    showSnackBar(context, content: Text(e.toString()));
+                    return e;
+                  },
+                  future: () => chatModel.editPowerLevel(
+                    room: room,
+                    key: key,
+                    newLevel: level,
+                    category: 'notifications',
+                  ),
                 ),
               ),
             );
@@ -118,21 +132,23 @@ class ChatPermissionsSettingsView extends StatelessWidget with WatchItMixin {
             children: [
               for (final entry in eventsPowerLevels.entries)
                 _ChatRoomPermissionTile(
+                  canEdit: canChangePowerLevel,
                   permissionKey: entry.key,
                   category: 'events',
                   permission: entry.value ?? 0,
-                  canEdit: room.canChangePowerLevel,
-                  onChanged: (level) => di<ChatModel>().editPowerLevel(
-                    room: room,
-                    onFail: () =>
-                        showSnackBar(context, content: Text(l10n.noPermission)),
-                    key: entry.key,
-                    onCustomPermissionsChosen: () => _showPermissionChooser(
-                      context,
-                      currentLevel: entry.value ?? 0,
+
+                  onChanged: (level) => showFutureLoadingDialog(
+                    context: context,
+                    onError: (e) {
+                      showSnackBar(context, content: Text(e.toString()));
+                      return e;
+                    },
+                    future: () => di<ChatModel>().editPowerLevel(
+                      room: room,
+                      key: entry.key,
+                      newLevel: level,
+                      category: 'events',
                     ),
-                    newLevel: level,
-                    category: 'events',
                   ),
                 ),
             ],
@@ -141,35 +157,9 @@ class ChatPermissionsSettingsView extends StatelessWidget with WatchItMixin {
       ],
     );
   }
-
-  Future<int?> _showPermissionChooser(
-    BuildContext context, {
-    int currentLevel = 0,
-  }) async {
-    final l10n = context.l10n;
-    final customLevel = await showConfirmDialogWithInput(
-      context: context,
-      title: l10n.setPermissionsLevel,
-      initialText: currentLevel.toString(),
-      keyboardType: TextInputType.number,
-      autocorrect: false,
-      validator: (text) {
-        if (text.isEmpty) {
-          return l10n.pleaseEnterANumber;
-        }
-        final level = int.tryParse(text);
-        if (level == null) {
-          return l10n.pleaseEnterANumber;
-        }
-        return null;
-      },
-    );
-    if (customLevel == null) return null;
-    return int.tryParse(customLevel);
-  }
 }
 
-class _ChatRoomPermissionTile extends StatelessWidget {
+class _ChatRoomPermissionTile extends StatelessWidget with WatchItMixin {
   final String permissionKey;
   final int permission;
   final String? category;
@@ -238,6 +228,9 @@ class _ChatRoomPermissionTile extends StatelessWidget {
     final l10n = context.l10n;
     final theme = context.theme;
     final colorScheme = theme.colorScheme;
+    final style = canEdit
+        ? theme.textTheme.bodyMedium
+        : theme.textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
 
     final color = permission >= 100
         ? colorScheme.warning
@@ -251,40 +244,48 @@ class _ChatRoomPermissionTile extends StatelessWidget {
         style: theme.textTheme.titleSmall,
       ),
       trailing: Material(
-        color: color.withAlpha(32),
+        color: canEdit ? color.withAlpha(32) : null,
         borderRadius: BorderRadius.circular(kYaruContainerRadius),
         child: DropdownButton<int>(
           isDense: true,
-          style: TextStyle(color: colorScheme.onSurface),
+          style: style,
           icon: const SizedBox.shrink(),
           padding: const EdgeInsets.symmetric(
             horizontal: kMediumPadding,
             vertical: kSmallPadding,
           ),
           borderRadius: BorderRadius.circular(kYaruContainerRadius),
           underline: const SizedBox.shrink(),
-          onChanged: canEdit ? onChanged : null,
+          onChanged: onChanged,
           value: permission,
           items: [
             DropdownMenuItem(
               value: permission < 50 ? permission : 0,
-              child: Text(l10n.userLevel(permission < 50 ? permission : 0)),
+              child: Text(
+                l10n.userLevel(permission < 50 ? permission : 0),
+                style: style,
+              ),
             ),
             DropdownMenuItem(
               value: permission < 100 && permission >= 50 ? permission : 50,
               child: Text(
                 l10n.moderatorLevel(
                   permission < 100 && permission >= 50 ? permission : 50,
                 ),
+                style: style,
               ),
             ),
             DropdownMenuItem(
               value: permission >= 100 ? permission : 100,
               child: Text(
                 l10n.adminLevel(permission >= 100 ? permission : 100),
+                style: style,
               ),
             ),
-            DropdownMenuItem(value: null, child: Text(l10n.custom)),
+            DropdownMenuItem(
+              value: null,
+              child: Text(l10n.custom, style: style),
+            ),
           ],
         ),
       ),

lib/chat_room/input/draft_model.dart

@@ -52,12 +52,14 @@ class DraftModel extends SafeChangeNotifier {
     _setSending(true);
 
     try {
-      room.setTyping(false);
+      await room.setTyping(false);
     } on Exception catch (e, s) {
       onFail(e.toString());
       printMessageInDebugMode(e, s);
     }
 
+    final textDraft = '${getTextDraft(room.id)}';
+    removeTextDraft(room.id);
     final matrixFiles = List<MatrixFile>.from(getFilesDraft(room.id));
     if (matrixFiles.isNotEmpty) {
       for (var matrixFile in matrixFiles) {
@@ -84,6 +86,7 @@ class DraftModel extends SafeChangeNotifier {
             thumbnail: matrixFile.mimeType.startsWith('video') && xFile != null
                 ? await getVideoThumbnail(xFile)
                 : null,
+            extraContent: textDraft.isNotEmpty ? {'body': textDraft} : null,
           );
           if (eventId != null) {
             _matrixFilesToXFile.remove(matrixFile);
@@ -95,15 +98,11 @@ class DraftModel extends SafeChangeNotifier {
           printMessageInDebugMode(e, s);
         }
       }
-    }
-
-    if (getDraft(room.id)?.isNotEmpty == true) {
-      final draft = '${getDraft(room.id)}';
-      removeDraft(room.id);
+    } else if (textDraft.isNotEmpty == true) {
       String? eventId;
       try {
         eventId = await room.sendTextEvent(
-          draft.trim(),
+          textDraft.trim(),
           inReplyTo: replyEvent,
           editEventId: _editEvents[room.id]?.eventId,
         );
@@ -112,7 +111,7 @@ class DraftModel extends SafeChangeNotifier {
         printMessageInDebugMode(e, s);
       }
       if (eventId == null) {
-        setDraft(roomId: room.id, draft: draft, notify: true);
+        setTextDraft(roomId: room.id, draft: textDraft, notify: true);
       }
     }
 
@@ -123,25 +122,24 @@ class DraftModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
-  final Map<String, String> _drafts = {};
-  int get draftLength => _drafts.length;
-  Map<String, String?> get drafts => _drafts;
-  String? getDraft(String roomId) => _drafts[roomId];
-  void setDraft({
+  final Map<String, String> _textDrafts = {};
+  int get draftLength => _textDrafts.length;
+  String? getTextDraft(String roomId) => _textDrafts[roomId];
+  void setTextDraft({
     required String roomId,
     required String draft,
     required bool notify,
   }) {
-    _drafts[roomId] = draft;
+    _textDrafts[roomId] = draft;
     if (notify) {
       notifyListeners();
     }
   }
 
-  void removeDraft(String roomId) {
-    final oldDraft = _drafts[roomId];
+  void removeTextDraft(String roomId) {
+    final oldDraft = _textDrafts[roomId];
     if (oldDraft == null) return;
-    _drafts.remove(roomId);
+    _textDrafts.remove(roomId);
     notifyListeners();
   }