From 9da309be62b949a0da96a81fbc4652a7a6717555 Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Fri, 10 May 2024 17:31:32 +0200
Subject: [PATCH] chore: Make bottomnavbar labels always visible

---
 lib/pages/chat_list/chat_list_view.dart | 11 +++++------
 lib/pages/chat_list/space_view.dart     |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 96e2a4675..a91a0ee5e 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -31,13 +31,13 @@ class ChatListView extends StatelessWidget {
             badgePosition: badgePosition,
             filter:
                 controller.getRoomFilterByActiveFilter(ActiveFilter.messages),
-            child: const Icon(Icons.forum_outlined),
+            child: const Icon(Icons.chat_outlined),
           ),
           selectedIcon: UnreadRoomsBadge(
             badgePosition: badgePosition,
             filter:
                 controller.getRoomFilterByActiveFilter(ActiveFilter.messages),
-            child: const Icon(Icons.forum),
+            child: const Icon(Icons.chat),
           ),
           label: L10n.of(context)!.messages,
         ),
@@ -60,13 +60,13 @@ class ChatListView extends StatelessWidget {
             badgePosition: badgePosition,
             filter:
                 controller.getRoomFilterByActiveFilter(ActiveFilter.allChats),
-            child: const Icon(Icons.forum_outlined),
+            child: const Icon(Icons.chat_outlined),
           ),
           selectedIcon: UnreadRoomsBadge(
             badgePosition: badgePosition,
             filter:
                 controller.getRoomFilterByActiveFilter(ActiveFilter.allChats),
-            child: const Icon(Icons.forum),
+            child: const Icon(Icons.chat),
           ),
           label: L10n.of(context)!.chats,
         ),
@@ -187,8 +187,7 @@ class ChatListView extends StatelessWidget {
                         ? NavigationBar(
                             elevation: 4,
                             labelBehavior:
-                                NavigationDestinationLabelBehavior.alwaysHide,
-                            height: 64,
+                                NavigationDestinationLabelBehavior.alwaysShow,
                             shadowColor:
                                 Theme.of(context).colorScheme.onBackground,
                             surfaceTintColor:
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 0db6c5fbf..692429e4f 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -49,8 +49,9 @@ class _SpaceViewState extends State<SpaceView> {
     loadHierarchy();
   }
 
-  Future<GetSpaceHierarchyResponse> loadHierarchy([String? prevBatch]) async {
-    final activeSpaceId = widget.controller.activeSpaceId!;
+  Future<GetSpaceHierarchyResponse?> loadHierarchy([String? prevBatch]) async {
+    final activeSpaceId = widget.controller.activeSpaceId;
+    if (activeSpaceId == null) return null;
     final client = Matrix.of(context).client;
 
     final activeSpace = client.getRoomById(activeSpaceId);