Added scaffold on each screen

lib/config/app_screens.dart

@@ -35,9 +35,7 @@ List<AppScreen> screensServerConnected = [
   const AppScreen(
     name: "home", 
     icon: Icons.home_rounded, 
-    appBar: HomeAppBar(),
     body: Home(),
-    fab: HomeFab()
   ),
   const AppScreen(
     name: "clients", 
@@ -48,7 +46,6 @@ List<AppScreen> screensServerConnected = [
     name: "logs", 
     icon: Icons.list_alt_rounded, 
     body: Logs(),
-    appBar: LogsAppBar()
   ),
   const AppScreen(
     name: "filters", 

lib/screens/clients/added_list.dart

@@ -17,11 +17,13 @@ import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 
 class AddedList extends StatelessWidget {
+  final int loadStatus;
   final List<Client> data;
   final Future Function() fetchClients;
 
   const AddedList({
     Key? key,
+    required this.loadStatus,
     required this.data,
     required this.fetchClients
   }) : super(key: key);
@@ -133,11 +135,32 @@ class AddedList extends StatelessWidget {
       );
     }
 
+    switch (loadStatus) {
+      case 0:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const CircularProgressIndicator(),
+              const SizedBox(height: 30),
+              Text(
+                AppLocalizations.of(context)!.loadingStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      case 1:
         return Stack(
           children: [
-        if (data.isNotEmpty) RefreshIndicator(
+            if (data.isNotEmpty) ListView.builder(
-          onRefresh: () async {},
-          child: ListView.builder(
               padding: const EdgeInsets.only(top: 0),
               itemCount: data.length,
               itemBuilder: (context, index) => ListTile(
@@ -192,7 +215,6 @@ class AddedList extends StatelessWidget {
                 ),
               )
             ),
-        ),
             if (data.isEmpty) SizedBox(
               width: double.maxFinite,
               child: Column(
@@ -222,5 +244,35 @@ class AddedList extends StatelessWidget {
             ),
           ],
         );
+      
+      case 2:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          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)!.errorLoadServerStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      default:
+        return const SizedBox();
+    }
+
   }
 }

lib/screens/clients/blocked_list.dart

@@ -14,11 +14,13 @@ import 'package:adguard_home_manager/services/http_requests.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
 
 class BlockedList extends StatelessWidget {
+  final int loadStatus;
   final List<String> data;
   final Future Function() fetchClients;
 
   const BlockedList({
     Key? key,
+    required this.loadStatus,
     required this.data,
     required this.fetchClients
   }) : super(key: key);
@@ -71,6 +73,29 @@ class BlockedList extends StatelessWidget {
       }
     }
 
+    switch (loadStatus) {
+      case 0:
+         return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const CircularProgressIndicator(),
+              const SizedBox(height: 30),
+              Text(
+                AppLocalizations.of(context)!.loadingStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      case 1: 
         return Stack(
           children: [
             if (data.isNotEmpty) ListView.builder(
@@ -120,5 +145,35 @@ class BlockedList extends StatelessWidget {
             ),
           ]
         );
+
+      case 2: 
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          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)!.errorLoadServerStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      default:
+        return const SizedBox();
+    }
+
   }
 }

lib/screens/clients/clients.dart

@@ -89,15 +89,12 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
   Widget build(BuildContext context) {
     final serversProvider = Provider.of<ServersProvider>(context);
 
+    Widget generateBody() {
       switch (serversProvider.clients.loadStatus) {
       case 0:
           return Column(
             mainAxisSize: MainAxisSize.max,
             children: [
-            AppBar(
-              title: Text(AppLocalizations.of(context)!.clients),
-              centerTitle: true,
-            ),
               SizedBox(
                 width: double.maxFinite,
                 height: MediaQuery.of(context).size.height-171,
@@ -121,6 +118,42 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
           );
         
         case 1:
+        return Container();
+          
+        case 2:
+          return Column(
+            children: [
+              SizedBox(
+                width: double.maxFinite,
+                height: MediaQuery.of(context).size.height-171,
+                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)!.errorLoadServerStatus,
+                      style: const TextStyle(
+                        fontSize: 22,
+                        color: Colors.grey,
+                      ),
+                    )
+                  ],
+                ),
+              ),
+            ],
+          );
+
+        default:
+          return const SizedBox();
+      }
+    }
+
     return DefaultTabController(
       length: 3,
       child: NestedScrollView(
@@ -168,65 +201,34 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
               RefreshIndicator(
                 onRefresh: fetchClients,
                 child: ClientsList(
-                      data: serversProvider.clients.data!.autoClientsData,
+                  loadStatus: serversProvider.clients.loadStatus,
+                  data: serversProvider.clients.loadStatus == 1
+                    ? serversProvider.clients.data!.autoClientsData : [],
                   fetchClients: fetchClients,
                 ),
               ),
               RefreshIndicator(
                 onRefresh: fetchClients,
                 child: AddedList(
-                      data: serversProvider.clients.data!.clients, 
+                  loadStatus: serversProvider.clients.loadStatus,
+                  data: serversProvider.clients.loadStatus == 1
+                    ? serversProvider.clients.data!.clients : [], 
                   fetchClients: fetchClients,
                 )
               ),
               RefreshIndicator(
                 onRefresh: fetchClients,
                 child: BlockedList(
-                      data: serversProvider.clients.data!.clientsAllowedBlocked!.disallowedClients, 
+                  loadStatus: serversProvider.clients.loadStatus,
+                  data: serversProvider.clients.loadStatus == 1
+                    ? serversProvider.clients.data!.clientsAllowedBlocked!.disallowedClients : [], 
                   fetchClients: fetchClients,
-                    ),
-                  ),
-                ],
-              ),
                 )
+              ),
+            ]
+          )
+        ),
       )
     );
-        
-      case 2:
-        return Column(
-          children: [
-            AppBar(
-              title: Text(AppLocalizations.of(context)!.clients),
-              centerTitle: true,
-            ),
-            SizedBox(
-              width: double.maxFinite,
-              height: MediaQuery.of(context).size.height-171,
-              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)!.errorLoadServerStatus,
-                    style: const TextStyle(
-                      fontSize: 22,
-                      color: Colors.grey,
-                    ),
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-
-      default:
-        return const SizedBox();
-    }
   }
 }

lib/screens/clients/clients_list.dart

@@ -4,17 +4,42 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:adguard_home_manager/models/clients.dart';
 
 class ClientsList extends StatelessWidget {
+  final int loadStatus;
   final List<AutoClient> data;
   final Future Function() fetchClients;
 
   const ClientsList({
     Key? key,
+    required this.loadStatus,
     required this.data,
     required this.fetchClients
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    switch (loadStatus) {
+      case 0:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const CircularProgressIndicator(),
+              const SizedBox(height: 30),
+              Text(
+                AppLocalizations.of(context)!.loadingStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      case 1:
         if (data.isNotEmpty) {
           return ListView.builder(
             padding: const EdgeInsets.only(top: 0),
@@ -58,5 +83,34 @@ class ClientsList extends StatelessWidget {
             ),
           );
         }
+
+      case 2:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          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)!.errorLoadServerStatus,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+        
+      default:
+        return const SizedBox();
+    }
   }
 }

lib/screens/filters/custom_rules_list.dart

@@ -15,12 +15,14 @@ import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
 
 class CustomRulesList extends StatefulWidget {
+  final int loadStatus;
   final ScrollController scrollController;
   final List<String> data;
   final void Function() fetchData;
 
   const CustomRulesList({
     Key? key,
+    required this.loadStatus,
     required this.scrollController,
     required this.data,
     required this.fetchData
@@ -100,6 +102,29 @@ class _CustomRulesListState extends State<CustomRulesList> {
       );
     }
 
+    switch (widget.loadStatus) {
+      case 0:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const CircularProgressIndicator(),
+              const SizedBox(height: 30),
+              Text(
+                AppLocalizations.of(context)!.loadingFilters,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      case 1:
         return Stack(
           children: [
             if (widget.data.isNotEmpty) ListView.builder(
@@ -146,5 +171,35 @@ class _CustomRulesListState extends State<CustomRulesList> {
             )
           ],
         );
+
+      case 2:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          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)!.filtersNotLoaded,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      default:
+        return const SizedBox();
+    }
+
   }
 }

lib/screens/filters/filters.dart

@@ -80,42 +80,9 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
   Widget build(BuildContext context) {
     final serversProvider = Provider.of<ServersProvider>(context);
 
-    switch (serversProvider.filtering.loadStatus) {
-      case 0:
-        return Column(
-          mainAxisSize: MainAxisSize.max,
-          children: [
-            AppBar(
-              title: Text(AppLocalizations.of(context)!.filters),
-              centerTitle: true,
-            ),
-            SizedBox(
-              width: double.maxFinite,
-              height: MediaQuery.of(context).size.height-171,
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  const CircularProgressIndicator(),
-                  const SizedBox(height: 30),
-                  Text(
-                    AppLocalizations.of(context)!.loadingFilters,
-                    style: const TextStyle(
-                      fontSize: 22,
-                      color: Colors.grey,
-                    ),
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-      
-      case 1:
     return DefaultTabController(
       length: 3,
       child: NestedScrollView(
-            controller: scrollController,
         headerSliverBuilder: ((context, innerBoxIsScrolled) {
           return [
             SliverAppBar(
@@ -160,70 +127,39 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
               RefreshIndicator(
                 onRefresh: fetchFilters,
                 child: FiltersList(
+                  loadStatus: serversProvider.filtering.loadStatus,
                   scrollController: scrollController,
                   type: 'whitelist',
-                      data: serversProvider.filtering.data!.whitelistFilters,
+                  data: serversProvider.filtering.loadStatus == 1
+                    ? serversProvider.filtering.data!.whitelistFilters : [],
                   fetchData: fetchFilters,
                 )
               ),
               RefreshIndicator(
                 onRefresh: fetchFilters,
                 child: FiltersList(
+                  loadStatus: serversProvider.filtering.loadStatus,
                   scrollController: scrollController,
                   type: 'blacklist',
-                      data: serversProvider.filtering.data!.filters,
+                  data: serversProvider.filtering.loadStatus == 1
+                    ? serversProvider.filtering.data!.filters : [],
                   fetchData: fetchFilters,
                 )
               ),
               RefreshIndicator(
                 onRefresh: fetchFilters,
                 child: CustomRulesList(
+                  loadStatus: serversProvider.filtering.loadStatus,
                   scrollController: scrollController,
-                      data: serversProvider.filtering.data!.userRules,
+                  data: serversProvider.filtering.loadStatus == 1
+                    ? serversProvider.filtering.data!.userRules : [],
                   fetchData: fetchFilters,
                 )
               ),
-                ],
+            ]
-              ),
           )
+        ),
       )
     );
-        
-      case 2:
-        return Column(
-          children: [
-            AppBar(
-              title: Text(AppLocalizations.of(context)!.filters),
-              centerTitle: true,
-            ),
-            SizedBox(
-              width: double.maxFinite,
-              height: MediaQuery.of(context).size.height-171,
-              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)!.filtersNotLoaded,
-                    style: const TextStyle(
-                      fontSize: 22,
-                      color: Colors.grey,
-                    ),
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-
-      default:
-        return const SizedBox();
-    }
   }
 }

lib/screens/filters/filters_list.dart

@@ -18,6 +18,7 @@ import 'package:adguard_home_manager/functions/number_format.dart';
 import 'package:adguard_home_manager/models/filtering.dart';
 
 class FiltersList extends StatefulWidget {
+  final int loadStatus;
   final ScrollController scrollController;
   final List<Filter> data;
   final void Function() fetchData;
@@ -25,6 +26,7 @@ class FiltersList extends StatefulWidget {
 
   const FiltersList({
     Key? key,
+    required this.loadStatus,
     required this.scrollController,
     required this.data,
     required this.fetchData,
@@ -127,6 +129,29 @@ class _FiltersListState extends State<FiltersList> {
       );
     }
 
+    switch (widget.loadStatus) {
+      case 0:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const CircularProgressIndicator(),
+              const SizedBox(height: 30),
+              Text(
+                AppLocalizations.of(context)!.loadingFilters,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      case 1:
         return Stack(
           children: [
             if (widget.data.isNotEmpty) ListView.builder(
@@ -216,5 +241,35 @@ class _FiltersListState extends State<FiltersList> {
             )
           ],
         );
+
+      case 2:
+        return SizedBox(
+          width: double.maxFinite,
+          height: MediaQuery.of(context).size.height-171,
+          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)!.filtersNotLoaded,
+                style: const TextStyle(
+                  fontSize: 22,
+                  color: Colors.grey,
+                ),
+              )
+            ],
+          ),
+        );
+
+      default:
+        return const SizedBox();
+    }
+
   }
 }

lib/screens/home/home.dart

@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:adguard_home_manager/screens/home/server_status.dart';
+import 'package:adguard_home_manager/screens/home/appbar.dart';
 import 'package:adguard_home_manager/screens/home/top_items.dart';
 import 'package:adguard_home_manager/screens/home/chart.dart';
 
@@ -154,7 +155,9 @@ class Home extends StatelessWidget {
       }
     }
 
-    return RefreshIndicator(
+    return Scaffold(
+      appBar: const HomeAppBar(),
+      body: RefreshIndicator(
         color: Theme.of(context).primaryColor,
         onRefresh: () async {
           final result = await getServerStatus(serversProvider.selectedServer!);
@@ -172,6 +175,7 @@ class Home extends StatelessWidget {
           }
         },
         child: status()
+      ),
     );
   }
 }

lib/screens/logs/logs.dart

@@ -5,14 +5,12 @@ import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:adguard_home_manager/screens/logs/log_tile.dart';
+import 'package:adguard_home_manager/screens/logs/appbar.dart';
 
 import 'package:adguard_home_manager/providers/logs_provider.dart';
-import 'package:adguard_home_manager/models/filtering_status.dart';
-import 'package:adguard_home_manager/models/app_log.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/services/http_requests.dart';
 import 'package:adguard_home_manager/models/logs.dart';
-import 'package:adguard_home_manager/models/server.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 
 class Logs extends StatelessWidget {
@@ -132,6 +130,7 @@ class _LogsWidgetState extends State<LogsWidget> {
   Widget build(BuildContext context) {
     final logsProvider = Provider.of<LogsProvider>(context);
 
+    Widget generateBody() {
       switch (logsProvider.loadStatus) {
         case 0:
           return SizedBox(
@@ -242,4 +241,10 @@ class _LogsWidgetState extends State<LogsWidget> {
           return const SizedBox();
       }
     }
+
+    return Scaffold(
+      appBar: const LogsAppBar(),
+      body: generateBody(),
+    );
+  }
 }