From cd7e27a6e0d5461f8919c1b9f7dbe4a93fa6f6cf Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Wed, 22 Feb 2023 15:21:38 +0100
Subject: [PATCH] style: Adjust key verification dialog

---
 assets/l10n/intl_en.arb                                 | 4 ++--
 lib/pages/key_verification/key_verification_dialog.dart | 7 +++++--
 lib/utils/adaptive_bottom_sheet.dart                    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 27451abc..8b10fb66 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -537,12 +537,12 @@
         },
         "description": "State that {command} is not a valid /command."
     },
-    "compareEmojiMatch": "Compare and make sure the following emoji match those of the other device:",
+    "compareEmojiMatch": "Please compare the emojis",
     "@compareEmojiMatch": {
         "type": "text",
         "placeholders": {}
     },
-    "compareNumbersMatch": "Compare and make sure the following numbers match those of the other device:",
+    "compareNumbersMatch": "Please compare the numbers",
     "@compareNumbersMatch": {
         "type": "text",
         "placeholders": {}
diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart
index 880283e8..94cb9f28 100644
--- a/lib/pages/key_verification/key_verification_dialog.dart
+++ b/lib/pages/key_verification/key_verification_dialog.dart
@@ -221,7 +221,7 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
         if (widget.request.sasTypes.contains('emoji')) {
           title = Text(
             L10n.of(context)!.compareEmojiMatch,
-            maxLines: 2,
+            maxLines: 1,
             style: const TextStyle(fontSize: 16),
           );
           compareWidget = TextSpan(
@@ -374,7 +374,10 @@ class _Emoji extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       children: <Widget>[
         Text(emoji.emoji, style: const TextStyle(fontSize: 50)),
-        Text(getLocalizedName()),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 4.0),
+          child: Text(getLocalizedName()),
+        ),
         const SizedBox(height: 10, width: 5),
       ],
     );
diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart
index 3046f107..bfedb095 100644
--- a/lib/utils/adaptive_bottom_sheet.dart
+++ b/lib/utils/adaptive_bottom_sheet.dart
@@ -8,7 +8,7 @@ Future<T?> showAdaptiveBottomSheet<T>({
   required BuildContext context,
   required Widget Function(BuildContext) builder,
   bool isDismissible = true,
-  bool isScrollControlled = true,
+  bool isScrollControlled = false,
 }) =>
     showModalBottomSheet(
       context: context,