Merge branch 'main' of gitlab.com:famedly/fluffychat

assets/l10n/intl_et.arb

@@ -2489,5 +2489,22 @@
   "@commandHintSend": {
     "type": "text",
     "description": "Usage hint for the command /send"
+  },
+  "savedFileAs": "Salvestasin faili nimega {filename}",
+  "@savedFileAs": {
+    "type": "text",
+    "placeholders": {
+      "filename": {}
+    }
+  },
+  "saveFileToFolder": "Salvesta fail sellesse kausta",
+  "@saveFileToFolder": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "saveFile": "Salvesta fail",
+  "@saveFile": {
+    "type": "text",
+    "placeholders": {}
   }
 }

assets/l10n/intl_gl.arb

@@ -2489,5 +2489,22 @@
   "@commandHintSend": {
     "type": "text",
     "description": "Usage hint for the command /send"
+  },
+  "savedFileAs": "Ficheiro gardado como {filename}",
+  "@savedFileAs": {
+    "type": "text",
+    "placeholders": {
+      "filename": {}
+    }
+  },
+  "saveFileToFolder": "Gardar ficheiro neste cartafol",
+  "@saveFileToFolder": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "saveFile": "Gardar ficheiro",
+  "@saveFile": {
+    "type": "text",
+    "placeholders": {}
   }
 }

lib/pages/chat.dart

@@ -290,7 +290,8 @@ class ChatController extends State<Chat> {
   }
 
   void openCameraAction() async {
-    inputFocus.unfocus();
+    // Make sure the textfield is unfocused before opening the camera
+    FocusScope.of(context).requestFocus(FocusNode());
     final file = await ImagePicker().getImage(source: ImageSource.camera);
     if (file == null) return;
     final bytes = await file.readAsBytes();

pubspec.yaml

@@ -64,7 +64,7 @@ dependencies:
   scroll_to_index: ^2.0.0
   sentry: ^5.1.0
   share: ^2.0.4
-  swipe_to_action: ^0.1.0
+  swipe_to_action: ^0.2.0
   uni_links: ^0.5.1
   unifiedpush: ^1.0.6
   universal_html: ^2.0.8