From b93d616c86ec15b6c49eea57421ff2209c1593fe Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Fri, 8 Jan 2021 22:00:54 +0530 Subject: [PATCH 01/33] feat: Added message flagging --- lib/src/message_actions_modal.dart | 285 ++++++++++++++++++++++++----- lib/src/message_list_view.dart | 1 + lib/src/message_widget.dart | 3 + 3 files changed, 239 insertions(+), 50 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index c7ff56e0..8390ce97 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -1,5 +1,6 @@ import 'dart:ui'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -13,7 +14,7 @@ import 'message_widget.dart'; import 'stream_chat.dart'; import 'stream_chat_theme.dart'; -class MessageActionsModal extends StatelessWidget { +class MessageActionsModal extends StatefulWidget { final Widget Function(BuildContext, Message) editMessageInputBuilder; final void Function(Message) onThreadReplyTap; final void Function(Message) onReplyTap; @@ -26,6 +27,7 @@ class MessageActionsModal extends StatelessWidget { final bool showResendMessage; final bool showReply; final bool showThreadReply; + final bool showFlagButton; final bool reverse; final ShapeBorder messageShape; final DisplayWidget showUserAvatar; @@ -43,22 +45,38 @@ class MessageActionsModal extends StatelessWidget { this.showReply = true, this.showResendMessage = true, this.showThreadReply = true, + this.showFlagButton = true, this.showUserAvatar = DisplayWidget.show, this.editMessageInputBuilder, this.messageShape, this.reverse = false, }) : super(key: key); + @override + _MessageActionsModalState createState() => _MessageActionsModalState(); +} + +class _MessageActionsModalState extends State { + bool showConfirmFlagModal = false; + @override Widget build(BuildContext context) { + if (showConfirmFlagModal) { + return _showFlagDialog(); + } else { + return _showMessageOptionsModal(); + } + } + + Widget _showMessageOptionsModal() { final size = MediaQuery.of(context).size; final user = StreamChat.of(context).user; final roughMaxSize = 2 * size.width / 3; - var messageTextLength = message.text.length; - if (message.quotedMessage != null) { - var quotedMessageLength = message.quotedMessage.text.length + 40; - if (message.quotedMessage.attachments?.isNotEmpty == true) { + var messageTextLength = widget.message.text.length; + if (widget.message.quotedMessage != null) { + var quotedMessageLength = widget.message.quotedMessage.text.length + 40; + if (widget.message.quotedMessage.attachments?.isNotEmpty == true) { quotedMessageLength += 40; } if (quotedMessageLength > messageTextLength) { @@ -66,8 +84,8 @@ class MessageActionsModal extends StatelessWidget { } } final roughSentenceSize = - messageTextLength * messageTheme.messageText.fontSize * 1.2; - final divFactor = message.attachments?.isNotEmpty == true + messageTextLength * widget.messageTheme.messageText.fontSize * 1.2; + final divFactor = widget.message.attachments?.isNotEmpty == true ? 1 : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize)); @@ -95,18 +113,18 @@ class MessageActionsModal extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - if (showReactions && - (message.status == MessageSendingStatus.SENT || - message.status == null)) + if (widget.showReactions && + (widget.message.status == MessageSendingStatus.SENT || + widget.message.status == null)) Align( alignment: Alignment( - user.id == message.user.id + user.id == widget.message.user.id ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor)) : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)), 0.0), child: ReactionPicker( - message: message, - messageTheme: messageTheme, + message: widget.message, + messageTheme: widget.messageTheme, ), ), TweenAnimationBuilder( @@ -118,27 +136,28 @@ class MessageActionsModal extends StatelessWidget { child: IgnorePointer( child: MessageWidget( key: Key('MessageWidget'), - reverse: reverse, - message: message.copyWith( - text: message.text.length > 200 - ? '${message.text.substring(0, 200)}...' - : message.text, + reverse: widget.reverse, + message: widget.message.copyWith( + text: widget.message.text.length > 200 + ? '${widget.message.text.substring(0, 200)}...' + : widget.message.text, ), - messageTheme: messageTheme, + messageTheme: widget.messageTheme, showReactions: false, showUsername: false, showThreadReplyIndicator: false, showReplyIndicator: false, - showUserAvatar: showUserAvatar, + showUserAvatar: widget.showUserAvatar, showTimestamp: false, translateUserAvatar: false, - showReactionPickerIndicator: showReactions && - (message.status == - MessageSendingStatus.SENT || - message.status == null), + showReactionPickerIndicator: + widget.showReactions && + (widget.message.status == + MessageSendingStatus.SENT || + widget.message.status == null), showInChannelIndicator: false, showSendingIndicator: DisplayWidget.gone, - shape: messageShape, + shape: widget.messageShape, ), ), ); @@ -172,26 +191,28 @@ class MessageActionsModal extends StatelessWidget { children: ListTile.divideTiles( context: context, tiles: [ - if (showReply && - (message.status == + if (widget.showReply && + (widget.message.status == MessageSendingStatus.SENT || - message.status == null) && - message.parentId == null) + widget.message.status == null) && + widget.message.parentId == null) _buildReplyButton(context), - if (showThreadReply && - (message.status == + if (widget.showThreadReply && + (widget.message.status == MessageSendingStatus.SENT || - message.status == null) && - message.parentId == null) + widget.message.status == null) && + widget.message.parentId == null) _buildThreadReplyButton(context), - if (showResendMessage) + if (widget.showResendMessage) _buildResendMessage(context), - if (showEditMessage) + if (widget.showEditMessage) _buildEditMessage(context), - if (showDeleteMessage) + if (widget.showDeleteMessage) _buildDeleteButton(context), - if (showCopyMessage) + if (widget.showCopyMessage) _buildCopyButton(context), + if (widget.showCopyMessage) + _buildFlagButton(context), ], ).toList(), ), @@ -209,6 +230,150 @@ class MessageActionsModal extends StatelessWidget { ); } + Widget _showFlagDialog() { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => Navigator.maybePop(context), + child: Stack( + children: [ + Positioned.fill( + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: 10, + sigmaY: 10, + ), + child: Container( + color: StreamChatTheme.of(context).colorTheme.overlay, + ), + ), + ), + Center( + child: Opacity( + opacity: 0.9, + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0), + ), + clipBehavior: Clip.antiAlias, + child: Container( + width: 270.0, + height: 156.0, + alignment: Alignment.center, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 19.0, + ), + Text( + 'Flag Message', + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith(fontSize: 17.0), + ), + SizedBox( + height: 4.0, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Text( + 'Do you want to send a copy of this \nmessage to a moderator for further \ninvestigation?', + style: TextStyle(fontSize: 13.5), + textAlign: TextAlign.center, + ), + ), + SizedBox( + height: 21.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: Center( + child: InkWell( + child: Container( + height: 44.0, + alignment: Alignment.center, + child: Text( + 'Cancel', + style: StreamChatTheme.of(context) + .textTheme + .body + .copyWith( + fontSize: 17.0, + color: StreamChatTheme.of(context) + .colorTheme + .accentBlue), + ), + decoration: BoxDecoration( + border: Border.symmetric( + horizontal: BorderSide( + color: StreamChatTheme.of(context) + .colorTheme + .grey), + ), + ), + ), + onTap: () { + setState(() { + showConfirmFlagModal = false; + }); + }, + ), + ), + ), + Expanded( + child: Center( + child: InkWell( + child: Container( + height: 44.0, + alignment: Alignment.center, + child: Text( + 'Flag', + style: StreamChatTheme.of(context) + .textTheme + .body + .copyWith( + fontWeight: FontWeight.bold, + fontSize: 17.0, + color: StreamChatTheme.of(context) + .colorTheme + .accentBlue), + ), + decoration: BoxDecoration( + border: Border.fromBorderSide( + BorderSide( + color: StreamChatTheme.of(context) + .colorTheme + .grey), + ), + ), + ), + onTap: () { + setState(() { + showConfirmFlagModal = false; + }); + final client = StreamChat.of(context).client; + client.flagMessage(widget.message.id); + }, + ), + ), + ), + ], + ), + ], + ), + ), + ), + ), + ), + ], + ), + ); + } + Widget _buildReplyButton(BuildContext context) { return ListTile( title: Text( @@ -220,15 +385,34 @@ class MessageActionsModal extends StatelessWidget { ), onTap: () { Navigator.pop(context); - if (onReplyTap != null) { - onReplyTap(message); + if (widget.onReplyTap != null) { + widget.onReplyTap(widget.message); } }, ); } + Widget _buildFlagButton(BuildContext context) { + return ListTile( + title: Text( + 'Flag', + style: Theme.of(context).textTheme.headline6, + ), + leading: StreamSvgIcon.flag( + color: StreamChatTheme.of(context).primaryIconTheme.color, + size: 24.0, + ), + onTap: () { + setState(() { + showConfirmFlagModal = true; + }); + }, + ); + } + Widget _buildDeleteButton(BuildContext context) { - final isDeleteFailed = message.status == MessageSendingStatus.FAILED_DELETE; + final isDeleteFailed = + widget.message.status == MessageSendingStatus.FAILED_DELETE; return ListTile( title: Text( isDeleteFailed ? 'Retry deleting message' : 'Delete message', @@ -241,7 +425,7 @@ class MessageActionsModal extends StatelessWidget { onTap: () { Navigator.pop(context); StreamChat.of(context).client.deleteMessage( - message, + widget.message, StreamChannel.of(context).channel.cid, ); }, @@ -258,7 +442,7 @@ class MessageActionsModal extends StatelessWidget { color: StreamChatTheme.of(context).primaryIconTheme.color, ), onTap: () async { - await Clipboard.setData(ClipboardData(text: message.text)); + await Clipboard.setData(ClipboardData(text: widget.message.text)); Navigator.pop(context); }, ); @@ -281,7 +465,8 @@ class MessageActionsModal extends StatelessWidget { } Widget _buildResendMessage(BuildContext context) { - final isUpdateFailed = message.status == MessageSendingStatus.FAILED_UPDATE; + final isUpdateFailed = + widget.message.status == MessageSendingStatus.FAILED_UPDATE; return ListTile( title: Text( isUpdateFailed ? 'Resend edited message' : 'Resend', @@ -295,9 +480,9 @@ class MessageActionsModal extends StatelessWidget { final client = StreamChat.of(context).client; final channel = StreamChannel.of(context).channel; if (isUpdateFailed) { - client.updateMessage(message, channel.cid); + client.updateMessage(widget.message, channel.cid); } else { - channel.sendMessage(message); + channel.sendMessage(widget.message); } }, ); @@ -354,10 +539,10 @@ class MessageActionsModal extends StatelessWidget { padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom, ), - child: editMessageInputBuilder != null - ? editMessageInputBuilder(context, message) + child: widget.editMessageInputBuilder != null + ? widget.editMessageInputBuilder(context, widget.message) : MessageInput( - editMessage: message, + editMessage: widget.message, preMessageSending: (m) { FocusScope.of(context).unfocus(); Navigator.pop(context); @@ -383,8 +568,8 @@ class MessageActionsModal extends StatelessWidget { ), onTap: () { Navigator.pop(context); - if (onThreadReplyTap != null) { - onThreadReplyTap(message); + if (widget.onThreadReplyTap != null) { + widget.onThreadReplyTap(widget.message); } }, ); diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index 9f4cbc0d..21aa9ed1 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -800,6 +800,7 @@ class _MessageListViewState extends State { showTimestamp: !isNextUser || readList?.isNotEmpty == true, showEditMessage: isMyMessage, showDeleteMessage: isMyMessage, + showFlagButton: !isMyMessage, borderSide: isMyMessage ? BorderSide.none : null, onThreadTap: _onThreadTap, onReplyTap: widget.onReplyTap, diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index 1200f38d..c687f36f 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -133,6 +133,7 @@ class MessageWidget extends StatefulWidget { final bool showTimestamp; final bool showDeleteMessage; final bool showEditMessage; + final bool showFlagButton; final Map attachmentBuilders; /// Center user avatar with bottom of the message @@ -168,6 +169,7 @@ class MessageWidget extends StatefulWidget { this.showReactions = true, this.showDeleteMessage = true, this.showEditMessage = true, + this.showFlagButton = true, this.onUserAvatarTap, this.onLinkTap, this.onMessageActions, @@ -718,6 +720,7 @@ class _MessageWidgetState extends State { widget.onReplyTap != null, showThreadReply: widget.showThreadReplyIndicator && widget.onThreadTap != null, + showFlagButton: widget.showFlagButton, ), ); }); From bd73a8b6db86b66051b4ee85e6bd51fa494c14c8 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 14:37:53 +0530 Subject: [PATCH 02/33] feat: Added end dialog and animations --- lib/src/message_actions_modal.dart | 450 +++++++++++++++++++---------- lib/src/message_widget.dart | 5 +- 2 files changed, 309 insertions(+), 146 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 8390ce97..cc29527e 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -14,6 +14,12 @@ import 'message_widget.dart'; import 'stream_chat.dart'; import 'stream_chat_theme.dart'; +enum ActionsModalState { + modal, + confirmDialog, + dismissMessage, +} + class MessageActionsModal extends StatefulWidget { final Widget Function(BuildContext, Message) editMessageInputBuilder; final void Function(Message) onThreadReplyTap; @@ -57,14 +63,20 @@ class MessageActionsModal extends StatefulWidget { } class _MessageActionsModalState extends State { - bool showConfirmFlagModal = false; + ActionsModalState state = ActionsModalState.modal; @override Widget build(BuildContext context) { - if (showConfirmFlagModal) { - return _showFlagDialog(); - } else { - return _showMessageOptionsModal(); + switch (state) { + case ActionsModalState.modal: + return _showMessageOptionsModal(); + break; + case ActionsModalState.confirmDialog: + return _showFlagDialog(); + break; + case ActionsModalState.dismissMessage: + return _showDismissAlert(); + break; } } @@ -211,7 +223,7 @@ class _MessageActionsModalState extends State { _buildDeleteButton(context), if (widget.showCopyMessage) _buildCopyButton(context), - if (widget.showCopyMessage) + if (widget.showFlagButton) _buildFlagButton(context), ], ).toList(), @@ -231,147 +243,295 @@ class _MessageActionsModalState extends State { } Widget _showFlagDialog() { - return GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => Navigator.maybePop(context), - child: Stack( - children: [ - Positioned.fill( - child: BackdropFilter( - filter: ImageFilter.blur( - sigmaX: 10, - sigmaY: 10, - ), - child: Container( - color: StreamChatTheme.of(context).colorTheme.overlay, - ), - ), - ), - Center( - child: Opacity( - opacity: 0.9, - child: Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16.0), - ), - clipBehavior: Clip.antiAlias, - child: Container( - width: 270.0, - height: 156.0, - alignment: Alignment.center, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - height: 19.0, - ), - Text( - 'Flag Message', - style: StreamChatTheme.of(context) - .textTheme - .bodyBold - .copyWith(fontSize: 17.0), - ), - SizedBox( - height: 4.0, - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Text( - 'Do you want to send a copy of this \nmessage to a moderator for further \ninvestigation?', - style: TextStyle(fontSize: 13.5), - textAlign: TextAlign.center, - ), - ), - SizedBox( - height: 21.0, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Expanded( - child: Center( - child: InkWell( - child: Container( - height: 44.0, - alignment: Alignment.center, - child: Text( - 'Cancel', - style: StreamChatTheme.of(context) - .textTheme - .body - .copyWith( - fontSize: 17.0, - color: StreamChatTheme.of(context) - .colorTheme - .accentBlue), - ), - decoration: BoxDecoration( - border: Border.symmetric( - horizontal: BorderSide( - color: StreamChatTheme.of(context) - .colorTheme - .grey), - ), - ), - ), - onTap: () { - setState(() { - showConfirmFlagModal = false; - }); - }, - ), - ), - ), - Expanded( - child: Center( - child: InkWell( - child: Container( - height: 44.0, - alignment: Alignment.center, - child: Text( - 'Flag', - style: StreamChatTheme.of(context) - .textTheme - .body - .copyWith( - fontWeight: FontWeight.bold, - fontSize: 17.0, - color: StreamChatTheme.of(context) - .colorTheme - .accentBlue), - ), - decoration: BoxDecoration( - border: Border.fromBorderSide( - BorderSide( - color: StreamChatTheme.of(context) - .colorTheme - .grey), - ), - ), - ), - onTap: () { - setState(() { - showConfirmFlagModal = false; - }); - final client = StreamChat.of(context).client; - client.flagMessage(widget.message.id); - }, - ), - ), - ), - ], - ), - ], + return TweenAnimationBuilder( + tween: Tween(begin: 0.0, end: 1.0), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOut, + builder: (context, value, _) { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => Navigator.maybePop(context), + child: Stack( + children: [ + Positioned.fill( + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: 10, + sigmaY: 10, + ), + child: Container( + color: StreamChatTheme.of(context).colorTheme.overlay, + ), ), ), - ), + Transform.scale( + scale: value, + child: Center( + child: Opacity( + opacity: 0.9, + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0), + ), + clipBehavior: Clip.antiAlias, + child: Container( + width: 270.0, + height: 156.0, + alignment: Alignment.center, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 19.0, + ), + Text( + 'Flag Message', + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith(fontSize: 17.0), + ), + SizedBox( + height: 4.0, + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0), + child: Text( + 'Do you want to send a copy of this \nmessage to a moderator for further \ninvestigation?', + style: TextStyle(fontSize: 13.5), + textAlign: TextAlign.center, + ), + ), + SizedBox( + height: 21.0, + ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: Center( + child: InkWell( + child: Container( + height: 44.0, + alignment: Alignment.center, + child: Text( + 'Cancel', + style: StreamChatTheme.of(context) + .textTheme + .body + .copyWith( + fontSize: 17.0, + color: StreamChatTheme.of( + context) + .colorTheme + .accentBlue), + ), + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: StreamChatTheme.of( + context) + .colorTheme + .grey + .withOpacity(0.8)), + right: BorderSide( + color: StreamChatTheme.of( + context) + .colorTheme + .grey + .withOpacity(0.8)), + ), + ), + ), + onTap: () { + setState(() { + state = ActionsModalState.modal; + }); + }, + ), + ), + ), + Expanded( + child: Center( + child: InkWell( + child: Container( + height: 44.0, + alignment: Alignment.center, + child: Text( + 'Flag', + style: StreamChatTheme.of(context) + .textTheme + .body + .copyWith( + fontWeight: FontWeight.bold, + fontSize: 17.0, + color: StreamChatTheme.of( + context) + .colorTheme + .accentBlue), + ), + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: StreamChatTheme.of( + context) + .colorTheme + .grey + .withOpacity(0.8)), + ), + ), + ), + onTap: () { + setState(() { + state = ActionsModalState + .dismissMessage; + }); + final client = + StreamChat.of(context).client; + client.flagMessage(widget.message.id); + }, + ), + ), + ), + ], + ), + ], + ), + ), + ), + ), + ), + ), + ], ), - ), - ], - ), - ); + ); + }); + } + + Widget _showDismissAlert() { + return TweenAnimationBuilder( + key: GlobalKey(), + tween: Tween(begin: 0.0, end: 1.0), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOut, + builder: (context, value, _) { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => Navigator.maybePop(context), + child: Stack( + children: [ + Positioned.fill( + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: 10, + sigmaY: 10, + ), + child: Container( + color: StreamChatTheme.of(context).colorTheme.overlay, + ), + ), + ), + Transform.scale( + scale: value, + child: Center( + child: Opacity( + opacity: 0.9, + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0), + ), + clipBehavior: Clip.antiAlias, + child: Container( + width: 270.0, + height: 156.0, + alignment: Alignment.center, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 19.0, + ), + Text( + 'Message Flagged', + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith(fontSize: 17.0), + ), + SizedBox( + height: 4.0, + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0), + child: Text( + 'This message has been reported to a\nmoderator.', + style: TextStyle(fontSize: 13.5), + textAlign: TextAlign.center, + ), + ), + SizedBox( + height: 21.0, + ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: Center( + child: InkWell( + child: Container( + height: 44.0, + alignment: Alignment.center, + child: Text( + 'Dismiss', + style: StreamChatTheme.of(context) + .textTheme + .body + .copyWith( + fontWeight: FontWeight.bold, + fontSize: 17.0, + color: StreamChatTheme.of( + context) + .colorTheme + .accentBlue), + ), + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: StreamChatTheme.of( + context) + .colorTheme + .grey + .withOpacity(0.8)), + ), + ), + ), + onTap: () { + setState(() { + state = ActionsModalState.modal; + }); + }, + ), + ), + ), + ], + ), + ], + ), + ), + ), + ), + ), + ), + ], + ), + ); + }); } Widget _buildReplyButton(BuildContext context) { @@ -404,7 +564,7 @@ class _MessageActionsModalState extends State { ), onTap: () { setState(() { - showConfirmFlagModal = true; + state = ActionsModalState.confirmDialog; }); }, ); diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index c687f36f..e26524f8 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -686,6 +686,9 @@ class _MessageWidgetState extends State { void _showMessageActionModalBottomSheet(BuildContext context) { final channel = StreamChannel.of(context).channel; + final isMyMessage = + widget.message.user.id == StreamChat.of(context).user.id; + showDialog( context: context, barrierColor: StreamChatTheme.of(context).colorTheme.overlay, @@ -720,7 +723,7 @@ class _MessageWidgetState extends State { widget.onReplyTap != null, showThreadReply: widget.showThreadReplyIndicator && widget.onThreadTap != null, - showFlagButton: widget.showFlagButton, + showFlagButton: widget.showFlagButton && !isMyMessage, ), ); }); From aca3918786f6e77626bacae8fa2443d550b95ec8 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 14:50:31 +0530 Subject: [PATCH 03/33] fix: Fixed dialog styling --- lib/src/message_actions_modal.dart | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index cc29527e..486bc83d 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -268,8 +268,12 @@ class _MessageActionsModalState extends State { scale: value, child: Center( child: Opacity( - opacity: 0.9, + opacity: 0.8, child: Material( + color: StreamChatTheme.of(context) + .colorTheme + .whiteSnow + .withOpacity(0.8), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(16.0), ), @@ -332,12 +336,14 @@ class _MessageActionsModalState extends State { decoration: BoxDecoration( border: Border( top: BorderSide( + width: 0.5, color: StreamChatTheme.of( context) .colorTheme .grey .withOpacity(0.8)), right: BorderSide( + width: 0.5, color: StreamChatTheme.of( context) .colorTheme @@ -376,6 +382,7 @@ class _MessageActionsModalState extends State { decoration: BoxDecoration( border: Border( top: BorderSide( + width: 0.5, color: StreamChatTheme.of( context) .colorTheme @@ -438,8 +445,12 @@ class _MessageActionsModalState extends State { scale: value, child: Center( child: Opacity( - opacity: 0.9, + opacity: 0.8, child: Material( + color: StreamChatTheme.of(context) + .colorTheme + .whiteSnow + .withOpacity(0.8), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(16.0), ), @@ -503,6 +514,7 @@ class _MessageActionsModalState extends State { decoration: BoxDecoration( border: Border( top: BorderSide( + width: 0.5, color: StreamChatTheme.of( context) .colorTheme From 43006b61848086d02dd3972c8352e4b229b86019 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 15:13:01 +0530 Subject: [PATCH 04/33] fix: merge and tile styling change --- lib/src/message_actions_modal.dart | 54 +++++++++++++++++------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 37c0aeae..0953c789 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -123,7 +123,7 @@ class _MessageActionsModalState extends State { child: Padding( padding: const EdgeInsets.symmetric(vertical: 8.0), child: Column( - crossAxisAlignment: reverse + crossAxisAlignment: widget.reverse ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [ @@ -185,13 +185,13 @@ class _MessageActionsModalState extends State { transform: Matrix4.identity() ..scale(val) ..rotateZ(-1.0 + val), - alignment: reverse + alignment: widget.reverse ? Alignment.topRight : Alignment.topLeft, child: Padding( padding: EdgeInsets.only( - right: reverse ? 16 : 0, - left: reverse ? 0 : 48, + right: widget.reverse ? 16 : 0, + left: widget.reverse ? 0 : 48, ), child: SizedBox( width: MediaQuery.of(context).size.width * 0.75, @@ -212,27 +212,29 @@ class _MessageActionsModalState extends State { .greyWhisper, context: context, tiles: [ - if (showReply && - (message.status == + if (widget.showReply && + (widget.message.status == MessageSendingStatus.SENT || - message.status == null) && - message.parentId == null) + widget.message.status == + null) && + widget.message.parentId == null) _buildReplyButton(context), - if (showThreadReply && - (message.status == + if (widget.showThreadReply && + (widget.message.status == MessageSendingStatus.SENT || - message.status == null) && - message.parentId == null) + widget.message.status == + null) && + widget.message.parentId == null) _buildThreadReplyButton(context), - if (showResendMessage) + if (widget.showResendMessage) _buildResendMessage(context), - if (showEditMessage) + if (widget.showEditMessage) _buildEditMessage(context), - if (showCopyMessage) + if (widget.showCopyMessage) _buildCopyButton(context), if (widget.showFlagButton) _buildFlagButton(context), - if (showDeleteMessage) + if (widget.showDeleteMessage) _buildDeleteButton(context), ], ).toList(), @@ -570,13 +572,19 @@ class _MessageActionsModalState extends State { Widget _buildFlagButton(BuildContext context) { return ListTile( - title: Text( - 'Flag', - style: Theme.of(context).textTheme.headline6, - ), - leading: StreamSvgIcon.flag( - color: StreamChatTheme.of(context).primaryIconTheme.color, - size: 24.0, + dense: true, + title: Row( + children: [ + StreamSvgIcon.flag( + color: StreamChatTheme.of(context).primaryIconTheme.color, + size: 23.0, + ), + const SizedBox(width: 16), + Text( + 'Flag', + style: StreamChatTheme.of(context).textTheme.headline, + ), + ], ), onTap: () { setState(() { From 2879b491fff44894b4525f78fc9ae0b6863d310f Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 16:20:42 +0530 Subject: [PATCH 05/33] fix: Added correct icon in modal --- example/ios/Podfile.lock | 2 +- lib/src/message_actions_modal.dart | 3 +-- lib/src/stream_svg_icon.dart | 12 ++++++++++++ lib/svgs/icon_flag.svg | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 lib/svgs/icon_flag.svg diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f266b656..af57742c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -296,4 +296,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: eb001256612a59f8f9e4d083ad8b9671e69dd184 -COCOAPODS: 1.10.0 +COCOAPODS: 1.8.3 diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 0953c789..5c2f16bb 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -575,9 +575,8 @@ class _MessageActionsModalState extends State { dense: true, title: Row( children: [ - StreamSvgIcon.flag( + StreamSvgIcon.icon_flag( color: StreamChatTheme.of(context).primaryIconTheme.color, - size: 23.0, ), const SizedBox(width: 16), Text( diff --git a/lib/src/stream_svg_icon.dart b/lib/src/stream_svg_icon.dart index 3e8cfae2..e8af3436 100644 --- a/lib/src/stream_svg_icon.dart +++ b/lib/src/stream_svg_icon.dart @@ -877,4 +877,16 @@ class StreamSvgIcon extends StatelessWidget { height: size, ); } + + factory StreamSvgIcon.icon_flag({ + double size, + Color color, + }) { + return StreamSvgIcon( + assetName: 'icon_flag.svg', + color: color, + width: size, + height: size, + ); + } } diff --git a/lib/svgs/icon_flag.svg b/lib/svgs/icon_flag.svg new file mode 100644 index 00000000..0f382e94 --- /dev/null +++ b/lib/svgs/icon_flag.svg @@ -0,0 +1,3 @@ + + + From 0eb482e96669165d3ecd79aaf405eb160f58be02 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 16:21:15 +0530 Subject: [PATCH 06/33] fix: Added correct icon in modal --- example/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index af57742c..f266b656 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -296,4 +296,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: eb001256612a59f8f9e4d083ad8b9671e69dd184 -COCOAPODS: 1.8.3 +COCOAPODS: 1.10.0 From 7b32379d07e5b4f9705216cf89381d71680f0dda Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 17:20:29 +0530 Subject: [PATCH 07/33] fix: Removed unnecessary check --- lib/src/message_widget.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index 38d2f1e2..ebf57c94 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -694,8 +694,6 @@ class _MessageWidgetState extends State { void _showMessageActionModalBottomSheet(BuildContext context) { final channel = StreamChannel.of(context).channel; - final isMyMessage = - widget.message.user.id == StreamChat.of(context).user.id; showDialog( context: context, @@ -731,7 +729,7 @@ class _MessageWidgetState extends State { widget.onReplyTap != null, showThreadReply: widget.showThreadReplyIndicator && widget.onThreadTap != null, - showFlagButton: widget.showFlagButton && !isMyMessage, + showFlagButton: widget.showFlagButton, ), ); }); From c987066329c740aa03aa08fbbffa379592a3d973 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 21:22:32 +0530 Subject: [PATCH 08/33] fix: Added modals instead --- lib/src/message_actions_modal.dart | 444 ++++++++++------------------- lib/src/utils.dart | 73 ++++- 2 files changed, 216 insertions(+), 301 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 5c2f16bb..e4db71f5 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -1,4 +1,3 @@ -import 'dart:math'; import 'dart:ui'; import 'package:flutter/cupertino.dart'; @@ -9,6 +8,7 @@ import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter/src/reaction_picker.dart'; import 'package:stream_chat_flutter/src/stream_channel.dart'; import 'package:stream_chat_flutter/src/stream_svg_icon.dart'; +import 'package:stream_chat_flutter/src/utils.dart'; import 'message_input.dart'; import 'message_widget.dart'; @@ -64,21 +64,9 @@ class MessageActionsModal extends StatefulWidget { } class _MessageActionsModalState extends State { - ActionsModalState state = ActionsModalState.modal; - @override Widget build(BuildContext context) { - switch (state) { - case ActionsModalState.modal: - return _showMessageOptionsModal(); - break; - case ActionsModalState.confirmDialog: - return _showFlagDialog(); - break; - case ActionsModalState.dismissMessage: - return _showDismissAlert(); - break; - } + return _showMessageOptionsModal(); } Widget _showMessageOptionsModal() { @@ -254,296 +242,154 @@ class _MessageActionsModalState extends State { ); } - Widget _showFlagDialog() { - return TweenAnimationBuilder( - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - curve: Curves.easeInOut, - builder: (context, value, _) { - return GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => Navigator.maybePop(context), - child: Stack( - children: [ - Positioned.fill( - child: BackdropFilter( - filter: ImageFilter.blur( - sigmaX: 10, - sigmaY: 10, - ), - child: Container( - color: StreamChatTheme.of(context).colorTheme.overlay, - ), - ), - ), - Transform.scale( - scale: value, - child: Center( - child: Opacity( - opacity: 0.9, - child: Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16.0), - ), - clipBehavior: Clip.antiAlias, - child: Container( - width: 270.0, - height: 156.0, - alignment: Alignment.center, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - height: 19.0, - ), - Text( - 'Flag Message', - style: StreamChatTheme.of(context) - .textTheme - .bodyBold - .copyWith(fontSize: 17.0), - ), - SizedBox( - height: 4.0, - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0), - child: Text( - 'Do you want to send a copy of this \nmessage to a moderator for further \ninvestigation?', - style: TextStyle(fontSize: 13.5), - textAlign: TextAlign.center, - ), - ), - SizedBox( - height: 21.0, - ), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - children: [ - Expanded( - child: Center( - child: InkWell( - child: Container( - height: 44.0, - alignment: Alignment.center, - child: Text( - 'Cancel', - style: StreamChatTheme.of(context) - .textTheme - .body - .copyWith( - fontSize: 17.0, - color: StreamChatTheme.of( - context) - .colorTheme - .accentBlue), - ), - decoration: BoxDecoration( - border: Border( - top: BorderSide( - color: StreamChatTheme.of( - context) - .colorTheme - .grey - .withOpacity(0.8)), - right: BorderSide( - color: StreamChatTheme.of( - context) - .colorTheme - .grey - .withOpacity(0.8)), - ), - ), - ), - onTap: () { - setState(() { - state = ActionsModalState.modal; - }); - }, - ), - ), - ), - Expanded( - child: Center( - child: InkWell( - child: Container( - height: 44.0, - alignment: Alignment.center, - child: Text( - 'Flag', - style: StreamChatTheme.of(context) - .textTheme - .body - .copyWith( - fontWeight: FontWeight.bold, - fontSize: 17.0, - color: StreamChatTheme.of( - context) - .colorTheme - .accentBlue), - ), - decoration: BoxDecoration( - border: Border( - top: BorderSide( - color: StreamChatTheme.of( - context) - .colorTheme - .grey - .withOpacity(0.8)), - ), - ), - ), - onTap: () { - setState(() { - state = ActionsModalState - .dismissMessage; - }); - final client = - StreamChat.of(context).client; - client.flagMessage(widget.message.id); - }, - ), - ), - ), - ], - ), - ], - ), - ), - ), - ), - ), - ), - ], - ), - ); - }); + void _showFlagDialog() async { + final client = StreamChat.of(context).client; + + var answer = await showConfirmationDialog(context, + title: 'Flag Message', + icon: StreamSvgIcon.flag( + color: StreamChatTheme.of(context).colorTheme.accentRed, + size: 24.0, + ), + question: + 'Do you want to send a copy of this message to a\nmoderator for further investigation?', + okText: 'FLAG', + cancelText: 'CANCEL'); + + if (answer) { + try { + await client.flagMessage(widget.message.id); + _showDismissAlert(); + } catch (err) { + _showErrorAlert(); + } + } else { + Navigator.pop(context); + } } - Widget _showDismissAlert() { - return TweenAnimationBuilder( - key: GlobalKey(), - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - curve: Curves.easeInOut, - builder: (context, value, _) { - return GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => Navigator.maybePop(context), - child: Stack( + void _showDismissAlert() { + showModalBottomSheet( + backgroundColor: StreamChatTheme.of(context).colorTheme.white, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16.0), + topRight: Radius.circular(16.0), + )), + builder: (context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + height: 26.0, + ), + StreamSvgIcon.flag( + color: StreamChatTheme.of(context).colorTheme.accentRed, + size: 24.0, + ), + SizedBox( + height: 26.0, + ), + Text( + 'Message flagged', + style: StreamChatTheme.of(context).textTheme.headlineBold, + ), + SizedBox( + height: 7.0, + ), + Text('The message has been reported to a moderator.'), + SizedBox( + height: 36.0, + ), + Container( + color: + StreamChatTheme.of(context).colorTheme.black.withOpacity(.08), + height: 1.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, children: [ - Positioned.fill( - child: BackdropFilter( - filter: ImageFilter.blur( - sigmaX: 10, - sigmaY: 10, - ), - child: Container( - color: StreamChatTheme.of(context).colorTheme.overlay, - ), - ), - ), - Transform.scale( - scale: value, - child: Center( - child: Opacity( - opacity: 0.9, - child: Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16.0), - ), - clipBehavior: Clip.antiAlias, - child: Container( - width: 270.0, - height: 156.0, - alignment: Alignment.center, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - height: 19.0, - ), - Text( - 'Message Flagged', - style: StreamChatTheme.of(context) - .textTheme - .bodyBold - .copyWith(fontSize: 17.0), - ), - SizedBox( - height: 4.0, - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0), - child: Text( - 'This message has been reported to a\nmoderator.', - style: TextStyle(fontSize: 13.5), - textAlign: TextAlign.center, - ), - ), - SizedBox( - height: 21.0, - ), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - children: [ - Expanded( - child: Center( - child: InkWell( - child: Container( - height: 44.0, - alignment: Alignment.center, - child: Text( - 'Dismiss', - style: StreamChatTheme.of(context) - .textTheme - .body - .copyWith( - fontWeight: FontWeight.bold, - fontSize: 17.0, - color: StreamChatTheme.of( - context) - .colorTheme - .accentBlue), - ), - decoration: BoxDecoration( - border: Border( - top: BorderSide( - color: StreamChatTheme.of( - context) - .colorTheme - .grey - .withOpacity(0.8)), - ), - ), - ), - onTap: () { - setState(() { - state = ActionsModalState.modal; - }); - }, - ), - ), - ), - ], - ), - ], - ), - ), - ), - ), + FlatButton( + child: Text( + 'OK', + style: TextStyle( + color: + StreamChatTheme.of(context).colorTheme.accentBlue, + fontWeight: FontWeight.w400), ), + onPressed: () { + Navigator.of(context).pop(); + }, ), ], ), - ); - }); + ], + ); + }, + ); + } + + void _showErrorAlert() { + showModalBottomSheet( + backgroundColor: StreamChatTheme.of(context).colorTheme.white, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16.0), + topRight: Radius.circular(16.0), + )), + builder: (context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + height: 26.0, + ), + StreamSvgIcon.error( + color: StreamChatTheme.of(context).colorTheme.accentRed, + size: 24.0, + ), + SizedBox( + height: 26.0, + ), + Text( + 'Something went wrong', + style: StreamChatTheme.of(context).textTheme.headlineBold, + ), + SizedBox( + height: 7.0, + ), + Text('The operation couldn\'t be completed.'), + SizedBox( + height: 36.0, + ), + Container( + color: + StreamChatTheme.of(context).colorTheme.black.withOpacity(.08), + height: 1.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + FlatButton( + child: Text( + 'OK', + style: TextStyle( + color: + StreamChatTheme.of(context).colorTheme.accentBlue, + fontWeight: FontWeight.w400), + ), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ), + ], + ); + }, + ); } Widget _buildReplyButton(BuildContext context) { @@ -586,9 +432,7 @@ class _MessageActionsModalState extends State { ], ), onTap: () { - setState(() { - state = ActionsModalState.confirmDialog; - }); + _showFlagDialog(); }, ); } diff --git a/lib/src/utils.dart b/lib/src/utils.dart index f573b77b..21ca8114 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -75,7 +75,7 @@ Future showConfirmationDialog( fontWeight: FontWeight.w400), ), onPressed: () { - Navigator.of(context).pop(); + Navigator.of(context).pop(false); }, ), FlatButton( @@ -95,6 +95,77 @@ Future showConfirmationDialog( }); } +Future showInfoDialog( + BuildContext context, { + String title, + Widget icon, + String question, + String okText, + StreamChatThemeData theme, +}) { + return showModalBottomSheet( + backgroundColor: + theme.colorTheme.white ?? StreamChatTheme.of(context).colorTheme.white, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16.0), + topRight: Radius.circular(16.0), + )), + builder: (context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + height: 26.0, + ), + if (icon != null) icon, + SizedBox( + height: 26.0, + ), + Text( + title, + style: theme.textTheme.headlineBold ?? + StreamChatTheme.of(context).textTheme.headlineBold, + ), + SizedBox( + height: 7.0, + ), + Text(question), + SizedBox( + height: 36.0, + ), + Container( + color: theme.colorTheme.black.withOpacity(.08) ?? + StreamChatTheme.of(context).colorTheme.black.withOpacity(.08), + height: 1.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + FlatButton( + child: Text( + okText, + style: TextStyle( + color: theme.colorTheme.black.withOpacity(0.5) ?? + StreamChatTheme.of(context) + .colorTheme + .black + .withOpacity(0.5), + fontWeight: FontWeight.w400), + ), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ), + ], + ); + }, + ); +} + /// Get random png with initials String getRandomPicUrl(User user) => 'https://getstream.io/random_png/?id=${user.id}&name=${user.name}'; From 6274f1437e9d48bdca37ed49ed2929201f5002ff Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 21:29:31 +0530 Subject: [PATCH 09/33] feat: corrected text styles --- lib/src/message_actions_modal.dart | 22 ++++++++++++++-------- lib/src/utils.dart | 19 +++++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index e4db71f5..4db2dd73 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -313,10 +313,13 @@ class _MessageActionsModalState extends State { FlatButton( child: Text( 'OK', - style: TextStyle( - color: - StreamChatTheme.of(context).colorTheme.accentBlue, - fontWeight: FontWeight.w400), + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith( + color: StreamChatTheme.of(context) + .colorTheme + .accentBlue), ), onPressed: () { Navigator.of(context).pop(); @@ -375,10 +378,13 @@ class _MessageActionsModalState extends State { FlatButton( child: Text( 'OK', - style: TextStyle( - color: - StreamChatTheme.of(context).colorTheme.accentBlue, - fontWeight: FontWeight.w400), + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith( + color: StreamChatTheme.of(context) + .colorTheme + .accentBlue), ), onPressed: () { Navigator.of(context).pop(); diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 21ca8114..4e55111f 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -67,12 +67,10 @@ Future showConfirmationDialog( FlatButton( child: Text( cancelText, - style: TextStyle( - color: StreamChatTheme.of(context) - .colorTheme - .black - .withOpacity(0.5), - fontWeight: FontWeight.w400), + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith(color: Colors.black.withOpacity(0.5)), ), onPressed: () { Navigator.of(context).pop(false); @@ -81,8 +79,13 @@ Future showConfirmationDialog( FlatButton( child: Text( okText, - style: TextStyle( - color: Colors.red, fontWeight: FontWeight.w400), + style: StreamChatTheme.of(context) + .textTheme + .bodyBold + .copyWith( + color: StreamChatTheme.of(context) + .colorTheme + .accentRed), ), onPressed: () { Navigator.pop(context, true); From 746688e04d9d5fcab23bef7619891e836ef0bfec Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 21:43:47 +0530 Subject: [PATCH 10/33] fix: merge --- lib/src/message_actions_modal.dart | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index fa7b8da1..d1f6e0ff 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -1,6 +1,5 @@ import 'dart:ui'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -15,12 +14,6 @@ import 'message_widget.dart'; import 'stream_chat.dart'; import 'stream_chat_theme.dart'; -enum ActionsModalState { - modal, - confirmDialog, - dismissMessage, -} - class MessageActionsModal extends StatefulWidget { final Widget Function(BuildContext, Message) editMessageInputBuilder; final void Function(Message) onThreadReplyTap; @@ -149,7 +142,7 @@ class _MessageActionsModalState extends State { showUsername: false, showThreadReplyIndicator: false, showReplyMessage: false, - showUserAvatar: showUserAvatar, + showUserAvatar: widget.showUserAvatar, showTimestamp: false, translateUserAvatar: false, showReactionPickerIndicator: @@ -158,7 +151,7 @@ class _MessageActionsModalState extends State { MessageSendingStatus.SENT || widget.message.status == null), showInChannelIndicator: false, - showSendingIndicator: DisplayWidget.gone, + showSendingIndicator: false, shape: widget.messageShape, ), ), From 4f41f6be7f46b2266f96a4443128fb581a4f08c5 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 21:45:31 +0530 Subject: [PATCH 11/33] fix: color and fmt --- lib/src/utils.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 27559f7a..0b59e54c 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -70,7 +70,11 @@ Future showConfirmationDialog( style: StreamChatTheme.of(context) .textTheme .bodyBold - .copyWith(color: Colors.black.withOpacity(0.5)), + .copyWith( + color: StreamChatTheme.of(context) + .colorTheme + .black + .withOpacity(0.5)), ), onPressed: () { Navigator.of(context).pop(false); From 1556564ea7ebafa5ccc5a2b2f1b788c089f15d0b Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 11 Jan 2021 21:49:34 +0530 Subject: [PATCH 12/33] fix: Cancel behaviour --- lib/src/message_actions_modal.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index d1f6e0ff..f288fa7a 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -256,8 +256,6 @@ class _MessageActionsModalState extends State { } catch (err) { _showErrorAlert(); } - } else { - Navigator.pop(context); } } From bc1761867d73a7fd73c1f326b94e4465ea4e4e1c Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 12:27:42 +0530 Subject: [PATCH 13/33] [MessageListView] Make thread type messages all corners rounded Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index cda0d64c..2e45dff7 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -857,14 +857,21 @@ class _MessageListViewState extends State { attachmentBorderRadiusGeometry: BorderRadius.only( topLeft: Radius.circular(attachmentBorderRadius), bottomLeft: Radius.circular( - timeDiff >= 1 || !isNextUserSame ? 0 : attachmentBorderRadius), + (timeDiff >= 1 || !isNextUserSame) && !hasReplies && !isThreadMessage + ? 0 + : attachmentBorderRadius, + ), topRight: Radius.circular(attachmentBorderRadius), bottomRight: Radius.circular(attachmentBorderRadius), ), attachmentPadding: const EdgeInsets.all(2), borderRadiusGeometry: BorderRadius.only( topLeft: Radius.circular(16), - bottomLeft: Radius.circular(timeDiff >= 1 || !isNextUserSame ? 0 : 16), + bottomLeft: Radius.circular( + (timeDiff >= 1 || !isNextUserSame) && !hasReplies && !isThreadMessage + ? 0 + : 16, + ), topRight: Radius.circular(16), bottomRight: Radius.circular(16), ), From 4a7350530ebb2ba4a0aae634f484ef34db37172e Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 12:52:52 +0530 Subject: [PATCH 14/33] [MessageListView] Remove topMessage extra top padding in thread conversation. Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 107 ++++++++++++++++----------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index 2e45dff7..aa557c6a 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -338,9 +338,28 @@ class _MessageListViewState extends State { messages.length + 2 + (_isThreadConversation ? 1 : 0), separatorBuilder: (context, i) { if (i == messages.length) return Offstage(); - if (i == messages.length + 2) return Offstage(); - if (i == messages.length + 1) return Offstage(); if (i == 0) return SizedBox(height: 30); + if (i == messages.length + 1) { + final replyCount = widget.parentMessage.replyCount; + return Container( + decoration: BoxDecoration( + gradient: + StreamChatTheme.of(context).colorTheme.bgGradient, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + '$replyCount ${replyCount == 1 ? 'Reply' : 'Replies'}', + textAlign: TextAlign.center, + style: StreamChatTheme.of(context) + .channelTheme + .channelHeaderTheme + .lastMessageAt, + ), + ), + ); + } + final message = messages[i]; final nextMessage = messages[i - 1]; if (!Jiffy(message.createdAt.toLocal()).isSame( @@ -385,30 +404,7 @@ class _MessageListViewState extends State { widget.parentMessage, ); } else { - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - buildParentMessage(widget.parentMessage), - Container( - decoration: BoxDecoration( - gradient: StreamChatTheme.of(context) - .colorTheme - .bgGradient, - ), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - '${widget.parentMessage.replyCount} ${widget.parentMessage.replyCount == 1 ? 'Reply' : 'Replies'}', - textAlign: TextAlign.center, - style: StreamChatTheme.of(context) - .channelTheme - .channelHeaderTheme - .lastMessageAt, - ), - ), - ), - ], - ); + return buildParentMessage(widget.parentMessage); } } if (i == messages.length + 1) { @@ -602,37 +598,38 @@ class _MessageListViewState extends State { ? streamChannel.queryTopMessages : streamChannel.queryBottomMessages; return StreamBuilder( - key: Key('LOADING-INDICATOR'), - stream: stream, - initialData: false, - builder: (context, snapshot) { - if (snapshot.hasError) { - return Container( - color: StreamChatTheme.of(context) - .colorTheme - .accentRed - .withOpacity(.2), - child: Center( - child: Text('Error loading messages'), - ), - ); - } - if (!snapshot.data) { - if (direction == QueryDirection.top) { - return Container( - height: 52, - width: double.infinity, - ); - } - return Offstage(); - } - return Center( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: const CircularProgressIndicator(), + key: Key('LOADING-INDICATOR'), + stream: stream, + initialData: false, + builder: (context, snapshot) { + if (snapshot.hasError) { + return Container( + color: StreamChatTheme.of(context) + .colorTheme + .accentRed + .withOpacity(.2), + child: Center( + child: Text('Error loading messages'), ), ); - }); + } + if (!snapshot.data) { + if (!_isThreadConversation && direction == QueryDirection.top) { + return Container( + height: 52, + width: double.infinity, + ); + } + return Offstage(); + } + return Center( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: const CircularProgressIndicator(), + ), + ); + }, + ); } Widget _buildTopMessage( From 9379c4672701689e31a2c36c1a091f740a37a921 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 14:32:02 +0530 Subject: [PATCH 15/33] [QuotedMessageWidget] Fix attachment getting cropped by border side Signed-off-by: Sahil Kumar --- lib/src/quoted_message_widget.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/src/quoted_message_widget.dart b/lib/src/quoted_message_widget.dart index 7621174f..d012e15a 100644 --- a/lib/src/quoted_message_widget.dart +++ b/lib/src/quoted_message_widget.dart @@ -235,9 +235,7 @@ class QuotedMessageWidget extends StatelessWidget { ShapeBorder _getDefaultShape(BuildContext context) { return RoundedRectangleBorder( - side: BorderSide( - color: StreamChatTheme.of(context).colorTheme.greyWhisper, - ), + side: BorderSide(width: 0.0, color: Colors.transparent), borderRadius: BorderRadius.circular(8), ); } From f9ac3fe6faf6d4d2c58b9e293b3684b58399cd04 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 14:58:43 +0530 Subject: [PATCH 16/33] [MessageListView] minor fixes Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index aa557c6a..ba9c499e 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -708,6 +708,7 @@ class _MessageListViewState extends State { Message message, ) { final isMyMessage = message.user.id == StreamChat.of(context).user.id; + final isOnlyEmoji = textIsOnlyEmoji(message.text); return MessageWidget( showThreadReplyIndicator: false, @@ -721,12 +722,7 @@ class _MessageListViewState extends State { message: message, reverse: isMyMessage, showUsername: !isMyMessage, - padding: EdgeInsets.only( - top: 8.0, - left: 8.0, - right: 8.0, - bottom: 16.0, - ), + padding: const EdgeInsets.all(8.0), showSendingIndicator: false, onThreadTap: _onThreadTap, borderRadiusGeometry: BorderRadius.only( @@ -735,7 +731,7 @@ class _MessageListViewState extends State { topRight: Radius.circular(16), bottomRight: Radius.circular(16), ), - borderSide: isMyMessage ? BorderSide.none : null, + borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null, showUserAvatar: isMyMessage ? DisplayWidget.gone : DisplayWidget.show, messageTheme: isMyMessage ? StreamChatTheme.of(context).ownMessageTheme @@ -810,8 +806,9 @@ class _MessageListViewState extends State { final showSendingIndicator = isMyMessage && (index == 0 || timeDiff >= 1 || !isNextUserSame); - bool showInChannelIndicator = !_isThreadConversation && isThreadMessage; - bool showThreadReplyIndicator = !_isThreadConversation && hasReplies; + final showInChannelIndicator = !_isThreadConversation && isThreadMessage; + final showThreadReplyIndicator = !_isThreadConversation && hasReplies; + final isOnlyEmoji = textIsOnlyEmoji(message.text); Widget child = MessageWidget( key: ValueKey('MESSAGE-${message.id}'), @@ -848,7 +845,7 @@ class _MessageListViewState extends State { showEditMessage: isMyMessage, showDeleteMessage: isMyMessage, showThreadReplyMessage: !isThreadMessage, - borderSide: isMyMessage ? BorderSide.none : null, + borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null, onThreadTap: _onThreadTap, onReplyTap: widget.onReplyTap, attachmentBorderRadiusGeometry: BorderRadius.only( From 85aaf9eab89bc1dd1c1191166d370fc18fdaa3d9 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 15:05:50 +0530 Subject: [PATCH 17/33] [MessageListView] simplify some conditions Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index ba9c499e..6f61e261 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -851,7 +851,7 @@ class _MessageListViewState extends State { attachmentBorderRadiusGeometry: BorderRadius.only( topLeft: Radius.circular(attachmentBorderRadius), bottomLeft: Radius.circular( - (timeDiff >= 1 || !isNextUserSame) && !hasReplies && !isThreadMessage + (timeDiff >= 1 || !isNextUserSame) && !(hasReplies || isThreadMessage) ? 0 : attachmentBorderRadius, ), @@ -862,7 +862,7 @@ class _MessageListViewState extends State { borderRadiusGeometry: BorderRadius.only( topLeft: Radius.circular(16), bottomLeft: Radius.circular( - (timeDiff >= 1 || !isNextUserSame) && !hasReplies && !isThreadMessage + (timeDiff >= 1 || !isNextUserSame) && !(hasReplies || isThreadMessage) ? 0 : 16, ), From b402add586ed080fc5e2e1f5339b79fc21594270 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Tue, 12 Jan 2021 15:11:52 +0530 Subject: [PATCH 18/33] feat: Added delete dialog and added dismiss dialog in case of message flagged --- lib/src/message_actions_modal.dart | 35 +++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index f288fa7a..95ecdea5 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -1,3 +1,4 @@ +import 'dart:convert'; import 'dart:ui'; import 'package:flutter/foundation.dart'; @@ -253,6 +254,34 @@ class _MessageActionsModalState extends State { try { await client.flagMessage(widget.message.id); _showDismissAlert(); + } catch (err) { + if (json.decode(err?.body ?? {})['code'] == 4) { + _showDismissAlert(); + } else { + _showErrorAlert(); + } + } + } + } + + void _showDeleteDialog() async { + var answer = await showConfirmationDialog(context, + title: 'Delete message', + icon: StreamSvgIcon.flag( + color: StreamChatTheme.of(context).colorTheme.accentRed, + size: 24.0, + ), + question: 'Are you sure you want to permanently delete this\nmessage?', + okText: 'DELETE', + cancelText: 'CANCEL'); + + if (answer) { + try { + Navigator.pop(context); + StreamChat.of(context).client.deleteMessage( + widget.message, + StreamChannel.of(context).channel.cid, + ); } catch (err) { _showErrorAlert(); } @@ -455,11 +484,7 @@ class _MessageActionsModalState extends State { ], ), onTap: () { - Navigator.pop(context); - StreamChat.of(context).client.deleteMessage( - widget.message, - StreamChannel.of(context).channel.cid, - ); + _showDeleteDialog(); }, ); } From 0605cbc3b4ffcfd68464c8be3afb812922a1431f Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 15:30:45 +0530 Subject: [PATCH 19/33] Move `isOnlyEmoji` utility function into String extension Signed-off-by: Sahil Kumar --- lib/src/extension.dart | 21 +++++++++++++++++++++ lib/src/message_list_view.dart | 5 +++-- lib/src/message_widget.dart | 2 +- lib/src/quoted_message_widget.dart | 2 +- lib/src/utils.dart | 14 -------------- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/lib/src/extension.dart b/lib/src/extension.dart index 71edefe6..3ffd0e24 100644 --- a/lib/src/extension.dart +++ b/lib/src/extension.dart @@ -1,7 +1,28 @@ +import 'package:emojis/emoji.dart'; +import 'package:characters/characters.dart'; + +final _emojis = Emoji.all(); + extension StringExtension on String { String capitalize() { return "${this[0].toUpperCase()}${this.substring(1)}"; } + + // Emojis guidelines + // 1 to 3 emojis: big size with no text bubble. + // 4+ emojis or emojis+text: standard size with text bubble. + bool get isOnlyEmoji { + final characters = this.trim().characters; + if (characters.isEmpty) return false; + if (characters.length > 3) return false; + return characters.every((c) { + return _emojis.firstWhere( + (Emoji emoji) => emoji.char.contains(c), + orElse: () => null, + ) != + null; + }); + } } /// List extension diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index 6f61e261..095b6b73 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -17,6 +17,7 @@ import '../stream_chat_flutter.dart'; import 'date_divider.dart'; import 'stream_channel.dart'; import 'swipeable.dart'; +import 'extension.dart'; typedef MessageBuilder = Widget Function( BuildContext, @@ -708,7 +709,7 @@ class _MessageListViewState extends State { Message message, ) { final isMyMessage = message.user.id == StreamChat.of(context).user.id; - final isOnlyEmoji = textIsOnlyEmoji(message.text); + final isOnlyEmoji = message.text.isOnlyEmoji; return MessageWidget( showThreadReplyIndicator: false, @@ -808,7 +809,7 @@ class _MessageListViewState extends State { final showInChannelIndicator = !_isThreadConversation && isThreadMessage; final showThreadReplyIndicator = !_isThreadConversation && hasReplies; - final isOnlyEmoji = textIsOnlyEmoji(message.text); + final isOnlyEmoji = message.text.isOnlyEmoji; Widget child = MessageWidget( key: ValueKey('MESSAGE-${message.id}'), diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index e9ea4873..cd14ac40 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -938,7 +938,7 @@ class _MessageWidgetState extends State { ); } - bool get isOnlyEmoji => textIsOnlyEmoji(widget.message.text); + bool get isOnlyEmoji => widget.message.text.isOnlyEmoji; Color _getBackgroundColor() { if (hasQuotedMessage) { diff --git a/lib/src/quoted_message_widget.dart b/lib/src/quoted_message_widget.dart index d012e15a..8a102635 100644 --- a/lib/src/quoted_message_widget.dart +++ b/lib/src/quoted_message_widget.dart @@ -125,7 +125,7 @@ class QuotedMessageWidget extends StatelessWidget { } Widget _buildMessage(BuildContext context) { - final isOnlyEmoji = textIsOnlyEmoji(message.text); + final isOnlyEmoji = message.text.isOnlyEmoji; var msg = _hasAttachments && !_containsText ? message.copyWith(text: message.attachments.last?.title ?? '') : message; diff --git a/lib/src/utils.dart b/lib/src/utils.dart index be10263e..333b96f1 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -1,4 +1,3 @@ -import 'package:emojis/emoji.dart'; import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -215,16 +214,3 @@ StreamSvgIcon getFileTypeImage(String type) { break; } } - -final _emojis = Emoji.all(); - -bool textIsOnlyEmoji(String text) { - return text.trim().characters.isNotEmpty && - text.trim().characters.every((c) => - _emojis.firstWhere( - (Emoji emoji) => emoji.char.contains(c), - orElse: () => null, - ) != - null) && - text.characters.length < 4; -} From fbc8fd9a5937f5b0826cbb625183c6fa95091bc5 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 15:38:54 +0530 Subject: [PATCH 20/33] [QuotedMessageWidget, MessageWidget] Fix emoji and regular text size Signed-off-by: Sahil Kumar --- lib/src/message_widget.dart | 2 +- lib/src/quoted_message_widget.dart | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index cd14ac40..a40556a2 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -923,7 +923,7 @@ class _MessageWidgetState extends State { ? widget.messageTheme.copyWith( messageText: widget.messageTheme.messageText.copyWith( - fontSize: 40, + fontSize: 42, )) : widget.messageTheme, ), diff --git a/lib/src/quoted_message_widget.dart b/lib/src/quoted_message_widget.dart index 8a102635..c718cdb5 100644 --- a/lib/src/quoted_message_widget.dart +++ b/lib/src/quoted_message_widget.dart @@ -145,9 +145,12 @@ class QuotedMessageWidget extends StatelessWidget { messageTheme: isOnlyEmoji && _containsText ? messageTheme.copyWith( messageText: messageTheme.messageText.copyWith( - fontSize: 24, + fontSize: 32, )) - : messageTheme, + : messageTheme.copyWith( + messageText: messageTheme.messageText.copyWith( + fontSize: 12, + )), ), ), ), From 317de62925d79a8dd735db9507e77d05f82bd94c Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 11:23:31 +0100 Subject: [PATCH 21/33] fix deleted message preview --- lib/src/channel_preview.dart | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart index eac6e3c2..3564be7a 100644 --- a/lib/src/channel_preview.dart +++ b/lib/src/channel_preview.dart @@ -96,12 +96,16 @@ class ChannelPreview extends StatelessWidget { Flexible(child: _buildSubtitle(context)), Builder( builder: (context) { - if (channel.state.lastMessage?.user?.id == + final lastMessage = channel.state.messages.lastWhere( + (m) => !m.isDeleted && m.shadowed != true, + orElse: () => null, + ); + if (lastMessage?.user?.id == StreamChat.of(context).user.id) { return Padding( padding: const EdgeInsets.only(right: 4.0), child: SendingIndicator( - message: channel.state.lastMessage, + message: lastMessage, size: StreamChatTheme.of(context) .channelPreviewTheme .indicatorIconSize, @@ -110,8 +114,7 @@ class ChannelPreview extends StatelessWidget { element.user.id != channel.client.state.user.id) ?.where((element) => element.lastRead - .isAfter(channel - .state.lastMessage.createdAt)) + .isAfter(lastMessage.createdAt)) ?.isNotEmpty == true, ), @@ -201,16 +204,15 @@ class ChannelPreview extends StatelessWidget { stream: channel.state.messagesStream, initialData: channel.state.messages, builder: (context, snapshot) { - final lastMessage = snapshot.data - ?.lastWhere((m) => m.shadowed != true, orElse: () => null); + final lastMessage = snapshot.data?.lastWhere( + (m) => m.shadowed != true && !m.isDeleted, + orElse: () => null); if (lastMessage == null) { return SizedBox(); } var text = lastMessage.text; - if (lastMessage.isDeleted) { - text = 'This message was deleted.'; - } else if (lastMessage.attachments != null) { + if (lastMessage.attachments != null) { final parts = [ ...lastMessage.attachments.map((e) { if (e.type == 'image') { From d9a50ae42eee303eae2bdbfbb21559fa18ff8e09 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 12:05:01 +0100 Subject: [PATCH 22/33] fix animations --- example/pubspec.yaml | 2 +- lib/src/message_actions_modal.dart | 283 +++++++++++++-------------- lib/src/message_reactions_modal.dart | 265 ++++++++++++------------- lib/src/reaction_picker.dart | 30 +-- 4 files changed, 284 insertions(+), 296 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index cdc07de7..46dc8820 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.1.0+1 +version: 1.1.0+2 environment: sdk: ">=2.2.2 <3.0.0" diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 95ecdea5..7f9c5e85 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -84,155 +84,146 @@ class _MessageActionsModalState extends State { ? 1 : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize)); - return GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => Navigator.maybePop(context), - child: Stack( - children: [ - Positioned.fill( - child: BackdropFilter( - filter: ImageFilter.blur( - sigmaX: 10, - sigmaY: 10, - ), - child: Container( - color: StreamChatTheme.of(context).colorTheme.overlay, - ), - ), - ), - Center( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 8.0), - child: Column( - crossAxisAlignment: widget.reverse - ? CrossAxisAlignment.end - : CrossAxisAlignment.start, - children: [ - if (widget.showReactions && - (widget.message.status == MessageSendingStatus.SENT || - widget.message.status == null)) - Align( - alignment: Alignment( - user.id == widget.message.user.id - ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor)) - : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)), - 0.0), - child: ReactionPicker( - message: widget.message, - messageTheme: widget.messageTheme, - ), - ), - TweenAnimationBuilder( - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - builder: (context, val, snapshot) { - return Transform.scale( - scale: val, - child: IgnorePointer( - child: MessageWidget( - key: Key('MessageWidget'), - reverse: widget.reverse, - message: widget.message.copyWith( - text: widget.message.text.length > 200 - ? '${widget.message.text.substring(0, 200)}...' - : widget.message.text, - ), - messageTheme: widget.messageTheme, - showReactions: false, - showUsername: false, - showThreadReplyIndicator: false, - showReplyMessage: false, - showUserAvatar: widget.showUserAvatar, - showTimestamp: false, - translateUserAvatar: false, - showReactionPickerIndicator: - widget.showReactions && - (widget.message.status == - MessageSendingStatus.SENT || - widget.message.status == null), - showInChannelIndicator: false, - showSendingIndicator: false, - shape: widget.messageShape, - ), - ), - ); - }), - TweenAnimationBuilder( - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - curve: Curves.easeInOut, - builder: (context, val, wid) { - return Transform( - transform: Matrix4.identity() - ..scale(val) - ..rotateZ(-1.0 + val), - alignment: widget.reverse - ? Alignment.topRight - : Alignment.topLeft, - child: Padding( - padding: EdgeInsets.only( - right: widget.reverse ? 16 : 0, - left: widget.reverse ? 0 : 48, - ), - child: SizedBox( - width: MediaQuery.of(context).size.width * 0.75, - child: Material( - color: StreamChatTheme.of(context) - .colorTheme - .whiteSnow, - clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16), - ), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.stretch, - children: ListTile.divideTiles( - color: StreamChatTheme.of(context) - .colorTheme - .greyWhisper, - context: context, - tiles: [ - if (widget.showReplyMessage && - (widget.message.status == - MessageSendingStatus.SENT || - widget.message.status == - null) && - widget.message.parentId == null) - _buildReplyButton(context), - if (widget.showThreadReplyMessage && - (widget.message.status == - MessageSendingStatus.SENT || - widget.message.status == - null) && - widget.message.parentId == null) - _buildThreadReplyButton(context), - if (widget.showResendMessage) - _buildResendMessage(context), - if (widget.showEditMessage) - _buildEditMessage(context), - if (widget.showCopyMessage) - _buildCopyButton(context), - if (widget.showFlagButton) - _buildFlagButton(context), - if (widget.showDeleteMessage) - _buildDeleteButton(context), - ], - ).toList(), - ), - ), - ), - ), - ); - }) - ], + return TweenAnimationBuilder( + tween: Tween(begin: 0.0, end: 1.0), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutBack, + builder: (context, val, snapshot) { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => Navigator.maybePop(context), + child: Stack( + children: [ + Positioned.fill( + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: 10, + sigmaY: 10, + ), + child: Container( + color: StreamChatTheme.of(context).colorTheme.overlay, + ), ), ), - ), + Transform.scale( + scale: val, + child: Center( + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Column( + crossAxisAlignment: widget.reverse + ? CrossAxisAlignment.end + : CrossAxisAlignment.start, + children: [ + if (widget.showReactions && + (widget.message.status == + MessageSendingStatus.SENT || + widget.message.status == null)) + Align( + alignment: Alignment( + user.id == widget.message.user.id + ? (divFactor > 1.0 + ? 0.0 + : (1.0 - divFactor)) + : (divFactor > 1.0 + ? 0.0 + : -(1.0 - divFactor)), + 0.0), + child: ReactionPicker( + message: widget.message, + messageTheme: widget.messageTheme, + ), + ), + IgnorePointer( + child: MessageWidget( + key: Key('MessageWidget'), + reverse: widget.reverse, + message: widget.message.copyWith( + text: widget.message.text.length > 200 + ? '${widget.message.text.substring(0, 200)}...' + : widget.message.text, + ), + messageTheme: widget.messageTheme, + showReactions: false, + showUsername: false, + showThreadReplyIndicator: false, + showReplyMessage: false, + showUserAvatar: widget.showUserAvatar, + showTimestamp: false, + translateUserAvatar: false, + showReactionPickerIndicator: + widget.showReactions && + (widget.message.status == + MessageSendingStatus.SENT || + widget.message.status == null), + showInChannelIndicator: false, + showSendingIndicator: false, + shape: widget.messageShape, + ), + ), + Padding( + padding: EdgeInsets.only( + right: widget.reverse ? 16 : 0, + left: widget.reverse ? 0 : 48, + ), + child: SizedBox( + width: MediaQuery.of(context).size.width * 0.75, + child: Material( + color: StreamChatTheme.of(context) + .colorTheme + .whiteSnow, + clipBehavior: Clip.hardEdge, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + ), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.stretch, + children: ListTile.divideTiles( + color: StreamChatTheme.of(context) + .colorTheme + .greyWhisper, + context: context, + tiles: [ + if (widget.showReplyMessage && + (widget.message.status == + MessageSendingStatus.SENT || + widget.message.status == null) && + widget.message.parentId == null) + _buildReplyButton(context), + if (widget.showThreadReplyMessage && + (widget.message.status == + MessageSendingStatus.SENT || + widget.message.status == null) && + widget.message.parentId == null) + _buildThreadReplyButton(context), + if (widget.showResendMessage) + _buildResendMessage(context), + if (widget.showEditMessage) + _buildEditMessage(context), + if (widget.showCopyMessage) + _buildCopyButton(context), + if (widget.showFlagButton) + _buildFlagButton(context), + if (widget.showDeleteMessage) + _buildDeleteButton(context), + ], + ).toList(), + ), + ), + ), + ), + ], + ), + ), + ), + ), + ), + ], ), - ], - ), + ); + }, ); } diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart index 5c24e047..15a301cc 100644 --- a/lib/src/message_reactions_modal.dart +++ b/lib/src/message_reactions_modal.dart @@ -56,86 +56,92 @@ class MessageReactionsModal extends StatelessWidget { ? 1 : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize)); - return GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => Navigator.maybePop(context), - child: Stack( - children: [ - Positioned.fill( - child: BackdropFilter( - filter: ImageFilter.blur( - sigmaX: 10, - sigmaY: 10, - ), - child: Container( - color: StreamChatTheme.of(context).colorTheme.overlay, - ), - ), - ), - Center( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 8.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - if (showReactions && - (message.status == MessageSendingStatus.SENT || - message.status == null)) - Align( - alignment: Alignment( - user.id == message.user.id - ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor)) - : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)), - 0.0), - child: ReactionPicker( - message: message, - messageTheme: messageTheme, - ), - ), - TweenAnimationBuilder( - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - builder: (context, val, snapshot) { - return Transform.scale( - scale: val, - child: IgnorePointer( - child: MessageWidget( - key: Key('MessageWidget'), - reverse: reverse, - message: message.copyWith( - text: message.text.length > 200 - ? '${message.text.substring(0, 200)}...' - : message.text, - ), - messageTheme: messageTheme, - showReactions: false, - showUsername: false, - showUserAvatar: showUserAvatar, - showThreadReplyIndicator: false, - showTimestamp: false, - translateUserAvatar: false, - showSendingIndicator: false, - shape: messageShape, - showInChannelIndicator: false, - showReactionPickerIndicator: showReactions && - (message.status == - MessageSendingStatus.SENT || - message.status == null), - ), - ), - ); - }), - if (message.latestReactions?.isNotEmpty == true) - _buildReactionCard(context), - ], + return TweenAnimationBuilder( + tween: Tween(begin: 0.0, end: 1.0), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutBack, + builder: (context, val, snapshot) { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => Navigator.maybePop(context), + child: Stack( + children: [ + Positioned.fill( + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: 10, + sigmaY: 10, + ), + child: Container( + color: StreamChatTheme.of(context).colorTheme.overlay, + ), ), ), - ), + Transform.scale( + scale: val, + child: Center( + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (showReactions && + (message.status == MessageSendingStatus.SENT || + message.status == null)) + Align( + alignment: Alignment( + user.id == message.user.id + ? (divFactor > 1.0 + ? 0.0 + : (1.0 - divFactor)) + : (divFactor > 1.0 + ? 0.0 + : -(1.0 - divFactor)), + 0.0), + child: ReactionPicker( + message: message, + messageTheme: messageTheme, + ), + ), + IgnorePointer( + child: MessageWidget( + key: Key('MessageWidget'), + reverse: reverse, + message: message.copyWith( + text: message.text.length > 200 + ? '${message.text.substring(0, 200)}...' + : message.text, + ), + messageTheme: messageTheme, + showReactions: false, + showUsername: false, + showUserAvatar: showUserAvatar, + showThreadReplyIndicator: false, + showTimestamp: false, + translateUserAvatar: false, + showSendingIndicator: false, + shape: messageShape, + showInChannelIndicator: false, + showReactionPickerIndicator: showReactions && + (message.status == + MessageSendingStatus.SENT || + message.status == null), + ), + ), + if (message.latestReactions?.isNotEmpty == true) + _buildReactionCard(context), + ], + ), + ), + ), + ), + ), + ], ), - ], - ), + ); + }, ); } @@ -191,64 +197,53 @@ class MessageReactionsModal extends StatelessWidget { BuildContext context, ) { final isCurrentUser = reaction.user.id == currentUser.id; - return TweenAnimationBuilder( - tween: Tween(begin: 0.0, end: 1.0), - duration: Duration(milliseconds: 300), - curve: Curves.easeInOut, - builder: (context, val, snapshot) { - return Transform.scale( - scale: val, - child: ConstrainedBox( - constraints: BoxConstraints.loose(Size( - 64, - 98, - )), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Stack( - children: [ - UserAvatar( - onTap: onUserAvatarTap, - user: reaction.user, - constraints: BoxConstraints.tightFor( - height: 64, - width: 64, - ), - borderRadius: BorderRadius.circular(32), - ), - Positioned( - child: Align( - alignment: reverse - ? Alignment.centerRight - : Alignment.centerLeft, - child: ReactionBubble( - reactions: [reaction], - flipTail: !reverse, - borderColor: messageTheme.reactionsBorderColor, - backgroundColor: - messageTheme.reactionsBackgroundColor, - highlightOwnReactions: false, - ), - ), - bottom: 6, - left: isCurrentUser ? 0 : null, - right: isCurrentUser ? 0 : null, - ), - ], - ), - const SizedBox(height: 8), - Text( - reaction.user.name, - style: StreamChatTheme.of(context).textTheme.footnoteBold, - textAlign: TextAlign.center, - ), - ], + return ConstrainedBox( + constraints: BoxConstraints.loose(Size( + 64, + 98, + )), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Stack( + children: [ + UserAvatar( + onTap: onUserAvatarTap, + user: reaction.user, + constraints: BoxConstraints.tightFor( + height: 64, + width: 64, + ), + borderRadius: BorderRadius.circular(32), ), - ), - ); - }); + Positioned( + child: Align( + alignment: + reverse ? Alignment.centerRight : Alignment.centerLeft, + child: ReactionBubble( + reactions: [reaction], + flipTail: !reverse, + borderColor: messageTheme.reactionsBorderColor, + backgroundColor: messageTheme.reactionsBackgroundColor, + highlightOwnReactions: false, + ), + ), + bottom: 6, + left: isCurrentUser ? 0 : null, + right: isCurrentUser ? 0 : null, + ), + ], + ), + const SizedBox(height: 8), + Text( + reaction.user.name, + style: StreamChatTheme.of(context).textTheme.footnoteBold, + textAlign: TextAlign.center, + ), + ], + ), + ); } } diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart index c5c42bd1..bca74a99 100644 --- a/lib/src/reaction_picker.dart +++ b/lib/src/reaction_picker.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:ezanimation/ezanimation.dart'; import 'package:flutter/material.dart'; import 'package:stream_chat_flutter/src/stream_svg_icon.dart'; @@ -36,13 +38,10 @@ class _ReactionPickerState extends State if (animations.isEmpty && reactionIcons.isNotEmpty) { reactionIcons.forEach((element) { animations.add( - EzAnimation.sequence( - [ - SequenceItem(0.0, 1.4), - SequenceItem(1.4, 1.0), - ], + EzAnimation.tween( + Tween(begin: 0.0, end: 1.0), Duration(milliseconds: 500), - vsync: this, + curve: Curves.easeInOutBack, ), ); }); @@ -52,7 +51,7 @@ class _ReactionPickerState extends State return TweenAnimationBuilder( tween: Tween(begin: 0.0, end: 1.0), - curve: Curves.easeInOutExpo, + curve: Curves.easeInOutBack, duration: Duration(milliseconds: 500), builder: (context, val, wid) { return Transform.scale( @@ -81,15 +80,18 @@ class _ReactionPickerState extends State icon: AnimatedBuilder( animation: animations[index], builder: (context, val) { - return Transform( - transform: Matrix4.identity() - ..scale(animations[index].value, - animations[index].value) - ..rotateZ(1.0 - animations[index].value), + return Transform.scale( + scale: animations[index].value, child: StreamSvgIcon( assetName: reactionIcon.assetName, - height: animations[index].value * 24.0, - width: animations[index].value * 24.0, + height: max( + 0, + animations[index].value * 24.0, + ), + width: max( + 0, + animations[index].value * 24.0, + ), color: ownReactionIndex != -1 ? StreamChatTheme.of(context) .colorTheme From 47a3a94c93b38112c19612017f876d8383b34346 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 16:57:04 +0530 Subject: [PATCH 23/33] [MessageInput] Fix iconButtons and textField paddings and text sizes Signed-off-by: Sahil Kumar --- lib/src/message_input.dart | 559 ++++++++++++++++++------------------- 1 file changed, 271 insertions(+), 288 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index ee8763ba..8bb20302 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -358,31 +358,31 @@ class MessageInputState extends State { ); } - AnimatedCrossFade _animateSendButton(BuildContext context) { - return AnimatedCrossFade( - crossFadeState: ((_messageIsPresent || _attachments.isNotEmpty) && - _attachments.every((a) => a.uploaded == true)) - ? CrossFadeState.showFirst - : CrossFadeState.showSecond, - firstChild: _buildSendButton(context), - secondChild: _buildIdleSendButton(context), - duration: Duration(milliseconds: 300), - alignment: Alignment.center, + Widget _animateSendButton(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: AnimatedCrossFade( + crossFadeState: ((_messageIsPresent || _attachments.isNotEmpty) && + _attachments.every((a) => a.uploaded == true)) + ? CrossFadeState.showFirst + : CrossFadeState.showSecond, + firstChild: _buildSendButton(context), + secondChild: _buildIdleSendButton(context), + duration: Duration(milliseconds: 300), + alignment: Alignment.center, + ), ); } Widget _buildExpandActionsButton() { - return AnimatedCrossFade( - crossFadeState: - _actionsShrunk ? CrossFadeState.showFirst : CrossFadeState.showSecond, - firstChild: Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: IconButton( - onPressed: () { - setState(() { - _actionsShrunk = false; - }); - }, + return Padding( + padding: const EdgeInsets.all(8.0), + child: AnimatedCrossFade( + crossFadeState: _actionsShrunk + ? CrossFadeState.showFirst + : CrossFadeState.showSecond, + firstChild: IconButton( + onPressed: () => setState(() => _actionsShrunk = false), icon: StreamSvgIcon.emptyCircleLeft( color: StreamChatTheme.of(context).colorTheme.accentBlue, ), @@ -393,34 +393,36 @@ class MessageInputState extends State { ), splashRadius: 24, ), + secondChild: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + if (!widget.disableAttachments) _buildAttachmentButton(), + if (widget.editMessage == null && + StreamChannel.of(context) + .channel + ?.config + ?.commands + ?.isNotEmpty == + true) + _buildCommandButton(), + ].insertBetween(const SizedBox(width: 8)), + ), + duration: Duration(milliseconds: 300), + alignment: Alignment.center, ), - secondChild: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - if (!widget.disableAttachments) _buildAttachmentButton(), - if (widget.editMessage == null && - StreamChannel.of(context).channel?.config?.commands?.isNotEmpty == - true) - _buildCommandButton(), - ], - ), - duration: Duration(milliseconds: 300), - alignment: Alignment.center, ); } Expanded _buildTextInput(BuildContext context) { + final theme = StreamChatTheme.of(context); return Expanded( child: Center( child: Container( clipBehavior: Clip.antiAlias, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(24.0), - border: Border.all( - color: StreamChatTheme.of(context).colorTheme.greyGainsboro, - ), + borderRadius: BorderRadius.circular(20.0), + border: Border.all(color: theme.colorTheme.greyGainsboro), ), - padding: _attachments.isEmpty ? null : EdgeInsets.all(6.0), child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, @@ -429,52 +431,48 @@ class MessageInputState extends State { _buildAttachments(), LimitedBox( maxHeight: widget.maxHeight, - child: TextField( - key: Key('messageInputText'), - enabled: _inputEnabled, - minLines: null, - maxLines: null, - onSubmitted: (_) { - sendMessage(); - }, - keyboardType: widget.keyboardType, - controller: textEditingController, - focusNode: _focusNode, - style: Theme.of(context).textTheme.bodyText2, - autofocus: false, - textAlignVertical: TextAlignVertical.center, - decoration: InputDecoration( - isDense: true, - hintText: _getHint(), - prefixText: _commandEnabled ? null : ' ', - border: OutlineInputBorder( - borderSide: BorderSide(color: Colors.transparent)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.transparent)), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.transparent)), - errorBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.transparent)), - disabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.transparent)), - contentPadding: EdgeInsets.symmetric( - horizontal: 16, - vertical: 13, - ), - prefixIcon: _commandEnabled - ? Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8.0), - child: Chip( - backgroundColor: StreamChatTheme.of(context) - .colorTheme - .accentBlue, - padding: EdgeInsets.zero, - labelPadding: - EdgeInsets.symmetric(horizontal: 8.0), - label: Row( + child: SizedBox( + height: 40, + child: TextField( + key: Key('messageInputText'), + enabled: _inputEnabled, + minLines: null, + maxLines: null, + onSubmitted: (_) => sendMessage(), + keyboardType: widget.keyboardType, + controller: textEditingController, + focusNode: _focusNode, + style: theme.textTheme.body, + autofocus: false, + textAlignVertical: TextAlignVertical.center, + decoration: InputDecoration( + isDense: true, + hintText: _getHint(), + hintStyle: theme.textTheme.body.copyWith( + color: theme.colorTheme.grey, + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent)), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent)), + errorBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent)), + disabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent)), + contentPadding: const EdgeInsets.fromLTRB(16, 12, 13, 11), + prefixIcon: _commandEnabled + ? Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: theme.colorTheme.accentBlue, + ), + height: 24, + margin: const EdgeInsets.all(8.0), + padding: const EdgeInsets.only(right: 8, left: 4), + child: Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, children: [ StreamSvgIcon.lightning( color: Colors.white, @@ -484,27 +482,32 @@ class MessageInputState extends State { _chosenCommand?.name?.toUpperCase() ?? '', style: StreamChatTheme.of(context) .textTheme - .footnote + .footnoteBold .copyWith( color: Colors.white, ), ), ], ), - ), - ) - : null, - suffixIcon: _commandEnabled - ? IconButton( - icon: StreamSvgIcon.close_small(), - splashRadius: 24, - onPressed: () { - setState(() => _commandEnabled = false); - }, - ) - : null, + ) + : null, + suffixIcon: _commandEnabled + ? IconButton( + icon: StreamSvgIcon.close_small(), + splashRadius: 24, + padding: const EdgeInsets.all(0), + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + onPressed: () { + setState(() => _commandEnabled = false); + }, + ) + : null, + ), + textCapitalization: TextCapitalization.sentences, ), - textCapitalization: TextCapitalization.sentences, ), ) ], @@ -1515,9 +1518,7 @@ class MessageInputState extends State { } Widget _buildReplyToMessage() { - if (!_hasQuotedMessage) { - return Offstage(); - } + if (!_hasQuotedMessage) return Offstage(); final containsUrl = widget.quotedMessage.attachments ?.any((element) => element.ogScrapeUrl != null) == true; @@ -1534,109 +1535,104 @@ class MessageInputState extends State { } Widget _buildAttachments() { - return _attachments.isEmpty - ? Container() - : Column( - children: [ - if (_attachments.any((e) => e.attachment?.type == 'file')) - LimitedBox( - maxHeight: 136.0, - child: ListView( - reverse: true, - shrinkWrap: true, - children: _attachments.reversed - .where((e) => e.attachment?.type == 'file') - .map( - (e) => Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(10), - clipBehavior: Clip.antiAlias, - child: FileAttachment( - attachment: e.attachment, - attachmentType: FileAttachmentType.local, - file: e.file, - size: Size( - MediaQuery.of(context).size.width * 0.65, - 56.0, + if (_attachments.isEmpty) return Offstage(); + return Column( + children: [ + if (_attachments.any((e) => e.attachment?.type == 'file')) + LimitedBox( + maxHeight: 136.0, + child: ListView( + reverse: true, + shrinkWrap: true, + children: _attachments.reversed + .where((e) => e.attachment?.type == 'file') + .map( + (e) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: ClipRRect( + borderRadius: BorderRadius.circular(10), + clipBehavior: Clip.antiAlias, + child: FileAttachment( + attachment: e.attachment, + attachmentType: FileAttachmentType.local, + file: e.file, + size: Size( + MediaQuery.of(context).size.width * 0.65, + 56.0, + ), + trailing: Padding( + padding: const EdgeInsets.all(8.0), + child: InkWell( + child: CircleAvatar( + backgroundColor: StreamChatTheme.of(context) + .colorTheme + .black + .withOpacity(0.6), + maxRadius: 12.0, + child: StreamSvgIcon.close( + color: StreamChatTheme.of(context) + .colorTheme + .white, ), - trailing: Padding( - padding: const EdgeInsets.all(8.0), - child: InkWell( - child: CircleAvatar( - backgroundColor: - StreamChatTheme.of(context) - .colorTheme - .black - .withOpacity(0.6), - maxRadius: 12.0, - child: StreamSvgIcon.close( - color: StreamChatTheme.of(context) - .colorTheme - .white, + ), + onTap: () { + setState(() { + _attachments.remove(e); + }); + }, + ), + ), + ), + ), + ), + ) + .toList(), + ), + ), + if (_attachments.any((e) => e.attachment?.type != 'file')) + LimitedBox( + maxHeight: 104.0, + child: ListView( + scrollDirection: Axis.horizontal, + children: _attachments + .where((e) => e.attachment?.type != 'file') + .map( + (attachment) => Padding( + padding: const EdgeInsets.all(8.0), + child: ClipRRect( + borderRadius: BorderRadius.circular(10), + clipBehavior: Clip.antiAlias, + child: Stack( + children: [ + AspectRatio( + aspectRatio: 1.0, + child: Container( + height: 104, + width: 104, + child: _buildAttachment(attachment), + ), + ), + _buildRemoveButton(attachment), + attachment.uploaded + ? SizedBox() + : Positioned.fill( + child: Center( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: CircularProgressIndicator(), ), ), - onTap: () { - setState(() { - _attachments.remove(e); - }); - }, ), - ), - ), - ), - ), - ) - .toList(), - ), - ), - if (_attachments.any((e) => e.attachment?.type != 'file')) - LimitedBox( - maxHeight: 104.0, - child: ListView( - scrollDirection: Axis.horizontal, - children: _attachments - .where((e) => e.attachment?.type != 'file') - .map( - (attachment) => Padding( - padding: const EdgeInsets.all(8.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(10), - clipBehavior: Clip.antiAlias, - child: Stack( - children: [ - AspectRatio( - aspectRatio: 1.0, - child: Container( - height: 104, - width: 104, - child: _buildAttachment(attachment), - ), - ), - _buildRemoveButton(attachment), - attachment.uploaded - ? SizedBox() - : Positioned.fill( - child: Center( - child: Padding( - padding: - const EdgeInsets.all(16.0), - child: - CircularProgressIndicator(), - ), - ), - ), - ], - ), - ), - ), - ) - .toList(), - ), - ), - ], - ); + ], + ), + ), + ), + ) + .toList(), + ), + ), + ], + ); } Positioned _buildRemoveButton(_SendingAttachment attachment) { @@ -1746,80 +1742,74 @@ class MessageInputState extends State { } Widget _buildCommandButton() { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: IconButton( - icon: StreamSvgIcon.lightning( - color: _commandsOverlay != null - ? StreamChatTheme.of(context).colorTheme.accentBlue - : StreamChatTheme.of(context).colorTheme.grey, - ), - padding: const EdgeInsets.all(0), - constraints: BoxConstraints.tightFor( - height: 24, - width: 24, - ), - splashRadius: 24, - onPressed: () async { - if (_openFilePickerSection) { - setState(() { - _animateContainer = false; - _openFilePickerSection = false; - _filePickerSize = _kMinMediaPickerSize; - }); - await Future.delayed(Duration(milliseconds: 300)); - } - - if (_commandsOverlay == null) { - setState(() { - _commandsOverlay = _buildCommandsOverlayEntry(); - Overlay.of(context).insert(_commandsOverlay); - }); - } else { - setState(() { - _commandsOverlay?.remove(); - _commandsOverlay = null; - }); - } - }, + return IconButton( + icon: StreamSvgIcon.lightning( + color: _commandsOverlay != null + ? StreamChatTheme.of(context).colorTheme.accentBlue + : StreamChatTheme.of(context).colorTheme.grey, ), + padding: const EdgeInsets.all(0), + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + splashRadius: 24, + onPressed: () async { + if (_openFilePickerSection) { + setState(() { + _animateContainer = false; + _openFilePickerSection = false; + _filePickerSize = _kMinMediaPickerSize; + }); + await Future.delayed(Duration(milliseconds: 300)); + } + + if (_commandsOverlay == null) { + setState(() { + _commandsOverlay = _buildCommandsOverlayEntry(); + Overlay.of(context).insert(_commandsOverlay); + }); + } else { + setState(() { + _commandsOverlay?.remove(); + _commandsOverlay = null; + }); + } + }, ); } Widget _buildAttachmentButton() { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: IconButton( - icon: StreamSvgIcon.attach( - color: _openFilePickerSection - ? StreamChatTheme.of(context).colorTheme.accentBlue - : StreamChatTheme.of(context).colorTheme.grey, - ), - padding: const EdgeInsets.all(0), - constraints: BoxConstraints.tightFor( - height: 24, - width: 24, - ), - splashRadius: 24, - onPressed: () async { - _emojiOverlay?.remove(); - _emojiOverlay = null; - _commandsOverlay?.remove(); - _commandsOverlay = null; - _mentionsOverlay?.remove(); - _mentionsOverlay = null; - - if (_openFilePickerSection) { - setState(() { - _animateContainer = true; - _openFilePickerSection = false; - _filePickerSize = _kMinMediaPickerSize; - }); - } else { - showAttachmentModal(); - } - }, + return IconButton( + icon: StreamSvgIcon.attach( + color: _openFilePickerSection + ? StreamChatTheme.of(context).colorTheme.accentBlue + : StreamChatTheme.of(context).colorTheme.grey, ), + padding: const EdgeInsets.all(0), + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + splashRadius: 24, + onPressed: () async { + _emojiOverlay?.remove(); + _emojiOverlay = null; + _commandsOverlay?.remove(); + _commandsOverlay = null; + _mentionsOverlay?.remove(); + _mentionsOverlay = null; + + if (_openFilePickerSection) { + setState(() { + _animateContainer = true; + _openFilePickerSection = false; + _filePickerSize = _kMinMediaPickerSize; + }); + } else { + showAttachmentModal(); + } + }, ); } @@ -2118,31 +2108,24 @@ class MessageInputState extends State { } Widget _buildIdleSendButton(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: StreamSvgIcon( - assetName: _getIdleSendIcon(), - color: StreamChatTheme.of(context).colorTheme.greyGainsboro, - ), + return StreamSvgIcon( + assetName: _getIdleSendIcon(), + color: StreamChatTheme.of(context).colorTheme.greyGainsboro, ); } Widget _buildSendButton(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: IconButton( - onPressed: sendMessage, - visualDensity: VisualDensity.compact, - padding: const EdgeInsets.all(0), - splashRadius: 24, - constraints: BoxConstraints.tightFor( - height: 24, - width: 24, - ), - icon: StreamSvgIcon( - assetName: _getSendIcon(), - color: StreamChatTheme.of(context).colorTheme.accentBlue, - ), + return IconButton( + onPressed: sendMessage, + padding: const EdgeInsets.all(0), + splashRadius: 24, + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + icon: StreamSvgIcon( + assetName: _getSendIcon(), + color: StreamChatTheme.of(context).colorTheme.accentBlue, ), ); } From c5f245808378e685af2daec504cc8989233706c2 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 18:03:24 +0530 Subject: [PATCH 24/33] [MessageWidget] Move messageBorderSide handling one level up Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 10 +++++++++- lib/src/message_widget.dart | 7 ++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index 095b6b73..dab8eda1 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -811,6 +811,14 @@ class _MessageListViewState extends State { final showThreadReplyIndicator = !_isThreadConversation && hasReplies; final isOnlyEmoji = message.text.isOnlyEmoji; + final borderSide = isMyMessage + ? !(showThreadReplyIndicator || showInChannelIndicator) + ? BorderSide.none + : null + : isOnlyEmoji + ? BorderSide.none + : null; + Widget child = MessageWidget( key: ValueKey('MESSAGE-${message.id}'), message: message, @@ -846,7 +854,7 @@ class _MessageListViewState extends State { showEditMessage: isMyMessage, showDeleteMessage: isMyMessage, showThreadReplyMessage: !isThreadMessage, - borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null, + borderSide: borderSide, onThreadTap: _onThreadTap, onReplyTap: widget.onReplyTap, attachmentBorderRadiusGeometry: BorderRadius.only( diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index a40556a2..ba458a7e 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -383,11 +383,8 @@ class _MessageWidgetState extends State { ), shape: widget.shape ?? RoundedRectangleBorder( - side: isOnlyEmoji && - !(showThreadReplyIndicator || - showInChannel) - ? BorderSide.none - : widget.borderSide ?? + side: + widget.borderSide ?? BorderSide( color: widget .messageTheme From 7e8def27072acc5231bb826a5036848b533402a6 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 18:08:50 +0530 Subject: [PATCH 25/33] [MessageListView] Minor border visibility condition fixes Signed-off-by: Sahil Kumar --- lib/src/message_list_view.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart index dab8eda1..6242bd8a 100644 --- a/lib/src/message_list_view.dart +++ b/lib/src/message_list_view.dart @@ -732,7 +732,7 @@ class _MessageListViewState extends State { topRight: Radius.circular(16), bottomRight: Radius.circular(16), ), - borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null, + borderSide: isMyMessage || isOnlyEmoji ? BorderSide.none : null, showUserAvatar: isMyMessage ? DisplayWidget.gone : DisplayWidget.show, messageTheme: isMyMessage ? StreamChatTheme.of(context).ownMessageTheme @@ -811,11 +811,13 @@ class _MessageListViewState extends State { final showThreadReplyIndicator = !_isThreadConversation && hasReplies; final isOnlyEmoji = message.text.isOnlyEmoji; + final showMessageBorder = + showThreadReplyIndicator || showInChannelIndicator; final borderSide = isMyMessage - ? !(showThreadReplyIndicator || showInChannelIndicator) + ? !showMessageBorder ? BorderSide.none : null - : isOnlyEmoji + : isOnlyEmoji && !showMessageBorder ? BorderSide.none : null; From 40910f93f1e82b49291e44e0868d1a62b8fbccca Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 13:49:44 +0100 Subject: [PATCH 26/33] fix reaction picker spacing and size --- example/pubspec.yaml | 2 +- lib/src/reaction_picker.dart | 123 ++++++++++++++++++++--------------- 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 46dc8820..6c4ae4dc 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.1.0+2 +version: 1.1.0+3 environment: sdk: ">=2.2.2 <3.0.0" diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart index bca74a99..804b1559 100644 --- a/lib/src/reaction_picker.dart +++ b/lib/src/reaction_picker.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:stream_chat_flutter/src/stream_svg_icon.dart'; import '../stream_chat_flutter.dart'; +import 'extension.dart'; /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker.png) /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker_paint.png) @@ -57,67 +58,83 @@ class _ReactionPickerState extends State return Transform.scale( scale: val, child: Material( + borderRadius: BorderRadius.circular(24), color: StreamChatTheme.of(context).colorTheme.white, clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(24), - ), child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 8.0), + padding: const EdgeInsets.symmetric( + horizontal: 16.0, + vertical: 8.0, + ), child: Row( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.end, mainAxisSize: MainAxisSize.min, - children: reactionIcons.map((reactionIcon) { - final ownReactionIndex = widget.message.ownReactions - ?.indexWhere((reaction) => - reaction.type == reactionIcon.type) ?? - -1; - var index = reactionIcons.indexOf(reactionIcon); + children: reactionIcons + .map((reactionIcon) { + final ownReactionIndex = widget.message.ownReactions + ?.indexWhere((reaction) => + reaction.type == reactionIcon.type) ?? + -1; + var index = reactionIcons.indexOf(reactionIcon); - return IconButton( - iconSize: 24, - icon: AnimatedBuilder( - animation: animations[index], - builder: (context, val) { - return Transform.scale( - scale: animations[index].value, - child: StreamSvgIcon( - assetName: reactionIcon.assetName, - height: max( - 0, - animations[index].value * 24.0, - ), - width: max( - 0, - animations[index].value * 24.0, - ), - color: ownReactionIndex != -1 - ? StreamChatTheme.of(context) - .colorTheme - .accentBlue - : Theme.of(context) - .iconTheme - .color - .withOpacity(.5), - ), - ); - }), - onPressed: () { - if (ownReactionIndex != -1) { - removeReaction( - context, - widget.message.ownReactions[ownReactionIndex], - ); - } else { - sendReaction( - context, - reactionIcon.type, - ); - } - }, - ); - }).toList(), + return RawMaterialButton( + elevation: 0, + padding: const EdgeInsets.all(0), + clipBehavior: Clip.none, + shape: ContinuousRectangleBorder( + borderRadius: BorderRadius.circular(16), + ), + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + child: AnimatedBuilder( + animation: animations[index], + builder: (context, val) { + return Transform.scale( + alignment: Alignment.center, + scale: animations[index].value, + child: StreamSvgIcon( + assetName: reactionIcon.assetName, + height: max( + 0, + animations[index].value * 24.0, + ), + width: max( + 0, + animations[index].value * 24.0, + ), + color: ownReactionIndex != -1 + ? StreamChatTheme.of(context) + .colorTheme + .accentBlue + : Theme.of(context) + .iconTheme + .color + .withOpacity(.5), + ), + ); + }), + onPressed: () { + if (ownReactionIndex != -1) { + removeReaction( + context, + widget.message.ownReactions[ownReactionIndex], + ); + } else { + sendReaction( + context, + reactionIcon.type, + ); + } + }, + ); + }) + .insertBetween(SizedBox( + width: 16, + )) + .toList(), ), ), ), From 294c9edafb455813ceda4cb74cb9ed13091c199e Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 14:35:29 +0100 Subject: [PATCH 27/33] fix reaction picker spacing and size --- lib/src/reaction_picker.dart | 96 +++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart index 804b1559..b0aa51ce 100644 --- a/lib/src/reaction_picker.dart +++ b/lib/src/reaction_picker.dart @@ -78,57 +78,63 @@ class _ReactionPickerState extends State -1; var index = reactionIcons.indexOf(reactionIcon); - return RawMaterialButton( - elevation: 0, - padding: const EdgeInsets.all(0), - clipBehavior: Clip.none, - shape: ContinuousRectangleBorder( - borderRadius: BorderRadius.circular(16), - ), + return ConstrainedBox( constraints: BoxConstraints.tightFor( height: 24, width: 24, ), - child: AnimatedBuilder( - animation: animations[index], - builder: (context, val) { - return Transform.scale( - alignment: Alignment.center, - scale: animations[index].value, - child: StreamSvgIcon( - assetName: reactionIcon.assetName, - height: max( - 0, - animations[index].value * 24.0, + child: RawMaterialButton( + elevation: 0, + padding: const EdgeInsets.all(0), + clipBehavior: Clip.none, + shape: ContinuousRectangleBorder( + borderRadius: BorderRadius.circular(16), + ), + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, + ), + child: AnimatedBuilder( + animation: animations[index], + builder: (context, val) { + return Transform.scale( + alignment: Alignment.center, + scale: animations[index].value, + child: StreamSvgIcon( + assetName: reactionIcon.assetName, + height: max( + 0, + animations[index].value * 24.0, + ), + width: max( + 0, + animations[index].value * 24.0, + ), + color: ownReactionIndex != -1 + ? StreamChatTheme.of(context) + .colorTheme + .accentBlue + : Theme.of(context) + .iconTheme + .color + .withOpacity(.5), ), - width: max( - 0, - animations[index].value * 24.0, - ), - color: ownReactionIndex != -1 - ? StreamChatTheme.of(context) - .colorTheme - .accentBlue - : Theme.of(context) - .iconTheme - .color - .withOpacity(.5), - ), + ); + }), + onPressed: () { + if (ownReactionIndex != -1) { + removeReaction( + context, + widget.message.ownReactions[ownReactionIndex], ); - }), - onPressed: () { - if (ownReactionIndex != -1) { - removeReaction( - context, - widget.message.ownReactions[ownReactionIndex], - ); - } else { - sendReaction( - context, - reactionIcon.type, - ); - } - }, + } else { + sendReaction( + context, + reactionIcon.type, + ); + } + }, + ), ); }) .insertBetween(SizedBox( From 04902f6a8124c40e68d325c9987c6e28e79ee400 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 14:50:47 +0100 Subject: [PATCH 28/33] fix indicator --- lib/src/message_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index 8118af01..ccf7dc83 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -428,7 +428,7 @@ class _MessageWidgetState extends State { if (widget.showReactionPickerIndicator) Positioned( right: 0, - top: -6, + top: -8, child: Transform( transform: Matrix4.rotationY( widget.reverse ? pi : 0), From 16bedf87287d845a2a765f114b016c62419ef9d6 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 19:36:12 +0530 Subject: [PATCH 29/33] [QuotedMessageWidget, MessageWidget] Fix quoted message padding in case of attachments Signed-off-by: Sahil Kumar --- lib/src/message_widget.dart | 33 +++++++++++++++++++++-------- lib/src/quoted_message_widget.dart | 34 ++++++++++++------------------ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart index c4b03ce2..8f4b0158 100644 --- a/lib/src/message_widget.dart +++ b/lib/src/message_widget.dart @@ -272,6 +272,12 @@ class _MessageWidgetState extends State { widget.message.attachments?.any((element) => element.type == 'giphy') == true; + bool get hasNonUrlAttachments => + widget.message.attachments + ?.where((it) => it.ogScrapeUrl == null) + ?.isNotEmpty == + true; + bool get showBottomRow => showThreadReplyIndicator || showUsername || @@ -409,8 +415,9 @@ class _MessageWidgetState extends State { children: [ if (hasQuotedMessage) _buildQuotedMessage(), - ..._parseAttachments( - context), + if (hasNonUrlAttachments) + ..._parseAttachments( + context), if (widget.message.text .trim() .isNotEmpty && @@ -487,13 +494,21 @@ class _MessageWidgetState extends State { widget.onQuotedMessageTap != null ? () => widget.onQuotedMessageTap(widget.message.quotedMessageId) : null; - return QuotedMessageWidget( - onTap: onTap, - message: widget.message.quotedMessage, - messageTheme: isMyMessage - ? StreamChatTheme.of(context).otherMessageTheme - : StreamChatTheme.of(context).ownMessageTheme, - reverse: widget.reverse, + return Padding( + padding: EdgeInsets.only( + right: 8, + left: 8, + top: 8, + bottom: hasNonUrlAttachments ? 8 : 0, + ), + child: QuotedMessageWidget( + onTap: onTap, + message: widget.message.quotedMessage, + messageTheme: isMyMessage + ? StreamChatTheme.of(context).otherMessageTheme + : StreamChatTheme.of(context).ownMessageTheme, + reverse: widget.reverse, + ), ); } diff --git a/lib/src/quoted_message_widget.dart b/lib/src/quoted_message_widget.dart index c718cdb5..309df703 100644 --- a/lib/src/quoted_message_widget.dart +++ b/lib/src/quoted_message_widget.dart @@ -109,17 +109,14 @@ class QuotedMessageWidget extends StatelessWidget { Widget build(BuildContext context) { return InkWell( onTap: onTap, - child: Padding( - padding: const EdgeInsets.only(top: 8, right: 4, left: 8), - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisSize: MainAxisSize.min, - children: [ - Flexible(child: _buildMessage(context)), - SizedBox(width: 4), - _buildUserAvatar(), - ], - ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: [ + Flexible(child: _buildMessage(context)), + SizedBox(width: 8), + _buildUserAvatar(), + ], ), ); } @@ -247,16 +244,13 @@ class QuotedMessageWidget extends StatelessWidget { return Transform( transform: Matrix4.rotationY(reverse ? pi : 0), alignment: Alignment.center, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 4.0), - child: UserAvatar( - user: message.user, - constraints: BoxConstraints.tightFor( - height: 24, - width: 24, - ), - showOnlineStatus: false, + child: UserAvatar( + user: message.user, + constraints: BoxConstraints.tightFor( + height: 24, + width: 24, ), + showOnlineStatus: false, ), ); } From 80d8c48826a7f1da7b9ab8f6bd6813bdc28e0ea2 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 12 Jan 2021 19:46:19 +0530 Subject: [PATCH 30/33] Minor ui fixes Signed-off-by: Sahil Kumar --- lib/src/message_actions_modal.dart | 6 ++---- lib/src/message_input.dart | 13 ++++++++----- lib/src/utils.dart | 22 ++++++++-------------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart index 7f9c5e85..2d125bab 100644 --- a/lib/src/message_actions_modal.dart +++ b/lib/src/message_actions_modal.dart @@ -164,7 +164,7 @@ class _MessageActionsModalState extends State { ), Padding( padding: EdgeInsets.only( - right: widget.reverse ? 16 : 0, + right: widget.reverse ? 8 : 0, left: widget.reverse ? 0 : 48, ), child: SizedBox( @@ -448,9 +448,7 @@ class _MessageActionsModalState extends State { ), ], ), - onTap: () { - _showFlagDialog(); - }, + onTap: () => _showFlagDialog(), ); } diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 8bb20302..4561372e 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -1525,11 +1525,14 @@ class MessageInputState extends State { return Transform( transform: Matrix4.rotationY(pi), alignment: Alignment.center, - child: QuotedMessageWidget( - reverse: true, - showBorder: !containsUrl, - message: widget.quotedMessage, - messageTheme: StreamChatTheme.of(context).otherMessageTheme, + child: Padding( + padding: const EdgeInsets.fromLTRB(8, 8, 8, 0), + child: QuotedMessageWidget( + reverse: true, + showBorder: !containsUrl, + message: widget.quotedMessage, + messageTheme: StreamChatTheme.of(context).otherMessageTheme, + ), ), ); } diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 6548b987..d1dec9c8 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -37,27 +37,21 @@ Future showConfirmationDialog( return Column( mainAxisSize: MainAxisSize.min, children: [ - SizedBox( - height: 26.0, - ), + SizedBox(height: 26.0), if (icon != null) icon, - SizedBox( - height: 26.0, - ), + SizedBox(height: 26.0), Text( title, style: StreamChatTheme.of(context).textTheme.headlineBold, ), - SizedBox( - height: 7.0, - ), - Text(question), - SizedBox( - height: 36.0, + SizedBox(height: 7.0), + Text( + question, + textAlign: TextAlign.center, ), + SizedBox(height: 36.0), Container( - color: - StreamChatTheme.of(context).colorTheme.black.withOpacity(.08), + color: StreamChatTheme.of(context).colorTheme.greyGainsboro, height: 1.0, ), Row( From 74e9ec648c0ea56b398cc459e21a33342d025d45 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 15:24:53 +0100 Subject: [PATCH 31/33] remove add member for distinct channels --- example/lib/group_info_screen.dart | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/example/lib/group_info_screen.dart b/example/lib/group_info_screen.dart index ed5f2c61..bde4c0df 100644 --- a/example/lib/group_info_screen.dart +++ b/example/lib/group_info_screen.dart @@ -137,20 +137,21 @@ class _GroupInfoScreenState extends State { ), centerTitle: true, actions: [ - StreamNeumorphicButton( - child: InkWell( - onTap: () { - _buildAddUserModal(context); - }, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: StreamSvgIcon.userAdd( - color: StreamChatTheme.of(context) - .colorTheme - .accentBlue), + if (!channel.channel.isDistinct) + StreamNeumorphicButton( + child: InkWell( + onTap: () { + _buildAddUserModal(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: StreamSvgIcon.userAdd( + color: StreamChatTheme.of(context) + .colorTheme + .accentBlue), + ), ), ), - ), ], ), body: ListView( From 18d3cbcc86cad354e5fe1785a0ecc7249593dbab Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 15:25:25 +0100 Subject: [PATCH 32/33] version bump --- example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 6c4ae4dc..1605cdd5 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.1.0+3 +version: 1.1.1 environment: sdk: ">=2.2.2 <3.0.0" From 4aa224a5e6dba291da80dac2c0c6a9a286abe62f Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 12 Jan 2021 16:58:52 +0100 Subject: [PATCH 33/33] fix messageinput focus --- example/lib/main.dart | 7 +++++-- example/pubspec.yaml | 2 +- lib/src/message_input.dart | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 98fa71a2..49ee3fdc 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -623,8 +623,8 @@ class _ChannelPageState extends State { @override void initState() { - super.initState(); _focusNode = FocusNode(); + super.initState(); } @override @@ -635,7 +635,9 @@ class _ChannelPageState extends State { void _reply(Message message) { setState(() => _quotedMessage = message); - _focusNode.requestFocus(); + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + _focusNode.requestFocus(); + }); } @override @@ -752,6 +754,7 @@ class _ChannelPageState extends State { quotedMessage: _quotedMessage, onQuotedMessageCleared: () { setState(() => _quotedMessage = null); + _focusNode.unfocus(); }, ), ], diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 1605cdd5..2b8859ea 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.1.1 +version: 1.1.1+1 environment: sdk: ">=2.2.2 <3.0.0" diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 4561372e..cc12fbd9 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -203,6 +203,8 @@ class MessageInputState extends State { bool _openFilePickerSection = false; int _filePickerIndex = 0; double _filePickerSize = _kMinMediaPickerSize; + KeyboardVisibilityController _keyboardVisibilityController = + KeyboardVisibilityController(); /// The editing controller passed to the input TextField TextEditingController textEditingController; @@ -2249,7 +2251,8 @@ class MessageInputState extends State { _emojiNames = Emoji.all().map((e) => e.name); if (!kIsWeb) { - _keyboardListener = KeyboardVisibility.onChange.listen((visible) { + _keyboardListener = + _keyboardVisibilityController.onChange.listen((visible) { if (_focusNode.hasFocus) { _onChanged(context, textEditingController.text); }