Merge branch 'main' into usability-5-14

pull/1183/head
ggurdin 2 years ago
commit e03beac866

@ -167,9 +167,10 @@ class Message extends StatelessWidget {
// #Pangea
ToolbarDisplayController? toolbarController;
if (event.type == EventTypes.Message &&
event.messageType == MessageTypes.Text ||
event.messageType == MessageTypes.Notice ||
event.messageType == MessageTypes.Audio) {
!event.redacted &&
(event.messageType == MessageTypes.Text ||
event.messageType == MessageTypes.Notice ||
event.messageType == MessageTypes.Audio)) {
toolbarController = controller.getToolbarDisplayController(
event.eventId,
nextEvent: nextEvent,

@ -65,7 +65,7 @@ class SettingsLearningView extends StatelessWidget {
defaultValue: controller.pangeaController.pStoreService.read(
PLocalKey.autoPlayMessages,
) ??
true,
false,
title: L10n.of(context)!.autoPlayTitle,
subtitle: L10n.of(context)!.autoPlayDesc,
pStoreKey: PLocalKey.autoPlayMessages,

Loading…
Cancel
Save