luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-16 23:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed legacy code

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
lib/screens/clients/search_clients.dart
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/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();

1
lib/screens/home/management_modal/main_switch.dart
View file

@ -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 {

336
lib/screens/settings/dns_rewrites/dns_rewrite_modal.dart
View file

@ -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);
Widget content() {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: SingleChildScrollView(
child: Wrap(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Column(
children: [
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(
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: SingleChildScrollView(
child: Wrap(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 24),
child: Icon(
widget.rule != null
? AppLocalizations.of(context)!.editRewriteRule
: AppLocalizations.of(context)!.addDnsRewrite,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurface
),
? Icons.edit
: Icons.add,
size: 24,
color: Theme.of(context).listTileTheme.iconColor
),
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,
labelText: AppLocalizations.of(context)!.domain,
const SizedBox(height: 16),
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(
left: 24, right: 24, top: 12
),
Padding(
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(
Radius.circular(10)
)
),
labelText: AppLocalizations.of(context)!.answer,
),
),
],
),
),
),
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)
),
),
),
],
),
),
)
],
),
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()
),
);
}
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()
),
);
}
if (Platform.isIOS) const SizedBox(height: 16)
],
);
}
}

1
lib/screens/settings/settings.dart
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/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';