Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-10 06:25:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: Follow up select event

Browse source
This commit is contained in:
krille-chan 2023-11-11 09:54:34 +01:00
parent dc2204d8b6
commit 41ae97fb8a
No known key found for this signature in database
1 changed files with 172 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

362
lib/pages/chat/events/message.dart
View file

@ -10,7 +10,6 @@ import 'package:fluffychat/utils/string_color.dart';
import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
import '../../../config/app_config.dart'; import '../../../config/app_config.dart';
import '../../../widgets/hover_builder.dart';
import 'message_content.dart'; import 'message_content.dart';
import 'message_reactions.dart'; import 'message_reactions.dart';
import 'reply_content.dart'; import 'reply_content.dart';
@ -21,10 +20,10 @@ class Message extends StatelessWidget {
final Event event; final Event event;
final Event? nextEvent; final Event? nextEvent;
final bool displayReadMarker; final bool displayReadMarker;
final void Function(Event)? onSelect; final void Function(Event) onSelect;
final void Function(Event)? onAvatarTab; final void Function(Event) onAvatarTab;
final void Function(Event)? onInfoTab; final void Function(Event) onInfoTab;
final void Function(String)? scrollToEventId; final void Function(String) scrollToEventId;
final void Function() onSwipe; final void Function() onSwipe;
final bool longPressSelect; final bool longPressSelect;
final bool selected; final bool selected;
@ -35,10 +34,10 @@ class Message extends StatelessWidget {
this.nextEvent, this.nextEvent,
this.displayReadMarker = false, this.displayReadMarker = false,
this.longPressSelect = false, this.longPressSelect = false,
this.onSelect, required this.onSelect,
this.onInfoTab, required this.onInfoTab,
this.onAvatarTab, required this.onAvatarTab,
this.scrollToEventId, required this.scrollToEventId,
required this.onSwipe, required this.onSwipe,
this.selected = false, this.selected = false,
required this.timeline, required this.timeline,
@ -114,185 +113,171 @@ class Message extends StatelessWidget {
: Theme.of(context).colorScheme.primaryContainer; : Theme.of(context).colorScheme.primaryContainer;
} }
final row = HoverBuilder( final row = Row(
builder: (context, hovered) => Row( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: rowMainAxisAlignment,
mainAxisAlignment: rowMainAxisAlignment, children: [
children: [ if (sameSender || ownMessage)
if (hovered || selected) SizedBox(
SizedBox( width: Avatar.defaultSize,
width: Avatar.defaultSize, child: Center(
height: Avatar.defaultSize - 8, child: SizedBox(
child: Checkbox.adaptive( width: 16,
value: selected, height: 16,
onChanged: (_) => onSelect?.call(event), child: event.status == EventStatus.sending
? const CircularProgressIndicator.adaptive(
strokeWidth: 2,
)
: event.status == EventStatus.error
? const Icon(Icons.error, color: Colors.red)
: null,
), ),
)
else if (sameSender || ownMessage)
SizedBox(
width: Avatar.defaultSize,
child: Center(
child: SizedBox(
width: 16,
height: 16,
child: event.status == EventStatus.sending
? const CircularProgressIndicator.adaptive(
strokeWidth: 2,
)
: event.status == EventStatus.error
? const Icon(Icons.error, color: Colors.red)
: null,
),
),
)
else
FutureBuilder<User?>(
future: event.fetchSenderUser(),
builder: (context, snapshot) {
final user = snapshot.data ?? event.senderFromMemoryOrFallback;
return Avatar(
mxContent: user.avatarUrl,
name: user.calcDisplayname(),
onTap: () => onAvatarTab!(event),
);
},
), ),
Expanded( )
child: Column( else
crossAxisAlignment: CrossAxisAlignment.start, FutureBuilder<User?>(
mainAxisSize: MainAxisSize.min, future: event.fetchSenderUser(),
children: [ builder: (context, snapshot) {
if (!sameSender) final user = snapshot.data ?? event.senderFromMemoryOrFallback;
Padding( return Avatar(
padding: const EdgeInsets.only(left: 8.0, bottom: 4), mxContent: user.avatarUrl,
child: ownMessage || event.room.isDirectChat name: user.calcDisplayname(),
? const SizedBox(height: 12) onTap: () => onAvatarTab(event),
: FutureBuilder<User?>( );
future: event.fetchSenderUser(), },
builder: (context, snapshot) { ),
final displayname = Expanded(
snapshot.data?.calcDisplayname() ?? child: Column(
event.senderFromMemoryOrFallback crossAxisAlignment: CrossAxisAlignment.start,
.calcDisplayname(); mainAxisSize: MainAxisSize.min,
return Text( children: [
displayname, if (!sameSender)
style: TextStyle( Padding(
fontSize: 12, padding: const EdgeInsets.only(left: 8.0, bottom: 4),
fontWeight: FontWeight.bold, child: ownMessage || event.room.isDirectChat
color: (Theme.of(context).brightness == ? const SizedBox(height: 12)
Brightness.light : FutureBuilder<User?>(
? displayname.color future: event.fetchSenderUser(),
: displayname.lightColorText), builder: (context, snapshot) {
final displayname =
snapshot.data?.calcDisplayname() ??
event.senderFromMemoryOrFallback
.calcDisplayname();
return Text(
displayname,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: (Theme.of(context).brightness ==
Brightness.light
? displayname.color
: displayname.lightColorText),
),
);
},
),
),
Container(
alignment: alignment,
padding: const EdgeInsets.only(left: 8),
child: Material(
color: noBubble ? Colors.transparent : color,
borderRadius: borderRadius,
clipBehavior: Clip.antiAlias,
child: Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(AppConfig.borderRadius),
),
padding: noBubble || noPadding
? EdgeInsets.zero
: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 8,
),
constraints: const BoxConstraints(
maxWidth: FluffyThemes.columnWidth * 1.5,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
if (event.relationshipType == RelationshipTypes.reply)
FutureBuilder<Event?>(
future: event.getReplyEvent(timeline),
builder: (BuildContext context, snapshot) {
final replyEvent = snapshot.hasData
? snapshot.data!
: Event(
eventId: event.relationshipEventId!,
content: {
'msgtype': 'm.text',
'body': '...',
},
senderId: event.senderId,
type: 'm.room.message',
room: event.room,
status: EventStatus.sent,
originServerTs: DateTime.now(),
);
return InkWell(
onTap: () =>
scrollToEventId(replyEvent.eventId),
child: AbsorbPointer(
child: Container(
margin: const EdgeInsets.symmetric(
vertical: 4.0,
),
child: ReplyContent(
replyEvent,
ownMessage: ownMessage,
timeline: timeline,
),
),
), ),
); );
}, },
), ),
), MessageContent(
Container( displayEvent,
alignment: alignment, textColor: textColor,
padding: const EdgeInsets.only(left: 8), onInfoTab: onInfoTab,
child: Material( ),
color: noBubble ? Colors.transparent : color, if (event.hasAggregatedEvents(
borderRadius: borderRadius, timeline,
clipBehavior: Clip.antiAlias, RelationshipTypes.edit,
child: Container( ))
decoration: BoxDecoration( Padding(
borderRadius: padding: const EdgeInsets.only(
BorderRadius.circular(AppConfig.borderRadius), top: 4.0,
),
padding: noBubble || noPadding
? EdgeInsets.zero
: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 8,
), ),
constraints: const BoxConstraints( child: Row(
maxWidth: FluffyThemes.columnWidth * 1.5, mainAxisSize: MainAxisSize.min,
), children: [
child: Column( Icon(
mainAxisSize: MainAxisSize.min, Icons.edit_outlined,
crossAxisAlignment: CrossAxisAlignment.start, color: textColor.withAlpha(164),
children: <Widget>[ size: 14,
if (event.relationshipType == RelationshipTypes.reply) ),
FutureBuilder<Event?>( Text(
future: event.getReplyEvent(timeline), ' - ${displayEvent.originServerTs.localizedTimeShort(context)}',
builder: (BuildContext context, snapshot) { style: TextStyle(
final replyEvent = snapshot.hasData
? snapshot.data!
: Event(
eventId: event.relationshipEventId!,
content: {
'msgtype': 'm.text',
'body': '...',
},
senderId: event.senderId,
type: 'm.room.message',
room: event.room,
status: EventStatus.sent,
originServerTs: DateTime.now(),
);
return InkWell(
onTap: () {
if (scrollToEventId != null) {
scrollToEventId!(replyEvent.eventId);
}
},
child: AbsorbPointer(
child: Container(
margin: const EdgeInsets.symmetric(
vertical: 4.0,
),
child: ReplyContent(
replyEvent,
ownMessage: ownMessage,
timeline: timeline,
),
),
),
);
},
),
MessageContent(
displayEvent,
textColor: textColor,
onInfoTab: onInfoTab,
),
if (event.hasAggregatedEvents(
timeline,
RelationshipTypes.edit,
))
Padding(
padding: const EdgeInsets.only(
top: 4.0,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.edit_outlined,
color: textColor.withAlpha(164), color: textColor.withAlpha(164),
size: 14, fontSize: 12,
), ),
Text( ),
' - ${displayEvent.originServerTs.localizedTimeShort(context)}', ],
style: TextStyle(
color: textColor.withAlpha(164),
fontSize: 12,
),
),
],
),
), ),
], ),
), ],
), ),
), ),
), ),
], ),
), ],
), ),
], ),
), ],
); );
Widget container; Widget container;
if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction) || if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction) ||
@ -391,23 +376,20 @@ class Message extends StatelessWidget {
), ),
direction: SwipeDirection.endToStart, direction: SwipeDirection.endToStart,
onSwipe: (_) => onSwipe(), onSwipe: (_) => onSwipe(),
child: Center( child: InkWell(
child: InkWell( onTap: () => onSelect(event),
onTap: longPressSelect ? () => onSelect!(event) : null, child: Container(
onLongPress: () => onSelect!(event), color: selected
child: Container( ? Theme.of(context).primaryColor.withAlpha(100)
color: selected : Theme.of(context).primaryColor.withAlpha(0),
? Theme.of(context).primaryColor.withAlpha(100) constraints: const BoxConstraints(
: Theme.of(context).primaryColor.withAlpha(0), maxWidth: FluffyThemes.columnWidth * 2.5,
constraints: const BoxConstraints(
maxWidth: FluffyThemes.columnWidth * 2.5,
),
padding: const EdgeInsets.symmetric(
horizontal: 8.0,
vertical: 4.0,
),
child: container,
), ),
padding: const EdgeInsets.symmetric(
horizontal: 8.0,
vertical: 4.0,
),
child: container,
), ),
), ),
); );