Merge branch 'main' into chats-show-when-loaded

pull/1384/head
ggurdin 1 year ago committed by GitHub
commit 8913f808e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -138,19 +138,22 @@ class ChatDetailsView extends StatelessWidget {
Avatar.defaultSize * 2.5,
),
),
child: Hero(
tag: controller.widget
.embeddedCloseButton !=
null
? 'embedded_content_banner'
: 'content_banner',
// #Pangea
// Hero animation is causing weird visual glitch
// Probably not worth keeping
// child: Hero(
// tag: controller.widget
// .embeddedCloseButton !=
// null
// ? 'embedded_content_banner'
// : 'content_banner',
// Pangea#
child: Avatar(
mxContent: room.avatar,
name: displayname,
size: Avatar.defaultSize * 2.5,
),
),
),
if (!room.isDirectChat &&
room.canChangeStateEvent(
EventTypes.RoomAvatar,

@ -71,12 +71,11 @@ extension MessageModeExtension on MessageMode {
switch (this) {
case MessageMode.translation:
case MessageMode.textToSpeech:
case MessageMode.practiceActivity:
case MessageMode.definition:
return event.messageType == MessageTypes.Text;
case MessageMode.speechToText:
return event.messageType == MessageTypes.Audio;
default:
case MessageMode.practiceActivity:
return true;
}
}

Loading…
Cancel
Save