fluffychat merge

android/app/build.gradle.kts

@@ -35,7 +35,7 @@ configurations.all {
 android {
     namespace = "com.talktolearn.chat"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.12077973"
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11

lib/l10n/intl_gl.arb

@@ -3351,7 +3351,7 @@
     "@pleaseWaitUntilInvited": {},
     "youHaveKnocked": "Petaches á porta",
     "@youHaveKnocked": {},
-    "sentVoiceMessage": "🎙️ {duration} - Mensaxe de voz de  {sender}",
+    "sentVoiceMessage": "🎙️ {duration} - Mensaxe de voz de {sender}",
     "@sentVoiceMessage": {
         "type": "String",
         "placeholders": {
@@ -3382,6 +3382,8 @@
     "@customReaction": {},
     "declineInvitation": "Rexeitar o convite",
     "@declineInvitation": {},
+    "noMessagesYet": "Aínda non hai mensaxes",
+    "@noMessagesYet": {},
     "checkList": "Lista de verificación",
     "displayNavigationRail": "Mostrar rail de navegación en móbil",
     "writeAMessageLangCodes": "Escribe en {l1} ou {l2}...",

lib/l10n/intl_nl.arb

@@ -3385,6 +3385,8 @@
     "@customReaction": {},
     "declineInvitation": "Uitnodiging afwijzen",
     "@declineInvitation": {},
+    "noMessagesYet": "Nog geen berichten",
+    "@noMessagesYet": {},
     "writeAMessageLangCodes": "Typ in {l1} of {l2}...",
     "requests": "Verzoeken",
     "holdForInfo": "Klik en houd vast voor woordinformatie.",

pubspec.lock

@@ -1939,10 +1939,10 @@ packages:
     dependency: "direct main"
     description:
       name: qr_code_scanner_plus
-      sha256: "39696b50d277097ee4d90d4292de36f38c66213a4f5216a06b2bdd2b63117859"
+      sha256: a0f1ac8e13299b3db2646635f252fe2ec67222b848b24ed34d11052faf080bfa
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10+1"
+    version: "2.0.12"
   qr_image:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -78,7 +78,7 @@ dependencies:
   pretty_qr_code: ^3.5.0
   provider: ^6.0.2
   punycode: ^1.0.0
-  qr_code_scanner_plus: ^2.0.10+1
+  qr_code_scanner_plus: ^2.0.12
   qr_image: ^1.0.0
   receive_sharing_intent: ^1.8.1
   record: ^6.1.1