From 49f792bceb273a15d467ba53a51b2e4f7bd38dc0 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 11 Nov 2020 17:23:51 +0530 Subject: [PATCH] rfac, fix: Separated URL attachment to widget, fixed clipping --- lib/src/message_widget.dart | 96 ++----------------------------- lib/src/url_attachment.dart | 110 ++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 91 deletions(-) create mode 100644 lib/src/url_attachment.dart diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index 6f81f149..a41bc97f 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -12,6 +12,7 @@ import 'package:jiffy/jiffy.dart'; import 'package:stream_chat_flutter/src/message_actions_modal.dart'; import 'package:stream_chat_flutter/src/message_reactions_modal.dart'; import 'package:stream_chat_flutter/src/reaction_bubble.dart'; +import 'package:stream_chat_flutter/src/url_attachment.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'image_group.dart'; @@ -356,97 +357,10 @@ class _MessageWidgetState extends State { _getWebsiteName(hostName.toLowerCase()) ?? hostName.capitalize(); - return Stack( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - if (urlAttachment.imageUrl != null) - SizedBox( - height: 16.0, - ), - if (urlAttachment.imageUrl != null) - Container( - margin: EdgeInsets.symmetric(horizontal: 8.0), - child: Stack( - clipBehavior: Clip.antiAlias, - children: [ - Center( - child: CachedNetworkImage( - imageUrl: urlAttachment.imageUrl, - ), - ), - Positioned( - left: 0.0, - bottom: 0.0, - child: Container( - child: Padding( - padding: const EdgeInsets.only( - top: 8.0, - left: 8.0, - right: 8.0, - ), - child: Text( - hostDisplayName, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Color(0xFF006CFF), - ), - ), - ), - decoration: BoxDecoration( - borderRadius: BorderRadius.only( - topRight: Radius.circular(16.0), - ), - color: Color(0xFFE9F2FF), - ), - ), - ), - ], - ), - clipBehavior: Clip.antiAlias, - decoration: - BoxDecoration(borderRadius: BorderRadius.circular(8.0)), - ), - Padding( - padding: widget.textPadding, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (urlAttachment.title != null) - Text( - urlAttachment.title, - maxLines: 1, - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 12.0, - ), - ), - if (urlAttachment.text != null) - Text( - urlAttachment.text, - style: TextStyle( - fontWeight: FontWeight.w400, - fontSize: 12.0, - ), - ), - ], - ), - ), - ], - ), - Positioned.fill( - child: Material( - color: Colors.transparent, - child: InkWell( - onTap: () => launchURL( - context, - urlAttachment.ogScrapeUrl, - ), - ), - ), - ), - ], + return UrlAttachment( + urlAttachment: urlAttachment, + hostDisplayName: hostDisplayName, + textPadding: widget.textPadding, ); } diff --git a/lib/src/url_attachment.dart b/lib/src/url_attachment.dart new file mode 100644 index 00000000..4b296a6a --- /dev/null +++ b/lib/src/url_attachment.dart @@ -0,0 +1,110 @@ +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/material.dart'; +import 'package:stream_chat_flutter/src/utils.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class UrlAttachment extends StatelessWidget { + Attachment urlAttachment; + String hostDisplayName; + EdgeInsets textPadding; + + UrlAttachment({ + @required this.urlAttachment, + @required this.hostDisplayName, + @required this.textPadding, + }); + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (urlAttachment.imageUrl != null) + SizedBox( + height: 16.0, + ), + if (urlAttachment.imageUrl != null) + Container( + margin: EdgeInsets.symmetric(horizontal: 8.0), + child: Stack( + children: [ + Center( + child: CachedNetworkImage( + imageUrl: urlAttachment.imageUrl, + ), + ), + Positioned( + left: 0.0, + bottom: -1, + child: Container( + child: Padding( + padding: const EdgeInsets.only( + top: 8.0, + left: 8.0, + right: 8.0, + ), + child: Text( + hostDisplayName, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Color(0xFF006CFF), + ), + ), + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topRight: Radius.circular(16.0), + ), + color: Color(0xFFE9F2FF), + ), + ), + ), + ], + ), + decoration: + BoxDecoration(borderRadius: BorderRadius.circular(8.0)), + ), + Padding( + padding: textPadding, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (urlAttachment.title != null) + Text( + urlAttachment.title, + maxLines: 1, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 12.0, + ), + ), + if (urlAttachment.text != null) + Text( + urlAttachment.text, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 12.0, + ), + ), + ], + ), + ), + ], + ), + Positioned.fill( + child: Material( + color: Colors.transparent, + child: InkWell( + onTap: () => launchURL( + context, + urlAttachment.ogScrapeUrl, + ), + ), + ), + ), + ], + ); + } +}