diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart index f6b6c7a..69aa799 100644 --- a/lib/components/list_items/message.dart +++ b/lib/components/list_items/message.dart @@ -54,7 +54,7 @@ class Message extends StatelessWidget { MessageTypes.Emote, MessageTypes.None, ].contains(event.messageType) && - event.getBody().isNotEmpty) { + event.body.isNotEmpty) { popupMenuList.add( const PopupMenuItem( value: "copy", @@ -97,7 +97,7 @@ class Message extends StatelessWidget { await event.remove(); break; case "copy": - await Clipboard.setData(ClipboardData(text: event.getBody())); + await Clipboard.setData(ClipboardData(text: event.body)); break; } }, diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart index 630080f..6908775 100644 --- a/lib/components/matrix.dart +++ b/lib/components/matrix.dart @@ -278,7 +278,7 @@ class MatrixState extends State { body = "${event.sender.calcDisplayname()} sent a video"; break; default: - body = "${event.sender.calcDisplayname()}: ${event.getBody()}"; + body = "${event.sender.calcDisplayname()}: ${event.body}"; break; } diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart index 700fb9f..5facb50 100644 --- a/lib/components/message_content.dart +++ b/lib/components/message_content.dart @@ -92,7 +92,7 @@ class MessageContent extends StatelessWidget { child: RaisedButton( color: Colors.blueGrey, child: Text( - "Download ${event.getBody()}", + "Download ${event.body}", overflow: TextOverflow.fade, softWrap: false, maxLines: 1, @@ -116,7 +116,7 @@ class MessageContent extends StatelessWidget { : ""; final String body = event.redacted ? "Redacted by ${event.redactedBecause.sender.calcDisplayname()}" - : senderPrefix + event.getBody(); + : senderPrefix + event.body; if (textOnly) { return Text( body, @@ -140,7 +140,7 @@ class MessageContent extends StatelessWidget { case MessageTypes.Emote: if (textOnly) { return Text( - "* " + event.getBody(), + "* " + event.body, maxLines: maxLines, overflow: TextOverflow.ellipsis, style: TextStyle( @@ -152,7 +152,7 @@ class MessageContent extends StatelessWidget { ); } return LinkText( - text: "* " + event.getBody(), + text: "* " + event.body, textStyle: TextStyle( color: textColor, fontStyle: FontStyle.italic, diff --git a/pubspec.lock b/pubspec.lock index 855cd76..1e87219 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -360,7 +360,7 @@ packages: source: hosted version: "1.0.5" url_launcher_web: - dependency: transitive + dependency: "direct main" description: name: url_launcher_web url: "https://pub.dartlang.org" diff --git a/pubspec.yaml b/pubspec.yaml index 4d79253..882e901 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,6 +36,7 @@ dependencies: image_picker: ^0.6.2+3 flutter_speed_dial: ^1.2.5 url_launcher: ^5.4.1 + url_launcher_web: ^0.1.0 sqflite: ^1.2.0 cached_network_image: ^2.0.0 firebase_messaging: ^6.0.9