Merge branch 'master' into implement-sign-up

This commit is contained in:
Christian Pauly 2020-01-14 12:46:19 +01:00
commit a1eba21da0
5 changed files with 9 additions and 8 deletions

View file

@ -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<String>(
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;
}
},

View file

@ -278,7 +278,7 @@ class MatrixState extends State<Matrix> {
body = "${event.sender.calcDisplayname()} sent a video";
break;
default:
body = "${event.sender.calcDisplayname()}: ${event.getBody()}";
body = "${event.sender.calcDisplayname()}: ${event.body}";
break;
}

View file

@ -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,

View file

@ -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"

View file

@ -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