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