Removed color appbar desktop mode

lib/screens/settings/dns/bootstrap_dns.dart

@@ -1,5 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -66,6 +67,8 @@ class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
     final dnsProvider = Provider.of<DnsProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
 
+    final width = MediaQuery.of(context).size.width;
+
     void saveData() async {
       ProcessModal processModal = ProcessModal(context: context);
       processModal.open(AppLocalizations.of(context)!.savingConfig);
@@ -102,6 +105,7 @@ class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.bootstrapDns),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           IconButton(
             onPressed: validValues == true

lib/screens/settings/dns/cache_config.dart

@@ -7,6 +7,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
 import 'package:adguard_home_manager/screens/settings/dns/clear_dns_cache_dialog.dart';
 
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
@@ -69,6 +70,8 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
     final dnsProvider = Provider.of<DnsProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
 
+    final width = MediaQuery.of(context).size.width;
+
     void saveData() async {
       ProcessModal processModal = ProcessModal(context: context);
       processModal.open(AppLocalizations.of(context)!.savingConfig);
@@ -154,6 +157,7 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.dnsCacheConfig),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           IconButton(
             onPressed: validData == true

lib/screens/settings/dns/dns.dart

@@ -1,9 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'dart:io';
-
-import 'package:adguard_home_manager/constants/enums.dart';
-import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_split_view/flutter_split_view.dart';
 import 'package:provider/provider.dart';
@@ -17,13 +14,21 @@ import 'package:adguard_home_manager/screens/settings/dns/private_reverse_server
 import 'package:adguard_home_manager/screens/settings/dns/upstream_dns.dart';
 import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
 
+import 'package:adguard_home_manager/constants/enums.dart';
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
+import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:adguard_home_manager/functions/clear_dns_cache.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 
 class DnsSettings extends StatefulWidget {
-  const DnsSettings({Key? key}) : super(key: key);
+  final bool splitView;
+
+  const DnsSettings({
+    Key? key,
+    required this.splitView,
+  }) : super(key: key);
 
   @override
   State<DnsSettings> createState() => _DnsSettingsState();
@@ -44,106 +49,17 @@ class _DnsSettingsState extends State<DnsSettings> {
 
     final width = MediaQuery.of(context).size.width;
 
-    void navigate(Widget widget) {
-      if (width > 900 || !(Platform.isAndroid || Platform.isIOS)) {
-        SplitView.of(context).push(widget);
+    void navigate(Widget w) {
+      if (widget.splitView) {
+        SplitView.of(context).push(w);
       }
       else {
         Navigator.push(context, MaterialPageRoute(
-          builder: (context) => widget
+          builder: (context) => w
         ));
       }
     }
 
-    Widget generateBody() {
-      switch (dnsProvider.loadStatus) {
-        case LoadStatus.loading:
-          return SizedBox(
-            width: double.maxFinite,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const CircularProgressIndicator(),
-                const SizedBox(height: 30),
-                Text(
-                  AppLocalizations.of(context)!.loadingDnsConfig,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 22,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-                )
-              ],
-            )
-          );
-
-        case LoadStatus.loaded:
-          return ListView(
-            children: [
-              CustomListTile(
-                title: AppLocalizations.of(context)!.upstreamDns,
-                subtitle: AppLocalizations.of(context)!.upstreamDnsDescription,
-                onTap: () => navigate(const UpstreamDnsScreen()),
-                icon: Icons.upload_rounded,
-              ),
-              CustomListTile(
-                title: AppLocalizations.of(context)!.bootstrapDns,
-                subtitle: AppLocalizations.of(context)!.bootstrapDnsDescription,
-                onTap: () => navigate(const BootstrapDnsScreen()),
-                icon: Icons.dns_rounded,
-              ),
-              CustomListTile(
-                title: AppLocalizations.of(context)!.privateReverseDnsServers,
-                subtitle: AppLocalizations.of(context)!.privateReverseDnsDescription,
-                onTap: () => navigate(const PrivateReverseDnsServersScreen()),
-                icon: Icons.person_rounded,
-              ),
-              CustomListTile(
-                title: AppLocalizations.of(context)!.dnsServerSettings,
-                subtitle: AppLocalizations.of(context)!.dnsServerSettingsDescription,
-                onTap: () => navigate(const DnsServerSettingsScreen()),
-                icon: Icons.settings,
-              ),
-              CustomListTile(
-                title: AppLocalizations.of(context)!.dnsCacheConfig,
-                subtitle: AppLocalizations.of(context)!.dnsCacheConfigDescription,
-                onTap: () => navigate(const CacheConfigDnsScreen()),
-                icon: Icons.storage_rounded,
-              ),
-            ],
-          );
-
-        case LoadStatus.error:
-          return SizedBox(
-            width: double.maxFinite,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const Icon(
-                  Icons.error,
-                  color: Colors.red,
-                  size: 50,
-                ),
-                const SizedBox(height: 30),
-                Text(
-                  AppLocalizations.of(context)!.dnsConfigNotLoaded,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 22,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-                )
-              ],
-            ),
-          );
-
-        default:
-          return const SizedBox();
-      }
-    }
-
     void clearCache() async {
       final result = await clearDnsCache(context, serversProvider.selectedServer!);
       if (result == true) {
@@ -165,6 +81,7 @@ class _DnsSettingsState extends State<DnsSettings> {
     return Scaffold(
       appBar: AppBar(
         title:  Text(AppLocalizations.of(context)!.dnsSettings),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           PopupMenuButton(
             itemBuilder: (context) => [
@@ -200,7 +117,96 @@ class _DnsSettingsState extends State<DnsSettings> {
           const SizedBox(width: 10)
         ],
       ),
-      body: generateBody(),
+      body: Builder(
+        builder: (context) {
+          switch (dnsProvider.loadStatus) {
+            case LoadStatus.loading:
+              return SizedBox(
+                width: double.maxFinite,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const CircularProgressIndicator(),
+                    const SizedBox(height: 30),
+                    Text(
+                      AppLocalizations.of(context)!.loadingDnsConfig,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 22,
+                        color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
+                    )
+                  ],
+                )
+              );
+
+            case LoadStatus.loaded:
+              return ListView(
+                children: [
+                  CustomListTile(
+                    title: AppLocalizations.of(context)!.upstreamDns,
+                    subtitle: AppLocalizations.of(context)!.upstreamDnsDescription,
+                    onTap: () => navigate(const UpstreamDnsScreen()),
+                    icon: Icons.upload_rounded,
+                  ),
+                  CustomListTile(
+                    title: AppLocalizations.of(context)!.bootstrapDns,
+                    subtitle: AppLocalizations.of(context)!.bootstrapDnsDescription,
+                    onTap: () => navigate(const BootstrapDnsScreen()),
+                    icon: Icons.dns_rounded,
+                  ),
+                  CustomListTile(
+                    title: AppLocalizations.of(context)!.privateReverseDnsServers,
+                    subtitle: AppLocalizations.of(context)!.privateReverseDnsDescription,
+                    onTap: () => navigate(const PrivateReverseDnsServersScreen()),
+                    icon: Icons.person_rounded,
+                  ),
+                  CustomListTile(
+                    title: AppLocalizations.of(context)!.dnsServerSettings,
+                    subtitle: AppLocalizations.of(context)!.dnsServerSettingsDescription,
+                    onTap: () => navigate(const DnsServerSettingsScreen()),
+                    icon: Icons.settings,
+                  ),
+                  CustomListTile(
+                    title: AppLocalizations.of(context)!.dnsCacheConfig,
+                    subtitle: AppLocalizations.of(context)!.dnsCacheConfigDescription,
+                    onTap: () => navigate(const CacheConfigDnsScreen()),
+                    icon: Icons.storage_rounded,
+                  ),
+                ],
+              );
+
+            case LoadStatus.error:
+              return SizedBox(
+                width: double.maxFinite,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const Icon(
+                      Icons.error,
+                      color: Colors.red,
+                      size: 50,
+                    ),
+                    const SizedBox(height: 30),
+                    Text(
+                      AppLocalizations.of(context)!.dnsConfigNotLoaded,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 22,
+                        color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
+                    )
+                  ],
+                ),
+              );
+
+            default:
+              return const SizedBox();
+          }
+        },
+      )
     );
   }
 }

lib/screens/settings/dns/dns_server_settings.dart

@@ -8,6 +8,7 @@ import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart';
 import 'package:adguard_home_manager/widgets/section_label.dart';
 import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
 
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
 import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
@@ -99,6 +100,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
   Widget build(BuildContext context) {
     final dnsProvider = Provider.of<DnsProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
+    final width = MediaQuery.of(context).size.width;
 
     void saveData() async {
       ProcessModal processModal = ProcessModal(context: context);
@@ -153,6 +155,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.dnsServerSettings),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           IconButton(
             onPressed: isDataValid == true

lib/screens/settings/dns/private_reverse_servers.dart

@@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
 
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
@@ -90,6 +91,8 @@ class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServer
     final dnsProvider = Provider.of<DnsProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
 
+    final width = MediaQuery.of(context).size.width;
+
     void saveData() async {
       ProcessModal processModal = ProcessModal(context: context);
       processModal.open(AppLocalizations.of(context)!.savingConfig);
@@ -134,6 +137,7 @@ class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServer
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.privateReverseDnsServers),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           IconButton(
             onPressed: validValues == true

lib/screens/settings/dns/upstream_dns.dart

@@ -11,6 +11,7 @@ import 'package:adguard_home_manager/screens/settings/dns/comment_modal.dart';
 import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart';
 
 import 'package:adguard_home_manager/classes/process_modal.dart';
+import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/providers/dns_provider.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
@@ -90,6 +91,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
       else {
         showModalBottomSheet(
           context: context, 
+          useRootNavigator: true,
           builder: (context) => CommentModal(
             onConfirm: (value) {
               setState(() {
@@ -123,6 +125,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
       else {
         showModalBottomSheet(
           context: context, 
+          useRootNavigator: true,
           builder: (context) => CommentModal(
             comment: item['comment'],
             onConfirm: (value) {
@@ -174,6 +177,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.upstreamDns),
+        surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
         actions: [
           IconButton(
             onPressed: validValues == true