From 68d45f825f4b181271d0247d91ec814f3bbfbbe2 Mon Sep 17 00:00:00 2001
From: TheOneWithTheBraid <the-one@with-the-braid.cf>
Date: Sat, 24 Dec 2022 19:46:36 +0100
Subject: [PATCH] fix: minor homeserver picker UI issues

- missing safe area preventing from choosing homeserver on notch devices
- low-accent black on grey

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
---
 .../homeserver_picker/homeserver_app_bar.dart | 42 +++++++++++--------
 .../homeserver_picker_view.dart               | 16 ++++---
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/lib/pages/homeserver_picker/homeserver_app_bar.dart b/lib/pages/homeserver_picker/homeserver_app_bar.dart
index f9d2c19a..18dbc733 100644
--- a/lib/pages/homeserver_picker/homeserver_app_bar.dart
+++ b/lib/pages/homeserver_picker/homeserver_app_bar.dart
@@ -13,25 +13,31 @@ class HomeserverAppBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return TextField(
-      focusNode: controller.homeserverFocusNode,
-      controller: controller.homeserverController,
-      onChanged: controller.onChanged,
-      decoration: InputDecoration(
-        prefixIcon: Navigator.of(context).canPop()
-            ? IconButton(
-                onPressed: Navigator.of(context).pop,
-                icon: const Icon(Icons.arrow_back),
-              )
-            : null,
-        prefixText: '${L10n.of(context)!.homeserver}: ',
-        hintText: L10n.of(context)!.enterYourHomeserver,
-        suffixIcon: const Icon(Icons.search),
-        errorText: controller.error,
+    return Material(
+      color: Theme.of(context).appBarTheme.backgroundColor,
+      child: SafeArea(
+        bottom: false,
+        child: TextField(
+          focusNode: controller.homeserverFocusNode,
+          controller: controller.homeserverController,
+          onChanged: controller.onChanged,
+          decoration: InputDecoration(
+            prefixIcon: Navigator.of(context).canPop()
+                ? IconButton(
+                    onPressed: Navigator.of(context).pop,
+                    icon: const Icon(Icons.arrow_back),
+                  )
+                : null,
+            prefixText: '${L10n.of(context)!.homeserver}: ',
+            hintText: L10n.of(context)!.enterYourHomeserver,
+            suffixIcon: const Icon(Icons.search),
+            errorText: controller.error,
+          ),
+          readOnly: !AppConfig.allowOtherHomeservers,
+          onSubmitted: (_) => controller.checkHomeserverAction(),
+          autocorrect: false,
+        ),
       ),
-      readOnly: !AppConfig.allowOtherHomeservers,
-      onSubmitted: (_) => controller.checkHomeserverAction(),
-      autocorrect: false,
     );
   }
 }
diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart
index b91dbe76..9434585d 100644
--- a/lib/pages/homeserver_picker/homeserver_picker_view.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart
@@ -69,9 +69,11 @@ class HomeserverPickerView extends StatelessWidget {
                                     .map(
                                       (server) => ListTile(
                                         trailing: IconButton(
-                                          icon: const Icon(
+                                          icon: Icon(
                                             Icons.info_outlined,
-                                            color: Colors.black,
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .secondary,
                                           ),
                                           onPressed: () =>
                                               controller.showServerInfo(server),
@@ -80,13 +82,17 @@ class HomeserverPickerView extends StatelessWidget {
                                             server.homeserver.baseUrl.host),
                                         title: Text(
                                           server.homeserver.baseUrl.host,
-                                          style: const TextStyle(
-                                              color: Colors.black),
+                                          style: TextStyle(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .secondary,
+                                          ),
                                         ),
                                         subtitle: Text(
                                           server.homeserver.description ?? '',
                                           style: TextStyle(
-                                              color: Colors.grey.shade700),
+                                            color: Colors.grey.shade700,
+                                          ),
                                         ),
                                       ),
                                     )