Removed legacy code

This commit is contained in:
Juan Gilsanz Polo 2023-11-20 02:31:07 +01:00
parent 9363652622
commit 5e67083661
4 changed files with 176 additions and 165 deletions

View file

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

View file

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

View file

@ -1,34 +1,78 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.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'; 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 void Function(RewriteRules newRule, RewriteRules? previousRule) onConfirm;
final bool dialog; final bool dialog;
final RewriteRules? rule; final RewriteRules? rule;
final void Function(RewriteRules) onDelete; final void Function(RewriteRules) onDelete;
const DnsRewriteModal({ const DnsRewriteModal({
Key? key, super.key,
required this.onConfirm, required this.onConfirm,
required this.dialog, required this.dialog,
this.rule, this.rule,
required this.onDelete required this.onDelete
}) : super(key: key); });
@override @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(); final TextEditingController domainController = TextEditingController();
String? domainError; String? domainError;
final TextEditingController answerController = TextEditingController(); final TextEditingController answerController = TextEditingController();
@ -71,9 +115,6 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
Widget content() {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -107,7 +148,7 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
color: Theme.of(context).colorScheme.onSurface color: Theme.of(context).colorScheme.onSurface
), ),
), ),
const SizedBox(height: 16), const SizedBox(height: 24),
], ],
), ),
], ],
@ -209,31 +250,4 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
], ],
); );
} }
if (widget.dialog == true) {
return Dialog(
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 400
),
child: content()
),
);
}
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()
),
);
}
}
} }

View file

@ -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/functions/desktop_mode.dart';
import 'package:adguard_home_manager/constants/strings.dart'; import 'package:adguard_home_manager/constants/strings.dart';
import 'package:adguard_home_manager/functions/open_url.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/constants/urls.dart';
import 'package:adguard_home_manager/providers/status_provider.dart'; import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart';