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

Load services from api

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-02-04 23:26:13 +01:00
parent 3359acbf27
commit 393528e4c0
11 changed files with 495 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

169
lib/screens/clients/services_modal.dart
View file

@ -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),

174
lib/screens/filters/blocked_services_modal.dart
View file

@ -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
View 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()
),
);
}
}

50
lib/screens/filters/filters.dart
View file

@ -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(),
)
);
});
}