mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-04 20:30:35 +00:00
Load services from api
This commit is contained in:
parent
3359acbf27
commit
393528e4c0
11 changed files with 495 additions and 394 deletions
|
@ -1,142 +0,0 @@
|
|||
const List<Map<String, String>> services = [
|
||||
{
|
||||
'id': '9gag',
|
||||
'label': "9Gag",
|
||||
},
|
||||
{
|
||||
'id': 'amazon',
|
||||
'label': "Amazon",
|
||||
},
|
||||
{
|
||||
'id': 'bilibili',
|
||||
'label': "Bilibili",
|
||||
},
|
||||
{
|
||||
'id': 'cloudflare',
|
||||
'label': "CloudFlare",
|
||||
},
|
||||
{
|
||||
'id': 'dailymotion',
|
||||
'label': "Dailymotion",
|
||||
},
|
||||
{
|
||||
'id': 'discord',
|
||||
'label': "Discord",
|
||||
},
|
||||
{
|
||||
'id': 'disneyplus',
|
||||
'label': "Disney+",
|
||||
},
|
||||
{
|
||||
'id': 'ebay',
|
||||
'label': "EBay+",
|
||||
},
|
||||
{
|
||||
'id': 'epic_games',
|
||||
'label': "Epic Games",
|
||||
},
|
||||
{
|
||||
'id': 'facebook',
|
||||
'label': "Facebook",
|
||||
},
|
||||
{
|
||||
'id': 'hulu',
|
||||
'label': "Hulu",
|
||||
},
|
||||
{
|
||||
'id': 'imgur',
|
||||
'label': "Imgur",
|
||||
},
|
||||
{
|
||||
'id': 'instagram',
|
||||
'label': "Instagram",
|
||||
},
|
||||
{
|
||||
'id': 'mail_ru',
|
||||
'label': "Mail.ru",
|
||||
},
|
||||
{
|
||||
'id': 'netflix',
|
||||
'label': "Netflix",
|
||||
},
|
||||
{
|
||||
'id': 'ok',
|
||||
'label': "OK.ru",
|
||||
},
|
||||
{
|
||||
'id': 'origin',
|
||||
'label': "Origin",
|
||||
},
|
||||
{
|
||||
'id': 'pinterest',
|
||||
'label': "Pinterest",
|
||||
},
|
||||
{
|
||||
'id': 'qq',
|
||||
'label': "QQ",
|
||||
},
|
||||
{
|
||||
'id': 'reddit',
|
||||
'label': "Reddit",
|
||||
},
|
||||
{
|
||||
'id': 'skype',
|
||||
'label': "Skype",
|
||||
},
|
||||
{
|
||||
'id': 'snapchat',
|
||||
'label': "Snapchat",
|
||||
},
|
||||
{
|
||||
'id': 'spotify',
|
||||
'label': "Spotify",
|
||||
},
|
||||
{
|
||||
'id': 'steam',
|
||||
'label': "Steam",
|
||||
},
|
||||
{
|
||||
'id': 'telegram',
|
||||
'label': "Telegram",
|
||||
},
|
||||
{
|
||||
'id': 'tiktok',
|
||||
'label': "TikTok",
|
||||
},
|
||||
{
|
||||
'id': 'tinder',
|
||||
'label': "Tinder",
|
||||
},
|
||||
{
|
||||
'id': 'twitch',
|
||||
'label': "Twitch",
|
||||
},
|
||||
{
|
||||
'id': 'viber',
|
||||
'label': "Viber",
|
||||
},
|
||||
{
|
||||
'id': 'vimeo',
|
||||
'label': "Vimeo",
|
||||
},
|
||||
{
|
||||
'id': 'vk',
|
||||
'label': "VK.com",
|
||||
},
|
||||
{
|
||||
'id': 'wechat',
|
||||
'label': "WeChat",
|
||||
},
|
||||
{
|
||||
'id': 'weibo',
|
||||
'label': "Weibo",
|
||||
},
|
||||
{
|
||||
'id': 'whatsapp',
|
||||
'label': "WhatsApp",
|
||||
},
|
||||
{
|
||||
'id': 'youtube',
|
||||
'label': "YouTube",
|
||||
},
|
||||
];
|
|
@ -8,7 +8,8 @@ void showSnacbkar({
|
|||
required BuildContext context,
|
||||
required AppConfigProvider appConfigProvider,
|
||||
required String label,
|
||||
required Color color
|
||||
required Color color,
|
||||
Color? labelColor
|
||||
}) async {
|
||||
if (appConfigProvider.showingSnackbar == true) {
|
||||
ScaffoldMessenger.of(context).clearSnackBars();
|
||||
|
@ -17,7 +18,12 @@ void showSnacbkar({
|
|||
appConfigProvider.setShowingSnackbar(true);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(label),
|
||||
content: Text(
|
||||
label,
|
||||
style: TextStyle(
|
||||
color: labelColor ?? Colors.white
|
||||
),
|
||||
),
|
||||
backgroundColor: color,
|
||||
)
|
||||
).closed.then((value) => appConfigProvider.setShowingSnackbar(false));
|
||||
|
|
|
@ -582,5 +582,7 @@
|
|||
"clearingDnsCache": "Clearing cache...",
|
||||
"dnsCacheNotCleared": "DNS cache couldn't be cleared",
|
||||
"clientsSelected": "clients selected",
|
||||
"invalidDomain": "Invalid domain"
|
||||
"invalidDomain": "Invalid domain",
|
||||
"loadingBlockedServicesList": "Loading blocked services list...",
|
||||
"blockedServicesListNotLoaded": "The blocked services list could not be loaded"
|
||||
}
|
|
@ -582,5 +582,7 @@
|
|||
"clearingDnsCache": "Borrando caché...",
|
||||
"dnsCacheNotCleared": "La caché de DNS no pudo ser borrada",
|
||||
"clientsSelected": "clientes seleccionados",
|
||||
"invalidDomain": "Dominio no válido"
|
||||
"invalidDomain": "Dominio no válido",
|
||||
"loadingBlockedServicesList": "Cargando lista de servicios bloqueados...",
|
||||
"blockedServicesListNotLoaded": "No se ha podido cargar la lista de servicios bloqueados"
|
||||
}
|
49
lib/models/blocked_services.dart
Normal file
49
lib/models/blocked_services.dart
Normal file
|
@ -0,0 +1,49 @@
|
|||
class BlockedServicesFromApi {
|
||||
final List<BlockedService> blockedServices;
|
||||
|
||||
BlockedServicesFromApi({
|
||||
required this.blockedServices,
|
||||
});
|
||||
|
||||
factory BlockedServicesFromApi.fromJson(Map<String, dynamic> json) => BlockedServicesFromApi(
|
||||
blockedServices: List<BlockedService>.from(json["blocked_services"].map((x) => BlockedService.fromJson(x))),
|
||||
);
|
||||
}
|
||||
|
||||
class BlockedServices {
|
||||
int loadStatus = 0;
|
||||
List<BlockedService>? services;
|
||||
|
||||
BlockedServices({
|
||||
this.loadStatus = 0,
|
||||
this.services
|
||||
});
|
||||
}
|
||||
|
||||
class BlockedService {
|
||||
final String id;
|
||||
final String name;
|
||||
final String iconSvg;
|
||||
final List<String> rules;
|
||||
|
||||
BlockedService({
|
||||
required this.id,
|
||||
required this.name,
|
||||
required this.iconSvg,
|
||||
required this.rules,
|
||||
});
|
||||
|
||||
factory BlockedService.fromJson(Map<String, dynamic> json) => BlockedService(
|
||||
id: json["id"],
|
||||
name: json["name"],
|
||||
iconSvg: json["icon_svg"],
|
||||
rules: List<String>.from(json["rules"].map((x) => x)),
|
||||
);
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
"id": id,
|
||||
"name": name,
|
||||
"icon_svg": iconSvg,
|
||||
"rules": List<dynamic>.from(rules.map((x) => x)),
|
||||
};
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
import 'package:adguard_home_manager/models/blocked_services.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:sqflite/sqflite.dart';
|
||||
|
||||
|
@ -49,6 +50,11 @@ class ServersProvider with ChangeNotifier {
|
|||
data: null
|
||||
);
|
||||
|
||||
final BlockedServices _blockedServicesList = BlockedServices(
|
||||
loadStatus: 0,
|
||||
services: null
|
||||
);
|
||||
|
||||
FilteringStatus? _filteringStatus;
|
||||
|
||||
List<Server> get serversList {
|
||||
|
@ -91,6 +97,10 @@ class ServersProvider with ChangeNotifier {
|
|||
return _dnsInfo;
|
||||
}
|
||||
|
||||
BlockedServices get blockedServicesList {
|
||||
return _blockedServicesList;
|
||||
}
|
||||
|
||||
void setDbInstance(Database db) {
|
||||
_dbInstance = db;
|
||||
}
|
||||
|
@ -201,6 +211,18 @@ class ServersProvider with ChangeNotifier {
|
|||
}
|
||||
}
|
||||
|
||||
void setBlockedServiceListData(List<BlockedService> data) {
|
||||
_blockedServicesList.services = data;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setBlockedServicesListLoadStatus(int status, bool notify) {
|
||||
_blockedServicesList.loadStatus = status;
|
||||
if (notify == true) {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<dynamic> createServer(Server server) async {
|
||||
final saved = await saveServerIntoDb(server);
|
||||
if (saved == null) {
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/constants/services.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
||||
import 'package:adguard_home_manager/services/http_requests.dart';
|
||||
|
||||
class ServicesModal extends StatefulWidget {
|
||||
class ServicesModal extends StatelessWidget {
|
||||
final List<String> blockedServices;
|
||||
final void Function(List<String>) onConfirm;
|
||||
|
||||
|
@ -14,14 +17,58 @@ class ServicesModal extends StatefulWidget {
|
|||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<ServicesModal> createState() => _ServicesModalState();
|
||||
Widget build(BuildContext context) {
|
||||
final serversProvider = Provider.of<ServersProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
|
||||
return ServicesModalWidget(
|
||||
blockedServices: blockedServices,
|
||||
onConfirm: onConfirm,
|
||||
serversProvider: serversProvider,
|
||||
appConfigProvider: appConfigProvider,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ServicesModalState extends State<ServicesModal> {
|
||||
class ServicesModalWidget extends StatefulWidget {
|
||||
final ServersProvider serversProvider;
|
||||
final AppConfigProvider appConfigProvider;
|
||||
final List<String> blockedServices;
|
||||
final void Function(List<String>) onConfirm;
|
||||
|
||||
const ServicesModalWidget({
|
||||
Key? key,
|
||||
required this.blockedServices,
|
||||
required this.onConfirm,
|
||||
required this.serversProvider,
|
||||
required this.appConfigProvider
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<ServicesModalWidget> createState() => _ServicesModalStateWidget();
|
||||
}
|
||||
|
||||
class _ServicesModalStateWidget extends State<ServicesModalWidget> {
|
||||
List<String> blockedServices = [];
|
||||
|
||||
Future loadBlockedServices() async {
|
||||
final result = await getBlockedServices(server: widget.serversProvider.selectedServer!);
|
||||
if (result['result'] == 'success') {
|
||||
widget.serversProvider.setBlockedServicesListLoadStatus(1, true);
|
||||
widget.serversProvider.setBlockedServiceListData(result['data']);
|
||||
}
|
||||
else {
|
||||
widget.serversProvider.setBlockedServicesListLoadStatus(2, true);
|
||||
widget.appConfigProvider.addLog(result['log']);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
if (widget.serversProvider.blockedServicesList.loadStatus != 1) {
|
||||
loadBlockedServices();
|
||||
}
|
||||
|
||||
blockedServices = widget.blockedServices;
|
||||
super.initState();
|
||||
}
|
||||
|
@ -41,6 +88,94 @@ class _ServicesModalState extends State<ServicesModal> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final serversProvider = Provider.of<ServersProvider>(context);
|
||||
|
||||
Widget content() {
|
||||
switch (serversProvider.blockedServicesList.loadStatus) {
|
||||
case 0:
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: SizedBox(
|
||||
width: double.maxFinite,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const CircularProgressIndicator(),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.loadingBlockedServicesList,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
case 1:
|
||||
return SizedBox(
|
||||
width: double.minPositive,
|
||||
height: MediaQuery.of(context).size.height*0.5,
|
||||
child: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: serversProvider.blockedServicesList.services!.length,
|
||||
itemBuilder: (context, index) => CheckboxListTile(
|
||||
title: Padding(
|
||||
padding: const EdgeInsets.only(left: 10),
|
||||
child: Text(
|
||||
serversProvider.blockedServicesList.services![index].name,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
value: blockedServices.contains(serversProvider.blockedServicesList.services![index].id),
|
||||
checkboxShape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(5)
|
||||
),
|
||||
onChanged: (value) => checkUncheckService(value!, serversProvider.blockedServicesList.services![index].id)
|
||||
)
|
||||
),
|
||||
);
|
||||
|
||||
case 2:
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: SizedBox(
|
||||
width: double.maxFinite,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.error,
|
||||
color: Colors.red,
|
||||
size: 26,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.blockedServicesListNotLoaded,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
default:
|
||||
return const SizedBox();
|
||||
}
|
||||
}
|
||||
|
||||
return AlertDialog(
|
||||
scrollable: true,
|
||||
contentPadding: const EdgeInsets.symmetric(
|
||||
|
@ -62,31 +197,7 @@ class _ServicesModalState extends State<ServicesModal> {
|
|||
)
|
||||
],
|
||||
),
|
||||
content: SizedBox(
|
||||
width: double.minPositive,
|
||||
height: MediaQuery.of(context).size.height*0.5,
|
||||
child: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: services.length,
|
||||
itemBuilder: (context, index) => CheckboxListTile(
|
||||
title: Padding(
|
||||
padding: const EdgeInsets.only(left: 10),
|
||||
child: Text(
|
||||
services[index]['label']!,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
value: blockedServices.contains(services[index]['id']),
|
||||
checkboxShape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(5)
|
||||
),
|
||||
onChanged: (value) => checkUncheckService(value!, services[index]['id']!)
|
||||
)
|
||||
),
|
||||
),
|
||||
content: content(),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
|
|
|
@ -1,174 +0,0 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/constants/services.dart';
|
||||
|
||||
class BlockedServicesModal extends StatefulWidget {
|
||||
final ScrollController scrollController;
|
||||
final List<String> blockedServices;
|
||||
final void Function(List<String>) onApply;
|
||||
|
||||
const BlockedServicesModal({
|
||||
Key? key,
|
||||
required this.scrollController,
|
||||
required this.blockedServices,
|
||||
required this.onApply,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<BlockedServicesModal> createState() => _BlockedServicesModalState();
|
||||
}
|
||||
|
||||
class _BlockedServicesModalState extends State<BlockedServicesModal> {
|
||||
List<Map<String, dynamic>> values = [];
|
||||
|
||||
List<String> convertFinalValues() {
|
||||
return List<String>.from(
|
||||
values.map((v) => v['checked'] == true ? v['id'] : '').where((v) => v != '')
|
||||
);
|
||||
}
|
||||
|
||||
void updateValues(bool value, Map<String, dynamic> item) {
|
||||
setState(() => values = values.map((v) {
|
||||
if (v['id'] == item['id']) {
|
||||
return {
|
||||
'id': v['id'],
|
||||
'checked': value
|
||||
};
|
||||
}
|
||||
else {
|
||||
return v;
|
||||
}
|
||||
}).toList());
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
for (var service in services) {
|
||||
values.add({
|
||||
"id": service['id'],
|
||||
"checked": widget.blockedServices.contains(service['id'])
|
||||
});
|
||||
}
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final allSelected = convertFinalValues().length == services.length ? true : false;
|
||||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).dialogBackgroundColor,
|
||||
borderRadius: const BorderRadius.only(
|
||||
topLeft: Radius.circular(28),
|
||||
topRight: Radius.circular(28)
|
||||
)
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: ListView(
|
||||
controller: widget.scrollController,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 24),
|
||||
child: Icon(
|
||||
Icons.block,
|
||||
size: 24,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.blockedServices,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
ListView.builder(
|
||||
primary: false,
|
||||
shrinkWrap: true,
|
||||
itemCount: services.length,
|
||||
itemBuilder: (context, index) => Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: () => updateValues(!(values[index]['checked'] as bool), services[index]),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 5),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
services[index]['label']!,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
Checkbox(
|
||||
value: values[index]['checked'],
|
||||
onChanged: (value) => updateValues(value!, services[index]),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(5)
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: () => {
|
||||
allSelected == true
|
||||
? setState(() => values = values.map((v) => {
|
||||
'id': v['id'],
|
||||
'checked': false
|
||||
}).toList())
|
||||
: setState(() => values = values.map((v) => {
|
||||
'id': v['id'],
|
||||
'checked': true
|
||||
}).toList())
|
||||
},
|
||||
child: Text(
|
||||
allSelected == true
|
||||
? AppLocalizations.of(context)!.unselectAll
|
||||
: AppLocalizations.of(context)!.selectAll
|
||||
)
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: Text(AppLocalizations.of(context)!.cancel)
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Navigator.pop(context);
|
||||
widget.onApply(convertFinalValues());
|
||||
},
|
||||
child: Text(AppLocalizations.of(context)!.apply)
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
227
lib/screens/filters/blocked_services_scren.dart
Normal file
227
lib/screens/filters/blocked_services_scren.dart
Normal file
|
@ -0,0 +1,227 @@
|
|||
// ignore_for_file: use_build_context_synchronously
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/models/blocked_services.dart';
|
||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||
import 'package:adguard_home_manager/services/http_requests.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
||||
|
||||
class BlockedServicesScreen extends StatelessWidget {
|
||||
const BlockedServicesScreen({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final serversProvider = Provider.of<ServersProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
|
||||
return BlockedServicesScreenWidget(
|
||||
serversProvider: serversProvider,
|
||||
appConfigProvider: appConfigProvider
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class BlockedServicesScreenWidget extends StatefulWidget {
|
||||
final ServersProvider serversProvider;
|
||||
final AppConfigProvider appConfigProvider;
|
||||
|
||||
const BlockedServicesScreenWidget({
|
||||
Key? key,
|
||||
required this.serversProvider,
|
||||
required this.appConfigProvider,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<BlockedServicesScreenWidget> createState() => _BlockedServicesScreenStateWidget();
|
||||
}
|
||||
|
||||
class _BlockedServicesScreenStateWidget extends State<BlockedServicesScreenWidget> {
|
||||
List<String> values = [];
|
||||
|
||||
Future loadBlockedServices() async {
|
||||
final result = await getBlockedServices(server: widget.serversProvider.selectedServer!);
|
||||
if (result['result'] == 'success') {
|
||||
widget.serversProvider.setBlockedServicesListLoadStatus(1, true);
|
||||
widget.serversProvider.setBlockedServiceListData(result['data']);
|
||||
}
|
||||
else {
|
||||
widget.serversProvider.setBlockedServicesListLoadStatus(2, true);
|
||||
widget.appConfigProvider.addLog(result['log']);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
if (widget.serversProvider.blockedServicesList.loadStatus != 1) {
|
||||
loadBlockedServices();
|
||||
}
|
||||
|
||||
values = widget.serversProvider.filtering.data!.blockedServices;
|
||||
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final serversProvider = Provider.of<ServersProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
|
||||
void updateValues(bool value, BlockedService item) {
|
||||
if (value == true) {
|
||||
setState(() {
|
||||
values = values.where((v) => v != item.id).toList();
|
||||
});
|
||||
}
|
||||
else {
|
||||
setState(() {
|
||||
values.add(item.id);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void updateBlockedServices() async {
|
||||
ProcessModal processModal = ProcessModal(context: context);
|
||||
processModal.open(AppLocalizations.of(context)!.updating);
|
||||
|
||||
final result = await setBlockedServices(server: serversProvider.selectedServer!, data: values);
|
||||
|
||||
processModal.close();
|
||||
|
||||
if (result['result'] == 'success') {
|
||||
serversProvider.setBlockedServices(values);
|
||||
|
||||
showSnacbkar(
|
||||
context: context,
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
context: context,
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesNotUpdated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Widget body() {
|
||||
switch (serversProvider.blockedServicesList.loadStatus) {
|
||||
case 0:
|
||||
return SizedBox(
|
||||
width: double.maxFinite,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const CircularProgressIndicator(),
|
||||
const SizedBox(height: 30),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.loadingBlockedServicesList,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 22,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
case 1:
|
||||
return ListView.builder(
|
||||
itemCount: serversProvider.blockedServicesList.services!.length,
|
||||
itemBuilder: (context, index) => Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: () => updateValues(
|
||||
values.contains(serversProvider.blockedServicesList.services![index].id),
|
||||
serversProvider.blockedServicesList.services![index]
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 5),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
serversProvider.blockedServicesList.services![index].name,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
Checkbox(
|
||||
value: values.contains(serversProvider.blockedServicesList.services![index].id),
|
||||
onChanged: (value) => updateValues(
|
||||
value!,
|
||||
serversProvider.blockedServicesList.services![index]
|
||||
),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(5)
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
case 2:
|
||||
return SizedBox(
|
||||
width: double.maxFinite,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.error,
|
||||
color: Colors.red,
|
||||
size: 50,
|
||||
),
|
||||
const SizedBox(height: 30),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.blockedServicesListNotLoaded,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 22,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
default:
|
||||
return const SizedBox();
|
||||
}
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(AppLocalizations.of(context)!.blockedServices),
|
||||
actions: [
|
||||
IconButton(
|
||||
onPressed: updateBlockedServices,
|
||||
icon: const Icon(
|
||||
Icons.save_rounded
|
||||
),
|
||||
tooltip: AppLocalizations.of(context)!.save,
|
||||
),
|
||||
const SizedBox(width: 10)
|
||||
],
|
||||
),
|
||||
body: RefreshIndicator(
|
||||
onRefresh: loadBlockedServices,
|
||||
child: body()
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
|
@ -2,12 +2,11 @@
|
|||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:bottom_sheet/bottom_sheet.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/filters/filters_list.dart';
|
||||
import 'package:adguard_home_manager/screens/filters/blocked_services_scren.dart';
|
||||
import 'package:adguard_home_manager/screens/filters/check_host_modal.dart';
|
||||
import 'package:adguard_home_manager/screens/filters/blocked_services_modal.dart';
|
||||
import 'package:adguard_home_manager/screens/filters/custom_rules_list.dart';
|
||||
import 'package:adguard_home_manager/screens/filters/update_interval_lists_modal.dart';
|
||||
|
||||
|
@ -211,51 +210,12 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
|
|||
}
|
||||
}
|
||||
|
||||
void updateBlockedServices(List<String> values) async {
|
||||
ProcessModal processModal = ProcessModal(context: context);
|
||||
processModal.open(AppLocalizations.of(context)!.updating);
|
||||
|
||||
final result = await setBlockedServices(server: serversProvider.selectedServer!, data: values);
|
||||
|
||||
processModal.close();
|
||||
|
||||
if (result['result'] == 'success') {
|
||||
serversProvider.setBlockedServices(values);
|
||||
|
||||
showSnacbkar(
|
||||
context: context,
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
context: context,
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesNotUpdated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void openBlockedServicesModal() {
|
||||
ScaffoldMessenger.of(context).clearSnackBars();
|
||||
Future.delayed(const Duration(seconds: 0), () {
|
||||
showFlexibleBottomSheet(
|
||||
minHeight: 0.6,
|
||||
initHeight: 0.6,
|
||||
maxHeight: 0.95,
|
||||
isCollapsible: true,
|
||||
duration: const Duration(milliseconds: 250),
|
||||
anchors: [0.95],
|
||||
context: context,
|
||||
builder: (ctx, controller, offset) => BlockedServicesModal(
|
||||
scrollController: controller,
|
||||
blockedServices: serversProvider.filtering.data!.blockedServices,
|
||||
onApply: updateBlockedServices,
|
||||
),
|
||||
bottomSheetColor: Colors.transparent
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(
|
||||
builder: (context) => const BlockedServicesScreen(),
|
||||
)
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import 'dart:async';
|
|||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:adguard_home_manager/models/blocked_services.dart';
|
||||
import 'package:adguard_home_manager/models/dhcp.dart';
|
||||
import 'package:adguard_home_manager/models/dns_info.dart';
|
||||
import 'package:adguard_home_manager/models/encryption.dart';
|
||||
|
@ -1745,6 +1746,43 @@ Future getEncryptionSettings({
|
|||
}
|
||||
}
|
||||
|
||||
Future getBlockedServices({
|
||||
required Server server,
|
||||
}) async {
|
||||
final result = await apiRequest(
|
||||
urlPath: '/blocked_services/all',
|
||||
method: 'get',
|
||||
server: server,
|
||||
type: 'get_blocked_services'
|
||||
);
|
||||
|
||||
if (result['hasResponse'] == true) {
|
||||
if (result['statusCode'] == 200) {
|
||||
return {
|
||||
'result': 'success',
|
||||
'data': List<BlockedService>.from(
|
||||
BlockedServicesFromApi.fromJson(jsonDecode(result['body'])).blockedServices
|
||||
)
|
||||
};
|
||||
}
|
||||
else {
|
||||
return {
|
||||
'result': 'error',
|
||||
'log': AppLog(
|
||||
type: 'get_encryption_settings',
|
||||
dateTime: DateTime.now(),
|
||||
message: 'error_code_not_expected',
|
||||
statusCode: result['statusCode'].toString(),
|
||||
resBody: result['body'],
|
||||
)
|
||||
};
|
||||
}
|
||||
}
|
||||
else {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
Future checkEncryptionSettings({
|
||||
required Server server,
|
||||
required Map<String, dynamic> data,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue