Removed legacy code

lib/screens/clients/search_clients.dart

@@ -13,7 +13,6 @@ import 'package:adguard_home_manager/widgets/section_label.dart';
 import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
 
 import 'package:adguard_home_manager/classes/process_modal.dart';
-import 'package:adguard_home_manager/functions/compare_versions.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/providers/clients_provider.dart';
@@ -21,7 +20,7 @@ import 'package:adguard_home_manager/models/clients.dart';
 import 'package:adguard_home_manager/providers/status_provider.dart';
 
 class SearchClients extends StatefulWidget {
-  const SearchClients({Key? key}) : super(key: key);
+  const SearchClients({super.key});
 
   @override
   State<SearchClients> createState() => _SearchClientsState();

lib/screens/home/management_modal/main_switch.dart

@@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:adguard_home_manager/functions/format_time.dart';
-import 'package:adguard_home_manager/functions/compare_versions.dart';
 import 'package:adguard_home_manager/providers/status_provider.dart';
 
 class MainSwitch extends StatelessWidget {

lib/screens/settings/dns_rewrites/dns_rewrite_modal.dart

@@ -1,34 +1,78 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'package:adguard_home_manager/screens/settings/dns_rewrites/server_version_needed.dart';
-
-import 'package:adguard_home_manager/providers/status_provider.dart';
-import 'package:adguard_home_manager/functions/compare_versions.dart';
 import 'package:adguard_home_manager/models/rewrite_rules.dart';
 
-class DnsRewriteModal extends StatefulWidget {
+class DnsRewriteModal extends StatelessWidget {
   final void Function(RewriteRules newRule, RewriteRules? previousRule) onConfirm;
   final bool dialog;
   final RewriteRules? rule;
   final void Function(RewriteRules) onDelete;
 
   const DnsRewriteModal({
-    Key? key,
+    super.key,
     required this.onConfirm,
     required this.dialog,
     this.rule,
     required this.onDelete
-  }) : super(key: key);
+  });
 
   @override
-  State<DnsRewriteModal> createState() => _AddDnsRewriteModalState();
+  Widget build(BuildContext context) {
+    if (dialog == true) {
+      return Dialog(
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(
+            maxWidth: 400
+          ),
+          child: _Content(
+            onConfirm: onConfirm,
+            onDelete: onDelete,
+            rule: rule,
+          )
+        ),
+      );
+    }
+    else {
+      return Padding(
+        padding: MediaQuery.of(context).viewInsets,
+        child: Container(
+          decoration: BoxDecoration(
+            borderRadius: const BorderRadius.only(
+              topLeft: Radius.circular(28),
+              topRight: Radius.circular(28)
+            ),
+            color: Theme.of(context).dialogBackgroundColor,
+          ),
+          child: _Content(
+            onConfirm: onConfirm,
+            onDelete: onDelete,
+            rule: rule,
+          )
+        ),
+      );
+    }
+  }
 }
 
-class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
+class _Content extends StatefulWidget {
+  final void Function(RewriteRules newRule, RewriteRules? previousRule) onConfirm;
+  final RewriteRules? rule;
+  final void Function(RewriteRules) onDelete;
+
+  const _Content({
+    required this.onConfirm,
+    this.rule,
+    required this.onDelete
+  });
+
+  @override
+  State<_Content> createState() => _ContentState();
+}
+
+class _ContentState extends State<_Content> {
   final TextEditingController domainController = TextEditingController();
   String? domainError;
   final TextEditingController answerController = TextEditingController();
@@ -71,169 +115,139 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
 
   @override
   Widget build(BuildContext context) {
-    final statusProvider = Provider.of<StatusProvider>(context);
+    return Column(
-
+      mainAxisSize: MainAxisSize.min,
-    Widget content() {
+      children: [
-      return Column(
+        Flexible(
-        mainAxisSize: MainAxisSize.min,
+          child: SingleChildScrollView(
-        children: [
+            child: Wrap(
-          Flexible(
+              children: [
-            child: SingleChildScrollView(
+                Row(
-              child: Wrap(
+                  mainAxisAlignment: MainAxisAlignment.center,
-                children: [
+                  children: [
-                  Row(
+                    Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
-                    children: [
+                        Padding(
-                      Column(
+                          padding: const EdgeInsets.only(top: 24),
-                        children: [
+                          child: Icon(
-                          Padding(
-                            padding: const EdgeInsets.only(top: 24),
-                            child: Icon(
-                              widget.rule != null
-                                ? Icons.edit
-                                : Icons.add,
-                              size: 24,
-                              color: Theme.of(context).listTileTheme.iconColor
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          Text(
                             widget.rule != null
-                              ? AppLocalizations.of(context)!.editRewriteRule
+                              ? Icons.edit
-                              : AppLocalizations.of(context)!.addDnsRewrite,
+                              : Icons.add,
-                            textAlign: TextAlign.center,
+                            size: 24,
-                            style: TextStyle(
+                            color: Theme.of(context).listTileTheme.iconColor
-                              fontSize: 24,
-                              color: Theme.of(context).colorScheme.onSurface
-                            ),
                           ),
-                          const SizedBox(height: 16),
-                        ],
-                      ),
-                    ],
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 24, right: 24, bottom: 12
-                    ),
-                    child: TextFormField(
-                      controller: domainController,
-                      onChanged: validateDomain,
-                      decoration: InputDecoration(
-                        prefixIcon: const Icon(Icons.link_rounded),
-                        border: const OutlineInputBorder(
-                          borderRadius: BorderRadius.all(
-                            Radius.circular(10)
-                          )
                         ),
-                        errorText: domainError,
+                        const SizedBox(height: 16),
-                        labelText: AppLocalizations.of(context)!.domain,
+                        Text(
+                          widget.rule != null
+                            ? AppLocalizations.of(context)!.editRewriteRule
+                            : AppLocalizations.of(context)!.addDnsRewrite,
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            fontSize: 24,
+                            color: Theme.of(context).colorScheme.onSurface
+                          ),
+                        ),
+                        const SizedBox(height: 24),
+                      ],
+                    ),
+                  ],
+                ),
+                Padding(
+                  padding: const EdgeInsets.only(
+                    left: 24, right: 24, bottom: 12
+                  ),
+                  child: TextFormField(
+                    controller: domainController,
+                    onChanged: validateDomain,
+                    decoration: InputDecoration(
+                      prefixIcon: const Icon(Icons.link_rounded),
+                      border: const OutlineInputBorder(
+                        borderRadius: BorderRadius.all(
+                          Radius.circular(10)
+                        )
                       ),
+                      errorText: domainError,
+                      labelText: AppLocalizations.of(context)!.domain,
                     ),
                   ),
-                  Padding(
+                ),
-                    padding: const EdgeInsets.only(
+                Padding(
-                      left: 24, right: 24, top: 12
+                  padding: const EdgeInsets.only(
+                    left: 24, right: 24, top: 12
+                  ),
+                  child: TextFormField(
+                    controller: answerController,
+                    onChanged: (_) => checkValidValues(),
+                    decoration: InputDecoration(
+                      prefixIcon: const Icon(Icons.system_update_alt_rounded),
+                      border: const OutlineInputBorder(
+                        borderRadius: BorderRadius.all(
+                          Radius.circular(10)
+                        )
+                      ),
+                      labelText: AppLocalizations.of(context)!.answer,
                     ),
-                    child: TextFormField(
+                  ),
-                      controller: answerController,
+                ),
-                      onChanged: (_) => checkValidValues(),
+              ],
-                      decoration: InputDecoration(
+            ),
-                        prefixIcon: const Icon(Icons.system_update_alt_rounded),
+          ),
-                        border: const OutlineInputBorder(
+        ),
-                          borderRadius: BorderRadius.all(
+        Padding(
-                            Radius.circular(10)
+          padding: const EdgeInsets.all(24),
-                          )
+          child: Row(
-                        ),
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        labelText: AppLocalizations.of(context)!.answer,
+            children: [
+              if (widget.rule != null) TextButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                  widget.onDelete(
+                    RewriteRules(
+                      domain: domainController.text, 
+                      answer: answerController.text
+                    )
+                  );
+                },
+                child: Text(AppLocalizations.of(context)!.delete),
+              ),
+              if (widget.rule == null) const SizedBox(),
+              Row(
+                children: [
+                  TextButton(
+                    onPressed: () => Navigator.pop(context),
+                    child: Text(AppLocalizations.of(context)!.cancel),
+                  ),
+                  const SizedBox(width: 20),
+                  TextButton(
+                    onPressed: validData == true
+                      ? () {
+                          Navigator.pop(context);
+                          widget.onConfirm(
+                            RewriteRules(
+                              domain: domainController.text, 
+                              answer: answerController.text
+                            ),
+                            widget.rule
+                          );
+                        }
+                      : null,
+                    child: Text(
+                      AppLocalizations.of(context)!.confirm,
+                      style: TextStyle(
+                        color: validData == true
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).colorScheme.onSurface.withOpacity(0.38)
                       ),
                     ),
                   ),
                 ],
-              ),
+              )
-            ),
+            ],
           ),
-          Padding(
-            padding: const EdgeInsets.all(24),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                if (widget.rule != null) TextButton(
-                  onPressed: () {
-                    Navigator.pop(context);
-                    widget.onDelete(
-                      RewriteRules(
-                        domain: domainController.text, 
-                        answer: answerController.text
-                      )
-                    );
-                  },
-                  child: Text(AppLocalizations.of(context)!.delete),
-                ),
-                if (widget.rule == null) const SizedBox(),
-                Row(
-                  children: [
-                    TextButton(
-                      onPressed: () => Navigator.pop(context),
-                      child: Text(AppLocalizations.of(context)!.cancel),
-                    ),
-                    const SizedBox(width: 20),
-                    TextButton(
-                      onPressed: validData == true
-                        ? () {
-                            Navigator.pop(context);
-                            widget.onConfirm(
-                              RewriteRules(
-                                domain: domainController.text, 
-                                answer: answerController.text
-                              ),
-                              widget.rule
-                            );
-                          }
-                        : null,
-                      child: Text(
-                        AppLocalizations.of(context)!.confirm,
-                        style: TextStyle(
-                          color: validData == true
-                            ? Theme.of(context).colorScheme.primary
-                            : Theme.of(context).colorScheme.onSurface.withOpacity(0.38)
-                        ),
-                      ),
-                    ),
-                  ],
-                )
-              ],
-            ),
-          ),
-          if (Platform.isIOS) const SizedBox(height: 16)
-        ],
-      );
-    }
-
-    if (widget.dialog == true) {
-      return Dialog(
-        child: ConstrainedBox(
-          constraints: const BoxConstraints(
-            maxWidth: 400
-          ),
-          child: content()
         ),
-      );
+        if (Platform.isIOS) const SizedBox(height: 16)
-    }
+      ],
-    else {
+    );
-      return Padding(
-        padding: MediaQuery.of(context).viewInsets,
-        child: Container(
-          decoration: BoxDecoration(
-            borderRadius: const BorderRadius.only(
-              topLeft: Radius.circular(28),
-              topRight: Radius.circular(28)
-            ),
-            color: Theme.of(context).dialogBackgroundColor,
-          ),
-          child: content()
-        ),
-      );
-    }
   }
 }

lib/screens/settings/settings.dart

@@ -26,7 +26,6 @@ import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
 import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/constants/strings.dart';
 import 'package:adguard_home_manager/functions/open_url.dart';
-import 'package:adguard_home_manager/functions/compare_versions.dart';
 import 'package:adguard_home_manager/constants/urls.dart';
 import 'package:adguard_home_manager/providers/status_provider.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';