From afcb7fcf54b8d3bf07f624a13705a768b550dcca Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 24 Oct 2023 15:03:02 -0400 Subject: [PATCH] fix nav rail highlighing --- lib/pages/chat_list/chat_list.dart | 9 +++++++++ lib/pages/chat_list/chat_list_view.dart | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index e6c260da1..955d4bf90 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -115,6 +115,15 @@ class ChatListController extends State } } + // #Pangea + bool isSelected(int i) { + if (activeFilter == ActiveFilter.spaces && activeSpaceId != null) { + return false; + } + return i == selectedIndex; + } + // Pangea# + ActiveFilter getActiveFilterByDestination(int? i) { switch (i) { case 1: diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index a12611107..04fba6670 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -148,7 +148,10 @@ class ChatListView extends StatelessWidget { itemBuilder: (context, i) { if (i < destinations.length) { return NaviRailItem( - isSelected: i == controller.selectedIndex, + // #Pangea + // isSelected: i == controller.selectedIndex, + isSelected: controller.isSelected(i), + // Pangea# onTap: () => controller.onDestinationSelected(i), icon: destinations[i].icon, selectedIcon: destinations[i].selectedIcon,