Merge branch 'beta'

JGeek00 · Dec 9, 2023 · 3bc8fce · 3bc8fce
2 parents e2f3fe9 + 5a12c4c
commit 3bc8fce
Show file tree

Hide file tree

Showing 56 changed files with 3,516 additions and 3,336 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -688,5 +688,7 @@
     "yourVersion": "Your version: {version}",
     "minimumRequiredVersion": "Minimum required version: {version}",
     "topUpstreams": "Top upstreams",
-    "averageUpstreamResponseTime": "Average upstream response time"
+    "averageUpstreamResponseTime": "Average upstream response time",
+    "dhcpNotAvailable": "The DHCP server is not available.",
+    "osServerInstalledIncompatible": "The OS where the server is installed is not compatible with this feature."
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -688,5 +688,7 @@
     "yourVersion": "Tu versión: {version}",
     "minimumRequiredVersion": "Versión mínima requerida: {version}",
     "topUpstreams": "DNS de subida más frecuentes",
-    "averageUpstreamResponseTime": "Tiempo promedio de respuesta upstream"
+    "averageUpstreamResponseTime": "Tiempo promedio de respuesta upstream",
+    "dhcpNotAvailable": "El servidor DHCP no está disponible.",
+    "osServerInstalledIncompatible": "El SO donde el servidor está instalado no es compatible con esta característica."
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
@@ -35,6 +36,7 @@ import 'package:adguard_home_manager/services/db/database.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
 
   if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
     setWindowMinSize(const Size(500, 500));

diff --git a/lib/models/dhcp.dart b/lib/models/dhcp.dart
@@ -1,9 +1,11 @@
 import 'dart:convert';
 class DhcpModel {
+  bool dhcpAvailable;
   List<NetworkInterface> networkInterfaces;
-  DhcpStatus dhcpStatus;
+  DhcpStatus? dhcpStatus;
 
   DhcpModel({
+    required this.dhcpAvailable,
     required this.networkInterfaces,
     required this.dhcpStatus,
   });

diff --git a/lib/providers/dhcp_provider.dart b/lib/providers/dhcp_provider.dart
@@ -69,7 +69,7 @@ class DhcpProvider with ChangeNotifier {
 
     if (result.successful == true) {
       DhcpModel data = dhcp!;
-      data.dhcpStatus.staticLeases = data.dhcpStatus.staticLeases.where((l) => l.mac != lease.mac).toList();
+      data.dhcpStatus!.staticLeases = data.dhcpStatus!.staticLeases.where((l) => l.mac != lease.mac).toList();
       setDhcpData(data);
       return true;
     }
@@ -90,7 +90,7 @@ class DhcpProvider with ChangeNotifier {
 
     if (result.successful == true) {
       DhcpModel data = dhcp!;
-      data.dhcpStatus.staticLeases.add(lease);
+      data.dhcpStatus!.staticLeases.add(lease);
       setDhcpData(data);
       return result;
     }

diff --git a/lib/screens/clients/client/client_screen.dart b/lib/screens/clients/client/client_screen.dart
@@ -185,34 +185,36 @@ class _ClientScreenState extends State<ClientScreen> {
             ),
             actions: actions(),
           ),
-          body: ClientForm(
-            isFullScreen: true,
-            client: widget.client, 
-            nameController: nameController,
-            updateValidValues: (v) => setState(() => validValues = v), 
-            identifiersControllers: identifiersControllers, 
-            selectedTags: selectedTags, 
-            useGlobalSettingsFiltering: useGlobalSettingsFiltering, 
-            enableFiltering: enableFiltering, 
-            enableParentalControl: enableParentalControl, 
-            enableSafeBrowsing: enableSafeBrowsing, 
-            enableSafeSearch: enableSafeSearch, 
-            safeSearch: safeSearch, 
-            blockedServices: blockedServices, 
-            updateBlockedServices: (v) => setState(() => blockedServices = v), 
-            upstreamServers: upstreamServers, 
-            updateUpstreamServers: (v) => setState(() => upstreamServers = v), 
-            defaultSafeSearch: defaultSafeSearch, 
-            useGlobalSettingsServices: useGlobalSettingsServices, 
-            updateSelectedTags: (v) => setState(() => selectedTags = v),
-            updateIdentifiersControllers: (v) => setState(() => identifiersControllers = v), 
-            enableDisableGlobalSettingsFiltering: enableDisableGlobalSettingsFiltering, 
-            updateEnableFiltering: (v) => setState(() => enableFiltering = v), 
-            updateEnableParentalControl: (v) => setState(() => enableParentalControl = v), 
-            updateEnableSafeBrowsing: (v) => setState(() => enableSafeBrowsing = v), 
-            updateEnableSafeSearch: (v) => setState(() => enableSafeSearch = v), 
-            updateSafeSearch: (v) => setState(() => safeSearch = v), 
-            updateUseGlobalSettingsServices: (v) => setState(() => useGlobalSettingsServices = v), 
+          body: SafeArea(
+            child: ClientForm(
+              isFullScreen: true,
+              client: widget.client, 
+              nameController: nameController,
+              updateValidValues: (v) => setState(() => validValues = v), 
+              identifiersControllers: identifiersControllers, 
+              selectedTags: selectedTags, 
+              useGlobalSettingsFiltering: useGlobalSettingsFiltering, 
+              enableFiltering: enableFiltering, 
+              enableParentalControl: enableParentalControl, 
+              enableSafeBrowsing: enableSafeBrowsing, 
+              enableSafeSearch: enableSafeSearch, 
+              safeSearch: safeSearch, 
+              blockedServices: blockedServices, 
+              updateBlockedServices: (v) => setState(() => blockedServices = v), 
+              upstreamServers: upstreamServers, 
+              updateUpstreamServers: (v) => setState(() => upstreamServers = v), 
+              defaultSafeSearch: defaultSafeSearch, 
+              useGlobalSettingsServices: useGlobalSettingsServices, 
+              updateSelectedTags: (v) => setState(() => selectedTags = v),
+              updateIdentifiersControllers: (v) => setState(() => identifiersControllers = v), 
+              enableDisableGlobalSettingsFiltering: enableDisableGlobalSettingsFiltering, 
+              updateEnableFiltering: (v) => setState(() => enableFiltering = v), 
+              updateEnableParentalControl: (v) => setState(() => enableParentalControl = v), 
+              updateEnableSafeBrowsing: (v) => setState(() => enableSafeBrowsing = v), 
+              updateEnableSafeSearch: (v) => setState(() => enableSafeSearch = v), 
+              updateSafeSearch: (v) => setState(() => safeSearch = v), 
+              updateUseGlobalSettingsServices: (v) => setState(() => useGlobalSettingsServices = v), 
+            ),
           ),
         ),
       );

diff --git a/lib/screens/clients/client/logs_list_client.dart b/lib/screens/clients/client/logs_list_client.dart
@@ -149,125 +149,127 @@ class _LogsListClientState extends State<LogsListClient> {
           ]
         ],
       ),
-      body: Builder(
-        builder: (context) {
-          switch (loadStatus) {
-            case 0:
-              return SizedBox(
-                width: double.maxFinite,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    const CircularProgressIndicator(),
-                    const SizedBox(height: 30),
-                    Text(
-                      AppLocalizations.of(context)!.loadingLogs,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        fontSize: 22,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                    )
-                  ],
-                ),
-              );
-
-            case 1:
-              if (logsData!.data.isNotEmpty) {
-                return RefreshIndicator(
-                  onRefresh: fetchLogs,
-                  child: ListView.builder(
-                    controller: scrollController,
-                    padding: const EdgeInsets.only(top: 0),
-                    itemCount: isLoadingMore == true 
-                      ? logsData!.data.length+1
-                      : logsData!.data.length,
-                    itemBuilder: (context, index) {
-                      if (isLoadingMore == true && index == logsData!.data.length) {
-                        return const Padding(
-                          padding: EdgeInsets.symmetric(vertical: 20),
-                          child: Center(
-                            child: CircularProgressIndicator(),
-                          ),
-                        );
-                      }
-                      else {
-                        return LogTile(
-                          log: logsData!.data[index],
-                          index: index,
-                          length: logsData!.data.length,
-                          useAlwaysNormalTile: true,
-                          onLogTap: (log) => {
-                            if (width > 700) {
-                              showDialog(
-                                context: context, 
-                                builder: (context) => LogDetailsScreen(
-                                  log: log, 
-                                  dialog: true
-                                )
-                              )
-                            }
-                            else {
-                              Navigator.of(context).push(
-                                MaterialPageRoute(
+      body: SafeArea(
+        child: Builder(
+          builder: (context) {
+            switch (loadStatus) {
+              case 0:
+                return SizedBox(
+                  width: double.maxFinite,
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      const CircularProgressIndicator(),
+                      const SizedBox(height: 30),
+                      Text(
+                        AppLocalizations.of(context)!.loadingLogs,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontSize: 22,
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                      )
+                    ],
+                  ),
+                );
+
+              case 1:
+                if (logsData!.data.isNotEmpty) {
+                  return RefreshIndicator(
+                    onRefresh: fetchLogs,
+                    child: ListView.builder(
+                      controller: scrollController,
+                      padding: const EdgeInsets.only(top: 0),
+                      itemCount: isLoadingMore == true 
+                        ? logsData!.data.length+1
+                        : logsData!.data.length,
+                      itemBuilder: (context, index) {
+                        if (isLoadingMore == true && index == logsData!.data.length) {
+                          return const Padding(
+                            padding: EdgeInsets.symmetric(vertical: 20),
+                            child: Center(
+                              child: CircularProgressIndicator(),
+                            ),
+                          );
+                        }
+                        else {
+                          return LogTile(
+                            log: logsData!.data[index],
+                            index: index,
+                            length: logsData!.data.length,
+                            useAlwaysNormalTile: true,
+                            onLogTap: (log) => {
+                              if (width > 700) {
+                                showDialog(
+                                  context: context, 
                                   builder: (context) => LogDetailsScreen(
                                     log: log, 
-                                    dialog: false
+                                    dialog: true
+                                  )
+                                )
+                              }
+                              else {
+                                Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (context) => LogDetailsScreen(
+                                      log: log, 
+                                      dialog: false
+                                    )
                                   )
                                 )
-                              )
-                            }
-                          },
-                          twoColumns: widget.splitView,
-                        );
+                              }
+                            },
+                            twoColumns: widget.splitView,
+                          );
+                        }
                       }
-                    }
-                  ),
-                );
-              }
-              else {
-                return Center(
-                  child: Text(
-                    AppLocalizations.of(context)!.noLogsDisplay,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      fontSize: 22,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-                  ),
-                );
-              }
-
-            case 2:
-              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)!.logsNotLoaded,
+                  );
+                }
+                else {
+                  return Center(
+                    child: Text(
+                      AppLocalizations.of(context)!.noLogsDisplay,
                       textAlign: TextAlign.center,
                       style: TextStyle(
                         fontSize: 22,
                         color: Theme.of(context).colorScheme.onSurfaceVariant,
                       ),
-                    )
-                  ],
-                ),
-              );
-
-            default:
-              return const SizedBox();
-          }
-        },
+                    ),
+                  );
+                }
+
+              case 2:
+                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)!.logsNotLoaded,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontSize: 22,
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                      )
+                    ],
+                  ),
+                );
+
+              default:
+                return const SizedBox();
+            }
+          },
+        ),
       )
     );
   }