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,17 +138,20 @@ class ChatDetailsView extends StatelessWidget {
Avatar.defaultSize * 2.5, Avatar.defaultSize * 2.5,
), ),
), ),
child: Hero( // #Pangea
tag: controller.widget // Hero animation is causing weird visual glitch
.embeddedCloseButton != // Probably not worth keeping
null // child: Hero(
? 'embedded_content_banner' // tag: controller.widget
: 'content_banner', // .embeddedCloseButton !=
child: Avatar( // null
mxContent: room.avatar, // ? 'embedded_content_banner'
name: displayname, // : 'content_banner',
size: Avatar.defaultSize * 2.5, // Pangea#
), child: Avatar(
mxContent: room.avatar,
name: displayname,
size: Avatar.defaultSize * 2.5,
), ),
), ),
if (!room.isDirectChat && if (!room.isDirectChat &&

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

Loading…
Cancel
Save