ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #963 from pangeachat/hidden-words-testing

Browse source 
showToolbar on click non-toolbar message, don't re-launch on toolbar …
This commit is contained in:
ggurdin 2024-11-13 11:11:29 -05:00 • committed by GitHub
commit d227202d58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pages/chat/events/message_content.dart
View file

@ -308,14 +308,16 @@ class MessageContent extends StatelessWidget {
if (pangeaMessageEvent?.messageDisplayRepresentation?.tokens !=
null) {
return MessageTokenTextStateful(
return MessageTokenText(
messageAnalyticsEntry:
controller.pangeaController.getAnalytics.perMessage.get(
pangeaMessageEvent!,
false,
)!,
style: messageTextStyle,
onClick: (token) => controller.showToolbar(pangeaMessageEvent!),
onClick: overlayController?.onClickOverlayMessageToken ??
(_) => controller.showToolbar(pangeaMessageEvent!),
isSelected: overlayController?.isTokenSelected,
);
}

17
lib/pangea/widgets/chat/message_token_text_stateful.dart
View file

@ -9,22 +9,23 @@ import 'package:flutter/material.dart';
/// Question - does this need to be stateful or does this work?
/// Need to test.
class MessageTokenTextStateful extends StatelessWidget {
class MessageTokenText extends StatelessWidget {
final PangeaController pangeaController = MatrixState.pangeaController;
final MessageAnalyticsEntry messageAnalyticsEntry;
final TextStyle style;
final bool Function(PangeaToken)? isSelected;
final void Function(PangeaToken)? onClick;
bool get ownMessage => messageAnalyticsEntry.pmEvent.ownMessage;
MessageTokenTextStateful({
MessageTokenText({
super.key,
required this.messageAnalyticsEntry,
required this.style,
required this.onClick,
this.isSelected,
});
PangeaMessageEvent get pangeaMessageEvent => messageAnalyticsEntry.pmEvent;
@ -47,13 +48,16 @@ class MessageTokenTextStateful extends StatelessWidget {
final int startIndex = messageCharacters.take(start).length;
final int endIndex = messageCharacters.take(end).length;
final hideContent =
token.targetTypes.contains(ActivityTypeEnum.hiddenWordListening);
if (globalIndex < startIndex) {
tokenPositions.add(
TokenPosition(
start: globalIndex,
end: startIndex,
hideContent: false,
highlight: false,
highlight: isSelected?.call(token.token) ?? false,
),
);
}
@ -63,9 +67,8 @@ class MessageTokenTextStateful extends StatelessWidget {
start: startIndex,
end: endIndex,
token: token.token,
hideContent:
token.targetTypes.contains(ActivityTypeEnum.hiddenWordListening),
highlight: false,
hideContent: hideContent,
highlight: (isSelected?.call(token.token) ?? false) && !hideContent,
),
);
globalIndex = endIndex;