HyperNet/Surface
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💄 Optimize chat style

Browse Source
This commit is contained in:
LittleSheep 2025-03-03 21:13:19 +08:00
parent 2b61c372f5
commit 4f47cd2c0c
3 changed files with 111 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/widgets/attachment/attachment_item.dart
View File

@ -16,6 +16,7 @@ import 'package:surface/providers/sn_network.dart';
import 'package:surface/types/attachment.dart'; import 'package:surface/types/attachment.dart';
import 'package:surface/widgets/universal_image.dart'; import 'package:surface/widgets/universal_image.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
import 'package:surface/widgets/dialog.dart';
class AttachmentItem extends StatelessWidget { class AttachmentItem extends StatelessWidget {
final SnAttachment? data; final SnAttachment? data;
@ -289,6 +290,7 @@ class _AttachmentItemContentVideoState extends State<_AttachmentItemContentVideo
shadows: labelShadows, shadows: labelShadows,
color: Colors.white, color: Colors.white,
), ),
maxLines: 1,
), ),
], ],
), ),
@ -480,12 +482,13 @@ class _AttachmentItemContentAudioState extends State<_AttachmentItemContentAudio
), ),
), ),
Text( Text(
widget.data.size.toString(), widget.data.size.formatBytes(),
style: GoogleFonts.robotoMono( style: GoogleFonts.robotoMono(
fontSize: 12, fontSize: 12,
shadows: labelShadows, shadows: labelShadows,
color: Colors.white, color: Colors.white,
), ),
maxLines: 1,
), ),
], ],
), ),

135
lib/widgets/attachment/attachment_list.dart
View File

@ -42,10 +42,7 @@ class AttachmentList extends StatefulWidget {
} }
class _AttachmentListState extends State<AttachmentList> { class _AttachmentListState extends State<AttachmentList> {
late final List<String> heroTags = List.generate( late final List<String> heroTags = List.generate(widget.data.length, (_) => const Uuid().v4());
widget.data.length,
(_) => const Uuid().v4(),
);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -61,13 +58,13 @@ class _AttachmentListState extends State<AttachmentList> {
if (widget.data.isEmpty) return const SizedBox.shrink(); if (widget.data.isEmpty) return const SizedBox.shrink();
if (widget.data.length == 1) { if (widget.data.length == 1) {
final singleAspectRatio = widget.data[0]?.data['ratio']?.toDouble() ?? final singleAspectRatio =
widget.data[0]?.data['ratio']?.toDouble() ??
switch (widget.data[0]?.mimetype.split('/').firstOrNull) { switch (widget.data[0]?.mimetype.split('/').firstOrNull) {
'audio' => 16 / 9, 'audio' => 16 / 9,
'video' => 16 / 9, 'video' => 16 / 9,
_ => 1, _ => 1,
} }.toDouble();
.toDouble();
return Container( return Container(
padding: widget.padding ?? EdgeInsets.zero, padding: widget.padding ?? EdgeInsets.zero,
@ -83,11 +80,7 @@ class _AttachmentListState extends State<AttachmentList> {
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
child: AttachmentItem( child: AttachmentItem(data: widget.data[0], heroTag: heroTags[0], fit: widget.fit),
data: widget.data[0],
heroTag: heroTags[0],
fit: widget.fit,
),
), ),
), ),
), ),
@ -115,10 +108,7 @@ class _AttachmentListState extends State<AttachmentList> {
margin: widget.padding ?? EdgeInsets.zero, margin: widget.padding ?? EdgeInsets.zero,
decoration: BoxDecoration( decoration: BoxDecoration(
color: backgroundColor, color: backgroundColor,
border: Border( border: Border(top: borderSide, bottom: borderSide),
top: borderSide,
bottom: borderSide,
),
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
), ),
child: ClipRRect( child: ClipRRect(
@ -127,32 +117,29 @@ class _AttachmentListState extends State<AttachmentList> {
crossAxisCount: math.min(widget.data.length, 2), crossAxisCount: math.min(widget.data.length, 2),
crossAxisSpacing: 4, crossAxisSpacing: 4,
mainAxisSpacing: 4, mainAxisSpacing: 4,
children: widget.data children:
.mapIndexed( widget.data
(idx, ele) => GestureDetector( .mapIndexed(
child: Container( (idx, ele) => GestureDetector(
constraints: constraints, child: Container(
child: AttachmentItem( constraints: constraints,
data: ele, child: AttachmentItem(data: ele, heroTag: heroTags[idx], fit: BoxFit.cover),
heroTag: heroTags[idx],
fit: BoxFit.cover,
),
),
onTap: () {
if (widget.data[idx]!.mediaType != SnMediaType.image) return;
context.pushTransparentRoute(
AttachmentZoomView(
data: widget.data.where((ele) => ele != null).cast(),
initialIndex: idx,
heroTags: heroTags,
), ),
backgroundColor: Colors.black.withOpacity(0.7), onTap: () {
rootNavigator: true, if (widget.data[idx]!.mediaType != SnMediaType.image) return;
); context.pushTransparentRoute(
}, AttachmentZoomView(
), data: widget.data.where((ele) => ele != null).cast(),
) initialIndex: idx,
.toList(), heroTags: heroTags,
),
backgroundColor: Colors.black.withOpacity(0.7),
rootNavigator: true,
);
},
),
)
.toList(),
), ),
), ),
); );
@ -163,43 +150,37 @@ class _AttachmentListState extends State<AttachmentList> {
margin: widget.padding ?? EdgeInsets.zero, margin: widget.padding ?? EdgeInsets.zero,
decoration: BoxDecoration( decoration: BoxDecoration(
color: backgroundColor, color: backgroundColor,
border: Border( border: Border(top: borderSide, bottom: borderSide),
top: borderSide,
bottom: borderSide,
),
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
child: Column( child: Column(
children: widget.data children:
.mapIndexed( widget.data
(idx, ele) => GestureDetector( .mapIndexed(
child: AspectRatio( (idx, ele) => GestureDetector(
aspectRatio: ele?.data['ratio']?.toDouble() ?? 1, child: AspectRatio(
child: Container( aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
constraints: constraints, child: Container(
child: AttachmentItem( constraints: constraints,
data: ele, child: AttachmentItem(data: ele, heroTag: heroTags[idx], fit: BoxFit.cover),
heroTag: heroTags[idx], ),
fit: BoxFit.cover,
), ),
), ),
), )
), .expand((ele) => [ele, const Divider(height: 1)])
) .toList()
.expand((ele) => [ele, const Divider(height: 1)]) ..removeLast(),
.toList()
..removeLast(),
), ),
), ),
); );
} }
return AspectRatio( return Container(
aspectRatio: widget.data[0]?.data['ratio']?.toDouble() ?? 1, constraints: BoxConstraints(maxHeight: constraints.maxHeight),
child: Container( child: AspectRatio(
constraints: BoxConstraints(maxHeight: constraints.maxHeight), aspectRatio: widget.data[0]?.data['ratio']?.toDouble() ?? 1,
child: ScrollConfiguration( child: ScrollConfiguration(
behavior: _AttachmentListScrollBehavior(), behavior: _AttachmentListScrollBehavior(),
child: ListView.separated( child: ListView.separated(
@ -216,7 +197,8 @@ class _AttachmentListState extends State<AttachmentList> {
if (widget.data[idx]?.mediaType != SnMediaType.image) return; if (widget.data[idx]?.mediaType != SnMediaType.image) return;
context.pushTransparentRoute( context.pushTransparentRoute(
AttachmentZoomView( AttachmentZoomView(
data: widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(), data:
widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(),
initialIndex: idx, initialIndex: idx,
heroTags: heroTags, heroTags: heroTags,
), ),
@ -230,26 +212,18 @@ class _AttachmentListState extends State<AttachmentList> {
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: backgroundColor, color: backgroundColor,
border: Border( border: Border(top: borderSide, bottom: borderSide),
top: borderSide,
bottom: borderSide,
),
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: AttachmentList.kDefaultRadius, borderRadius: AttachmentList.kDefaultRadius,
child: AttachmentItem( child: AttachmentItem(data: widget.data[idx], heroTag: heroTags[idx]),
data: widget.data[idx],
heroTag: heroTags[idx],
),
), ),
), ),
Positioned( Positioned(
right: 8, right: 8,
bottom: 8, bottom: 8,
child: Chip( child: Chip(label: Text('${idx + 1}/${widget.data.length}')),
label: Text('${idx + 1}/${widget.data.length}'),
),
), ),
], ],
), ),
@ -271,8 +245,5 @@ class _AttachmentListState extends State<AttachmentList> {
class _AttachmentListScrollBehavior extends MaterialScrollBehavior { class _AttachmentListScrollBehavior extends MaterialScrollBehavior {
@override @override
Set<PointerDeviceKind> get dragDevices => { Set<PointerDeviceKind> get dragDevices => {PointerDeviceKind.touch, PointerDeviceKind.mouse};
PointerDeviceKind.touch,
PointerDeviceKind.mouse,
};
} }

163
lib/widgets/chat/chat_message.dart
View File

@ -106,37 +106,30 @@ class ChatMessage extends StatelessWidget {
GestureDetector( GestureDetector(
child: AccountImage( child: AccountImage(
content: user?.avatar, content: user?.avatar,
badge: (user?.badges.isNotEmpty ?? false) badge:
? Icon( (user?.badges.isNotEmpty ?? false)
kBadgesMeta[user!.badges.first.type]?.$2 ?? ? Icon(
Symbols.question_mark, kBadgesMeta[user!.badges.first.type]?.$2 ?? Symbols.question_mark,
color: kBadgesMeta[user.badges.first.type]?.$3, color: kBadgesMeta[user.badges.first.type]?.$3,
fill: 1, fill: 1,
size: 18, size: 18,
shadows: [ shadows: [
Shadow( Shadow(offset: Offset(1, 1), blurRadius: 5.0, color: Color.fromARGB(200, 0, 0, 0)),
offset: Offset(1, 1), ],
blurRadius: 5.0, )
color: Color.fromARGB(200, 0, 0, 0), : null,
),
],
)
: null,
), ),
onTap: () { onTap: () {
if (user == null) return; if (user == null) return;
showPopover( showPopover(
backgroundColor: backgroundColor: Theme.of(context).colorScheme.surface,
Theme.of(context).colorScheme.surface,
context: context, context: context,
transition: PopoverTransition.other, transition: PopoverTransition.other,
bodyBuilder: (context) => SizedBox( bodyBuilder:
width: math.min( (context) => SizedBox(
400, MediaQuery.of(context).size.width - 10), width: math.min(400, MediaQuery.of(context).size.width - 10),
child: AccountPopoverCard( child: AccountPopoverCard(data: user),
data: user, ),
),
),
direction: PopoverDirection.bottom, direction: PopoverDirection.bottom,
arrowHeight: 5, arrowHeight: 5,
arrowWidth: 15, arrowWidth: 15,
@ -157,64 +150,46 @@ class ChatMessage extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
if (isCompact) if (isCompact) AccountImage(content: user?.avatar, radius: 12).padding(right: 8),
AccountImage(
content: user?.avatar,
radius: 12,
).padding(right: 8),
Text( Text(
(data.sender.nick?.isNotEmpty ?? false) (data.sender.nick?.isNotEmpty ?? false) ? data.sender.nick! : user?.nick ?? 'unknown',
? data.sender.nick!
: user?.nick ?? 'unknown',
).bold(), ).bold(),
const Gap(8), const Gap(8),
Text( Text(dateFormatter.format(data.createdAt.toLocal())).fontSize(13),
dateFormatter
.format(data.createdAt.toLocal()),
).fontSize(13),
], ],
).height(21), ).height(21),
if (isCompact) const Gap(8), if (isCompact) const Gap(8),
if (data.preload?.quoteEvent != null) if (data.preload?.quoteEvent != null)
StyledWidget(Container( StyledWidget(
constraints: BoxConstraints( Container(
maxWidth: 360, constraints: BoxConstraints(maxWidth: 360),
), decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: const BorderRadius.all(Radius.circular(8)),
borderRadius: border: Border.all(color: Theme.of(context).dividerColor, width: 1),
const BorderRadius.all(Radius.circular(8)), ),
border: Border.all( padding: const EdgeInsets.only(left: 4, right: 4, top: 8, bottom: 6),
color: Theme.of(context).dividerColor, child: ChatMessage(
width: 1, data: data.preload!.quoteEvent!,
isCompact: true,
onReply: onReply,
onEdit: onEdit,
onDelete: onDelete,
), ),
), ),
padding: const EdgeInsets.only( ).padding(bottom: 4, top: 4),
left: 4,
right: 4,
top: 8,
bottom: 6,
),
child: ChatMessage(
data: data.preload!.quoteEvent!,
isCompact: true,
onReply: onReply,
onEdit: onEdit,
onDelete: onDelete,
),
)).padding(bottom: 4, top: 4),
switch (data.type) { switch (data.type) {
'messages.new' => _ChatMessageText( 'messages.new' => _ChatMessageText(
data: data, data: data,
onReply: onReply, onReply: onReply,
onEdit: onEdit, onEdit: onEdit,
onDelete: onDelete, onDelete: onDelete,
), ),
_ => _ChatMessageSystemNotify(data: data), _ => _ChatMessageSystemNotify(data: data),
}, },
], ],
), ),
), ),
) ),
], ],
).opacity(isPending ? 0.5 : 1), ).opacity(isPending ? 0.5 : 1),
), ),
@ -222,22 +197,16 @@ class ChatMessage extends StatelessWidget {
data.type == 'messages.new' && data.type == 'messages.new' &&
(data.body['text']?.isNotEmpty ?? false) && (data.body['text']?.isNotEmpty ?? false) &&
(cfg.prefs.getBool(kAppExpandChatLink) ?? true)) (cfg.prefs.getBool(kAppExpandChatLink) ?? true))
LinkPreviewWidget(text: data.body['text']!), LinkPreviewWidget(text: data.body['text']!).padding(left: 48),
if (data.preload?.attachments?.isNotEmpty ?? false) if (data.preload?.attachments?.isNotEmpty ?? false)
AttachmentList( AttachmentList(
data: data.preload!.attachments!, data: data.preload!.attachments!,
bordered: true, bordered: true,
maxHeight: 360, maxHeight: 360,
maxWidth: 480 - 48 - padding.left, maxWidth: 480 - 48 - padding.left,
padding: padding.copyWith( padding: padding.copyWith(top: 8, left: isCompact ? padding.left : 48 + padding.left),
top: 8,
left: isCompact ? padding.left : 48 + padding.left,
),
), ),
if (!hasMerged && !isCompact) if (!hasMerged && !isCompact) const Gap(12) else if (!isCompact) const Gap(8),
const Gap(12)
else if (!isCompact)
const Gap(8),
], ],
), ),
), ),
@ -251,8 +220,7 @@ class _ChatMessageText extends StatelessWidget {
final Function(SnChatMessage)? onEdit; final Function(SnChatMessage)? onEdit;
final Function(SnChatMessage)? onDelete; final Function(SnChatMessage)? onDelete;
const _ChatMessageText( const _ChatMessageText({required this.data, this.onReply, this.onEdit, this.onDelete});
{required this.data, this.onReply, this.onEdit, this.onDelete});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -266,8 +234,7 @@ class _ChatMessageText extends StatelessWidget {
children: [ children: [
SelectionArea( SelectionArea(
contextMenuBuilder: (context, editableTextState) { contextMenuBuilder: (context, editableTextState) {
final List<ContextMenuButtonItem> items = final List<ContextMenuButtonItem> items = editableTextState.contextMenuButtonItems;
editableTextState.contextMenuButtonItems;
if (onReply != null) { if (onReply != null) {
items.insert( items.insert(
@ -314,14 +281,10 @@ class _ChatMessageText extends StatelessWidget {
child: MarkdownTextContent( child: MarkdownTextContent(
content: data.body['text'], content: data.body['text'],
isAutoWarp: true, isAutoWarp: true,
isEnlargeSticker: isEnlargeSticker: RegExp(r"^:([-\w]+):$").hasMatch(data.body['text'] ?? ''),
RegExp(r"^:([-\w]+):$").hasMatch(data.body['text'] ?? ''),
), ),
), ),
if (data.updatedAt != data.createdAt) if (data.updatedAt != data.createdAt) Text('messageEditedHint'.tr()).fontSize(13).opacity(0.75),
Text(
'messageEditedHint'.tr(),
).fontSize(13).opacity(0.75),
], ],
); );
} else if (data.body['attachments']?.isNotEmpty) { } else if (data.body['attachments']?.isNotEmpty) {
@ -329,11 +292,7 @@ class _ChatMessageText extends StatelessWidget {
children: [ children: [
const Icon(Symbols.file_present, size: 20), const Icon(Symbols.file_present, size: 20),
const Gap(4), const Gap(4),
Text( Text('messageFileHint'.plural(data.body['attachments']!.length)),
'messageFileHint'.plural(
data.body['attachments']!.length,
),
),
], ],
).opacity(0.75); ).opacity(0.75);
} }
@ -363,9 +322,7 @@ class _ChatMessageSystemNotify extends StatelessWidget {
children: [ children: [
const Icon(Symbols.edit, size: 20), const Icon(Symbols.edit, size: 20),
const Gap(4), const Gap(4),
Text( Text('messageEdited'.tr(args: ['#${data.relatedEventId}'])),
'messageEdited'.tr(args: ['#${data.relatedEventId}']),
),
], ],
).opacity(0.75); ).opacity(0.75);
case 'messages.delete': case 'messages.delete':
@ -373,31 +330,19 @@ class _ChatMessageSystemNotify extends StatelessWidget {
children: [ children: [
const Icon(Symbols.delete, size: 20), const Icon(Symbols.delete, size: 20),
const Gap(4), const Gap(4),
Text( Text('messageDeleted'.tr(args: ['#${data.relatedEventId}'])),
'messageDeleted'.tr(args: ['#${data.relatedEventId}']),
),
], ],
).opacity(0.75); ).opacity(0.75);
case 'calls.start': case 'calls.start':
return Row( return Row(
children: [ children: [const Icon(Symbols.call, size: 20), const Gap(4), Text('callMessageStarted'.tr())],
const Icon(Symbols.call, size: 20),
const Gap(4),
Text(
'callMessageStarted'.tr(),
),
],
).opacity(0.75); ).opacity(0.75);
case 'calls.end': case 'calls.end':
return Row( return Row(
children: [ children: [
const Icon(Symbols.call_end, size: 20), const Icon(Symbols.call_end, size: 20),
const Gap(4), const Gap(4),
Text( Text('callMessageEnded'.tr(args: [_formatDuration(Duration(seconds: data.body['last']))])),
'callMessageEnded'.tr(args: [
_formatDuration(Duration(seconds: data.body['last'])),
]),
),
], ],
).opacity(0.75); ).opacity(0.75);
default: default: