Rename replyToMessage -> quotedMessage

Signed-off-by: Sahil Kumar <[email protected]>
This commit is contained in:
Sahil Kumar
2021-01-04 13:48:29 +05:30
parent 380b9373a4
commit 8fa8c9dc6b
4 changed files with 27 additions and 27 deletions
+5 -5
View File
@@ -434,7 +434,7 @@ class ChannelPage extends StatefulWidget {
} }
class _ChannelPageState extends State<ChannelPage> { class _ChannelPageState extends State<ChannelPage> {
Message _replyToMessage; Message _quotedMessage;
FocusNode _focusNode; FocusNode _focusNode;
@override @override
@@ -450,7 +450,7 @@ class _ChannelPageState extends State<ChannelPage> {
} }
void _reply(Message message) { void _reply(Message message) {
setState(() => _replyToMessage = message); setState(() => _quotedMessage = message);
_focusNode.requestFocus(); _focusNode.requestFocus();
} }
@@ -502,9 +502,9 @@ class _ChannelPageState extends State<ChannelPage> {
), ),
MessageInput( MessageInput(
focusNode: _focusNode, focusNode: _focusNode,
replyToMessage: _replyToMessage, quotedMessage: _quotedMessage,
onReplyToMessageCleared: () { onQuotedMessageCleared: () {
setState(() => _replyToMessage = null); setState(() => _quotedMessage = null);
}, },
), ),
], ],
+14 -14
View File
@@ -110,8 +110,8 @@ class MessageInput extends StatefulWidget {
this.actionsLocation = ActionsLocation.left, this.actionsLocation = ActionsLocation.left,
this.attachmentThumbnailBuilders, this.attachmentThumbnailBuilders,
this.focusNode, this.focusNode,
this.replyToMessage, this.quotedMessage,
this.onReplyToMessageCleared, this.onQuotedMessageCleared,
}) : super(key: key); }) : super(key: key);
/// Message to edit /// Message to edit
@@ -161,10 +161,10 @@ class MessageInput extends StatefulWidget {
final FocusNode focusNode; final FocusNode focusNode;
/// ///
final Message replyToMessage; final Message quotedMessage;
/// ///
final VoidCallback onReplyToMessageCleared; final VoidCallback onQuotedMessageCleared;
@override @override
MessageInputState createState() => MessageInputState(); MessageInputState createState() => MessageInputState();
@@ -207,7 +207,7 @@ class MessageInputState extends State<MessageInput> {
/// The editing controller passed to the input TextField /// The editing controller passed to the input TextField
TextEditingController textEditingController; TextEditingController textEditingController;
bool get _hasReplyToMessage => widget.replyToMessage != null; bool get _hasQuotedMessage => widget.quotedMessage != null;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -226,7 +226,7 @@ class MessageInputState extends State<MessageInput> {
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
if (_hasReplyToMessage) if (_hasQuotedMessage)
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -244,7 +244,7 @@ class MessageInputState extends State<MessageInput> {
IconButton( IconButton(
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
icon: StreamSvgIcon.close_small(), icon: StreamSvgIcon.close_small(),
onPressed: widget.onReplyToMessageCleared, onPressed: widget.onQuotedMessageCleared,
), ),
], ],
), ),
@@ -1350,19 +1350,19 @@ class MessageInputState extends State<MessageInput> {
} }
Widget _buildReplyToMessage() { Widget _buildReplyToMessage() {
if (!_hasReplyToMessage) { if (!_hasQuotedMessage) {
return Offstage(); return Offstage();
} }
final containsUrl = widget.replyToMessage.attachments final containsUrl = widget.quotedMessage.attachments
?.any((element) => element.ogScrapeUrl != null) == ?.any((element) => element.ogScrapeUrl != null) ==
true; true;
return Transform( return Transform(
transform: Matrix4.rotationY(pi), transform: Matrix4.rotationY(pi),
alignment: Alignment.center, alignment: Alignment.center,
child: ReplyToMessageWidget( child: QuotedMessageWidget(
reverse: true, reverse: true,
showBorder: !containsUrl, showBorder: !containsUrl,
message: widget.replyToMessage, message: widget.quotedMessage,
messageTheme: StreamChatTheme.of(context).otherMessageTheme, messageTheme: StreamChatTheme.of(context).otherMessageTheme,
), ),
); );
@@ -2015,7 +2015,7 @@ class MessageInputState extends State<MessageInput> {
textEditingController.clear(); textEditingController.clear();
_attachments.clear(); _attachments.clear();
widget.onReplyToMessageCleared(); widget.onQuotedMessageCleared();
setState(() { setState(() {
_messageIsPresent = false; _messageIsPresent = false;
@@ -2047,9 +2047,9 @@ class MessageInputState extends State<MessageInput> {
); );
} }
if (widget.replyToMessage != null) { if (widget.quotedMessage != null) {
message = message.copyWith( message = message.copyWith(
replyToMessageId: widget.replyToMessage.id, quotedMessageId: widget.quotedMessage.id,
); );
} }
+6 -6
View File
@@ -241,7 +241,7 @@ class _MessageWidgetState extends State<MessageWidget> {
bool get showInChannel => bool get showInChannel =>
widget.showInChannelIndicator && widget.message?.showInChannel == true; widget.showInChannelIndicator && widget.message?.showInChannel == true;
bool get _hasReplyToMessage => widget.message?.replyToMessage != null; bool get _hasQuotedMessage => widget.message?.quotedMessage != null;
bool get isSendFailed => widget.message.status == MessageSendingStatus.FAILED; bool get isSendFailed => widget.message.status == MessageSendingStatus.FAILED;
@@ -397,11 +397,11 @@ class _MessageWidgetState extends State<MessageWidget> {
mainAxisSize: mainAxisSize:
MainAxisSize.min, MainAxisSize.min,
children: <Widget>[ children: <Widget>[
if (_hasReplyToMessage) if (_hasQuotedMessage)
ReplyToMessageWidget( QuotedMessageWidget(
message: widget message: widget
.message .message
.replyToMessage, .quotedMessage,
messageTheme: isMyMessage messageTheme: isMyMessage
? StreamChatTheme.of( ? StreamChatTheme.of(
context) context)
@@ -919,7 +919,7 @@ class _MessageWidgetState extends State<MessageWidget> {
if (widget.message.attachments if (widget.message.attachments
?.any((element) => element.ogScrapeUrl != null) == ?.any((element) => element.ogScrapeUrl != null) ==
true && true &&
!_hasReplyToMessage) !_hasQuotedMessage)
_buildUrlAttachment(), _buildUrlAttachment(),
], ],
), ),
@@ -931,7 +931,7 @@ class _MessageWidgetState extends State<MessageWidget> {
widget.message.text.characters.every((c) => Emoji.byChar(c) != null); widget.message.text.characters.every((c) => Emoji.byChar(c) != null);
Color _getBackgroundColor() { Color _getBackgroundColor() {
if (_hasReplyToMessage) { if (_hasQuotedMessage) {
return widget.messageTheme.messageBackgroundColor; return widget.messageTheme.messageBackgroundColor;
} }
+2 -2
View File
@@ -63,7 +63,7 @@ class _VideoAttachmentThumbnailState extends State<_VideoAttachmentThumbnail> {
} }
/// ///
class ReplyToMessageWidget extends StatelessWidget { class QuotedMessageWidget extends StatelessWidget {
/// The message /// The message
final Message message; final Message message;
@@ -84,7 +84,7 @@ class ReplyToMessageWidget extends StatelessWidget {
attachmentThumbnailBuilders; attachmentThumbnailBuilders;
/// ///
ReplyToMessageWidget({ QuotedMessageWidget({
Key key, Key key,
@required this.message, @required this.message,
@required this.messageTheme, @required this.messageTheme,