aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Follow up animate in

Browse Source
pull/754/head
krille-chan 2 years ago
parent f07aba448d
commit 627f7b88d4
No known key found for this signature in database
1 changed files with 269 additions and 259 deletions
Show Stats Download Patch File Download Diff File

528
lib/pages/chat/events/message.dart
Unescape Escape View File

@ -122,183 +122,215 @@ class Message extends StatelessWidget {
: Theme.of(context).colorScheme.primaryContainer; : Theme.of(context).colorScheme.primaryContainer;
} }
final row = Row( final resetAnimateIn = this.resetAnimateIn;
crossAxisAlignment: CrossAxisAlignment.start, var animateIn = this.animateIn;
mainAxisAlignment: rowMainAxisAlignment,
children: [ final row = StatefulBuilder(
if (sameSender || ownMessage) builder: (context, setState) {
SizedBox( if (animateIn && resetAnimateIn != null) {
width: Avatar.defaultSize, WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
child: Center( animateIn = false;
child: SizedBox( setState(resetAnimateIn);
width: 16, });
height: 16, }
child: event.status == EventStatus.sending return AnimatedSlide(
? const CircularProgressIndicator.adaptive( offset: Offset(0, animateIn ? 1 : 0),
strokeWidth: 2, duration: FluffyThemes.animationDuration,
) curve: FluffyThemes.animationCurve,
: event.status == EventStatus.error child: Row(
? 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(),
presenceUserId: user.stateKey,
onTap: () => onAvatarTab(event),
);
},
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisAlignment: rowMainAxisAlignment,
children: [ children: [
if (!sameSender) if (sameSender || ownMessage)
Padding( SizedBox(
padding: const EdgeInsets.only(left: 8.0, bottom: 4), width: Avatar.defaultSize,
child: ownMessage || event.room.isDirectChat child: Center(
? const SizedBox(height: 12) child: SizedBox(
: FutureBuilder<User?>( width: 16,
future: event.fetchSenderUser(), height: 16,
builder: (context, snapshot) { child: event.status == EventStatus.error
final displayname = ? const Icon(Icons.error, color: Colors.red)
snapshot.data?.calcDisplayname() ?? : null,
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,
clipBehavior: Clip.antiAlias,
elevation: highlightMarker || selected ? 10 : 0,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
side: BorderSide(
width: highlightMarker || selected ? 1 : 0,
color: selected
? Theme.of(context).colorScheme.onBackground
: highlightMarker
? Theme.of(context).colorScheme.primary
: Colors.transparent,
), ),
), ),
child: Container( )
decoration: BoxDecoration( else
borderRadius: FutureBuilder<User?>(
BorderRadius.circular(AppConfig.borderRadius), future: event.fetchSenderUser(),
), builder: (context, snapshot) {
padding: noBubble || noPadding final user =
? EdgeInsets.zero snapshot.data ?? event.senderFromMemoryOrFallback;
: const EdgeInsets.symmetric( return Avatar(
horizontal: 16, mxContent: user.avatarUrl,
vertical: 8, name: user.calcDisplayname(),
), presenceUserId: user.stateKey,
constraints: const BoxConstraints( onTap: () => onAvatarTab(event),
maxWidth: FluffyThemes.columnWidth * 1.5, );
), },
child: Column( ),
mainAxisSize: MainAxisSize.min, Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.start,
if (event.relationshipType == RelationshipTypes.reply) mainAxisSize: MainAxisSize.min,
FutureBuilder<Event?>( children: [
future: event.getReplyEvent(timeline), if (!sameSender)
builder: (BuildContext context, snapshot) { Padding(
final replyEvent = snapshot.hasData padding: const EdgeInsets.only(left: 8.0, bottom: 4),
? snapshot.data! child: ownMessage || event.room.isDirectChat
: Event( ? const SizedBox(height: 12)
eventId: event.relationshipEventId!, : FutureBuilder<User?>(
content: { future: event.fetchSenderUser(),
'msgtype': 'm.text', builder: (context, snapshot) {
'body': '...', final displayname =
}, snapshot.data?.calcDisplayname() ??
senderId: event.senderId, event.senderFromMemoryOrFallback
type: 'm.room.message', .calcDisplayname();
room: event.room, return Text(
status: EventStatus.sent, displayname,
originServerTs: DateTime.now(), style: TextStyle(
); fontSize: 12,
return Padding( fontWeight: FontWeight.bold,
padding: const EdgeInsets.only(bottom: 4.0), color: (Theme.of(context).brightness ==
child: InkWell( Brightness.light
borderRadius: ReplyContent.borderRadius, ? displayname.color
onTap: () => : displayname.lightColorText),
scrollToEventId(replyEvent.eventId),
child: AbsorbPointer(
child: ReplyContent(
replyEvent,
ownMessage: ownMessage,
timeline: timeline,
), ),
), );
), },
); ),
}, ),
Container(
alignment: alignment,
padding: const EdgeInsets.only(left: 8),
child: AnimatedOpacity(
opacity: animateIn
? 0
: event.redacted ||
event.messageType ==
MessageTypes.BadEncrypted ||
event.status.isSending
? 0.5
: 1,
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
child: Material(
color: noBubble ? Colors.transparent : color,
clipBehavior: Clip.antiAlias,
elevation: highlightMarker || selected ? 10 : 0,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
side: BorderSide(
width: highlightMarker || selected ? 1 : 0,
color: selected
? Theme.of(context).colorScheme.onBackground
: highlightMarker
? Theme.of(context).colorScheme.primary
: Colors.transparent,
),
), ),
MessageContent( child: Container(
displayEvent, decoration: BoxDecoration(
textColor: textColor, borderRadius:
onInfoTab: onInfoTab, BorderRadius.circular(AppConfig.borderRadius),
borderRadius: borderRadius, ),
), padding: noBubble || noPadding
if (event.hasAggregatedEvents( ? EdgeInsets.zero
timeline, : const EdgeInsets.symmetric(
RelationshipTypes.edit, horizontal: 16,
)) vertical: 8,
Padding( ),
padding: const EdgeInsets.only( constraints: const BoxConstraints(
top: 4.0, maxWidth: FluffyThemes.columnWidth * 1.5,
), ),
child: Row( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Icon( children: <Widget>[
Icons.edit_outlined, if (event.relationshipType ==
color: textColor.withAlpha(164), RelationshipTypes.reply)
size: 14, FutureBuilder<Event?>(
), future: event.getReplyEvent(timeline),
Text( builder: (BuildContext context, snapshot) {
' - ${displayEvent.originServerTs.localizedTimeShort(context)}', final replyEvent = snapshot.hasData
style: TextStyle( ? snapshot.data!
color: textColor.withAlpha(164), : Event(
fontSize: 12, 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 Padding(
padding:
const EdgeInsets.only(bottom: 4.0),
child: InkWell(
borderRadius:
ReplyContent.borderRadius,
onTap: () => scrollToEventId(
replyEvent.eventId,
),
child: AbsorbPointer(
child: ReplyContent(
replyEvent,
ownMessage: ownMessage,
timeline: timeline,
),
),
),
);
},
), ),
MessageContent(
displayEvent,
textColor: textColor,
onInfoTab: onInfoTab,
borderRadius: borderRadius,
), ),
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),
size: 14,
),
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) ||
@ -381,115 +413,93 @@ class Message extends StatelessWidget {
container = row; container = row;
} }
if (event.messageType == MessageTypes.BadEncrypted) {
container = Opacity(opacity: 0.4, child: container);
}
TapDownDetails? lastTapDownDetails; TapDownDetails? lastTapDownDetails;
final resetAnimateIn = this.resetAnimateIn;
var animateIn = this.animateIn;
return StatefulBuilder( return Center(
builder: (context, setState) { child: Swipeable(
if (animateIn && resetAnimateIn != null) { key: ValueKey(event.eventId),
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { background: const Padding(
animateIn = false; padding: EdgeInsets.symmetric(horizontal: 12.0),
setState(resetAnimateIn);
});
}
return AnimatedSlide(
offset: Offset(0, animateIn ? 1 : 0),
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
child: Center( child: Center(
child: Swipeable( child: Icon(Icons.check_outlined),
key: ValueKey(event.eventId), ),
background: const Padding( ),
padding: EdgeInsets.symmetric(horizontal: 12.0), direction: SwipeDirection.endToStart,
child: Center( onSwipe: (_) => onSwipe(),
child: Icon(Icons.check_outlined), child: HoverBuilder(
builder: (context, hovered) => GestureDetector(
onTapDown: (details) {
lastTapDownDetails = details;
},
onTap: () {
if (lastTapDownDetails?.kind == PointerDeviceKind.mouse) {
return;
}
onSelect(event);
},
child: Stack(
children: [
Container(
constraints: const BoxConstraints(
maxWidth: FluffyThemes.columnWidth * 2.5,
),
padding: const EdgeInsets.symmetric(
horizontal: 8.0,
vertical: 4.0,
),
child: container,
), ),
), if (hovered || selected)
direction: SwipeDirection.endToStart, Positioned(
onSwipe: (_) => onSwipe(), left: ownMessage ? 4 : null,
child: HoverBuilder( right: ownMessage ? null : 4,
builder: (context, hovered) => GestureDetector( bottom: 4,
onTapDown: (details) { child: Material(
lastTapDownDetails = details; color: Theme.of(context)
}, .colorScheme
onTap: () { .surfaceVariant
if (lastTapDownDetails?.kind == PointerDeviceKind.mouse) { .withOpacity(0.9),
return; elevation: Theme.of(context)
} .appBarTheme
onSelect(event); .scrolledUnderElevation ??
}, 4,
child: Stack( borderRadius:
children: [ BorderRadius.circular(AppConfig.borderRadius),
Container( shadowColor: Theme.of(context).appBarTheme.shadowColor,
constraints: const BoxConstraints( child: Row(
maxWidth: FluffyThemes.columnWidth * 2.5, mainAxisSize: MainAxisSize.min,
), children: [
padding: const EdgeInsets.symmetric( if (hovered) ...[
horizontal: 8.0, IconButton(
vertical: 4.0, icon: const Icon(
), Icons.reply_outlined,
child: container, size: 16,
), ),
if (hovered || selected) tooltip: L10n.of(context)!.reply,
Positioned( onPressed: () => onSwipe(),
left: ownMessage ? 4 : null, ),
right: ownMessage ? null : 4, ],
bottom: 4, IconButton(
child: Material( icon: Icon(
color: Theme.of(context) selected
.colorScheme ? Icons.check_circle
.surfaceVariant : longPressSelect
.withOpacity(0.9), ? Icons.check_circle_outlined
elevation: Theme.of(context) : Icons.menu,
.appBarTheme size: 16,
.scrolledUnderElevation ??
4,
borderRadius:
BorderRadius.circular(AppConfig.borderRadius),
shadowColor:
Theme.of(context).appBarTheme.shadowColor,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (hovered) ...[
IconButton(
icon: const Icon(
Icons.reply_outlined,
size: 16,
),
tooltip: L10n.of(context)!.reply,
onPressed: () => onSwipe(),
),
],
IconButton(
icon: Icon(
selected
? Icons.check_circle
: longPressSelect
? Icons.check_circle_outlined
: Icons.menu,
size: 16,
),
tooltip: L10n.of(context)!.select,
onPressed: () => onSelect(event),
),
],
), ),
tooltip: L10n.of(context)!.select,
onPressed: () => onSelect(event),
), ),
), ],
], ),
),
), ),
), ],
),
), ),
), ),
); ),
}, ),
); );
} }
} }

Write Preview
Loading…
Cancel
Save