diff --git a/lib/pangea/chat_settings/pages/pangea_chat_details.dart b/lib/pangea/chat_settings/pages/pangea_chat_details.dart index 049e3b013..ece634751 100644 --- a/lib/pangea/chat_settings/pages/pangea_chat_details.dart +++ b/lib/pangea/chat_settings/pages/pangea_chat_details.dart @@ -27,12 +27,12 @@ import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/user_dialog.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/hover_builder.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; +import 'package:fluffychat/widgets/member_actions_popup_menu_button.dart'; class PangeaChatDetailsView extends StatelessWidget { final ChatDetailsController controller; @@ -771,27 +771,27 @@ class RoomParticipantsSection extends StatelessWidget { height: _width, width: _width, ), - MouseRegion( - cursor: SystemMouseCursors.click, - child: GestureDetector( - onTap: () => UserDialog.show( - context: context, - profile: Profile( - userId: user.id, - displayName: user.displayName, - avatarUrl: user.avatarUrl, - ), - ), - child: Center( - child: Avatar( - mxContent: user.avatarUrl, - name: user.calcDisplayname(), - size: _width - 6.0, - presenceUserId: user.id, - showPresence: false, + Builder( + builder: (context) { + return MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + onTap: () => showMemberActionsPopupMenu( + context: context, + user: user, + ), + child: Center( + child: Avatar( + mxContent: user.avatarUrl, + name: user.calcDisplayname(), + size: _width - 6.0, + presenceUserId: user.id, + showPresence: false, + ), + ), ), - ), - ), + ); + }, ), ], ), diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index fff6685e9..306c3b428 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -72,6 +72,13 @@ Future showPermissionChooser( onPressed: () => Navigator.of(context).pop(0), child: Text(L10n.of(context).normalUser), ), + // #Pangea + AdaptiveDialogAction( + bigButtons: true, + onPressed: () => Navigator.of(context).pop(), + child: Text(L10n.of(context).close), + ), + // Pangea# ], ), );