ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix public room sheet navigation (#5323)

Browse source
This commit is contained in:
ggurdin 2026-01-21 15:19:16 -05:00 • committed by GitHub
parent 236af2ec54
commit 9c7ec313f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/pangea/chat_list/widgets/public_room_bottom_sheet.dart
View file

@ -8,7 +8,6 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/extensions/pangea_rooms_chunk_extension.dart';
import 'package:fluffychat/pangea/join_codes/space_code_controller.dart';
import 'package:fluffychat/pangea/navigation/navigation_util.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
@ -30,7 +29,7 @@ class PublicRoomBottomSheet extends StatefulWidget {
assert(roomAlias != null || chunk != null);
}
static Future<bool?> show({
static Future<String?> show({
required BuildContext context,
String? roomAlias,
PublicRoomsChunk? chunk,
@ -91,26 +90,13 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
notFoundError: L10n.of(context).notTheCodeError,
);
if (resp != null) {
Navigator.of(context).pop(true);
}
}
void _goToRoom(String roomID) {
if (chunk?.roomType != 'm.space' && !client.getRoomById(roomID)!.isSpace) {
NavigationUtil.goToSpaceRoute(
roomID,
[],
context,
);
} else {
context.go('/rooms/spaces/$roomID/details');
Navigator.of(context).pop(resp);
}
}
Future<void> _joinRoom() async {
if (_isRoomMember) {
_goToRoom(room!.id);
Navigator.of(context).pop();
Navigator.of(context).pop(room!.id);
return;
}
@ -131,15 +117,13 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
);
if (result.result != null) {
_goToRoom(result.result!);
Navigator.of(context).pop(true);
Navigator.of(context).pop(result.result!);
}
}
Future<void> _knockRoom() async {
if (_isRoomMember) {
_goToRoom(room!.id);
Navigator.of(context).pop();
Navigator.of(context).pop(room!.id);
return;
}

6
lib/pangea/course_chats/course_chats_page.dart
View file

@ -438,7 +438,7 @@ class CourseChatsController extends State<CourseChats>
void joinChildRoom(SpaceRoomsChunk item) async {
final space = widget.client.getRoomById(widget.roomId);
final joined = await PublicRoomBottomSheet.show(
final roomId = await PublicRoomBottomSheet.show(
context: context,
chunk: item,
via: space?.spaceChildren
@ -447,10 +447,12 @@ class CourseChatsController extends State<CourseChats>
)
?.via,
);
if (mounted && joined == true) {
if (mounted && roomId != null) {
setState(() {
discoveredChildren?.remove(item);
});
NavigationUtil.goToSpaceRoute(roomId, [], context);
}
}