luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-04 20:30:35 +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:26:53 +01:00
parent e08404b140
commit 9363652622
9 changed files with 70 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/models/clients.dart
View file

@ -84,7 +84,6 @@ class Client {
final bool filteringEnabled;
final bool parentalEnabled;
final bool safebrowsingEnabled;
final bool? safesearchEnabled;
final bool useGlobalBlockedServices;
final bool useGlobalSettings;
final SafeSearch? safeSearch;
@ -98,7 +97,6 @@ class Client {
required this.filteringEnabled,
required this.parentalEnabled,
required this.safebrowsingEnabled,
required this.safesearchEnabled,
required this.useGlobalBlockedServices,
required this.useGlobalSettings,
required this.safeSearch,
@ -113,7 +111,6 @@ class Client {
filteringEnabled: json["filtering_enabled"],
parentalEnabled: json["parental_enabled"],
safebrowsingEnabled: json["safebrowsing_enabled"],
safesearchEnabled: json["safesearch_enabled"],
useGlobalBlockedServices: json["use_global_blocked_services"],
useGlobalSettings: json["use_global_settings"],
safeSearch: json["safe_search"] != null
@ -130,7 +127,6 @@ class Client {
"filtering_enabled": filteringEnabled,
"parental_enabled": parentalEnabled,
"safebrowsing_enabled": safebrowsingEnabled,
"safesearch_enabled": safesearchEnabled,
"safe_search": safeSearch,
"use_global_blocked_services": useGlobalBlockedServices,
"use_global_settings": useGlobalSettings,

16
lib/providers/clients_provider.dart
View file

@ -142,13 +142,7 @@ class ClientsProvider with ChangeNotifier {
final result = await _serversProvider!.apiClient2!.postUpdateClient(
data: {
'name': client.name,
'data': serverVersionIsAhead(
currentVersion: _statusProvider!.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == false
? removePropFromMap(client.toJson(), 'safesearch_enabled')
: removePropFromMap(client.toJson(), 'safe_search')
'data': removePropFromMap(client.toJson(), 'safe_search')
}
);
@ -175,13 +169,7 @@ class ClientsProvider with ChangeNotifier {
Future<bool> addClient(Client client) async {
final result = await _serversProvider!.apiClient2!.postAddClient(
data: serverVersionIsAhead(
currentVersion: _statusProvider!.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == false
? removePropFromMap(client.toJson(), 'safesearch_enabled')
: removePropFromMap(client.toJson(), 'safe_search')
data: removePropFromMap(client.toJson(), 'safe_search')
);
if (result.successful == true) {

35
lib/screens/clients/client/added_client_tile.dart
View file

@ -5,8 +5,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
import 'package:adguard_home_manager/models/clients.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
@ -21,7 +19,7 @@ class AddedClientTile extends StatelessWidget {
final bool? splitView;
const AddedClientTile({
Key? key,
super.key,
required this.client,
required this.onTap,
required this.onLongPress,
@ -29,11 +27,10 @@ class AddedClientTile extends StatelessWidget {
required this.onDelete,
this.selectedClient,
required this.splitView,
}) : super(key: key);
});
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
if (splitView == true) {
@ -146,25 +143,13 @@ class AddedClientTile extends StatelessWidget {
Icon(
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
? client.safeSearch != null && client.safeSearch!.enabled == true
color: client.safeSearch != null && client.safeSearch!.enabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red
: client.safesearchEnabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red,
)
],
)
@ -260,25 +245,13 @@ class AddedClientTile extends StatelessWidget {
Icon(
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
? client.safeSearch != null && client.safeSearch!.enabled == true
color: client.safeSearch != null && client.safeSearch!.enabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red
: client.safesearchEnabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red,
)
],
)

25
lib/screens/clients/client/client_form.dart
View file

@ -1,7 +1,6 @@
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/clients/client/blocked_services_section.dart';
@ -15,10 +14,8 @@ import 'package:adguard_home_manager/screens/clients/client/upstream_servers_sec
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/widgets/section_label.dart';
import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/models/clients.dart';
import 'package:adguard_home_manager/models/safe_search.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
class ClientForm extends StatelessWidget {
final bool isFullScreen;
@ -82,8 +79,6 @@ class ClientForm extends StatelessWidget {
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
return ListView(
padding: const EdgeInsets.only(top: 0),
children: [
@ -195,13 +190,7 @@ class ClientForm extends StatelessWidget {
onChange: (value) => updateEnableParentalControl(value),
useGlobalSettingsFiltering: useGlobalSettingsFiltering,
),
if (
serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
) CustomListTile(
CustomListTile(
title: AppLocalizations.of(context)!.safeSearch,
padding: const EdgeInsets.symmetric(
horizontal: 42,
@ -226,18 +215,6 @@ class ClientForm extends StatelessWidget {
)
: null,
),
if (
serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == false
) SettingsTile(
label: AppLocalizations.of(context)!.enableSafeSearch,
value: enableSafeSearch,
onChange: (value) => updateEnableSafeSearch(value),
useGlobalSettingsFiltering: useGlobalSettingsFiltering,
),
SectionLabel(
label: AppLocalizations.of(context)!.blockedServices,
padding: const EdgeInsets.all(24),

18
lib/screens/clients/client/client_screen.dart
View file

@ -6,10 +6,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/client/client_form.dart';
import 'package:adguard_home_manager/screens/clients/client/client_screen_functions.dart';
import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/models/safe_search.dart';
import 'package:adguard_home_manager/providers/clients_provider.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/models/clients.dart';
class ControllerListItem {
@ -75,8 +73,6 @@ class _ClientScreenState extends State<ClientScreen> {
List<ControllerListItem> upstreamServers = [];
bool version = false;
void enableDisableGlobalSettingsFiltering() {
if (useGlobalSettingsFiltering == true) {
setState(() {
@ -104,12 +100,6 @@ class _ClientScreenState extends State<ClientScreen> {
@override
void initState() {
version = serverVersionIsAhead(
currentVersion: Provider.of<StatusProvider>(context, listen: false).serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
);
if (widget.client != null) {
validValues = true;
@ -123,12 +113,7 @@ class _ClientScreenState extends State<ClientScreen> {
enableFiltering = widget.client!.filteringEnabled;
enableParentalControl = widget.client!.parentalEnabled;
enableSafeBrowsing = widget.client!.safebrowsingEnabled;
if (version == true) {
safeSearch = widget.client!.safeSearch;
}
else {
enableSafeSearch = widget.client!.safesearchEnabled ?? false;
}
useGlobalSettingsServices = widget.client!.useGlobalBlockedServices;
blockedServices = widget.client!.blockedServices;
upstreamServers = widget.client!.upstreams.map((e) => ControllerListItem(
@ -151,8 +136,7 @@ class _ClientScreenState extends State<ClientScreen> {
filteringEnabled: enableFiltering ?? false,
parentalEnabled: enableParentalControl ?? false,
safebrowsingEnabled: enableSafeBrowsing ?? false,
safesearchEnabled: version == false ? enableSafeSearch : null,
safeSearch: version == true ? safeSearch : null,
safeSearch: safeSearch,
useGlobalBlockedServices: useGlobalSettingsServices,
blockedServices: blockedServices,
upstreams: List<String>.from(upstreamServers.map((e) => e.controller.text)),

14
lib/screens/clients/search_clients.dart
View file

@ -290,25 +290,13 @@ class _SearchClientsState extends State<SearchClients> {
Icon(
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
? clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true
color: clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red
: clientsScreen[index].safesearchEnabled == true
? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary
: Colors.green
: appConfigProvider.useThemeColorForStatus == true
? Colors.grey
: Colors.red,
)
],
)

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

@ -29,12 +29,7 @@ class MainSwitch extends StatelessWidget {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
? ExpandableNotifier(
child: ExpandableNotifier(
controller: expandableController,
child: Material(
color: Colors.transparent,
@ -83,34 +78,6 @@ class MainSwitch extends StatelessWidget {
),
)
)
: Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(28),
child: InkWell(
onTap: statusProvider.protectionsManagementProcess.contains('general') == false
? () => updateBlocking(
value: !statusProvider.serverStatus!.generalEnabled,
filter: 'general_legacy'
) : null,
borderRadius: BorderRadius.circular(28),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 12
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(28),
color: Theme.of(context).primaryColor.withOpacity(0.1)
),
child: _TopRow(
legacyMode: true,
expandableController: expandableController,
updateBlocking: updateBlocking,
animation: animation,
)
),
),
)
);
}
}

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

@ -181,11 +181,6 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
TextButton(
onPressed: validData == true
? () {
if (serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: '0.107.33',
referenceVersionBeta: '0.108.0-b.39'
)) {
Navigator.pop(context);
widget.onConfirm(
RewriteRules(
@ -195,13 +190,6 @@ class _AddDnsRewriteModalState extends State<DnsRewriteModal> {
widget.rule
);
}
else {
showDialog(
context: context,
builder: (context) => const ServerVersionNeeded(version: 'v0.107.33')
);
}
}
: null,
child: Text(
AppLocalizations.of(context)!.confirm,

6
lib/screens/settings/settings.dart
View file

@ -170,11 +170,7 @@ class _SettingsWidgetState extends State<SettingsWidget> {
serversProvider.apiClient != null
) ...[
SectionLabel(label: AppLocalizations.of(context)!.serverSettings),
if (serverVersionIsAhead(
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true) settingsTile(
settingsTile(
icon: Icons.search_rounded,
title: AppLocalizations.of(context)!.safeSearch,
subtitle: AppLocalizations.of(context)!.safeSearchSettings,