Merge commit '37d313c27116840d59866b541876e5a248f534a7' into fluffychat-merge

This commit is contained in:
ggurdin 2025-07-08 09:20:02 -04:00
commit d5759a95bc
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
2 changed files with 31 additions and 25 deletions

View file

@ -64,7 +64,7 @@ abstract class FluffyThemes {
: colorScheme.surfaceContainer,
popupMenuTheme: PopupMenuThemeData(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
),
),
segmentedButtonTheme: SegmentedButtonThemeData(

View file

@ -45,32 +45,38 @@ void showMemberActionsPopupMenu({
items: <PopupMenuEntry<_MemberActions>>[
PopupMenuItem(
value: _MemberActions.info,
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Center(
child: Column(
child: Row(
spacing: 12.0,
children: [
Avatar(
name: displayname,
mxContent: user.avatarUrl,
presenceUserId: user.id,
presenceBackgroundColor: theme.colorScheme.surfaceContainer,
),
Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Avatar(
name: displayname,
mxContent: user.avatarUrl,
presenceUserId: user.id,
presenceBackgroundColor: theme.colorScheme.surfaceContainer,
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 128),
child: Text(
displayname,
textAlign: TextAlign.center,
style: theme.textTheme.labelLarge,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(height: 8),
Text(
displayname,
textAlign: TextAlign.center,
style: theme.textTheme.labelLarge,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
Text(
user.id,
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 10),
maxLines: 1,
overflow: TextOverflow.ellipsis,
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 128),
child: Text(
user.id,
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 10),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
// #Pangea
Padding(
@ -85,7 +91,7 @@ void showMemberActionsPopupMenu({
// Pangea#
],
),
),
],
),
),
const PopupMenuDivider(),