Merge branch 'mp4-android' into 'main'

Play video without thumbnail if none

Closes #668

See merge request famedly/fluffychat!625
This commit is contained in:
Krille Fear 2021-12-22 08:05:10 +00:00
commit aa3d6729a5

View File

@ -89,28 +89,38 @@ class MessageContent extends StatelessWidget {
} }
return MessageDownloadContent(event, textColor); return MessageDownloadContent(event, textColor);
case MessageTypes.Video: case MessageTypes.Video:
if (event.showThumbnail && if (PlatformInfos.isMobile || PlatformInfos.isWeb) {
(PlatformInfos.isMobile || PlatformInfos.isWeb)) { if (event.showThumbnail) {
return Stack( return Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: <Widget>[ children: <Widget>[
ImageBubble( ImageBubble(
event, event,
width: 400, width: 400,
height: 300, height: 300,
fit: BoxFit.cover, fit: BoxFit.cover,
tapToView: false, tapToView: false,
),
FloatingActionButton.extended(
onPressed: () => showDialog(
context: Matrix.of(context).navigatorContext,
useRootNavigator: false,
builder: (_) => VideoViewer(event),
), ),
label: Text(L10n.of(context).play('Video')), FloatingActionButton.extended(
icon: const Icon(Icons.video_camera_front_outlined), onPressed: () => showDialog(
), context: Matrix.of(context).navigatorContext,
], useRootNavigator: false,
builder: (_) => VideoViewer(event),
),
label: Text(L10n.of(context).play('Video')),
icon: const Icon(Icons.video_camera_front_outlined),
),
],
);
}
return FloatingActionButton.extended(
onPressed: () => showDialog(
context: Matrix.of(context).navigatorContext,
useRootNavigator: false,
builder: (_) => VideoViewer(event),
),
label: Text(L10n.of(context).play('Video')),
icon: const Icon(Icons.video_camera_front_outlined),
); );
} }
return MessageDownloadContent(event, textColor); return MessageDownloadContent(event, textColor);