Merge pull request #309 from pangeachat/small-ui-fixes

allow leaving for all selected chats
pangeachat · Jun 7, 2024 · f0424d5 · f0424d5
2 parents 05ac1d7 + 363a91a
commit f0424d5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
@@ -105,6 +105,12 @@ class ChatListController extends State<ChatList>
       selectedRoomIds.clear();
       activeSpaceId = spaceId;
       activeFilter = ActiveFilter.spaces;
+      // #Pangea
+      // don't show all spaces view if in column mode
+      if (spaceId == null && FluffyThemes.isColumnMode(context)) {
+        activeFilter = ActiveFilter.allChats;
+      }
+      // Pangea#
     });
   }
 
@@ -693,7 +699,7 @@ class ChatListController extends State<ChatList>
           title: L10n.of(context)!.areYouSure,
           okLabel: L10n.of(context)!.yes,
           cancelLabel: L10n.of(context)!.cancel,
-          message: onlyAdmin
+          message: onlyAdmin && selectedRoomIds.length == 1
               ? L10n.of(context)!.onlyAdminDescription
               : L10n.of(context)!.leaveRoomDescription,
         ) ==

diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart
@@ -171,6 +171,12 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget {
                     onPressed: controller.toggleMuted,
                   ),
                   // #Pangea
+                  if (controller.selectedRoomIds.length > 1)
+                    IconButton(
+                      icon: const Icon(Icons.arrow_forward),
+                      tooltip: L10n.of(context)!.leave,
+                      onPressed: controller.leaveAction,
+                    ),
                   if (controller.selectedRoomIds.length == 1 &&
                       !(Matrix.of(context)
                               .client

diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
@@ -147,7 +147,10 @@ class _SpaceViewState extends State<SpaceView> {
       if (activeSpace != null) {
         await setChatCount(
           activeSpace,
-          _lastResponse[activeSpaceId],
+          _lastResponse[activeSpaceId] ??
+              GetSpaceHierarchyResponse(
+                rooms: [],
+              ),
         );
       }
       // Pangea#