aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: control space details tabs with query parameters (#3842)

Browse Source
pull/2245/head
ggurdin 2 months ago committed by GitHub
parent 677e9ce594
commit 0b6e334ed7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 95 additions and 86 deletions
Show Stats Download Patch File Download Diff File

19
lib/config/routes.dart
Unescape Escape View File

@ -569,6 +569,7 @@ abstract class AppRoutes {
state, state,
ChatDetails( ChatDetails(
roomId: state.pathParameters['spaceid']!, roomId: state.pathParameters['spaceid']!,
activeTab: state.uri.queryParameters['tab'],
), ),
), ),
redirect: loggedOutRedirect, redirect: loggedOutRedirect,
@ -581,9 +582,16 @@ abstract class AppRoutes {
const EmptyPage(), const EmptyPage(),
), ),
redirect: (context, state) { redirect: (context, state) {
final subroute = String subroute =
state.fullPath?.split(":spaceid/details").last ?? state.fullPath?.split(":spaceid/details").last ??
""; "";
if (state.uri.queryParameters.isNotEmpty) {
final queryString = state.uri.queryParameters.entries
.map((e) => '${e.key}=${e.value}')
.join('&');
subroute = '$subroute?$queryString';
}
return "/rooms/spaces/${state.pathParameters['spaceid']}$subroute"; return "/rooms/spaces/${state.pathParameters['spaceid']}$subroute";
}, },
routes: roomDetailsRoutes('spaceid'), routes: roomDetailsRoutes('spaceid'),
@ -683,7 +691,14 @@ abstract class AppRoutes {
// #Pangea // #Pangea
// redirect: loggedOutRedirect, // redirect: loggedOutRedirect,
redirect: (context, state) { redirect: (context, state) {
final subroute = state.fullPath!.split('roomid').last; String subroute = state.fullPath!.split('roomid').last;
if (state.uri.queryParameters.isNotEmpty) {
final queryString = state.uri.queryParameters.entries
.map((e) => '${e.key}=${e.value}')
.join('&');
subroute = '$subroute?$queryString';
}
final roomId = state.pathParameters['roomid']!; final roomId = state.pathParameters['roomid']!;
final room = Matrix.of(context).client.getRoomById(roomId); final room = Matrix.of(context).client.getRoomById(roomId);
if (room != null && room.isSpace) { if (room != null && room.isSpace) {

6
lib/pages/chat_details/chat_details.dart
Unescape Escape View File

@ -33,11 +33,17 @@ enum AliasActions { copy, delete, setCanonical }
class ChatDetails extends StatefulWidget { class ChatDetails extends StatefulWidget {
final String roomId; final String roomId;
final Widget? embeddedCloseButton; final Widget? embeddedCloseButton;
// #Pangea
final String? activeTab;
// Pangea#
const ChatDetails({ const ChatDetails({
super.key, super.key,
required this.roomId, required this.roomId,
this.embeddedCloseButton, this.embeddedCloseButton,
// #Pangea
this.activeTab,
// Pangea#
}); });
@override @override

151
lib/pangea/chat_settings/pages/space_details_content.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
@ -30,79 +31,71 @@ enum SpaceSettingsTabs {
course, course,
participants, participants,
analytics, analytics,
more, more;
static SpaceSettingsTabs? fromString(String value) {
return SpaceSettingsTabs.values.firstWhereOrNull(
(e) => e.name == value,
);
}
} }
class SpaceDetailsContent extends StatefulWidget { class SpaceDetailsContent extends StatelessWidget {
final ChatDetailsController controller; final ChatDetailsController controller;
final Room room; final Room room;
const SpaceDetailsContent(this.controller, this.room, {super.key}); const SpaceDetailsContent(
this.controller,
this.room, {
super.key,
});
@override SpaceSettingsTabs tab(BuildContext context) {
State<SpaceDetailsContent> createState() => SpaceDetailsContentState(); final defaultTab = FluffyThemes.isColumnMode(context)
} ? SpaceSettingsTabs.course
: SpaceSettingsTabs.chat;
class SpaceDetailsContentState extends State<SpaceDetailsContent> {
SpaceSettingsTabs? _selectedTab;
@override final activeTab = controller.widget.activeTab;
void initState() { if (activeTab != null) {
super.initState(); final selectedTab = SpaceSettingsTabs.fromString(activeTab);
WidgetsBinding.instance.addPostFrameCallback((_) { return selectedTab ?? defaultTab;
setState(
() => _selectedTab = FluffyThemes.isColumnMode(context)
? SpaceSettingsTabs.course
: SpaceSettingsTabs.chat,
);
});
}
@override
void didUpdateWidget(covariant SpaceDetailsContent oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.room.id != widget.room.id) {
setState(() {
_selectedTab = FluffyThemes.isColumnMode(context)
? SpaceSettingsTabs.course
: SpaceSettingsTabs.chat;
});
} }
return defaultTab;
} }
void setSelectedTab(SpaceSettingsTabs tab) { void setSelectedTab(SpaceSettingsTabs tab, BuildContext context) {
setState(() { context.go('/rooms/spaces/${room.id}/details?tab=${tab.name}');
_selectedTab = tab;
});
} }
List<ButtonDetails> get _buttons { List<ButtonDetails> _buttons(BuildContext context) {
final L10n l10n = L10n.of(context); final L10n l10n = L10n.of(context);
return [ return [
ButtonDetails( ButtonDetails(
title: l10n.chats, title: l10n.chats,
icon: const Icon(Icons.chat_bubble_outline, size: 30.0), icon: const Icon(Icons.chat_bubble_outline, size: 30.0),
onPressed: () => setSelectedTab(SpaceSettingsTabs.chat), onPressed: () => setSelectedTab(SpaceSettingsTabs.chat, context),
visible: !FluffyThemes.isColumnMode(context), visible: !FluffyThemes.isColumnMode(context),
tab: SpaceSettingsTabs.chat, tab: SpaceSettingsTabs.chat,
), ),
ButtonDetails( ButtonDetails(
title: l10n.coursePlan, title: l10n.coursePlan,
icon: const Icon(Icons.map_outlined, size: 30.0), icon: const Icon(Icons.map_outlined, size: 30.0),
onPressed: () => setSelectedTab(SpaceSettingsTabs.course), onPressed: () => setSelectedTab(SpaceSettingsTabs.course, context),
tab: SpaceSettingsTabs.course, tab: SpaceSettingsTabs.course,
), ),
ButtonDetails( ButtonDetails(
title: l10n.participants, title: l10n.participants,
icon: const Icon(Icons.group_outlined, size: 30.0), icon: const Icon(Icons.group_outlined, size: 30.0),
onPressed: () => setSelectedTab(SpaceSettingsTabs.participants), onPressed: () =>
setSelectedTab(SpaceSettingsTabs.participants, context),
tab: SpaceSettingsTabs.participants, tab: SpaceSettingsTabs.participants,
), ),
ButtonDetails( ButtonDetails(
title: l10n.stats, title: l10n.stats,
icon: const Icon(Symbols.bar_chart_4_bars, size: 30.0), icon: const Icon(Symbols.bar_chart_4_bars, size: 30.0),
onPressed: () => setSelectedTab(SpaceSettingsTabs.analytics), onPressed: () => setSelectedTab(SpaceSettingsTabs.analytics, context),
enabled: widget.room.isRoomAdmin, enabled: room.isRoomAdmin,
tab: SpaceSettingsTabs.analytics, tab: SpaceSettingsTabs.analytics,
), ),
ButtonDetails( ButtonDetails(
@ -111,16 +104,14 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
icon: const Icon(Icons.person_add_outlined, size: 30.0), icon: const Icon(Icons.person_add_outlined, size: 30.0),
onPressed: () { onPressed: () {
String filter = 'knocking'; String filter = 'knocking';
if (widget.room.getParticipants([Membership.knock]).isEmpty) { if (room.getParticipants([Membership.knock]).isEmpty) {
filter = widget.room.pangeaSpaceParents.isNotEmpty filter = room.pangeaSpaceParents.isNotEmpty ? 'space' : 'contacts';
? 'space'
: 'contacts';
} }
context.go( context.go(
'/rooms/spaces/${widget.room.id}/details/invite?filter=$filter', '/rooms/spaces/${room.id}/details/invite?filter=$filter',
); );
}, },
enabled: widget.room.canInvite && !widget.room.isDirectChat, enabled: room.canInvite && !room.isDirectChat,
showInMainView: false, showInMainView: false,
), ),
ButtonDetails( ButtonDetails(
@ -129,33 +120,32 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
icon: const Icon(Icons.edit_outlined, size: 30.0), icon: const Icon(Icons.edit_outlined, size: 30.0),
onPressed: () {}, onPressed: () {},
visible: false, visible: false,
enabled: widget.room.canChangeStateEvent(PangeaEventTypes.coursePlan), enabled: room.canChangeStateEvent(PangeaEventTypes.coursePlan),
showInMainView: false, showInMainView: false,
), ),
ButtonDetails( ButtonDetails(
title: l10n.permissions, title: l10n.permissions,
description: l10n.permissionsDesc, description: l10n.permissionsDesc,
icon: const Icon(Icons.edit_attributes_outlined, size: 30.0), icon: const Icon(Icons.edit_attributes_outlined, size: 30.0),
onPressed: () => onPressed: () => context.go('/rooms/${room.id}/details/permissions'),
context.go('/rooms/${widget.room.id}/details/permissions'), enabled: room.isRoomAdmin && !room.isDirectChat,
enabled: widget.room.isRoomAdmin && !widget.room.isDirectChat,
showInMainView: false, showInMainView: false,
), ),
ButtonDetails( ButtonDetails(
title: l10n.access, title: l10n.access,
description: l10n.accessDesc, description: l10n.accessDesc,
icon: const Icon(Icons.shield_outlined, size: 30.0), icon: const Icon(Icons.shield_outlined, size: 30.0),
onPressed: () => context.go('/rooms/${widget.room.id}/details/access'), onPressed: () => context.go('/rooms/${room.id}/details/access'),
enabled: widget.room.isRoomAdmin && widget.room.spaceParents.isEmpty, enabled: room.isRoomAdmin && room.spaceParents.isEmpty,
showInMainView: false, showInMainView: false,
), ),
ButtonDetails( ButtonDetails(
title: l10n.createGroupChat, title: l10n.createGroupChat,
description: l10n.createGroupChatDesc, description: l10n.createGroupChatDesc,
icon: const Icon(Symbols.chat_add_on, size: 30.0), icon: const Icon(Symbols.chat_add_on, size: 30.0),
onPressed: widget.controller.addGroupChat, onPressed: controller.addGroupChat,
enabled: widget.room.isRoomAdmin && enabled: room.isRoomAdmin &&
widget.room.canChangeStateEvent( room.canChangeStateEvent(
EventTypes.SpaceChild, EventTypes.SpaceChild,
), ),
showInMainView: false, showInMainView: false,
@ -176,13 +166,13 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
if (confirmed != OkCancelResult.ok) return; if (confirmed != OkCancelResult.ok) return;
final resp = await showFutureLoadingDialog( final resp = await showFutureLoadingDialog(
context: context, context: context,
future: widget.room.leaveSpace, future: room.leaveSpace,
); );
if (!resp.isError) { if (!resp.isError) {
context.go("/rooms"); context.go("/rooms");
} }
}, },
enabled: widget.room.membership == Membership.join, enabled: room.membership == Membership.join,
showInMainView: false, showInMainView: false,
), ),
ButtonDetails( ButtonDetails(
@ -195,14 +185,14 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
onPressed: () async { onPressed: () async {
final resp = await showDialog<bool?>( final resp = await showDialog<bool?>(
context: context, context: context,
builder: (_) => DeleteSpaceDialog(space: widget.room), builder: (_) => DeleteSpaceDialog(space: room),
); );
if (resp == true) { if (resp == true) {
context.go("/rooms"); context.go("/rooms");
} }
}, },
enabled: widget.room.isRoomAdmin && !widget.room.isDirectChat, enabled: room.isRoomAdmin && !room.isDirectChat,
showInMainView: false, showInMainView: false,
), ),
]; ];
@ -211,11 +201,11 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final isColumnMode = FluffyThemes.isColumnMode(context); final isColumnMode = FluffyThemes.isColumnMode(context);
final displayname = widget.room.getLocalizedDisplayname( final displayname = room.getLocalizedDisplayname(
MatrixLocals(L10n.of(context)), MatrixLocals(L10n.of(context)),
); );
return CoursePlanBuilder( return CoursePlanBuilder(
courseId: widget.room.coursePlan?.uuid, courseId: room.coursePlan?.uuid,
builder: (context, courseController) { builder: (context, courseController) {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -232,13 +222,12 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
children: [ children: [
if (isColumnMode) ...[ if (isColumnMode) ...[
Avatar( Avatar(
mxContent: widget.room.avatar, mxContent: room.avatar,
name: displayname, name: displayname,
userId: widget.room.directChatMatrixID, userId: room.directChatMatrixID,
size: 80.0, size: 80.0,
borderRadius: widget.room.isSpace borderRadius:
? BorderRadius.circular(24.0) room.isSpace ? BorderRadius.circular(24.0) : null,
: null,
), ),
const SizedBox(width: 16.0), const SizedBox(width: 16.0),
], ],
@ -271,51 +260,51 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
], ],
), ),
), ),
if (widget.room.classCode != null) if (room.classCode != null)
Padding( Padding(
padding: const EdgeInsets.only(left: 16.0), padding: const EdgeInsets.only(left: 16.0),
child: ShareRoomButton(room: widget.room), child: ShareRoomButton(room: room),
), ),
], ],
), ),
SizedBox(height: isColumnMode ? 24.0 : 12.0), SizedBox(height: isColumnMode ? 24.0 : 12.0),
SpaceDetailsButtonRow( SpaceDetailsButtonRow(
controller: widget.controller, controller: controller,
room: widget.room, room: room,
selectedTab: _selectedTab, selectedTab: tab(context),
onTabSelected: setSelectedTab, onTabSelected: (tab) => setSelectedTab(tab, context),
buttons: _buttons, buttons: _buttons(context),
), ),
SizedBox(height: isColumnMode ? 30.0 : 14.0), SizedBox(height: isColumnMode ? 30.0 : 14.0),
Expanded( Expanded(
child: Builder( child: Builder(
builder: (context) { builder: (context) {
switch (_selectedTab) { switch (tab(context)) {
case SpaceSettingsTabs.chat: case SpaceSettingsTabs.chat:
return CourseChats( return CourseChats(
widget.room.id, room.id,
activeChat: null, activeChat: null,
client: widget.room.client, client: room.client,
); );
case SpaceSettingsTabs.course: case SpaceSettingsTabs.course:
return SingleChildScrollView( return SingleChildScrollView(
child: CourseSettings( child: CourseSettings(
courseController, courseController,
room: widget.room, room: room,
), ),
); );
case SpaceSettingsTabs.participants: case SpaceSettingsTabs.participants:
return SingleChildScrollView( return SingleChildScrollView(
child: RoomParticipantsSection(room: widget.room), child: RoomParticipantsSection(room: room),
); );
case SpaceSettingsTabs.analytics: case SpaceSettingsTabs.analytics:
return SingleChildScrollView( return SingleChildScrollView(
child: Center( child: Center(
child: SpaceAnalytics(roomId: widget.room.id), child: SpaceAnalytics(roomId: room.id),
), ),
); );
case SpaceSettingsTabs.more: case SpaceSettingsTabs.more:
final buttons = _buttons final buttons = _buttons(context)
.where( .where(
(b) => !b.showInMainView && b.visible, (b) => !b.showInMainView && b.visible,
) )
@ -355,8 +344,6 @@ class SpaceDetailsContentState extends State<SpaceDetailsContent> {
], ],
), ),
); );
case null:
return const SizedBox();
} }
}, },
), ),

5
lib/pangea/course_chats/course_chats_view.dart
Unescape Escape View File

@ -270,8 +270,9 @@ class CourseChatsView extends StatelessWidget {
title: Text(L10n.of(context).whatNow), title: Text(L10n.of(context).whatNow),
subtitle: Text(L10n.of(context).chooseNextActivity), subtitle: Text(L10n.of(context).chooseNextActivity),
trailing: const Icon(Icons.arrow_forward), trailing: const Icon(Icons.arrow_forward),
onTap: () => onTap: () => context.go(
context.go("/rooms/spaces/${room.id}/details"), "/rooms/spaces/${room.id}/details?tab=course",
),
) )
: const SizedBox(); : const SizedBox();
} }

Write Preview
Loading…
Cancel
Save