2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Make bottomnavbar labels always visible

Browse source
This commit is contained in:
krille-chan 2024-05-10 17:31:32 +02:00
commit 9da309be62
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pages/chat_list/chat_list_view.dart
View file

@ -31,13 +31,13 @@ class ChatListView extends StatelessWidget {
badgePosition: badgePosition, badgePosition: badgePosition,
filter: filter:
controller.getRoomFilterByActiveFilter(ActiveFilter.messages), controller.getRoomFilterByActiveFilter(ActiveFilter.messages),
child: const Icon(Icons.forum_outlined), child: const Icon(Icons.chat_outlined),
), ),
selectedIcon: UnreadRoomsBadge( selectedIcon: UnreadRoomsBadge(
badgePosition: badgePosition, badgePosition: badgePosition,
filter: filter:
controller.getRoomFilterByActiveFilter(ActiveFilter.messages), controller.getRoomFilterByActiveFilter(ActiveFilter.messages),
child: const Icon(Icons.forum), child: const Icon(Icons.chat),
), ),
label: L10n.of(context)!.messages, label: L10n.of(context)!.messages,
), ),
@ -60,13 +60,13 @@ class ChatListView extends StatelessWidget {
badgePosition: badgePosition, badgePosition: badgePosition,
filter: filter:
controller.getRoomFilterByActiveFilter(ActiveFilter.allChats), controller.getRoomFilterByActiveFilter(ActiveFilter.allChats),
child: const Icon(Icons.forum_outlined), child: const Icon(Icons.chat_outlined),
), ),
selectedIcon: UnreadRoomsBadge( selectedIcon: UnreadRoomsBadge(
badgePosition: badgePosition, badgePosition: badgePosition,
filter: filter:
controller.getRoomFilterByActiveFilter(ActiveFilter.allChats), controller.getRoomFilterByActiveFilter(ActiveFilter.allChats),
child: const Icon(Icons.forum), child: const Icon(Icons.chat),
), ),
label: L10n.of(context)!.chats, label: L10n.of(context)!.chats,
), ),
@ -187,8 +187,7 @@ class ChatListView extends StatelessWidget {
? NavigationBar( ? NavigationBar(
elevation: 4, elevation: 4,
labelBehavior: labelBehavior:
NavigationDestinationLabelBehavior.alwaysHide, NavigationDestinationLabelBehavior.alwaysShow,
height: 64,
shadowColor: shadowColor:
Theme.of(context).colorScheme.onBackground, Theme.of(context).colorScheme.onBackground,
surfaceTintColor: surfaceTintColor:

5
lib/pages/chat_list/space_view.dart
View file

@ -49,8 +49,9 @@ class _SpaceViewState extends State<SpaceView> {
loadHierarchy(); loadHierarchy();
} }
Future<GetSpaceHierarchyResponse> loadHierarchy([String? prevBatch]) async { Future<GetSpaceHierarchyResponse?> loadHierarchy([String? prevBatch]) async {
final activeSpaceId = widget.controller.activeSpaceId!; final activeSpaceId = widget.controller.activeSpaceId;
if (activeSpaceId == null) return null;
final client = Matrix.of(context).client; final client = Matrix.of(context).client;
final activeSpace = client.getRoomById(activeSpaceId); final activeSpace = client.getRoomById(activeSpaceId);