From 38a17c49b9028d27c610c2781e6dcf969e5e997c Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 9 Apr 2020 10:16:38 +0200 Subject: [PATCH] Fix video calls --- CHANGELOG.md | 1 + lib/components/matrix.dart | 21 ++++++++++--------- lib/i18n/intl_de.arb | 10 +++++++++ lib/i18n/intl_messages.arb | 12 ++++++++++- lib/i18n/messages_de.dart | 2 ++ lib/i18n/messages_messages.dart | 2 ++ pubspec.lock | 37 +++++++++++++-------------------- 7 files changed, 52 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28c9f92..842b59e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Version 0.12.0 - 2020-04-?? ### Features: - Implement custom wallpapers +- Lightweight Jitsi integration for video calls - Use SKIA for web ### Fixes: - Fix image scaling diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart index b84c43e..6c410e3 100644 --- a/lib/components/matrix.dart +++ b/lib/components/matrix.dart @@ -373,19 +373,20 @@ class MatrixState extends State { showDialog( context: context, builder: (context) => AlertDialog( - title: ListTile( - contentPadding: EdgeInsets.all(0), - leading: Avatar(senderAvatar, senderName), - title: Text( - senderName, - style: TextStyle(fontSize: 18), - ), - subtitle: - event.room.isDirectChat ? null : Text(event.room.displayname), - ), + title: Text(I18n.of(context).videoCall), content: Column( mainAxisSize: MainAxisSize.min, children: [ + ListTile( + contentPadding: EdgeInsets.all(0), + leading: Avatar(senderAvatar, senderName), + title: Text( + senderName, + style: TextStyle(fontSize: 18), + ), + subtitle: + event.room.isDirectChat ? null : Text(event.room.displayname), + ), Divider(), Row( children: [ diff --git a/lib/i18n/intl_de.arb b/lib/i18n/intl_de.arb index eaa51c7..e49f83a 100644 --- a/lib/i18n/intl_de.arb +++ b/lib/i18n/intl_de.arb @@ -573,6 +573,11 @@ "type": "text", "placeholders": {} }, + "Edit Jitsi instance": "Jitsi Instanz ändern", + "@Edit Jitsi instance": { + "type": "text", + "placeholders": {} + }, "joinedTheChat": "{username} ist dem Chat beigetreten", "@joinedTheChat": { "type": "text", @@ -1167,6 +1172,11 @@ "type": "text", "placeholders": {} }, + "Video call": "Videoanruf", + "@Video call": { + "type": "text", + "placeholders": {} + }, "Visible for all participants": "Sichtbar für alle Teilnehmer", "@Visible for all participants": { "type": "text", diff --git a/lib/i18n/intl_messages.arb b/lib/i18n/intl_messages.arb index 9167412..1111437 100644 --- a/lib/i18n/intl_messages.arb +++ b/lib/i18n/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2020-04-03T20:17:02.102828", + "@@last_modified": "2020-04-09T10:05:25.548084", "About": "About", "@About": { "type": "text", @@ -573,6 +573,11 @@ "type": "text", "placeholders": {} }, + "Edit Jitsi instance": "Edit Jitsi instance", + "@Edit Jitsi instance": { + "type": "text", + "placeholders": {} + }, "joinedTheChat": "{username} joined the chat", "@joinedTheChat": { "type": "text", @@ -1167,6 +1172,11 @@ "type": "text", "placeholders": {} }, + "Video call": "Video call", + "@Video call": { + "type": "text", + "placeholders": {} + }, "Visible for all participants": "Visible for all participants", "@Visible for all participants": { "type": "text", diff --git a/lib/i18n/messages_de.dart b/lib/i18n/messages_de.dart index 428f2eb..0664cd8 100644 --- a/lib/i18n/messages_de.dart +++ b/lib/i18n/messages_de.dart @@ -178,6 +178,7 @@ class MessageLookup extends MessageLookupByLibrary { "Displayname has been changed" : MessageLookupByLibrary.simpleMessage("Anzeigename wurde geändert"), "Donate" : MessageLookupByLibrary.simpleMessage("Spenden"), "Download file" : MessageLookupByLibrary.simpleMessage("Datei herunterladen"), + "Edit Jitsi instance" : MessageLookupByLibrary.simpleMessage("Jitsi Instanz ändern"), "Edit displayname" : MessageLookupByLibrary.simpleMessage("Anzeigename ändern"), "Empty chat" : MessageLookupByLibrary.simpleMessage("Leerer Chat"), "Encryption algorithm" : MessageLookupByLibrary.simpleMessage("Verschlüsselungsalgorithmus"), @@ -279,6 +280,7 @@ class MessageLookup extends MessageLookupByLibrary { "Use Amoled compatible colors?" : MessageLookupByLibrary.simpleMessage("Amoled optimierte Farben verwenden?"), "Username" : MessageLookupByLibrary.simpleMessage("Benutzername"), "Verify" : MessageLookupByLibrary.simpleMessage("Bestätigen"), + "Video call" : MessageLookupByLibrary.simpleMessage("Videoanruf"), "Visibility of the chat history" : MessageLookupByLibrary.simpleMessage("Sichtbarkeit des Chat-Verlaufs"), "Visible for all participants" : MessageLookupByLibrary.simpleMessage("Sichtbar für alle Teilnehmer"), "Visible for everyone" : MessageLookupByLibrary.simpleMessage("Für jeden sichtbar"), diff --git a/lib/i18n/messages_messages.dart b/lib/i18n/messages_messages.dart index ce3ded3..a33e654 100644 --- a/lib/i18n/messages_messages.dart +++ b/lib/i18n/messages_messages.dart @@ -178,6 +178,7 @@ class MessageLookup extends MessageLookupByLibrary { "Displayname has been changed" : MessageLookupByLibrary.simpleMessage("Displayname has been changed"), "Donate" : MessageLookupByLibrary.simpleMessage("Donate"), "Download file" : MessageLookupByLibrary.simpleMessage("Download file"), + "Edit Jitsi instance" : MessageLookupByLibrary.simpleMessage("Edit Jitsi instance"), "Edit displayname" : MessageLookupByLibrary.simpleMessage("Edit displayname"), "Empty chat" : MessageLookupByLibrary.simpleMessage("Empty chat"), "Encryption algorithm" : MessageLookupByLibrary.simpleMessage("Encryption algorithm"), @@ -279,6 +280,7 @@ class MessageLookup extends MessageLookupByLibrary { "Use Amoled compatible colors?" : MessageLookupByLibrary.simpleMessage("Use Amoled compatible colors?"), "Username" : MessageLookupByLibrary.simpleMessage("Username"), "Verify" : MessageLookupByLibrary.simpleMessage("Verify"), + "Video call" : MessageLookupByLibrary.simpleMessage("Video call"), "Visibility of the chat history" : MessageLookupByLibrary.simpleMessage("Visibility of the chat history"), "Visible for all participants" : MessageLookupByLibrary.simpleMessage("Visible for all participants"), "Visible for everyone" : MessageLookupByLibrary.simpleMessage("Visible for everyone"), diff --git a/pubspec.lock b/pubspec.lock index 6f30b4b..22b82f6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,28 +21,28 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "2.0.11" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.4.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.0.5" bubble: dependency: "direct main" description: @@ -63,14 +63,14 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.1.2" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.12" + version: "1.14.11" convert: dependency: transitive description: @@ -91,7 +91,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.3" csslib: dependency: transitive description: @@ -260,7 +260,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "2.1.12" + version: "2.1.4" image_picker: dependency: "direct main" description: @@ -274,7 +274,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "0.16.0" intl_translation: dependency: "direct main" description: @@ -502,7 +502,7 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.0.5" receive_sharing_intent: dependency: "direct main" description: @@ -570,7 +570,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.5.5" sqflite: dependency: "direct main" description: @@ -619,21 +619,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.13.0" + version: "1.9.4" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.11" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.2.15" typed_data: dependency: transitive description: @@ -718,13 +718,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.0+1" webview_flutter: dependency: "direct main" description: @@ -738,7 +731,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "3.6.1" + version: "3.5.0" yaml: dependency: transitive description: