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

chore: if token is highlighted while playing audio, always show underline color (#3392)

Browse source
This commit is contained in:
ggurdin 2025-07-10 11:47:43 -04:00 • committed by GitHub
parent 4aac64e6b5
commit 109fe3e278
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pages/chat/events/html_message.dart
View file

@ -46,6 +46,7 @@ class HtmlMessage extends StatelessWidget {
final bool isTransitionAnimation;
final ReadingAssistanceMode? readingAssistanceMode;
final bool Function(PangeaToken)? isHighlighted;
final bool Function(PangeaToken)? isSelected;
final void Function(PangeaToken)? onClick;
// Pangea#
@ -68,6 +69,7 @@ class HtmlMessage extends StatelessWidget {
required this.controller,
this.nextEvent,
this.prevEvent,
this.isHighlighted,
this.isSelected,
this.onClick,
this.isTransitionAnimation = false,
@ -388,6 +390,10 @@ class HtmlMessage extends StatelessWidget {
? isSelected!.call(token)
: false;
final highlighted = token != null && isHighlighted != null
? isHighlighted!.call(token)
: false;
final isNew = token != null &&
overlayController != null &&
overlayController!.isNewToken(token);
@ -423,6 +429,7 @@ class HtmlMessage extends StatelessWidget {
color: renderer.backgroundColor(
context,
selected,
highlighted,
isNew,
),
),
@ -447,6 +454,7 @@ class HtmlMessage extends StatelessWidget {
color: renderer.backgroundColor(
context,
selected,
highlighted,
isNew,
),
),
@ -585,6 +593,7 @@ class HtmlMessage extends StatelessWidget {
context,
false,
false,
false,
),
),
),
@ -601,6 +610,7 @@ class HtmlMessage extends StatelessWidget {
context,
false,
false,
false,
),
),
// Pangea#

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

@ -155,11 +155,6 @@ class MessageContent extends StatelessWidget {
selectedToken: token,
);
}
bool isSelected(PangeaToken token) {
return overlayController!.isTokenSelected(token) ||
overlayController!.isTokenHighlighted(token);
}
// Pangea#
@override
@ -367,7 +362,8 @@ class MessageContent extends StatelessWidget {
pangeaMessageEvent: pangeaMessageEvent,
nextEvent: nextEvent,
prevEvent: prevEvent,
isSelected: overlayController != null ? isSelected : null,
isHighlighted: overlayController?.isTokenHighlighted,
isSelected: overlayController?.isTokenSelected,
onClick: event.isActivityMessage ? null : onClick,
isTransitionAnimation: isTransitionAnimation,
readingAssistanceMode: readingAssistanceMode,

12
lib/pangea/toolbar/utils/token_rendering_util.dart
View file

@ -86,10 +86,14 @@ class TokenRenderingUtil {
}
}
Color backgroundColor(BuildContext context, bool selected, bool isNew) {
if (isNew) {
return AppConfig.success;
}
Color backgroundColor(
BuildContext context,
bool selected,
bool highlighted,
bool isNew,
) {
if (highlighted) return Theme.of(context).colorScheme.primary;
if (isNew) return AppConfig.success;
return selected
? Theme.of(context).colorScheme.primary
: Colors.white.withAlpha(0);