From c27c250590683ffed1a587c1763d12019c139872 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 8 Aug 2024 15:24:50 -0400 Subject: [PATCH 1/3] Removes error button padding --- .../widgets/has_error_button.dart | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/pangea/choreographer/widgets/has_error_button.dart b/lib/pangea/choreographer/widgets/has_error_button.dart index 2cc6320f7..007820139 100644 --- a/lib/pangea/choreographer/widgets/has_error_button.dart +++ b/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), ); } } From 51705ba4855d9984aa72fd86812405118c5d8b5f Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 8 Aug 2024 16:25:16 -0400 Subject: [PATCH 2/3] Remove outdated info --- assets/l10n/intl_en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index b8ad9121b..5fcac8b57 100644 --- a/assets/l10n/intl_en.arb +++ b/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", From 9ea37bce5a85e819bbc4f3aa2c76444b15223a86 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 9 Aug 2024 10:05:30 -0400 Subject: [PATCH 3/3] Updated android target SDK to follow google's guidelines, also bumped version number --- android/app/build.gradle | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6be37905c..02dbcfefb 100644 --- a/android/app/build.gradle +++ b/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" diff --git a/pubspec.yaml b/pubspec.yaml index 2f2d47699..95ea003b3 100644 --- a/pubspec.yaml +++ b/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"