Skip to content

Commit 5242068

Browse files
authored
Merge pull request #147 from pangeachat/open-details
if in two column mode, open space details when active space is set
2 parents 15d2eca + 05116eb commit 5242068

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

lib/pangea/pages/analytics/construct_cloud.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart';
12
import 'package:flutter/material.dart';
23

3-
import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart';
44
import '../../word_cloud/word_cloud_data.dart';
55
import '../../word_cloud/word_cloud_shape.dart';
66
import '../../word_cloud/word_cloud_tap.dart';

lib/pangea/utils/chat_list_handle_space_tap.dart

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:adaptive_dialog/adaptive_dialog.dart';
2+
import 'package:fluffychat/config/themes.dart';
23
import 'package:fluffychat/pages/chat_list/chat_list.dart';
34
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
45
import 'package:fluffychat/widgets/matrix.dart';
@@ -18,7 +19,10 @@ void chatListHandleSpaceTap(
1819
) {
1920
void setActiveSpaceAndCloseChat() {
2021
controller.setActiveSpace(space.id);
21-
if (controller.activeChat != null &&
22+
23+
if (FluffyThemes.isColumnMode(context)) {
24+
context.push('/spaces/${space.id}');
25+
} else if (controller.activeChat != null &&
2226
!space.isFirstOrSecondChild(controller.activeChat!)) {
2327
context.go("/rooms");
2428
}

lib/pangea/utils/space_navigator.dart

-23
This file was deleted.

0 commit comments

Comments
 (0)