Merge pull request #2943 from pangeachat/2916-dont-see-user-roles-or-change-them

chore: show member action popup on click avatar in room details page
pull/2245/head
ggurdin 5 months ago committed by GitHub
commit 3e5ae8cb46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/url_launcher.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/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/avatar.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/hover_builder.dart'; import 'package:fluffychat/widgets/hover_builder.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/member_actions_popup_menu_button.dart';
class PangeaChatDetailsView extends StatelessWidget { class PangeaChatDetailsView extends StatelessWidget {
final ChatDetailsController controller; final ChatDetailsController controller;
@ -771,27 +771,27 @@ class RoomParticipantsSection extends StatelessWidget {
height: _width, height: _width,
width: _width, width: _width,
), ),
MouseRegion( Builder(
cursor: SystemMouseCursors.click, builder: (context) {
child: GestureDetector( return MouseRegion(
onTap: () => UserDialog.show( cursor: SystemMouseCursors.click,
context: context, child: GestureDetector(
profile: Profile( onTap: () => showMemberActionsPopupMenu(
userId: user.id, context: context,
displayName: user.displayName, user: user,
avatarUrl: user.avatarUrl, ),
), child: Center(
), child: Avatar(
child: Center( mxContent: user.avatarUrl,
child: Avatar( name: user.calcDisplayname(),
mxContent: user.avatarUrl, size: _width - 6.0,
name: user.calcDisplayname(), presenceUserId: user.id,
size: _width - 6.0, showPresence: false,
presenceUserId: user.id, ),
showPresence: false, ),
), ),
), );
), },
), ),
], ],
), ),

@ -72,6 +72,13 @@ Future<int?> showPermissionChooser(
onPressed: () => Navigator.of(context).pop<int>(0), onPressed: () => Navigator.of(context).pop<int>(0),
child: Text(L10n.of(context).normalUser), child: Text(L10n.of(context).normalUser),
), ),
// #Pangea
AdaptiveDialogAction(
bigButtons: true,
onPressed: () => Navigator.of(context).pop(),
child: Text(L10n.of(context).close),
),
// Pangea#
], ],
), ),
); );

Loading…
Cancel
Save