fluffychat merge - resolve conflicts

assets/l10n/intl_ar.arb

@@ -2789,5 +2789,7 @@
     "placeholders": {
       "version": {}
     }
-  }
+  },
+  "sendCanceled": "تم إلغاء الإرسال",
+  "@sendCanceled": {}
 }

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": {}
 }

assets/l10n/intl_tr.arb

@@ -2789,5 +2789,7 @@
     "placeholders": {
       "version": {}
     }
-  }
+  },
+  "sendCanceled": "Gönderme iptal edildi",
+  "@sendCanceled": {}
 }

assets/l10n/intl_uk.arb

@@ -2789,5 +2789,7 @@
   "joinedChats": "Приєднані чати",
   "@joinedChats": {},
   "unread": "Непрочитані",
-  "@unread": {}
+  "@unread": {},
+  "sendCanceled": "Надсилання скасовано",
+  "@sendCanceled": {}
 }

lib/pages/chat/reactions_picker.dart

@@ -1,4 +1,3 @@
-import 'package:emoji_proposal/emoji_proposal.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/app_emojis.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
@@ -32,14 +31,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<String>.from(AppEmojis.emojis);
+            final emojis = List<String>.from(AppEmojis.emojis);
             final allReactionEvents = controller.selectedEvents.first
                 .aggregatedEvents(
                   controller.timeline!,

lib/utils/platform_infos.dart

@@ -28,7 +28,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'}';

pubspec.lock

@@ -349,18 +349,10 @@ packages:
     dependency: "direct main"
     description:
       name: emoji_picker_flutter
-      sha256: "7c6681783e06710608df27be0e38aa4ba73ca1ccac370bb0e7a1320723ae4bca"
+      sha256: "839200a2bd1af9a65d71133a5a246dbf5b24f7e4f6f4c5390130c2e0ed5f85af"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
-  emoji_proposal:
-    dependency: "direct main"
-    description:
-      name: emoji_proposal
-      sha256: e931bc42b54a65397b3df7915bb58ee7dcbd3ed81c3b8c256b9a5b210e94ea63
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.1"
+    version: "2.2.0"
   emojis:
     dependency: "direct main"
     description:
@@ -1918,14 +1910,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:
@@ -1982,22 +1966,14 @@ 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"
   sentry:
     dependency: transitive
     description:
       name: sentry
-      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+      sha256: "1af8308298977259430d118ab25be8e1dda626cdefa1e6ce869073d530d39271"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.8.0"
   sentry_dart_plugin:
     dependency: "direct dev"
     description:
@@ -2010,10 +1986,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: c64f0aec5332bec87083b61514d1b6b29e435b9045d03ce1575861192b9a5680
+      sha256: "18fe4d125c2d529bd6127200f0d2895768266a8c60b4fb50b2086fd97e1a4ab2"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.8.0"
   share_plus:
     dependency: "direct main"
     description:

pubspec.yaml

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

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