GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-01-12 02:32:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into implement-sign-up

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/components/list_items/message.dart
View File

@ -54,7 +54,7 @@ class Message extends StatelessWidget {
MessageTypes.Emote, MessageTypes.Emote,
MessageTypes.None, MessageTypes.None,
].contains(event.messageType) && ].contains(event.messageType) &&
event.getBody().isNotEmpty) { event.body.isNotEmpty) {
popupMenuList.add( popupMenuList.add(
const PopupMenuItem<String>( const PopupMenuItem<String>(
value: "copy", value: "copy",
@ -97,7 +97,7 @@ class Message extends StatelessWidget {
await event.remove(); await event.remove();
break; break;
case "copy": case "copy":
await Clipboard.setData(ClipboardData(text: event.getBody())); await Clipboard.setData(ClipboardData(text: event.body));
break; break;
} }
}, },

2
lib/components/matrix.dart
View File

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

8
lib/components/message_content.dart
View File

@ -92,7 +92,7 @@ class MessageContent extends StatelessWidget {
child: RaisedButton( child: RaisedButton(
color: Colors.blueGrey, color: Colors.blueGrey,
child: Text( child: Text(
"Download ${event.getBody()}", "Download ${event.body}",
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
softWrap: false, softWrap: false,
maxLines: 1, maxLines: 1,
@ -116,7 +116,7 @@ class MessageContent extends StatelessWidget {
: ""; : "";
final String body = event.redacted final String body = event.redacted
? "Redacted by ${event.redactedBecause.sender.calcDisplayname()}" ? "Redacted by ${event.redactedBecause.sender.calcDisplayname()}"
: senderPrefix + event.getBody(); : senderPrefix + event.body;
if (textOnly) { if (textOnly) {
return Text( return Text(
body, body,
@ -140,7 +140,7 @@ class MessageContent extends StatelessWidget {
case MessageTypes.Emote: case MessageTypes.Emote:
if (textOnly) { if (textOnly) {
return Text( return Text(
"* " + event.getBody(), "* " + event.body,
maxLines: maxLines, maxLines: maxLines,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
@ -152,7 +152,7 @@ class MessageContent extends StatelessWidget {
); );
} }
return LinkText( return LinkText(
text: "* " + event.getBody(), text: "* " + event.body,
textStyle: TextStyle( textStyle: TextStyle(
color: textColor, color: textColor,
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,

2
pubspec.lock
View File

@ -360,7 +360,7 @@ packages:
source: hosted source: hosted
version: "1.0.5" version: "1.0.5"
url_launcher_web: url_launcher_web:
dependency: transitive dependency: "direct main"
description: description:
name: url_launcher_web name: url_launcher_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"

1
pubspec.yaml
View File

@ -36,6 +36,7 @@ dependencies:
image_picker: ^0.6.2+3 image_picker: ^0.6.2+3
flutter_speed_dial: ^1.2.5 flutter_speed_dial: ^1.2.5
url_launcher: ^5.4.1 url_launcher: ^5.4.1
url_launcher_web: ^0.1.0
sqflite: ^1.2.0 sqflite: ^1.2.0
cached_network_image: ^2.0.0 cached_network_image: ^2.0.0
firebase_messaging: ^6.0.9 firebase_messaging: ^6.0.9