Merge branch 'beta'

JGeek00 · Oct 4, 2023 · 832f349 · 832f349
2 parents c909db3 + f5b2533
commit 832f349
Show file tree

Hide file tree

Showing 13 changed files with 368 additions and 27 deletions.
diff --git a/lib/functions/refresh_server_status.dart b/lib/functions/refresh_server_status.dart
@@ -19,6 +19,7 @@ Future refreshServerStatus(BuildContext context) async {
   final result = await realtimeStatus(
     serversProvider.selectedServer!
   );
+  if (!context.mounted) return;
   if (result['result'] == "success") {
     serversProvider.updateselectedServerStatus(
       result['data'].status == 'enabled' ? true : false

diff --git a/lib/functions/server_management.dart b/lib/functions/server_management.dart
@@ -48,6 +48,7 @@ void disableServer(int time, BuildContext context) async {
     time
   );
   process.close();
+  if (!context.mounted) return;
   if (result['result'] == 'success') {
     serversProvider.updateselectedServerStatus(false);
     showSnackBar(

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -320,4 +320,4 @@
     "unlockWithFingerprint": "Unlock the app with your fingerprint",
     "fingerprintAuthUnavailableAttempts": "Fingerprint authentication unavailable due to many failed attempts.",
     "fingerprintAuthUnavailable": "Fingerprint authentication unavailable."
-}
+}
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
diff --git a/lib/main.dart b/lib/main.dart
@@ -240,7 +240,8 @@ class _DroidHoleState extends State<DroidHole> {
           supportedLocales: const [
             Locale('en', ''),
             Locale('es', ''),
-            Locale('de', '')
+            Locale('de', ''),
+            Locale('pl', ''),
           ],
           scaffoldMessengerKey: scaffoldMessengerKey,
           builder: (context, child) {

diff --git a/lib/screens/home/clients_last_hours.dart b/lib/screens/home/clients_last_hours.dart
@@ -21,11 +21,11 @@ class ClientsLastHours extends StatelessWidget {
   }) : super(key: key);
 
   LineChartData mainData(Map<String, dynamic> data, ThemeMode selectedTheme) {
-    final interval = (data['topPoint']/5).toDouble() > 0
+    final double interval = (data['topPoint']/5).toDouble() > 0
       ? (data['topPoint']/5).toDouble()
       : data['topPoint'].toDouble() > 0
         ? data['topPoint'].toDouble()
-        : 1;
+        : 1.0;
     return LineChartData(
       gridData: FlGridData(
         show: true,

diff --git a/lib/screens/home/home_tile.dart b/lib/screens/home/home_tile.dart
@@ -45,27 +45,31 @@ class HomeTile extends StatelessWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
-                  children: [
-                    Text(
-                      label,
-                      textAlign: TextAlign.end,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 14
+                Flexible(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          label,
+                          textAlign: TextAlign.end,
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 14
+                          ),
+                        ),
                       ),
-                    ),
-                    Text(
-                      value,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 24,
-                        fontWeight: FontWeight.w500
-                      ),
-                    )
-                  ],
+                      Text(
+                        value,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 24,
+                          fontWeight: FontWeight.w500
+                        ),
+                      )
+                    ],
+                  ),
                 ),
               ],
             ),

diff --git a/lib/screens/home/queries_last_hours.dart b/lib/screens/home/queries_last_hours.dart
@@ -16,11 +16,16 @@ class QueriesLastHours extends StatelessWidget {
   }) : super(key: key);
 
   LineChartData mainData(Map<String, dynamic> data, ThemeMode selectedTheme) {
+    final double interval = (data['topPoint']/5).toDouble() > 0
+      ? (data['topPoint']/5).toDouble()
+      : data['topPoint'].toDouble() > 0
+        ? data['topPoint'].toDouble()
+        : 1.0;
     return LineChartData(
       gridData: FlGridData(
         show: true,
         drawVerticalLine: false,
-        horizontalInterval: (data['topPoint']/5).toDouble(),
+        horizontalInterval: interval,
         getDrawingHorizontalLine: (value) => FlLine(
           color: selectedTheme == ThemeMode.light
             ? Colors.black12

diff --git a/lib/screens/logs/logs.dart b/lib/screens/logs/logs.dart
@@ -241,6 +241,7 @@ class _LogsState extends State<Logs> {
       loading.close();
       if (result['result'] == 'success') {
         if (result['data']['message'].toString().contains('Added')) {
+          if (!mounted) return;
           showSnackBar(
             appConfigProvider: appConfigProvider,
             label: list == 'white'

diff --git a/lib/screens/unlock.dart b/lib/screens/unlock.dart
@@ -48,6 +48,7 @@ class _UnlockState extends State<Unlock> {
           AppLock.of(context)!.didUnlock();
         }
       } catch (e) {
+        if (!mounted) return;
         if (e.toString().contains('LockedOut')) {
           showSnackBar(
             appConfigProvider: appConfigProvider, 

diff --git a/lib/widgets/start_warning_modal.dart b/lib/widgets/start_warning_modal.dart
@@ -51,9 +51,9 @@ class ImportantInfoModal extends StatelessWidget {
               Container(
                 width: double.maxFinite,
                 margin: const EdgeInsets.only(top: 10),
-                child: Column(
+                child: const Column(
                   crossAxisAlignment: CrossAxisAlignment.center,
-                  children: const [
+                  children: [
                     Text("Pi-hole: v5.12+"),
                     SizedBox(height: 5),
                     Text("Web interface: v5.14.2+")

diff --git a/windows/innosetup_installer_builder.iss b/windows/innosetup_installer_builder.iss
@@ -40,6 +40,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "..\build\windows\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\build\windows\runner\Release\dynamic_color_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\build\windows\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\build\windows\runner\Release\local_auth_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\build\windows\runner\Release\permission_handler_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\build\windows\runner\Release\sentry_flutter_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\build\windows\runner\Release\sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion

diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
     this->Show();
   });
 
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
   return true;
 }