From 002438c77163e64189dd3d838f4505a58cf038d2 Mon Sep 17 00:00:00 2001 From: ChrisElliotUK Date: Thu, 11 May 2023 10:22:22 +0100 Subject: [PATCH 1/7] fix message widget --- .../lib/src/message_widget/message_widget.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart index a2a3b55f..d6736567 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart @@ -1009,7 +1009,7 @@ class _StreamMessageWidgetState extends State title: Text(context.translations.copyMessageLabel), onClick: () { Navigator.of(context, rootNavigator: true).pop(); - Clipboard.setData(ClipboardData(text: widget.message.text)); + Clipboard.setData(ClipboardData(text: widget.message.text ?? '')); }, ), if (shouldShowEditAction) ...[ @@ -1169,7 +1169,7 @@ class _StreamMessageWidgetState extends State : DisplayWidget.show, ), onCopyTap: (message) => - Clipboard.setData(ClipboardData(text: message.text)), + Clipboard.setData(ClipboardData(text: message.text ?? '')), messageTheme: widget.messageTheme, reverse: widget.reverse, showDeleteMessage: shouldShowDeleteAction, From 247197a15d973f856c04e29c1fd3b9315e772659 Mon Sep 17 00:00:00 2001 From: Chris Elliot <102792401+ChrisElliotUK@users.noreply.github.com> Date: Thu, 11 May 2023 10:54:36 +0100 Subject: [PATCH 2/7] Update packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart Co-authored-by: Sahil Kumar --- .../lib/src/message_widget/message_widget.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart index d6736567..3a4ca1b4 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart @@ -1009,7 +1009,8 @@ class _StreamMessageWidgetState extends State title: Text(context.translations.copyMessageLabel), onClick: () { Navigator.of(context, rootNavigator: true).pop(); - Clipboard.setData(ClipboardData(text: widget.message.text ?? '')); + final text = message.text; + if (text != null) Clipboard.setData(ClipboardData(text: text)); }, ), if (shouldShowEditAction) ...[ From 49c05ad70fed53a72da538bd0464d157a415f277 Mon Sep 17 00:00:00 2001 From: Chris Elliot <102792401+ChrisElliotUK@users.noreply.github.com> Date: Thu, 11 May 2023 10:56:32 +0100 Subject: [PATCH 3/7] Update CHANGELOG.md --- packages/stream_chat_flutter/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index fc8b653f..c6e131b7 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -15,6 +15,7 @@ applied correctly. - [[#1525]](https://github.com/GetStream/stream-chat-flutter/issues/1525) Fixed `StreamQuotedMessageWidget` message for deleted messages not being shown correctly. +- [[#1529]](https://github.com/GetStream/stream-chat-flutter/issues/1529) Fixed fix `ClipboardData` requires non-nullable string as text on Flutter 2.10. ✅ Added From 0c2edac3deb46aa62d3520279356ee0ad03ef5fe Mon Sep 17 00:00:00 2001 From: Chris Elliot <102792401+ChrisElliotUK@users.noreply.github.com> Date: Thu, 11 May 2023 10:59:20 +0100 Subject: [PATCH 4/7] Update message_widget.dart --- .../lib/src/message_widget/message_widget.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart index 3a4ca1b4..f77fcedb 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart @@ -1169,8 +1169,10 @@ class _StreamMessageWidgetState extends State ? DisplayWidget.gone : DisplayWidget.show, ), - onCopyTap: (message) => - Clipboard.setData(ClipboardData(text: message.text ?? '')), + onCopyTap: (message) { + final text = message.text; + if (text != null) Clipboard.setData(ClipboardData(text: text)); + }, messageTheme: widget.messageTheme, reverse: widget.reverse, showDeleteMessage: shouldShowDeleteAction, From f8c2bee3aff30095b99ed5a3cdc0799ebafa8639 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Thu, 11 May 2023 16:19:55 +0530 Subject: [PATCH 5/7] Update packages/stream_chat_flutter/CHANGELOG.md --- packages/stream_chat_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index c6e131b7..d253743d 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -15,7 +15,7 @@ applied correctly. - [[#1525]](https://github.com/GetStream/stream-chat-flutter/issues/1525) Fixed `StreamQuotedMessageWidget` message for deleted messages not being shown correctly. -- [[#1529]](https://github.com/GetStream/stream-chat-flutter/issues/1529) Fixed fix `ClipboardData` requires non-nullable string as text on Flutter 2.10. +- [[#1529]](https://github.com/GetStream/stream-chat-flutter/issues/1529) Fixed fix `ClipboardData` requires non-nullable string as text on Flutter 3.10. ✅ Added From 2cc7fb5bdf08f55b14607a01479347f02d2225c3 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Thu, 11 May 2023 16:20:52 +0530 Subject: [PATCH 6/7] Update packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart --- .../lib/src/message_widget/message_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart index f77fcedb..c5e9538c 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart @@ -1170,7 +1170,7 @@ class _StreamMessageWidgetState extends State : DisplayWidget.show, ), onCopyTap: (message) { - final text = message.text; + final text = message.text; if (text != null) Clipboard.setData(ClipboardData(text: text)); }, messageTheme: widget.messageTheme, From 61eba92c8530c786a4f17412ab1ad43130f19b79 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Thu, 11 May 2023 16:26:07 +0530 Subject: [PATCH 7/7] Update packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart --- .../lib/src/message_widget/message_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart index c5e9538c..cd30aad7 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart @@ -1009,7 +1009,7 @@ class _StreamMessageWidgetState extends State title: Text(context.translations.copyMessageLabel), onClick: () { Navigator.of(context, rootNavigator: true).pop(); - final text = message.text; + final text = widget.message.text; if (text != null) Clipboard.setData(ClipboardData(text: text)); }, ),