GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-02-25 10:50:40 +01:00
Code Issues Projects Releases Wiki Activity

fix: Space settings routing problems

Browse Source
This commit is contained in:
Christian Pauly 2021-08-04 10:15:42 +02:00
parent 1d92af38cb
commit c77ea2e325
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/chat_details.dart
View File

@ -240,9 +240,9 @@ class ChatDetailsController extends State<ChatDetails> {
if ((room.states['im.ponies.room_emotes'] ?? <String, Event>{}) if ((room.states['im.ponies.room_emotes'] ?? <String, Event>{})
.keys .keys
.any((String s) => s.isNotEmpty)) { .any((String s) => s.isNotEmpty)) {
VRouter.of(context).to('/rooms/${room.id}/details/multiple_emotes'); VRouter.of(context).to('multiple_emotes');
} else { } else {
VRouter.of(context).to('/rooms/${room.id}/details/emotes'); VRouter.of(context).to('emotes');
} }
} }

8
lib/pages/views/chat_details_view.dart
View File

@ -316,8 +316,8 @@ class ChatDetailsView extends StatelessWidget {
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.edit_attributes_outlined), child: Icon(Icons.edit_attributes_outlined),
), ),
onTap: () => VRouter.of(context) onTap: () =>
.to('/rooms/${room.id}/details/permissions'), VRouter.of(context).to('permissions'),
), ),
Divider(thickness: 1), Divider(thickness: 1),
ListTile( ListTile(
@ -343,8 +343,8 @@ class ChatDetailsView extends StatelessWidget {
radius: Avatar.defaultSize / 2, radius: Avatar.defaultSize / 2,
child: Icon(Icons.add_outlined), child: Icon(Icons.add_outlined),
), ),
onTap: () => VRouter.of(context) onTap: () =>
.to('/rooms/${room.id}/invite'), VRouter.of(context).to('invite'),
) )
: Container(), : Container(),
], ],

12
lib/pages/views/chat_permissions_settings_view.dart
View File

@ -18,11 +18,13 @@ class ChatPermissionsSettingsView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
leading: IconButton( leading: VRouter.of(context).path.startsWith('/spaces/')
icon: Icon(Icons.close_outlined), ? null
onPressed: () => : IconButton(
VRouter.of(context).to('/rooms/${controller.roomId}'), icon: Icon(Icons.close_outlined),
), onPressed: () =>
VRouter.of(context).to('/rooms/${controller.roomId}'),
),
title: Text(L10n.of(context).editChatPermissions), title: Text(L10n.of(context).editChatPermissions),
), ),
body: MaxWidthBody( body: MaxWidthBody(

12
lib/pages/views/invitation_selection_view.dart
View File

@ -21,11 +21,13 @@ class InvitationSelectionView extends StatelessWidget {
room.name?.isEmpty ?? false ? L10n.of(context).group : room.name; room.name?.isEmpty ?? false ? L10n.of(context).group : room.name;
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
leading: IconButton( leading: VRouter.of(context).path.startsWith('/spaces/')
icon: Icon(Icons.close_outlined), ? null
onPressed: () => : IconButton(
VRouter.of(context).to('/rooms/${controller.roomId}'), icon: Icon(Icons.close_outlined),
), onPressed: () =>
VRouter.of(context).to('/rooms/${controller.roomId}'),
),
titleSpacing: 0, titleSpacing: 0,
title: DefaultAppBarSearchField( title: DefaultAppBarSearchField(
autofocus: true, autofocus: true,