2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Adjust design of adaptive dialogs

Browse source
This commit is contained in:
krille-chan 2025-02-04 21:13:37 +01:00
commit fba44d9946
No known key found for this signature in database
3 changed files with 102 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart
View file

@ -1,7 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:fluffychat/utils/url_launcher.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
enum OkCancelResult { ok, cancel } enum OkCancelResult { ok, cancel }
@ -25,7 +27,17 @@ Future<OkCancelResult?> showOkCancelAlertDialog({
), ),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256), constraints: const BoxConstraints(maxWidth: 256),
child: message == null ? null : Text(message), child: message == null
? null
: SelectableLinkify(
text: message,
linkStyle: TextStyle(
color: Theme.of(context).colorScheme.primary,
decorationColor: Theme.of(context).colorScheme.primary,
),
options: const LinkifyOptions(humanize: false),
onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
),
), ),
actions: [ actions: [
AdaptiveDialogAction( AdaptiveDialogAction(
@ -65,7 +77,17 @@ Future<OkCancelResult?> showOkAlertDialog({
), ),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256), constraints: const BoxConstraints(maxWidth: 256),
child: message == null ? null : Text(message), child: message == null
? null
: SelectableLinkify(
text: message,
linkStyle: TextStyle(
color: Theme.of(context).colorScheme.primary,
decorationColor: Theme.of(context).colorScheme.primary,
),
options: const LinkifyOptions(humanize: false),
onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
),
), ),
actions: [ actions: [
AdaptiveDialogAction( AdaptiveDialogAction(

18
lib/widgets/adaptive_dialogs/show_text_input_dialog.dart
View file

@ -2,7 +2,9 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:fluffychat/utils/url_launcher.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
Future<String?> showTextInputDialog({ Future<String?> showTextInputDialog({
@ -40,13 +42,20 @@ Future<String?> showTextInputDialog({
constraints: const BoxConstraints(maxWidth: 256), constraints: const BoxConstraints(maxWidth: 256),
child: Text(title), child: Text(title),
), ),
content: Column( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256),
child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
if (message != null) if (message != null)
ConstrainedBox( SelectableLinkify(
constraints: const BoxConstraints(maxWidth: 256), text: message,
child: Text(message), linkStyle: TextStyle(
color: Theme.of(context).colorScheme.primary,
decorationColor: Theme.of(context).colorScheme.primary,
),
options: const LinkifyOptions(humanize: false),
onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
ValueListenableBuilder<String?>( ValueListenableBuilder<String?>(
@ -108,6 +117,7 @@ Future<String?> showTextInputDialog({
), ),
], ],
), ),
),
actions: [ actions: [
AdaptiveDialogAction( AdaptiveDialogAction(
onPressed: () => Navigator.of(context).pop(null), onPressed: () => Navigator.of(context).pop(null),

6
lib/widgets/public_room_bottom_sheet.dart
View file

@ -210,9 +210,9 @@ class PublicRoomBottomSheet extends StatelessWidget {
ListTile( ListTile(
subtitle: SelectableLinkify( subtitle: SelectableLinkify(
text: profile!.topic!, text: profile!.topic!,
linkStyle: const TextStyle( linkStyle: TextStyle(
color: Colors.blueAccent, color: theme.colorScheme.primary,
decorationColor: Colors.blueAccent, decorationColor: theme.colorScheme.primary,
), ),
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,