Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection

android/app/build.gradle

@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId "com.talktolearn.chat"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

assets/l10n/intl_en.arb

@@ -3065,7 +3065,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "toggleToolSettingsDescription": "Here you can toggle your individual language tool settings. For chats within a space, the space settings will take precedence and may override these settings.",
+  "toggleToolSettingsDescription": "Here you can toggle your individual language tool settings.",
   "connectedToStaging": "You are connected to the staging server.",
   "@connectedToStaging": {
     "type": "text",

lib/pangea/choreographer/widgets/has_error_button.dart

@@ -15,24 +15,21 @@ class ChoreographerHasErrorButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 56.0),
-      child: FloatingActionButton(
-        onPressed: () {
-          if (error.type == ChoreoErrorType.unknown) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                duration: const Duration(seconds: 5),
-                content: Text(
-                  "${error.title(context)} ${error.description(context)}",
-                ),
+    return FloatingActionButton(
+      onPressed: () {
+        if (error.type == ChoreoErrorType.unknown) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              duration: const Duration(seconds: 5),
+              content: Text(
+                "${error.title(context)} ${error.description(context)}",
               ),
-            );
-          }
-        },
-        mini: true,
-        child: Icon(error.icon),
-      ),
+            ),
+          );
+        }
+      },
+      mini: true,
+      child: Icon(error.icon),
     );
   }
 }

pubspec.yaml

@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 1.21.2+3534
+version: 1.21.3+3535
 
 environment:
   sdk: ">=3.0.0 <4.0.0"