Merge pull request #244 from pangeachat/toolbar-fixes

Fixing toolbar bugs for newly-sent messages
pull/1183/head
ggurdin 2 years ago committed by GitHub
commit 4f96c557b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -344,9 +344,6 @@ class MessageContent extends StatelessWidget {
MatrixLocals(L10n.of(context)!),
hideReply: true,
);
toolbarController?.toolbar?.textSelection.setMessageText(
messageText,
);
return SelectableLinkify(
onSelectionChanged: (selection, cause) {
if (cause == SelectionChangedCause.longPress &&
@ -363,8 +360,7 @@ class MessageContent extends StatelessWidget {
.onTextSelection(selection);
},
onTap: () => toolbarController?.showToolbar(context),
text: toolbarController?.toolbar?.textSelection.messageText ??
messageText,
text: messageText,
contextMenuBuilder: (context, state) =>
(toolbarController?.highlighted ?? false)
? const SizedBox.shrink()

@ -188,10 +188,13 @@ class MessageToolbarState extends State<MessageToolbar> {
return;
}
setState(() {
currentMode = newMode;
updatingMode = true;
});
if (mounted) {
setState(() {
currentMode = newMode;
updatingMode = true;
});
}
if (!subscribed) {
toolbarContent = MessageUnsubscribedCard(
languageTool: newMode.title(context),
@ -221,9 +224,11 @@ class MessageToolbarState extends State<MessageToolbar> {
break;
}
}
setState(() {
updatingMode = false;
});
if (mounted) {
setState(() {
updatingMode = false;
});
}
}
void showTranslation() {
@ -289,7 +294,7 @@ class MessageToolbarState extends State<MessageToolbar> {
final bool autoplay = MatrixState.pangeaController.pStoreService.read(
PLocalKey.autoPlayMessages,
) ??
true;
false;
if (widget.pangeaMessageEvent.isAudioMessage) {
updateMode(MessageMode.speechToText);

@ -113,7 +113,9 @@ class MessageTranslationCardState extends State<MessageTranslationCard> {
l2Code = MatrixState.pangeaController.languageController.activeL2Code(
roomID: widget.messageEvent.room.id,
);
setState(() {});
if (mounted) {
setState(() {});
}
loadTranslation(() async {
if (widget.selection.selectedText != null) {

@ -61,9 +61,11 @@ class PangeaRichTextState extends State<PangeaRichText> {
widget.toolbarController?.toolbar?.textSelection.setMessageText(
newTextSpan,
);
setState(() {
textSpan = newTextSpan;
});
if (mounted) {
setState(() {
textSpan = newTextSpan;
});
}
}
void setTextSpan() {

Loading…
Cancel
Save