From 8db9a05071c51e51b0acacefb03af47b2ab0d926 Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 10 Apr 2025 19:22:24 +0200 Subject: [PATCH] chore: Follow up dialog themes Signed-off-by: Krille --- lib/widgets/adaptive_dialogs/user_dialog.dart | 187 +++++++++--------- lib/widgets/permission_slider_dialog.dart | 41 ++-- 2 files changed, 121 insertions(+), 107 deletions(-) diff --git a/lib/widgets/adaptive_dialogs/user_dialog.dart b/lib/widgets/adaptive_dialogs/user_dialog.dart index 7dbfb5297..c3645e426 100644 --- a/lib/widgets/adaptive_dialogs/user_dialog.dart +++ b/lib/widgets/adaptive_dialogs/user_dialog.dart @@ -1,16 +1,15 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/presence_builder.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + import '../../utils/url_launcher.dart'; import '../future_loading_dialog.dart'; import '../hover_builder.dart'; @@ -45,93 +44,105 @@ class UserDialog extends StatelessWidget { var copied = false; final theme = Theme.of(context); return AlertDialog.adaptive( - title: Center(child: Text(displayname, textAlign: TextAlign.center)), - content: SelectionArea( - child: PresenceBuilder( - userId: profile.userId, - client: Matrix.of(context).client, - builder: (context, presence) { - if (presence == null) return const SizedBox.shrink(); - final statusMsg = presence.statusMsg; - final lastActiveTimestamp = presence.lastActiveTimestamp; - final presenceText = presence.currentlyActive == true - ? L10n.of(context).currentlyActive - : lastActiveTimestamp != null - ? L10n.of(context).lastActiveAgo( - lastActiveTimestamp.localizedTimeShort(context), - ) - : null; - return Column( - spacing: 8, - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - HoverBuilder( - builder: (context, hovered) => StatefulBuilder( - builder: (context, setState) => GestureDetector( - onTap: () { - Clipboard.setData(ClipboardData(text: profile.userId)); - 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, + title: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 256), + child: Center(child: Text(displayname, textAlign: TextAlign.center)), + ), + content: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 256), + child: SelectionArea( + child: Center( + child: PresenceBuilder( + userId: profile.userId, + client: Matrix.of(context).client, + builder: (context, presence) { + if (presence == null) return const SizedBox.shrink(); + final statusMsg = presence.statusMsg; + final lastActiveTimestamp = presence.lastActiveTimestamp; + final presenceText = presence.currentlyActive == true + ? L10n.of(context).currentlyActive + : lastActiveTimestamp != null + ? L10n.of(context).lastActiveAgo( + lastActiveTimestamp.localizedTimeShort(context), + ) + : null; + return Column( + spacing: 8, + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + HoverBuilder( + builder: (context, hovered) => StatefulBuilder( + builder: (context, setState) => GestureDetector( + onTap: () { + Clipboard.setData( + ClipboardData(text: profile.userId)); + 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: profile.userId), + ], + style: theme.textTheme.bodyMedium + ?.copyWith(fontSize: 10), ), - TextSpan(text: profile.userId), - ], - style: theme.textTheme.bodyMedium - ?.copyWith(fontSize: 10), + textAlign: TextAlign.center, + ), ), - textAlign: TextAlign.center, ), ), - ), - ), - Avatar( - mxContent: profile.avatarUrl, - name: displayname, - size: Avatar.defaultSize * 2, - ), - if (presenceText != null) - Text( - presenceText, - style: const TextStyle(fontSize: 10), - ), - if (statusMsg != null) - Linkify( - text: statusMsg, - textAlign: TextAlign.center, - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: theme.colorScheme.primary, - decoration: TextDecoration.underline, - decorationColor: theme.colorScheme.primary, + Avatar( + mxContent: profile.avatarUrl, + name: displayname, + size: Avatar.defaultSize * 2, ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), - ), - ], - ); - }, + if (presenceText != null) + Text( + presenceText, + style: const TextStyle(fontSize: 10), + ), + if (statusMsg != null) + Linkify( + text: statusMsg, + 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: [ diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index 706ff382a..e76096bcd 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -1,9 +1,7 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/dialog_text_field.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; Future showPermissionChooser( BuildContext context, { @@ -16,22 +14,27 @@ Future showPermissionChooser( context: context, builder: (context) => AlertDialog.adaptive( title: Text(L10n.of(context).chatPermissions), - content: Column( - mainAxisSize: MainAxisSize.min, - spacing: 12.0, - children: [ - Text(L10n.of(context).setPermissionsLevelDescription), - ValueListenableBuilder( - valueListenable: error, - builder: (context, errorText, _) => DialogTextField( - controller: controller, - hintText: currentLevel.toString(), - keyboardType: TextInputType.number, - labelText: L10n.of(context).custom, - errorText: errorText, - ), + content: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 256), + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + spacing: 12.0, + children: [ + Text(L10n.of(context).setPermissionsLevelDescription), + ValueListenableBuilder( + valueListenable: error, + builder: (context, errorText, _) => DialogTextField( + controller: controller, + hintText: currentLevel.toString(), + keyboardType: TextInputType.number, + labelText: L10n.of(context).custom, + errorText: errorText, + ), + ), + ], ), - ], + ), ), actions: [ AdaptiveDialogAction(