From 8784acc7e6202d2a5d629fbec0014794c30a204e Mon Sep 17 00:00:00 2001 From: Krille Date: Mon, 12 Aug 2024 09:00:10 +0200 Subject: [PATCH 1/7] chore: Disable record on web --- lib/utils/platform_infos.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index 638c5bcc2..d43176d7a 100644 --- a/lib/utils/platform_infos.dart +++ b/lib/utils/platform_infos.dart @@ -29,7 +29,8 @@ abstract class PlatformInfos { static bool get usesTouchscreen => !isMobile; - static bool get platformCanRecord => (isMobile || isMacOS || isWeb); + /// Web could also record in theory but currently only wav which is too large + static bool get platformCanRecord => (isMobile || isMacOS); static String get clientName => '${AppConfig.applicationName} ${isWeb ? 'web' : Platform.operatingSystem}${kReleaseMode ? '' : 'Debug'}'; From 9089f89cff32af428ef534e7af13f142df420396 Mon Sep 17 00:00:00 2001 From: Rex_sa Date: Sun, 11 Aug 2024 18:14:52 +0000 Subject: [PATCH 2/7] Translated using Weblate (Arabic) Currently translated at 100.0% (657 of 657 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ --- assets/l10n/intl_ar.arb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_ar.arb b/assets/l10n/intl_ar.arb index 6ad065889..59859a8a9 100644 --- a/assets/l10n/intl_ar.arb +++ b/assets/l10n/intl_ar.arb @@ -2789,5 +2789,7 @@ "placeholders": { "version": {} } - } + }, + "sendCanceled": "تم إلغاء الإرسال", + "@sendCanceled": {} } From 885f84a84e5366cde0ea1cb670fbcad2e54db40f Mon Sep 17 00:00:00 2001 From: xabirequejo Date: Sun, 11 Aug 2024 10:38:45 +0000 Subject: [PATCH 3/7] Translated using Weblate (Basque) Currently translated at 100.0% (657 of 657 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ --- assets/l10n/intl_eu.arb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_eu.arb b/assets/l10n/intl_eu.arb index 64765054d..39b93f6f1 100644 --- a/assets/l10n/intl_eu.arb +++ b/assets/l10n/intl_eu.arb @@ -2789,5 +2789,7 @@ "changelog": "Aldaketak", "@changelog": {}, "chatPermissionsDescription": "Definitu zer botere-maila behar den txat honetako ekintza jakinetarako. 0, 50 eta 100 botere-mailek erabiltzaileak, moderatzaileak eta administratzaileak ordezkatzen dituzte, baina edozein graduazio posible da.", - "@chatPermissionsDescription": {} + "@chatPermissionsDescription": {}, + "sendCanceled": "Bidalketa bertan behera utzi da", + "@sendCanceled": {} } From 50f3fe26d9d1ce745e66e6ab93eff0c5c5daf655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sun, 11 Aug 2024 07:26:21 +0000 Subject: [PATCH 4/7] Translated using Weblate (Turkish) Currently translated at 100.0% (657 of 657 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/tr/ --- assets/l10n/intl_tr.arb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_tr.arb b/assets/l10n/intl_tr.arb index dbb60c3d8..ec387220a 100644 --- a/assets/l10n/intl_tr.arb +++ b/assets/l10n/intl_tr.arb @@ -2789,5 +2789,7 @@ "placeholders": { "version": {} } - } + }, + "sendCanceled": "Gönderme iptal edildi", + "@sendCanceled": {} } From c6ab9e9300506eb97bace28933fbe8f02582f812 Mon Sep 17 00:00:00 2001 From: Bezruchenko Simon Date: Sun, 11 Aug 2024 18:08:44 +0000 Subject: [PATCH 5/7] Translated using Weblate (Ukrainian) Currently translated at 100.0% (657 of 657 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ --- assets/l10n/intl_uk.arb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_uk.arb b/assets/l10n/intl_uk.arb index 4a70f11ae..7c39b63d5 100644 --- a/assets/l10n/intl_uk.arb +++ b/assets/l10n/intl_uk.arb @@ -2789,5 +2789,7 @@ "joinedChats": "Приєднані чати", "@joinedChats": {}, "unread": "Непрочитані", - "@unread": {} + "@unread": {}, + "sendCanceled": "Надсилання скасовано", + "@sendCanceled": {} } From 2615632881f80b7aea3b3c02f9573b80be1bf670 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Mon, 12 Aug 2024 17:54:02 +0200 Subject: [PATCH 6/7] chore: Remove emoji proposals feature --- lib/pages/chat/reactions_picker.dart | 10 +--------- pubspec.lock | 24 ------------------------ pubspec.yaml | 1 - 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart index 4488e05df..2610a0d50 100644 --- a/lib/pages/chat/reactions_picker.dart +++ b/lib/pages/chat/reactions_picker.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:emoji_proposal/emoji_proposal.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/app_config.dart'; @@ -33,14 +32,7 @@ class ReactionsPicker extends StatelessWidget { if (!display) { return const SizedBox.shrink(); } - final proposals = proposeEmojis( - controller.selectedEvents.first.plaintextBody, - number: 25, - languageCodes: EmojiProposalLanguageCodes.values.toSet(), - ); - final emojis = proposals.isNotEmpty - ? proposals.map((e) => e.char).toList() - : List.from(AppEmojis.emojis); + final emojis = List.from(AppEmojis.emojis); final allReactionEvents = controller.selectedEvents.first .aggregatedEvents( controller.timeline!, diff --git a/pubspec.lock b/pubspec.lock index 7632df4b4..2163a8d87 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -337,14 +337,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" - emoji_proposal: - dependency: "direct main" - description: - name: emoji_proposal - sha256: e931bc42b54a65397b3df7915bb58ee7dcbd3ed81c3b8c256b9a5b210e94ea63 - url: "https://pub.dev" - source: hosted - version: "0.0.1" emojis: dependency: "direct main" description: @@ -1670,14 +1662,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.3" - remove_emoji: - dependency: transitive - description: - name: remove_emoji - sha256: ed9e8463e8c9ca05b86fcddd4c0dbd2c2605a50d267f4ffa05496607924809e3 - url: "https://pub.dev" - source: hosted - version: "0.0.10" retry: dependency: transitive description: @@ -1718,14 +1702,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.2" - sentiment_dart: - dependency: transitive - description: - name: sentiment_dart - sha256: ddac8742cf5141f531eb1510b074ce715b9958cb02a763a4cc0a918768e4a0c8 - url: "https://pub.dev" - source: hosted - version: "0.0.5" share_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 5e6d4a25d..d256a852f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,6 @@ dependencies: device_info_plus: ^10.0.1 dynamic_color: ^1.7.0 emoji_picker_flutter: ^2.1.1 - emoji_proposal: ^0.0.1 emojis: ^0.9.9 #fcm_shared_isolate: ^0.1.0 file_picker: ^8.0.6 From 156f38cf4656e5b98a28f78fbe4496e35591f276 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Mon, 12 Aug 2024 18:43:12 +0200 Subject: [PATCH 7/7] chore: Follow up fix google services patch --- scripts/enable-android-google-services.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index 7c783015c..4ec4b8f13 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -126,8 +126,8 @@ index 69c80d6e..efd32d89 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: + dynamic_color: ^1.7.0 emoji_picker_flutter: ^2.1.1 - emoji_proposal: ^0.0.1 emojis: ^0.9.9 - #fcm_shared_isolate: ^0.1.0 + fcm_shared_isolate: ^0.1.0