GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-24 04:59:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/sticker-rendering' into 'main'

Browse Source 
feat: Render stickers nicer

See merge request famedly/fluffychat!445
This commit is contained in:
Sorunome 2021-07-20 15:34:50 +00:00
commit 9a74d0977b
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/widgets/event_content/image_bubble.dart
View File

@ -21,6 +21,8 @@ class ImageBubble extends StatefulWidget {
final Color backgroundColor; final Color backgroundColor;
final double radius; final double radius;
final bool thumbnailOnly; final bool thumbnailOnly;
final double width;
final double height;
final void Function() onLoaded; final void Function() onLoaded;
const ImageBubble( const ImageBubble(
@ -32,6 +34,8 @@ class ImageBubble extends StatefulWidget {
this.radius = 10.0, this.radius = 10.0,
this.thumbnailOnly = true, this.thumbnailOnly = true,
this.onLoaded, this.onLoaded,
this.width = 400,
this.height = 300,
Key key, Key key,
}) : super(key: key); }) : super(key: key);
@ -361,8 +365,8 @@ class _ImageBubbleState extends State<ImageBubble> {
duration: Duration(milliseconds: 1000), duration: Duration(milliseconds: 1000),
child: Container( child: Container(
key: ValueKey(key), key: ValueKey(key),
height: widget.maxSize ? 300 : null, height: widget.maxSize ? widget.height : null,
width: widget.maxSize ? 400 : null, width: widget.maxSize ? widget.width : null,
child: content, child: content,
), ),
), ),

26
lib/widgets/event_content/message_content.dart
View File

@ -78,7 +78,31 @@ class MessageContent extends StatelessWidget {
case MessageTypes.Image: case MessageTypes.Image:
case MessageTypes.Sticker: case MessageTypes.Sticker:
if (event.showThumbnail) { if (event.showThumbnail) {
return ImageBubble(event); // normal images should have a ratio of 4:3
var ratio = 4.0 / 3.0;
if (event.messageType == MessageTypes.Sticker) {
// stickers should default to a ratio of 1:1
ratio = 1.0;
// if a width and a height is specified for stickers, use those!
if (event.infoMap['w'] is int && event.infoMap['h'] is int) {
ratio = event.infoMap['w'] / event.infoMap['h'];
// make sure the ratio is within 0.9 - 2.0
if (ratio > 2.0) {
ratio = 2.0;
}
if (ratio < 0.9) {
ratio = 0.9;
}
}
}
return ImageBubble(
event,
width: 400,
height: 400 / ratio,
fit: event.messageType == MessageTypes.Sticker && ratio < 1.0
? BoxFit.contain
: BoxFit.cover,
);
} }
return MessageDownloadContent(event, textColor); return MessageDownloadContent(event, textColor);
case MessageTypes.Audio: case MessageTypes.Audio: