From cdc844a4c0bcd75e77cdec12c52165b503396523 Mon Sep 17 00:00:00 2001 From: Krille Date: Sat, 11 Nov 2023 15:36:11 +0100 Subject: [PATCH] chore: Follow up imagebubble borderradius --- lib/pages/chat/events/image_bubble.dart | 8 ++++++-- lib/pages/chat/events/message.dart | 1 + lib/pages/chat/events/message_content.dart | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart index 33800a8b..ab5fb03c 100644 --- a/lib/pages/chat/events/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -18,6 +18,7 @@ class ImageBubble extends StatelessWidget { final double width; final double height; final void Function()? onTap; + final BorderRadius? borderRadius; const ImageBubble( this.event, { @@ -30,6 +31,7 @@ class ImageBubble extends StatelessWidget { this.height = 300, this.animated = false, this.onTap, + this.borderRadius, super.key, }); @@ -80,14 +82,16 @@ class ImageBubble extends StatelessWidget { @override Widget build(BuildContext context) { + final borderRadius = + this.borderRadius ?? BorderRadius.circular(AppConfig.borderRadius); return Material( shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(AppConfig.borderRadius), + borderRadius: borderRadius, side: BorderSide(color: Theme.of(context).dividerColor), ), child: InkWell( onTap: () => _onTap(context), - borderRadius: BorderRadius.circular(AppConfig.borderRadius), + borderRadius: borderRadius, child: Hero( tag: event.eventId, child: ConstrainedBox( diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 5a6086da..e15c7c41 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -242,6 +242,7 @@ class Message extends StatelessWidget { displayEvent, textColor: textColor, onInfoTab: onInfoTab, + borderRadius: borderRadius, ), if (event.hasAggregatedEvents( timeline, diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 2177d2de..8ead66e4 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -26,12 +26,14 @@ class MessageContent extends StatelessWidget { final Event event; final Color textColor; final void Function(Event)? onInfoTab; + final BorderRadius borderRadius; const MessageContent( this.event, { this.onInfoTab, super.key, required this.textColor, + required this.borderRadius, }); void _verifyOrRequestKey(BuildContext context) async { @@ -111,6 +113,7 @@ class MessageContent extends StatelessWidget { width: 400, height: 300, fit: BoxFit.cover, + borderRadius: borderRadius, ); case MessageTypes.Sticker: if (event.redacted) continue textmessage;