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

chore: allow users to select activity messages (#2153)

Browse Source
pull/1817/head
ggurdin 8 months ago committed by GitHub
parent dacc4c3470
commit 83bcf95f2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 160 additions and 157 deletions
Show Stats Download Patch File Download Diff File

2
lib/pages/chat/chat_event_list.dart
Unescape Escape View File

@ -189,6 +189,8 @@ class ChatEventList extends StatelessWidget {
resetAnimateIn: () { resetAnimateIn: () {
controller.animateInEventIndex = null; controller.animateInEventIndex = null;
}, },
highlightMarker:
controller.scrollToEventIdMarker == event.eventId,
) )
: :
// Pangea# // Pangea#

4
lib/pages/chat/events/html_message.dart
Unescape Escape View File

@ -609,9 +609,9 @@ class HtmlMessage extends StatelessWidget {
return SelectionArea( return SelectionArea(
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
if (!isOverlay && pangeaMessageEvent != null) { if (!isOverlay) {
controller.showToolbar( controller.showToolbar(
pangeaMessageEvent!.event, pangeaMessageEvent?.event ?? event,
pangeaMessageEvent: pangeaMessageEvent, pangeaMessageEvent: pangeaMessageEvent,
nextEvent: nextEvent, nextEvent: nextEvent,
prevEvent: prevEvent, prevEvent: prevEvent,

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

@ -10,10 +10,8 @@ import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pages/chat/events/room_creation_state_event.dart'; import 'package:fluffychat/pages/chat/events/room_creation_state_event.dart';
import 'package:fluffychat/pangea/choreographer/enums/use_type.dart'; import 'package:fluffychat/pangea/choreographer/enums/use_type.dart';
import 'package:fluffychat/pangea/common/utils/any_state_holder.dart';
import 'package:fluffychat/pangea/common/widgets/pressable_button.dart'; import 'package:fluffychat/pangea/common/widgets/pressable_button.dart';
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/date_time_extension.dart';
import 'package:fluffychat/utils/file_description.dart'; import 'package:fluffychat/utils/file_description.dart';
import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/utils/string_color.dart';
@ -47,7 +45,6 @@ class Message extends StatelessWidget {
// #Pangea // #Pangea
final bool immersionMode; final bool immersionMode;
final ChatController controller; final ChatController controller;
final MessageOverlayController? overlayController;
final bool isButton; final bool isButton;
// Pangea# // Pangea#
final List<Color> colors; final List<Color> colors;
@ -73,7 +70,6 @@ class Message extends StatelessWidget {
// #Pangea // #Pangea
required this.immersionMode, required this.immersionMode,
required this.controller, required this.controller,
this.overlayController,
this.isButton = false, this.isButton = false,
// Pangea# // Pangea#
required this.colors, required this.colors,
@ -83,7 +79,7 @@ class Message extends StatelessWidget {
// #Pangea // #Pangea
void showToolbar(PangeaMessageEvent? pangeaMessageEvent) { void showToolbar(PangeaMessageEvent? pangeaMessageEvent) {
// if overlayController is not null, the message is already in overlay mode // if overlayController is not null, the message is already in overlay mode
if (pangeaMessageEvent != null && overlayController == null) { if (pangeaMessageEvent != null) {
controller.showToolbar( controller.showToolbar(
event, event,
pangeaMessageEvent: pangeaMessageEvent, pangeaMessageEvent: pangeaMessageEvent,
@ -253,12 +249,8 @@ class Message extends StatelessWidget {
right: 0, right: 0,
child: InkWell( child: InkWell(
// #Pangea // #Pangea
onTap: () => overlayController == null onTap: () => showToolbar(pangeaMessageEvent),
? showToolbar(pangeaMessageEvent) onLongPress: () => showToolbar(pangeaMessageEvent),
: controller.clearSelectedEvents(),
onLongPress: () => overlayController == null
? showToolbar(pangeaMessageEvent)
: controller.clearSelectedEvents(),
// onTap: () => onSelect(event), // onTap: () => onSelect(event),
// onLongPress: () => onSelect(event), // onLongPress: () => onSelect(event),
// Pangea# // Pangea#
@ -290,9 +282,7 @@ class Message extends StatelessWidget {
// ), // ),
// ) // )
// else if (nextEventSameSender || ownMessage) // else if (nextEventSameSender || ownMessage)
if (nextEventSameSender || if (nextEventSameSender || ownMessage)
ownMessage ||
overlayController != null)
// Pangea# // Pangea#
SizedBox( SizedBox(
width: Avatar.defaultSize, width: Avatar.defaultSize,
@ -332,11 +322,7 @@ class Message extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
// #Pangea if (!nextEventSameSender)
// if (!nextEventSameSender)
if (!nextEventSameSender &&
overlayController == null)
// Pangea#
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 8.0, left: 8.0,
@ -431,14 +417,11 @@ class Message extends StatelessWidget {
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
// #Pangea // #Pangea
child: CompositedTransformTarget( child: CompositedTransformTarget(
link: overlayController != null link: MatrixState.pAnyState
? LayerLinkAndKey('overlay_msg') .layerLinkAndKey(
.link event.eventId,
: MatrixState.pAnyState )
.layerLinkAndKey( .link,
event.eventId,
)
.link,
// child: BubbleBackground( // child: BubbleBackground(
// colors: colors, // colors: colors,
// ignore: noBubble || !ownMessage, // ignore: noBubble || !ownMessage,
@ -446,15 +429,11 @@ class Message extends StatelessWidget {
// Pangea# // Pangea#
child: Container( child: Container(
// #Pangea // #Pangea
key: overlayController != null key: MatrixState.pAnyState
? LayerLinkAndKey( .layerLinkAndKey(
'overlay_msg', event.eventId,
).key )
: MatrixState.pAnyState .key,
.layerLinkAndKey(
event.eventId,
)
.key,
// Pangea# // Pangea#
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
@ -551,8 +530,6 @@ class Message extends StatelessWidget {
pangeaMessageEvent: pangeaMessageEvent:
pangeaMessageEvent, pangeaMessageEvent,
immersionMode: immersionMode, immersionMode: immersionMode,
overlayController:
overlayController,
controller: controller, controller: controller,
nextEvent: nextEvent, nextEvent: nextEvent,
prevEvent: previousEvent, prevEvent: previousEvent,
@ -648,11 +625,10 @@ class Message extends StatelessWidget {
event.hasAggregatedEvents(timeline, RelationshipTypes.reaction); event.hasAggregatedEvents(timeline, RelationshipTypes.reaction);
// #Pangea // #Pangea
// if (showReceiptsRow || displayTime || selected || displayReadMarker) { // if (showReceiptsRow || displayTime || selected || displayReadMarker) {
if (overlayController == null && if (showReceiptsRow ||
(showReceiptsRow || displayTime ||
displayTime || displayReadMarker ||
displayReadMarker || (pangeaMessageEvent?.showMessageButtons ?? false)) {
(pangeaMessageEvent?.showMessageButtons ?? false))) {
// Pangea# // Pangea#
container = Column( container = Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -694,9 +670,8 @@ class Message extends StatelessWidget {
duration: FluffyThemes.animationDuration, duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve, curve: FluffyThemes.animationCurve,
// #Pangea // #Pangea
child: overlayController != null || child: !showReceiptsRow &&
(!showReceiptsRow && !(pangeaMessageEvent?.showMessageButtons ?? false)
!(pangeaMessageEvent?.showMessageButtons ?? false))
// child: !showReceiptsRow // child: !showReceiptsRow
// Pangea# // Pangea#
? const SizedBox.shrink() ? const SizedBox.shrink()
@ -784,15 +759,7 @@ class Message extends StatelessWidget {
left: 8.0, left: 8.0,
right: 8.0, right: 8.0,
top: nextEventSameSender ? 1.0 : 4.0, top: nextEventSameSender ? 1.0 : 4.0,
bottom: bottom: previousEventSameSender ? 1.0 : 4.0,
// #Pangea
overlayController != null
? 0
:
// Pangea#
previousEventSameSender
? 1.0
: 4.0,
), ),
child: container, child: container,
), ),

234
lib/pangea/activity_planner/activity_plan_message.dart
Unescape Escape View File

@ -17,13 +17,15 @@ class ActivityPlanMessage extends StatelessWidget {
final bool animateIn; final bool animateIn;
final void Function()? resetAnimateIn; final void Function()? resetAnimateIn;
final ChatController controller; final ChatController controller;
final bool highlightMarker;
const ActivityPlanMessage( const ActivityPlanMessage(
this.event, { this.event, {
required this.timeline, required this.timeline,
required this.controller,
this.animateIn = false, this.animateIn = false,
this.resetAnimateIn, this.resetAnimateIn,
required this.controller, this.highlightMarker = false,
super.key, super.key,
}); });
@ -65,114 +67,146 @@ class ActivityPlanMessage extends StatelessWidget {
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: animateIn child: animateIn
? const SizedBox(height: 0, width: double.infinity) ? const SizedBox(height: 0, width: double.infinity)
: Container( : Stack(
alignment: Alignment.center, children: [
child: Column( Positioned(
crossAxisAlignment: CrossAxisAlignment.end, top: 0,
children: [ bottom: 0,
AnimatedOpacity( left: 0,
opacity: animateIn right: 0,
? 0 child: InkWell(
: event.messageType == MessageTypes.BadEncrypted || onTap: () => controller.showToolbar(event),
event.status.isSending onLongPress: () => controller.showToolbar(event),
? 0.5 borderRadius:
: 1, BorderRadius.circular(AppConfig.borderRadius / 2),
duration: FluffyThemes.animationDuration, child: Material(
curve: FluffyThemes.animationCurve, borderRadius:
child: Container( BorderRadius.circular(AppConfig.borderRadius / 2),
decoration: BoxDecoration( color: highlightMarker
color: color, ? theme.colorScheme.secondaryContainer
borderRadius: borderRadius, .withAlpha(128)
), : Colors.transparent,
clipBehavior: Clip.antiAlias, ),
child: CompositedTransformTarget( ),
link: MatrixState.pAnyState ),
.layerLinkAndKey( Container(
event.eventId, alignment: Alignment.center,
) child: GestureDetector(
.link, onTap: () => controller.showToolbar(event),
child: Container( onLongPress: () => controller.showToolbar(event),
key: MatrixState.pAnyState child: Column(
.layerLinkAndKey( crossAxisAlignment: CrossAxisAlignment.end,
event.eventId, children: [
) AnimatedOpacity(
.key, opacity: animateIn
decoration: BoxDecoration( ? 0
borderRadius: BorderRadius.circular( : event.messageType ==
AppConfig.borderRadius, MessageTypes.BadEncrypted ||
event.status.isSending
? 0.5
: 1,
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
child: Container(
decoration: BoxDecoration(
color: color,
borderRadius: borderRadius,
), ),
), clipBehavior: Clip.antiAlias,
padding: const EdgeInsets.symmetric( child: CompositedTransformTarget(
horizontal: 16, link: MatrixState.pAnyState
vertical: 8, .layerLinkAndKey(
), event.eventId,
constraints: const BoxConstraints( )
maxWidth: FluffyThemes.columnWidth * 1.5, .link,
), child: Container(
child: Column( key: MatrixState.pAnyState
mainAxisSize: MainAxisSize.min, .layerLinkAndKey(
crossAxisAlignment: CrossAxisAlignment.start, event.eventId,
children: <Widget>[ )
MessageContent( .key,
displayEvent, decoration: BoxDecoration(
textColor: textColor, borderRadius: BorderRadius.circular(
borderRadius: borderRadius, AppConfig.borderRadius,
controller: controller,
immersionMode: false,
timeline: timeline,
linkColor:
theme.brightness == Brightness.light
? theme.colorScheme.primary
: theme.colorScheme.onPrimary,
),
if (event.hasAggregatedEvents(
timeline,
RelationshipTypes.edit,
))
Padding(
padding: const EdgeInsets.only(
top: 4.0,
), ),
child: Row( ),
mainAxisSize: MainAxisSize.min, padding: const EdgeInsets.symmetric(
children: [ horizontal: 16,
if (event.hasAggregatedEvents( vertical: 8,
timeline, ),
RelationshipTypes.edit, constraints: const BoxConstraints(
)) ...[ maxWidth: FluffyThemes.columnWidth * 1.5,
Icon( ),
Icons.edit_outlined, child: Column(
color: textColor.withAlpha(164), mainAxisSize: MainAxisSize.min,
size: 14, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
MessageContent(
displayEvent,
textColor: textColor,
borderRadius: borderRadius,
controller: controller,
immersionMode: false,
timeline: timeline,
linkColor: theme.brightness ==
Brightness.light
? theme.colorScheme.primary
: theme.colorScheme.onPrimary,
),
if (event.hasAggregatedEvents(
timeline,
RelationshipTypes.edit,
))
Padding(
padding: const EdgeInsets.only(
top: 4.0,
), ),
Text( child: Row(
' - ${displayEvent.originServerTs.localizedTimeShort(context)}', mainAxisSize: MainAxisSize.min,
style: TextStyle( children: [
color: textColor.withAlpha( if (event.hasAggregatedEvents(
164, timeline,
), RelationshipTypes.edit,
fontSize: 12, )) ...[
), Icon(
Icons.edit_outlined,
color: textColor
.withAlpha(164),
size: 14,
),
Text(
' - ${displayEvent.originServerTs.localizedTimeShort(context)}',
style: TextStyle(
color:
textColor.withAlpha(
164,
),
fontSize: 12,
),
),
],
],
), ),
], ),
], ],
),
), ),
], ),
),
), ),
), ),
), Padding(
), padding: const EdgeInsets.only(
), top: 4.0,
Padding( right: 4.0,
padding: const EdgeInsets.only( ),
top: 4.0, child: MessageReactions(event, timeline),
right: 4.0, ),
],
), ),
child: MessageReactions(event, timeline),
), ),
], ),
), ],
), ),
); );
}, },

Write Preview
Loading…
Cancel
Save