2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

design: Display images in correct ratio in timeline

Browse source
This commit is contained in:
krille-chan 2024-03-17 19:42:34 +01:00
commit 2104793ecd
No known key found for this signature in database
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pages/chat/events/image_bubble.dart
View file

@ -15,8 +15,8 @@ class ImageBubble extends StatelessWidget {
final Color? backgroundColor; final Color? backgroundColor;
final bool thumbnailOnly; final bool thumbnailOnly;
final bool animated; final bool animated;
final double width; final double? width;
final double height; final double? height;
final void Function()? onTap; final void Function()? onTap;
final BorderRadius? borderRadius; final BorderRadius? borderRadius;
@ -25,7 +25,7 @@ class ImageBubble extends StatelessWidget {
this.tapToView = true, this.tapToView = true,
this.maxSize = true, this.maxSize = true,
this.backgroundColor, this.backgroundColor,
this.fit = BoxFit.cover, this.fit = BoxFit.contain,
this.thumbnailOnly = true, this.thumbnailOnly = true,
this.width = 400, this.width = 400,
this.height = 300, this.height = 300,
@ -98,8 +98,8 @@ class ImageBubble extends StatelessWidget {
child: ConstrainedBox( child: ConstrainedBox(
constraints: maxSize constraints: maxSize
? BoxConstraints( ? BoxConstraints(
maxWidth: width, maxWidth: width ?? double.infinity,
maxHeight: height, maxHeight: height ?? double.infinity,
) )
: const BoxConstraints.expand(), : const BoxConstraints.expand(),
child: MxcImage( child: MxcImage(

17
lib/pages/chat/events/message_content.dart
View file

@ -106,11 +106,22 @@ class MessageContent extends StatelessWidget {
case EventTypes.Sticker: case EventTypes.Sticker:
switch (event.messageType) { switch (event.messageType) {
case MessageTypes.Image: case MessageTypes.Image:
const width = 200;
const ratio = 2.0;
final w = event.content
.tryGetMap<String, Object?>('info')
?.tryGet<int>('w') ??
width;
final h = event.content
.tryGetMap<String, Object?>('info')
?.tryGet<int>('h') ??
width;
final overRatio = h > w * ratio;
return ImageBubble( return ImageBubble(
event, event,
width: 400, height: overRatio ? width * ratio : null,
height: 300, width: width.toDouble(),
fit: BoxFit.cover, fit: overRatio ? BoxFit.cover : BoxFit.contain,
borderRadius: borderRadius, borderRadius: borderRadius,
); );
case MessageTypes.Sticker: case MessageTypes.Sticker: