Extracted dns rewrites

lib/main.dart

@@ -21,6 +21,7 @@ import 'package:adguard_home_manager/providers/logs_provider.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/providers/clients_provider.dart';
 import 'package:adguard_home_manager/providers/filters_provider.dart';
+import 'package:adguard_home_manager/providers/rewrute_rules_provider.dart';
 import 'package:adguard_home_manager/providers/dhcp_provider.dart';
 import 'package:adguard_home_manager/providers/status_provider.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
@@ -45,13 +46,14 @@ void main() async {
 
   await dotenv.load(fileName: '.env');
   
-  AppConfigProvider appConfigProvider = AppConfigProvider();
+  final AppConfigProvider appConfigProvider = AppConfigProvider();
-  ServersProvider serversProvider = ServersProvider();
+  final ServersProvider serversProvider = ServersProvider();
-  StatusProvider statusProvider = StatusProvider();
+  final StatusProvider statusProvider = StatusProvider();
-  ClientsProvider clientsProvider = ClientsProvider();
+  final ClientsProvider clientsProvider = ClientsProvider();
-  FilteringProvider filtersProvider = FilteringProvider();
+  final FilteringProvider filtersProvider = FilteringProvider();
-  DhcpProvider dhcpProvider = DhcpProvider();
+  final DhcpProvider dhcpProvider = DhcpProvider();
-  LogsProvider logsProvider = LogsProvider();
+  final RewriteRulesProvider rewriteRulesProvider = RewriteRulesProvider();
+  final LogsProvider logsProvider = LogsProvider();
 
   DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
   if (Platform.isAndroid) {
@@ -116,6 +118,9 @@ void main() async {
         ChangeNotifierProvider(
           create: ((context) => dhcpProvider)
         ),
+        ChangeNotifierProvider(
+          create: ((context) => rewriteRulesProvider)
+        ),
         ChangeNotifierProxyProvider<StatusProvider, FilteringProvider>(
           create: (context) => filtersProvider, 
           update: (context, status, filtering) => filtering!..updateStatus(status),

lib/models/rewrite_rules.dart

@@ -1,29 +1,13 @@
-import 'dart:convert';
-
 class RewriteRules {
-  int loadStatus = 0;
-  List<RewriteRulesData>? data;
-
-  RewriteRules({
-    required this.loadStatus,
-    this.data
-  });
-}
-
-List<RewriteRulesData> rewriteRulesDataFromJson(String str) => List<RewriteRulesData>.from(json.decode(str).map((x) => RewriteRulesData.fromJson(x)));
-
-String rewriteRulesDataToJson(List<RewriteRulesData> data) => json.encode(List<RewriteRulesData>.from(data.map((x) => x.toJson())));
-
-class RewriteRulesData {
   final String domain;
   final String answer;
 
-  RewriteRulesData({
+  RewriteRules({
     required this.domain,
     required this.answer,
   });
 
-  factory RewriteRulesData.fromJson(Map<String, dynamic> json) => RewriteRulesData(
+  factory RewriteRules.fromJson(Map<String, dynamic> json) => RewriteRules(
     domain: json["domain"],
     answer: json["answer"],
   );

lib/providers/rewrute_rules_provider.dart

@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+
+import 'package:adguard_home_manager/constants/enums.dart';
+import 'package:adguard_home_manager/models/rewrite_rules.dart';
+
+class RewriteRulesProvider with ChangeNotifier {
+  LoadStatus _loadStatus = LoadStatus.loading;
+  List<RewriteRules>? _rewriteRules;
+
+  LoadStatus get loadStatus {
+    return _loadStatus;
+  }
+
+  List<RewriteRules>? get rewriteRules {
+    return _rewriteRules;
+  }
+
+  void setRewriteRulesData(List<RewriteRules> data) {
+    _rewriteRules = data;
+    notifyListeners();
+  }
+
+  void setRewriteRulesLoadStatus(LoadStatus status, bool notify) {
+    _loadStatus = status;
+    if (notify == true) {
+      notifyListeners();
+    }
+  }
+}

lib/providers/servers_provider.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:sqflite/sqflite.dart';
 
-import 'package:adguard_home_manager/models/dhcp.dart';
 import 'package:adguard_home_manager/models/dns_info.dart';
 import 'package:adguard_home_manager/models/rewrite_rules.dart';
 import 'package:adguard_home_manager/models/server.dart';
@@ -18,11 +17,6 @@ class ServersProvider with ChangeNotifier {
   List<Server> _serversList = [];
   Server? _selectedServer;
 
-  final RewriteRules _rewriteRules = RewriteRules(
-    loadStatus: 0, // 0 = loading, 1 = loaded, 2 = error
-    data: null
-  );
-
   final DnsInfo _dnsInfo = DnsInfo(
     loadStatus: 0, // 0 = loading, 1 = loaded, 2 = error
     data: null
@@ -41,10 +35,6 @@ class ServersProvider with ChangeNotifier {
     return _selectedServer;
   }
 
-  RewriteRules get rewriteRules {
-    return _rewriteRules;
-  }
-
   DnsInfo get dnsInfo {
     return _dnsInfo;
   }
@@ -66,19 +56,7 @@ class ServersProvider with ChangeNotifier {
     _selectedServer = server;
     notifyListeners();
   }
-  
-  void setRewriteRulesData(List<RewriteRulesData> data) {
-    _rewriteRules.data = data;
-    notifyListeners();
-  }
 
-  void setRewriteRulesLoadStatus(int status, bool notify) {
-    _rewriteRules.loadStatus = status;
-    if (notify == true) {
-      notifyListeners();
-    }
-  }
-  
   void setDnsInfoData(DnsInfoData data) {
     _dnsInfo.data = data;
     notifyListeners();

lib/screens/settings/dns_rewrites/add_dns_rewrite_modal.dart

@@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:adguard_home_manager/models/rewrite_rules.dart';
 
 class AddDnsRewriteModal extends StatefulWidget {
-  final void Function(RewriteRulesData) onConfirm;
+  final void Function(RewriteRules) onConfirm;
   final bool dialog;
 
   const AddDnsRewriteModal({
@@ -143,7 +143,7 @@ class _AddDnsRewriteModalState extends State<AddDnsRewriteModal> {
                     ? () {
                       Navigator.pop(context);
                       widget.onConfirm(
-                        RewriteRulesData(
+                        RewriteRules(
                           domain: domainController.text, 
                           answer: answerController.text
                         )

lib/screens/settings/dns_rewrites/dns_rewrites.dart

@@ -12,52 +12,36 @@ import 'package:adguard_home_manager/screens/settings/dns_rewrites/delete_dns_re
 import 'package:adguard_home_manager/services/http_requests.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
+import 'package:adguard_home_manager/constants/enums.dart';
+import 'package:adguard_home_manager/providers/rewrute_rules_provider.dart';
 import 'package:adguard_home_manager/models/rewrite_rules.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/classes/process_modal.dart';
 
-class DnsRewrites extends StatelessWidget {
+class DnsRewritesScreen extends StatefulWidget {
-  const DnsRewrites({Key? key}) : super(key: key);
+  const DnsRewritesScreen({Key? key}) : super(key: key);
 
   @override
-  Widget build(BuildContext context) {
+  State<DnsRewritesScreen> createState() => _DnsRewritesScreenState();
-    final serversProvider = Provider.of<ServersProvider>(context);
-    final appConfigProvider = Provider.of<AppConfigProvider>(context);
-
-    return DnsRewritesWidget(
-      serversProvider: serversProvider,
-      appConfigProvider: appConfigProvider,
-    );
-  }
 }
 
-class DnsRewritesWidget extends StatefulWidget {
+class _DnsRewritesScreenState extends State<DnsRewritesScreen> {
-  final ServersProvider serversProvider;
-  final AppConfigProvider appConfigProvider;
-
-  const DnsRewritesWidget({
-    Key? key,
-    required this.serversProvider,
-    required this.appConfigProvider
-  }) : super(key: key);
-
-  @override
-  State<DnsRewritesWidget> createState() => _DnsRewritesWidgetState();
-}
-
-class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
   Future fetchData() async {
-    widget.serversProvider.setRewriteRulesLoadStatus(0, false);
+    final rewriteRulesProvider = Provider.of<RewriteRulesProvider>(context, listen: false);
+    final serversProvider = Provider.of<ServersProvider>(context, listen: false);
+    final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
 
-    final result = await getDnsRewriteRules(server: widget.serversProvider.selectedServer!);
+    rewriteRulesProvider.setRewriteRulesLoadStatus(LoadStatus.loading, false);
+
+    final result = await getDnsRewriteRules(server: serversProvider.selectedServer!);
 
     if (result['result'] == 'success') {
-      widget.serversProvider.setRewriteRulesData(result['data']);
+      rewriteRulesProvider.setRewriteRulesData(result['data']);
-      widget.serversProvider.setRewriteRulesLoadStatus(1, true);
+      rewriteRulesProvider.setRewriteRulesLoadStatus(LoadStatus.loaded, true);
     }
     else {
-      widget.appConfigProvider.addLog(result['log']);
+      appConfigProvider.addLog(result['log']);
-      widget.serversProvider.setRewriteRulesLoadStatus(2, true);
+      rewriteRulesProvider.setRewriteRulesLoadStatus(LoadStatus.error, true);
     }
   }
 
@@ -70,11 +54,12 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
   @override
   Widget build(BuildContext context) {
     final serversProvider = Provider.of<ServersProvider>(context);
+    final rewriteRulesProvider = Provider.of<RewriteRulesProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
 
     final width = MediaQuery.of(context).size.width;
 
-    void deleteDnsRewrite(RewriteRulesData rule) async {
+    void deleteDnsRewrite(RewriteRules rule) async {
       ProcessModal processModal = ProcessModal(context: context);
       processModal.open(AppLocalizations.of(context)!.deleting);
 
@@ -86,9 +71,9 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
       processModal.close();
 
       if (result['result'] == 'success') {
-        List<RewriteRulesData> data = serversProvider.rewriteRules.data!;
+        List<RewriteRules> data = rewriteRulesProvider.rewriteRules!;
         data = data.where((item) => item.domain != rule.domain).toList();
-        serversProvider.setRewriteRulesData(data);
+        rewriteRulesProvider.setRewriteRulesData(data);
 
         showSnacbkar(
           appConfigProvider: appConfigProvider,
@@ -106,7 +91,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
       }
     }
 
-    void addDnsRewrite(RewriteRulesData rule) async {
+    void addDnsRewrite(RewriteRules rule) async {
       ProcessModal processModal = ProcessModal(context: context);
       processModal.open(AppLocalizations.of(context)!.addingRewrite);
 
@@ -118,9 +103,9 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
       processModal.close();
 
       if (result['result'] == 'success') {
-        List<RewriteRulesData> data = serversProvider.rewriteRules.data!;
+        List<RewriteRules> data = rewriteRulesProvider.rewriteRules!;
         data.add(rule);
-        serversProvider.setRewriteRulesData(data);
+        rewriteRulesProvider.setRewriteRulesData(data);
 
         showSnacbkar(
           appConfigProvider: appConfigProvider,
@@ -139,8 +124,8 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
     }
 
     Widget generateBody() {
-      switch (serversProvider.rewriteRules.loadStatus) {
+      switch (rewriteRulesProvider.loadStatus) {
-        case 0:
+        case LoadStatus.loading:
           return SizedBox(
             width: double.maxFinite,
             child: Column(
@@ -160,15 +145,15 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
             ),
           );
         
-        case 1:
+        case LoadStatus.loaded:
-          if (serversProvider.rewriteRules.data!.isNotEmpty) {
+          if (rewriteRulesProvider.rewriteRules!.isNotEmpty) {
             return RefreshIndicator(
               onRefresh: () async {
                 await fetchData();
               },
               child: ListView.builder(
                 padding: const EdgeInsets.only(top: 0),
-                itemCount: serversProvider.rewriteRules.data!.length,
+                itemCount: rewriteRulesProvider.rewriteRules!.length,
                 itemBuilder: (context, index) => Container(
                   padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
                   decoration: BoxDecoration(
@@ -195,7 +180,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
                                 ),
                               ),
                               Text(
-                                serversProvider.rewriteRules.data![index].domain,
+                                rewriteRulesProvider.rewriteRules![index].domain,
                                 style: TextStyle(
                                   color: Theme.of(context).colorScheme.onSurface
                                 ),
@@ -213,7 +198,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
                                 ),
                               ),
                               Text(
-                                serversProvider.rewriteRules.data![index].answer,
+                                rewriteRulesProvider.rewriteRules![index].answer,
                                 style: TextStyle(
                                   color: Theme.of(context).colorScheme.onSurface
                                 ),
@@ -227,7 +212,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
                           showDialog(
                             context: context, 
                             builder: (context) => DeleteDnsRewrite(
-                              onConfirm: () => deleteDnsRewrite(serversProvider.rewriteRules.data![index])
+                              onConfirm: () => deleteDnsRewrite(rewriteRulesProvider.rewriteRules![index])
                             )
                           )
                         }, 
@@ -251,7 +236,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
             );
           }
 
-        case 2:
+        case LoadStatus.error:
           return SizedBox(
             width: double.maxFinite,
             child: Column(

lib/screens/settings/settings.dart

@@ -177,7 +177,7 @@ class SettingsWidget extends StatelessWidget {
                 title: AppLocalizations.of(context)!.dnsRewrites,
                 subtitle: AppLocalizations.of(context)!.dnsRewritesDescription,
                 thisItem: 5,
-                screenToNavigate: const DnsRewrites(),
+                screenToNavigate: const DnsRewritesScreen(),
               ),
               if (serversProvider.updateAvailable.data != null) settingsTile(
                 icon: Icons.system_update_rounded,

lib/services/http_requests.dart

@@ -1528,8 +1528,8 @@ Future getDnsRewriteRules({
 
   if (result['hasResponse'] == true) {
     if (result['statusCode'] == 200) {
-      final List<RewriteRulesData> data = List<RewriteRulesData>.from(
+      final List<RewriteRules> data = List<RewriteRules>.from(
-        jsonDecode(result['body']).map((item) => RewriteRulesData.fromJson(item))
+        jsonDecode(result['body']).map((item) => RewriteRules.fromJson(item))
       );
 
       return {