chore: Follow up user dialog and public room dialog

This commit is contained in:
Christian Kußowski 2026-02-25 08:57:07 +01:00
commit 1cbeb16616
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
3 changed files with 270 additions and 186 deletions

View file

@ -82,3 +82,73 @@ class AdaptiveDialogAction extends StatelessWidget {
} }
} }
} }
class AdaptiveDialogInkWell extends StatelessWidget {
final Widget child;
final VoidCallback onTap;
const AdaptiveDialogInkWell({
super.key,
required this.onTap,
required this.child,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if ({TargetPlatform.iOS, TargetPlatform.macOS}.contains(theme.platform)) {
return CupertinoButton(
onPressed: onTap,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
color: theme.colorScheme.surfaceBright,
padding: EdgeInsets.all(8),
child: child,
);
}
return Material(
color: theme.colorScheme.surfaceBright,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
child: InkWell(
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
onTap: onTap,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Center(child: child),
),
),
);
}
}
class AdaptiveIconTextButton extends StatelessWidget {
final String label;
final IconData icon;
final VoidCallback onTap;
const AdaptiveIconTextButton({
super.key,
required this.label,
required this.icon,
required this.onTap,
});
@override
Widget build(BuildContext context) {
final color = Theme.of(context).colorScheme.secondary;
return Expanded(
child: AdaptiveDialogInkWell(
onTap: onTap,
child: Column(
mainAxisSize: .min,
children: [
Icon(icon, color: color),
Text(
label,
style: TextStyle(fontSize: 12, color: color),
maxLines: 1,
overflow: .ellipsis,
),
],
),
),
);
}
}

View file

@ -6,7 +6,9 @@ import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/fluffy_share.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/show_text_input_dialog.dart';
import '../../config/themes.dart'; import '../../config/themes.dart';
import '../../utils/url_launcher.dart'; import '../../utils/url_launcher.dart';
import '../avatar.dart'; import '../avatar.dart';
@ -90,15 +92,8 @@ class PublicRoomDialog extends StatelessWidget {
final roomLink = roomAlias ?? chunk?.roomId; final roomLink = roomAlias ?? chunk?.roomId;
var copied = false; var copied = false;
return AlertDialog.adaptive( return AlertDialog.adaptive(
title: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256),
child: Text(
chunk?.name ?? roomAlias?.localpart ?? chunk?.roomId ?? 'Unknown',
textAlign: TextAlign.center,
),
),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256, maxHeight: 256), constraints: const BoxConstraints(maxWidth: 256),
child: FutureBuilder<PublishedRoomsChunk>( child: FutureBuilder<PublishedRoomsChunk>(
future: _search(context), future: _search(context),
builder: (context, snapshot) { builder: (context, snapshot) {
@ -109,125 +104,196 @@ class PublicRoomDialog extends StatelessWidget {
final topic = profile?.topic; final topic = profile?.topic;
return SingleChildScrollView( return SingleChildScrollView(
child: Column( child: Column(
spacing: 8, spacing: 16,
mainAxisSize: .min, mainAxisSize: .min,
crossAxisAlignment: .stretch, crossAxisAlignment: .stretch,
children: [ children: [
if (roomLink != null) Row(
HoverBuilder( spacing: 12,
builder: (context, hovered) => StatefulBuilder( children: [
builder: (context, setState) => MouseRegion( Avatar(
cursor: SystemMouseCursors.click, mxContent: avatar,
child: GestureDetector( name: profile?.name ?? roomLink,
onTap: () { size: Avatar.defaultSize * 1.5,
Clipboard.setData(ClipboardData(text: roomLink)); onTap: avatar != null
setState(() { ? () => showDialog(
copied = true; context: context,
}); builder: (_) => MxcImageViewer(avatar),
}, )
child: RichText( : null,
text: TextSpan( ),
children: [ Expanded(
WidgetSpan( child: Column(
child: Padding( crossAxisAlignment: .start,
padding: const EdgeInsets.only( children: [
right: 4.0, Text(
), profile?.name ??
child: AnimatedScale( roomLink ??
duration: profile?.roomId ??
FluffyThemes.animationDuration, ' - ',
curve: FluffyThemes.animationCurve, maxLines: 1,
scale: hovered overflow: .ellipsis,
? 1.33 style: TextStyle(fontSize: 16),
: copied ),
? 1.25 const SizedBox(height: 8),
: 1.0, if (roomLink != null)
child: Icon( HoverBuilder(
copied builder: (context, hovered) => StatefulBuilder(
? Icons.check_circle builder: (context, setState) => MouseRegion(
: Icons.copy, cursor: SystemMouseCursors.click,
size: 12, child: GestureDetector(
color: copied ? Colors.green : null, onTap: () {
Clipboard.setData(
ClipboardData(text: roomLink),
);
setState(() {
copied = true;
});
},
child: RichText(
text: TextSpan(
children: [
WidgetSpan(
child: Padding(
padding: const EdgeInsets.only(
right: 4.0,
),
child: AnimatedScale(
duration: FluffyThemes
.animationDuration,
curve: FluffyThemes
.animationCurve,
scale: hovered
? 1.33
: copied
? 1.25
: 1.0,
child: Icon(
copied
? Icons.check_circle
: Icons.copy,
size: 12,
color: copied
? Colors.green
: null,
),
),
),
),
TextSpan(text: roomLink),
],
style: theme.textTheme.bodyMedium
?.copyWith(fontSize: 10),
), ),
textAlign: TextAlign.center,
), ),
), ),
), ),
TextSpan(text: roomLink),
],
style: theme.textTheme.bodyMedium?.copyWith(
fontSize: 10,
), ),
), ),
textAlign: TextAlign.center,
if (profile?.numJoinedMembers != null)
Text(
L10n.of(context).countParticipants(
profile?.numJoinedMembers ?? 0,
),
style: const TextStyle(fontSize: 10),
textAlign: TextAlign.center,
),
],
),
),
],
),
if (topic != null && topic.isNotEmpty)
ConstrainedBox(
constraints: BoxConstraints(maxHeight: 200),
child: Scrollbar(
thumbVisibility: true,
trackVisibility: true,
child: SingleChildScrollView(
child: SelectableLinkify(
text: topic,
textScaleFactor: MediaQuery.textScalerOf(
context,
).scale(1),
textAlign: .start,
options: const LinkifyOptions(humanize: false),
linkStyle: TextStyle(
color: theme.colorScheme.primary,
decoration: TextDecoration.underline,
decorationColor: theme.colorScheme.primary,
), ),
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
), ),
), ),
), ),
), ),
Center(
child: Avatar( Row(
mxContent: avatar, mainAxisAlignment: .spaceBetween,
name: profile?.name ?? roomLink, spacing: 4,
size: Avatar.defaultSize * 2, children: [
onTap: avatar != null AdaptiveIconTextButton(
? () => showDialog( label: L10n.of(context).report,
context: context, icon: Icons.gavel_outlined,
builder: (_) => MxcImageViewer(avatar), onTap: () async {
) Navigator.of(context).pop();
: null, final reason = await showTextInputDialog(
context: context,
title: L10n.of(context).whyDoYouWantToReportThis,
okLabel: L10n.of(context).report,
cancelLabel: L10n.of(context).cancel,
hintText: L10n.of(context).reason,
);
if (reason == null || reason.isEmpty) return;
await showFutureLoadingDialog(
context: context,
future: () => Matrix.of(context).client.reportRoom(
chunk?.roomId ?? roomAlias!,
reason,
),
);
},
),
AdaptiveIconTextButton(
label: L10n.of(context).copy,
icon: Icons.copy_outlined,
onTap: () =>
Clipboard.setData(ClipboardData(text: roomLink!)),
),
AdaptiveIconTextButton(
label: L10n.of(context).share,
icon: Icons.adaptive.share,
onTap: () => FluffyShare.share(
'https://matrix.to/#/$roomLink',
context,
),
),
],
),
AdaptiveDialogInkWell(
onTap: () => _joinRoom(context),
child: Text(
chunk?.joinRule == 'knock' &&
Matrix.of(
context,
).client.getRoomById(chunk!.roomId) ==
null
? L10n.of(context).knock
: chunk?.roomType == 'm.space'
? L10n.of(context).joinSpace
: L10n.of(context).joinRoom,
style: TextStyle(color: theme.colorScheme.secondary),
), ),
), ),
if (profile?.numJoinedMembers != null)
Text(
L10n.of(
context,
).countParticipants(profile?.numJoinedMembers ?? 0),
style: const TextStyle(fontSize: 10),
textAlign: TextAlign.center,
),
if (topic != null && topic.isNotEmpty)
SelectableLinkify(
text: topic,
textScaleFactor: MediaQuery.textScalerOf(
context,
).scale(1),
textAlign: TextAlign.center,
options: const LinkifyOptions(humanize: false),
linkStyle: TextStyle(
color: theme.colorScheme.primary,
decoration: TextDecoration.underline,
decorationColor: theme.colorScheme.primary,
),
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
),
], ],
), ),
); );
}, },
), ),
), ),
actions: [
AdaptiveDialogAction(
bigButtons: true,
borderRadius: AdaptiveDialogAction.topRadius,
onPressed: () => _joinRoom(context),
child: Text(
chunk?.joinRule == 'knock' &&
Matrix.of(context).client.getRoomById(chunk!.roomId) == null
? L10n.of(context).knock
: chunk?.roomType == 'm.space'
? L10n.of(context).joinSpace
: L10n.of(context).joinRoom,
),
),
AdaptiveDialogAction(
bigButtons: true,
borderRadius: AdaptiveDialogAction.bottomRadius,
onPressed: Navigator.of(context).pop,
child: Text(L10n.of(context).close),
),
],
); );
} }
} }

View file

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -6,11 +5,11 @@ import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/date_time_extension.dart';
import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/fluffy_share.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart';
import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/presence_builder.dart'; import 'package:fluffychat/widgets/presence_builder.dart';
@ -20,6 +19,8 @@ import '../hover_builder.dart';
import '../matrix.dart'; import '../matrix.dart';
import '../mxc_image_viewer.dart'; import '../mxc_image_viewer.dart';
// ignore: unused_import
class UserDialog extends StatelessWidget { class UserDialog extends StatelessWidget {
static Future<void> show({ static Future<void> show({
required BuildContext context, required BuildContext context,
@ -162,23 +163,35 @@ class UserDialog extends StatelessWidget {
), ),
if (statusMsg != null) if (statusMsg != null)
SelectableLinkify( ConstrainedBox(
text: statusMsg, constraints: BoxConstraints(maxHeight: 200),
textScaleFactor: MediaQuery.textScalerOf(context).scale(1), child: Scrollbar(
textAlign: TextAlign.start, thumbVisibility: true,
options: const LinkifyOptions(humanize: false), trackVisibility: true,
linkStyle: TextStyle( child: SingleChildScrollView(
color: theme.colorScheme.primary, child: SelectableLinkify(
decoration: TextDecoration.underline, text: statusMsg,
decorationColor: theme.colorScheme.primary, textScaleFactor: MediaQuery.textScalerOf(
context,
).scale(1),
textAlign: TextAlign.start,
options: const LinkifyOptions(humanize: false),
linkStyle: TextStyle(
color: theme.colorScheme.primary,
decoration: TextDecoration.underline,
decorationColor: theme.colorScheme.primary,
),
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
),
),
), ),
onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
), ),
Row( Row(
mainAxisAlignment: .spaceBetween, mainAxisAlignment: .spaceBetween,
spacing: 4, spacing: 4,
children: [ children: [
_AdaptiveIconTextButton( AdaptiveIconTextButton(
label: L10n.of(context).block, label: L10n.of(context).block,
icon: Icons.block_outlined, icon: Icons.block_outlined,
onTap: () { onTap: () {
@ -190,7 +203,7 @@ class UserDialog extends StatelessWidget {
); );
}, },
), ),
_AdaptiveIconTextButton( AdaptiveIconTextButton(
label: L10n.of(context).report, label: L10n.of(context).report,
icon: Icons.gavel_outlined, icon: Icons.gavel_outlined,
onTap: () async { onTap: () async {
@ -211,14 +224,14 @@ class UserDialog extends StatelessWidget {
); );
}, },
), ),
_AdaptiveIconTextButton( AdaptiveIconTextButton(
label: L10n.of(context).share, label: L10n.of(context).share,
icon: Icons.adaptive.share, icon: Icons.adaptive.share,
onTap: () => FluffyShare.share(profile.userId, context), onTap: () => FluffyShare.share(profile.userId, context),
), ),
], ],
), ),
_AdaptiveDialogInkWell( AdaptiveDialogInkWell(
onTap: () async { onTap: () async {
final router = GoRouter.of(context); final router = GoRouter.of(context);
final roomIdResult = await showFutureLoadingDialog( final roomIdResult = await showFutureLoadingDialog(
@ -242,68 +255,3 @@ class UserDialog extends StatelessWidget {
); );
} }
} }
class _AdaptiveDialogInkWell extends StatelessWidget {
final Widget child;
final VoidCallback onTap;
const _AdaptiveDialogInkWell({required this.onTap, required this.child});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if ({TargetPlatform.iOS, TargetPlatform.macOS}.contains(theme.platform)) {
return CupertinoButton(
onPressed: onTap,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
color: theme.colorScheme.surfaceBright,
padding: EdgeInsets.all(8),
child: child,
);
}
return Material(
color: theme.colorScheme.surfaceBright,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
child: InkWell(
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
onTap: onTap,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Center(child: child),
),
),
);
}
}
class _AdaptiveIconTextButton extends StatelessWidget {
final String label;
final IconData icon;
final VoidCallback onTap;
const _AdaptiveIconTextButton({
required this.label,
required this.icon,
required this.onTap,
});
@override
Widget build(BuildContext context) {
final color = Theme.of(context).colorScheme.secondary;
return Expanded(
child: _AdaptiveDialogInkWell(
onTap: onTap,
child: Column(
mainAxisSize: .min,
children: [
Icon(icon, color: color),
Text(
label,
style: TextStyle(fontSize: 12, color: color),
maxLines: 1,
overflow: .ellipsis,
),
],
),
),
);
}
}