diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 01ed673ab5..2e414adaaf 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -14,6 +14,7 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart'; import 'package:uni_links/uni_links.dart'; import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; import 'package:fluffychat/pangea/chat_list/utils/app_version_util.dart'; import 'package:fluffychat/pangea/chat_list/utils/chat_list_handle_space_tap.dart'; @@ -44,6 +45,7 @@ import '../../widgets/matrix.dart'; import 'package:fluffychat/utils/tor_stub.dart' if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; + enum PopupMenuAction { settings, invite, @@ -111,6 +113,12 @@ class ChatListController extends State void setActiveSpace(String spaceId) async { await Matrix.of(context).client.getRoomById(spaceId)!.postLoad(); + // #Pangea + if (FluffyThemes.isColumnMode(context)) { + context.push("/rooms/$spaceId/details"); + } + // Pangea# + setState(() { _activeSpaceId = spaceId; }); diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart index 0e51d418c4..05b8c837a4 100644 --- a/lib/widgets/public_room_bottom_sheet.dart +++ b/lib/widgets/public_room_bottom_sheet.dart @@ -104,6 +104,11 @@ class PublicRoomBottomSheetState extends State { !client.getRoomById(result.result!)!.isSpace) { outerContext.go('/rooms/${result.result!}'); } + // #Pangea + else { + outerContext.push('/rooms/${result.result!}/details'); + } + // Pangea# return; } }