From 18ef679639c8b1ce6c74be4e9be07930da99e3c8 Mon Sep 17 00:00:00 2001
From: Juan Gilsanz Polo <juangilsanz@gmail.com>
Date: Sun, 9 Oct 2022 01:43:09 +0200
Subject: [PATCH] Small fixes

---
 lib/screens/connect/connect.dart   | 12 +++++---
 lib/screens/settings/settings.dart | 48 ++++++++++++++++--------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/lib/screens/connect/connect.dart b/lib/screens/connect/connect.dart
index 871f50b..9db4edf 100644
--- a/lib/screens/connect/connect.dart
+++ b/lib/screens/connect/connect.dart
@@ -2,6 +2,7 @@ import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import 'package:adguard_home_manager/screens/connect/appbar.dart';
 import 'package:adguard_home_manager/widgets/servers_list/servers_list.dart';
 
 import 'package:adguard_home_manager/providers/servers_provider.dart';
@@ -28,10 +29,13 @@ class _ConnectState extends State<Connect> {
       expandableControllerList.add(ExpandableController());
     }
 
-    return ServersList(
-      context: context, 
-      controllers: expandableControllerList, 
-      onChange: expandOrContract
+    return Scaffold(
+      appBar: const ConnectAppBar(),
+      body: ServersList(
+        context: context, 
+        controllers: expandableControllerList, 
+        onChange: expandOrContract
+      ),
     );
   }
 }
\ No newline at end of file
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index 09e5c54..4e6660b 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -85,31 +85,33 @@ class Settings extends StatelessWidget {
       appBar: const SettingsAppBar(),
       body: ListView(
         children: [
-          SectionLabel(label: AppLocalizations.of(context)!.serverSettings),
-          CustomListTile(
-            leadingIcon: Icons.lock_rounded,
-            label: AppLocalizations.of(context)!.accessSettings,
-            description: AppLocalizations.of(context)!.accessSettingsDescription,
-            onTap: () => {
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (context) => const AccessSettings()
+          if (serversProvider.selectedServer != null) ...[
+            SectionLabel(label: AppLocalizations.of(context)!.serverSettings),
+            CustomListTile(
+              leadingIcon: Icons.lock_rounded,
+              label: AppLocalizations.of(context)!.accessSettings,
+              description: AppLocalizations.of(context)!.accessSettingsDescription,
+              onTap: () => {
+                Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) => const AccessSettings()
+                  )
                 )
-              )
-            },
-          ),
-          CustomListTile(
-            leadingIcon: Icons.info_rounded,
-            label: AppLocalizations.of(context)!.serverInformation,
-            description: AppLocalizations.of(context)!.serverInformationDescription,
-            onTap: () => {
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (context) => const ServerInformation()
+              },
+            ),
+            CustomListTile(
+              leadingIcon: Icons.info_rounded,
+              label: AppLocalizations.of(context)!.serverInformation,
+              description: AppLocalizations.of(context)!.serverInformationDescription,
+              onTap: () => {
+                Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) => const ServerInformation()
+                  )
                 )
-              )
-            },
-          ),
+              },
+            ),
+          ],
           SectionLabel(label: AppLocalizations.of(context)!.appSettings),
           CustomListTile(
             leadingIcon: Icons.light_mode_rounded,