fluffychat merge
This commit is contained in:
commit
9ccc03f651
6 changed files with 16 additions and 0 deletions
|
|
@ -167,6 +167,8 @@ class ChatEventList extends StatelessWidget {
|
|||
},
|
||||
highlightMarker:
|
||||
controller.scrollToEventIdMarker == event.eventId,
|
||||
selected: controller.selectedEvents
|
||||
.any((e) => e.eventId == event.eventId),
|
||||
)
|
||||
:
|
||||
// Pangea#
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ class HtmlMessage extends StatelessWidget {
|
|||
final void Function(LinkableElement) onOpen;
|
||||
final String? eventId;
|
||||
final Set<Event>? checkboxCheckedEvents;
|
||||
final bool limitHeight;
|
||||
|
||||
// #Pangea
|
||||
final MessageOverlayController? overlayController;
|
||||
|
|
@ -59,6 +60,7 @@ class HtmlMessage extends StatelessWidget {
|
|||
required this.onOpen,
|
||||
this.eventId,
|
||||
this.checkboxCheckedEvents,
|
||||
this.limitHeight = true,
|
||||
// #Pangea
|
||||
this.overlayController,
|
||||
required this.event,
|
||||
|
|
@ -829,6 +831,8 @@ class HtmlMessage extends StatelessWidget {
|
|||
// fontSize: fontSize,
|
||||
// color: textColor,
|
||||
// ),
|
||||
// maxLines: limitHeight ? 64 : null,Add commentMore actions
|
||||
// overflow: TextOverflow.fade,
|
||||
// );
|
||||
dom.Node parsed = parser.parse(html).body ?? dom.Element.html('');
|
||||
if (tokens != null) {
|
||||
|
|
@ -860,6 +864,8 @@ class HtmlMessage extends StatelessWidget {
|
|||
fontSize: fontSize,
|
||||
color: textColor,
|
||||
),
|
||||
maxLines: limitHeight ? 64 : null,
|
||||
overflow: TextOverflow.fade,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -536,6 +536,7 @@ class Message extends StatelessWidget {
|
|||
onInfoTab: onInfoTab,
|
||||
borderRadius: borderRadius,
|
||||
timeline: timeline,
|
||||
selected: selected,
|
||||
// #Pangea
|
||||
pangeaMessageEvent:
|
||||
pangeaMessageEvent,
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ class MessageContent extends StatelessWidget {
|
|||
final void Function(Event)? onInfoTab;
|
||||
final BorderRadius borderRadius;
|
||||
final Timeline timeline;
|
||||
final bool selected;
|
||||
|
||||
// #Pangea
|
||||
final PangeaMessageEvent? pangeaMessageEvent;
|
||||
|
|
@ -54,6 +55,7 @@ class MessageContent extends StatelessWidget {
|
|||
required this.textColor,
|
||||
required this.linkColor,
|
||||
required this.borderRadius,
|
||||
required this.selected,
|
||||
// #Pangea
|
||||
this.pangeaMessageEvent,
|
||||
required this.immersionMode,
|
||||
|
|
@ -336,6 +338,7 @@ class MessageContent extends StatelessWidget {
|
|||
textColor: textColor,
|
||||
room: event.room,
|
||||
fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize,
|
||||
limitHeight: !selected,
|
||||
linkStyle: TextStyle(
|
||||
color: linkColor,
|
||||
fontSize:
|
||||
|
|
|
|||
|
|
@ -18,11 +18,13 @@ class ActivityPlanMessage extends StatelessWidget {
|
|||
final void Function()? resetAnimateIn;
|
||||
final ChatController controller;
|
||||
final bool highlightMarker;
|
||||
final bool selected;
|
||||
|
||||
const ActivityPlanMessage(
|
||||
this.event, {
|
||||
required this.timeline,
|
||||
required this.controller,
|
||||
required this.selected,
|
||||
this.animateIn = false,
|
||||
this.resetAnimateIn,
|
||||
this.highlightMarker = false,
|
||||
|
|
@ -149,6 +151,7 @@ class ActivityPlanMessage extends StatelessWidget {
|
|||
Brightness.light
|
||||
? theme.colorScheme.primary
|
||||
: theme.colorScheme.onPrimary,
|
||||
selected: selected,
|
||||
),
|
||||
if (event.hasAggregatedEvents(
|
||||
timeline,
|
||||
|
|
|
|||
|
|
@ -219,6 +219,7 @@ class OverlayMessage extends StatelessWidget {
|
|||
prevEvent: previousEvent,
|
||||
isTransitionAnimation: isTransitionAnimation,
|
||||
readingAssistanceMode: readingAssistanceMode,
|
||||
selected: true,
|
||||
),
|
||||
if (event.hasAggregatedEvents(
|
||||
timeline,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue