mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-14 14:02:48 +00:00
Added context menus and other improvements
This commit is contained in:
parent
ac4dc2c774
commit
dd8583a168
8 changed files with 507 additions and 237 deletions
|
@ -614,5 +614,8 @@
|
||||||
"enableList": "Enable list",
|
"enableList": "Enable list",
|
||||||
"screens": "Screens",
|
"screens": "Screens",
|
||||||
"copiedClipboard": "Copied to clipboard",
|
"copiedClipboard": "Copied to clipboard",
|
||||||
"seeDetails": "See details"
|
"seeDetails": "See details",
|
||||||
|
"listNotAvailable": "List not available",
|
||||||
|
"copyListUrl": "Copy list URL",
|
||||||
|
"listUrlCopied": "List URL copied to the clipboard"
|
||||||
}
|
}
|
|
@ -614,5 +614,8 @@
|
||||||
"enableList": "Habilitar lista",
|
"enableList": "Habilitar lista",
|
||||||
"screens": "Pantallas",
|
"screens": "Pantallas",
|
||||||
"copiedClipboard": "Copiado al portapapeles",
|
"copiedClipboard": "Copiado al portapapeles",
|
||||||
"seeDetails": "Ver los detalles"
|
"seeDetails": "Ver los detalles",
|
||||||
|
"listNotAvailable": "Lista no disponible",
|
||||||
|
"copyListUrl": "Copiar URL de lista",
|
||||||
|
"listUrlCopied": "URL de la lista copiada al portapapeles"
|
||||||
}
|
}
|
|
@ -286,7 +286,7 @@ class _FiltersWidgetState extends State<FiltersWidget> {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => ListDetailsScreen(
|
builder: (context) => ListDetailsScreen(
|
||||||
list: filter,
|
listId: filter.id,
|
||||||
type: type,
|
type: type,
|
||||||
dialog: true,
|
dialog: true,
|
||||||
),
|
),
|
||||||
|
@ -297,7 +297,7 @@ class _FiltersWidgetState extends State<FiltersWidget> {
|
||||||
Navigator.of(context).push(
|
Navigator.of(context).push(
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
builder: (context) => ListDetailsScreen(
|
builder: (context) => ListDetailsScreen(
|
||||||
list: filter,
|
listId: filter.id,
|
||||||
type: type,
|
type: type,
|
||||||
dialog: false,
|
dialog: false,
|
||||||
)
|
)
|
||||||
|
|
|
@ -8,6 +8,7 @@ import 'package:flutter/rendering.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/filters/add_button.dart';
|
import 'package:adguard_home_manager/screens/filters/add_button.dart';
|
||||||
|
import 'package:adguard_home_manager/screens/filters/list_options_menu.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/widgets/tab_content_list.dart';
|
import 'package:adguard_home_manager/widgets/tab_content_list.dart';
|
||||||
|
|
||||||
|
@ -87,7 +88,10 @@ class _FiltersListState extends State<FiltersList> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
itemsCount: widget.data.length,
|
itemsCount: widget.data.length,
|
||||||
contentWidget: (index) => CustomListTile(
|
contentWidget: (index) => ListOptionsMenu(
|
||||||
|
list: widget.data[index],
|
||||||
|
listType: widget.type,
|
||||||
|
child: CustomListTile(
|
||||||
title: widget.data[index].name,
|
title: widget.data[index].name,
|
||||||
subtitle: "${intFormat(widget.data[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
subtitle: "${intFormat(widget.data[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
||||||
trailing: Icon(
|
trailing: Icon(
|
||||||
|
@ -104,6 +108,7 @@ class _FiltersListState extends State<FiltersList> {
|
||||||
),
|
),
|
||||||
onTap: () => widget.onOpenDetailsScreen(widget.data[index], widget.type),
|
onTap: () => widget.onOpenDetailsScreen(widget.data[index], widget.type),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
noData: Container(
|
noData: Container(
|
||||||
width: double.maxFinite,
|
width: double.maxFinite,
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
// ignore_for_file: use_build_context_synchronously
|
||||||
|
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -6,6 +8,7 @@ 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/filters/add_button.dart';
|
import 'package:adguard_home_manager/screens/filters/add_button.dart';
|
||||||
|
import 'package:adguard_home_manager/screens/filters/list_options_menu.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/widgets/options_modal.dart';
|
import 'package:adguard_home_manager/widgets/options_modal.dart';
|
||||||
|
|
||||||
|
@ -128,8 +131,9 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
type: 'whitelist',
|
type: 'whitelist',
|
||||||
widget: (fn) => IconButton(
|
widget: (fn) => IconButton(
|
||||||
onPressed: fn,
|
onPressed: fn,
|
||||||
icon: const Icon(Icons.add_rounded)
|
icon: const Icon(Icons.add_rounded),
|
||||||
)
|
tooltip: AppLocalizations.of(context)!.addWhitelist,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -137,7 +141,10 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
itemCount: serversProvider.filtering.data!.whitelistFilters.length,
|
itemCount: serversProvider.filtering.data!.whitelistFilters.length,
|
||||||
itemBuilder: (context, index) => CustomListTile(
|
itemBuilder: (context, index) => ListOptionsMenu(
|
||||||
|
list: serversProvider.filtering.data!.whitelistFilters[index],
|
||||||
|
listType: 'whitelist',
|
||||||
|
child: CustomListTile(
|
||||||
title: serversProvider.filtering.data!.whitelistFilters[index].name,
|
title: serversProvider.filtering.data!.whitelistFilters[index].name,
|
||||||
subtitle: "${intFormat(serversProvider.filtering.data!.whitelistFilters[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
subtitle: "${intFormat(serversProvider.filtering.data!.whitelistFilters[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
||||||
trailing: Icon(
|
trailing: Icon(
|
||||||
|
@ -155,6 +162,7 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
onTap: () => onOpenDetailsModal(serversProvider.filtering.data!.whitelistFilters[index], 'whitelist'),
|
onTap: () => onOpenDetailsModal(serversProvider.filtering.data!.whitelistFilters[index], 'whitelist'),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -179,7 +187,8 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
type: 'blacklist',
|
type: 'blacklist',
|
||||||
widget: (fn) => IconButton(
|
widget: (fn) => IconButton(
|
||||||
onPressed: fn,
|
onPressed: fn,
|
||||||
icon: const Icon(Icons.add_rounded)
|
icon: const Icon(Icons.add_rounded),
|
||||||
|
tooltip: AppLocalizations.of(context)!.addBlacklist,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
@ -188,7 +197,10 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
itemCount: serversProvider.filtering.data!.filters.length,
|
itemCount: serversProvider.filtering.data!.filters.length,
|
||||||
itemBuilder: (context, index) => CustomListTile(
|
itemBuilder: (context, index) => ListOptionsMenu(
|
||||||
|
list: serversProvider.filtering.data!.filters[index],
|
||||||
|
listType: 'blacklist',
|
||||||
|
child: CustomListTile(
|
||||||
title: serversProvider.filtering.data!.filters[index].name,
|
title: serversProvider.filtering.data!.filters[index].name,
|
||||||
subtitle: "${intFormat(serversProvider.filtering.data!.filters[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
subtitle: "${intFormat(serversProvider.filtering.data!.filters[index].rulesCount, Platform.localeName)} ${AppLocalizations.of(context)!.enabledRules}",
|
||||||
trailing: Icon(
|
trailing: Icon(
|
||||||
|
@ -206,6 +218,7 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
onTap: () => onOpenDetailsModal(serversProvider.filtering.data!.filters[index], 'blacklist'),
|
onTap: () => onOpenDetailsModal(serversProvider.filtering.data!.filters[index], 'blacklist'),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -230,7 +243,8 @@ class FiltersTripleColumn extends StatelessWidget {
|
||||||
type: '',
|
type: '',
|
||||||
widget: (fn) => IconButton(
|
widget: (fn) => IconButton(
|
||||||
onPressed: fn,
|
onPressed: fn,
|
||||||
icon: const Icon(Icons.add_rounded)
|
icon: const Icon(Icons.add_rounded),
|
||||||
|
tooltip: AppLocalizations.of(context)!.addCustomRule,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
|
|
@ -9,25 +9,23 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
import 'package:adguard_home_manager/screens/filters/add_list_modal.dart';
|
import 'package:adguard_home_manager/screens/filters/add_list_modal.dart';
|
||||||
import 'package:adguard_home_manager/screens/filters/delete_list_modal.dart';
|
import 'package:adguard_home_manager/screens/filters/delete_list_modal.dart';
|
||||||
|
import 'package:adguard_home_manager/screens/filters/list_functions.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/functions/format_time.dart';
|
import 'package:adguard_home_manager/functions/format_time.dart';
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
|
||||||
import 'package:adguard_home_manager/constants/enums.dart';
|
|
||||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||||
import 'package:adguard_home_manager/classes/process_modal.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/providers/servers_provider.dart';
|
||||||
import 'package:adguard_home_manager/services/http_requests.dart';
|
|
||||||
import 'package:adguard_home_manager/models/filtering.dart';
|
import 'package:adguard_home_manager/models/filtering.dart';
|
||||||
|
|
||||||
class ListDetailsScreen extends StatefulWidget {
|
class ListDetailsScreen extends StatefulWidget {
|
||||||
final Filter list;
|
final int listId;
|
||||||
final String type;
|
final String type;
|
||||||
final bool dialog;
|
final bool dialog;
|
||||||
|
|
||||||
const ListDetailsScreen({
|
const ListDetailsScreen({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.list,
|
required this.listId,
|
||||||
required this.type,
|
required this.type,
|
||||||
required this.dialog
|
required this.dialog
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
@ -38,15 +36,10 @@ class ListDetailsScreen extends StatefulWidget {
|
||||||
|
|
||||||
class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
final ScrollController scrollController = ScrollController();
|
final ScrollController scrollController = ScrollController();
|
||||||
String name = "";
|
|
||||||
bool enabled = true;
|
|
||||||
bool fabVisible = true;
|
bool fabVisible = true;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
name = widget.list.name;
|
|
||||||
enabled = widget.list.enabled;
|
|
||||||
|
|
||||||
scrollController.addListener(() {
|
scrollController.addListener(() {
|
||||||
if (scrollController.position.userScrollDirection == ScrollDirection.reverse) {
|
if (scrollController.position.userScrollDirection == ScrollDirection.reverse) {
|
||||||
if (mounted && fabVisible == true) {
|
if (mounted && fabVisible == true) {
|
||||||
|
@ -72,152 +65,15 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
|
|
||||||
final width = MediaQuery.of(context).size.width;
|
final width = MediaQuery.of(context).size.width;
|
||||||
|
|
||||||
void enableDisableList(Filter list, bool newStatus) async {
|
Filter? list;
|
||||||
ProcessModal processModal = ProcessModal(context: context);
|
try {
|
||||||
processModal.open(
|
list = serversProvider.filtering.data != null
|
||||||
enabled == true
|
? widget.type == 'whitelist'
|
||||||
? AppLocalizations.of(context)!.disablingList
|
? serversProvider.filtering.data!.whitelistFilters.firstWhere((l) => l.id == widget.listId)
|
||||||
: AppLocalizations.of(context)!.enablingList,
|
: serversProvider.filtering.data!.filters.firstWhere((l) => l.id == widget.listId)
|
||||||
);
|
: null;
|
||||||
|
} catch (e) {
|
||||||
final result = await updateFilterList(server: serversProvider.selectedServer!, data: {
|
// ------- //
|
||||||
"data": {
|
|
||||||
"enabled": newStatus,
|
|
||||||
"name": list.name,
|
|
||||||
"url": list.url
|
|
||||||
},
|
|
||||||
"url": list.url,
|
|
||||||
"whitelist": widget.type == 'whitelist' ? true : false
|
|
||||||
});
|
|
||||||
|
|
||||||
processModal.close();
|
|
||||||
|
|
||||||
if (result['result'] == 'success') {
|
|
||||||
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
|
||||||
|
|
||||||
if (result2['result'] == 'success') {
|
|
||||||
serversProvider.setFilteringData(result2['data']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
appConfigProvider.addLog(result2['log']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.error, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
setState(() => enabled = newStatus);
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listDataUpdated,
|
|
||||||
color: Colors.green
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
appConfigProvider.addLog(result['log']);
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
|
||||||
color: Colors.red
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void confirmEditList({required Filter list, required String type}) async {
|
|
||||||
ProcessModal processModal = ProcessModal(context: context);
|
|
||||||
processModal.open(AppLocalizations.of(context)!.updatingListData);
|
|
||||||
|
|
||||||
final result1 = await updateFilterList(server: serversProvider.selectedServer!, data: {
|
|
||||||
"data": {
|
|
||||||
"enabled": list.enabled,
|
|
||||||
"name": list.name,
|
|
||||||
"url": list.url
|
|
||||||
},
|
|
||||||
"url": list.url,
|
|
||||||
"whitelist": type == 'whitelist' ? true : false
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result1['result'] == 'success') {
|
|
||||||
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
|
||||||
|
|
||||||
if (result2['result'] == 'success') {
|
|
||||||
serversProvider.setFilteringData(result2['data']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
appConfigProvider.addLog(result2['log']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.error, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
processModal.close();
|
|
||||||
|
|
||||||
setState(() => name = list.name);
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listDataUpdated,
|
|
||||||
color: Colors.green
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
processModal.close();
|
|
||||||
appConfigProvider.addLog(result1['log']);
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
|
||||||
color: Colors.red
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void deleteList(Filter list, String type) async {
|
|
||||||
ProcessModal processModal = ProcessModal(context: context);
|
|
||||||
processModal.open(AppLocalizations.of(context)!.deletingList);
|
|
||||||
|
|
||||||
final result1 = await deleteFilterList(server: serversProvider.selectedServer!, data: {
|
|
||||||
"url": list.url,
|
|
||||||
"whitelist": type == 'whitelist' ? true : false
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result1['result'] == 'success') {
|
|
||||||
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
|
||||||
|
|
||||||
if (result2['result'] == 'success') {
|
|
||||||
serversProvider.setFilteringData(result2['data']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
appConfigProvider.addLog(result2['log']);
|
|
||||||
serversProvider.setFilteringLoadStatus(LoadStatus.loading, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
processModal.close();
|
|
||||||
|
|
||||||
Navigator.pop(context); // Closes the screen
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listDeleted,
|
|
||||||
color: Colors.green
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
processModal.close();
|
|
||||||
appConfigProvider.addLog(result1['log']);
|
|
||||||
|
|
||||||
showSnacbkar(
|
|
||||||
context: context,
|
|
||||||
appConfigProvider: appConfigProvider,
|
|
||||||
label: AppLocalizations.of(context)!.listNotDeleted,
|
|
||||||
color: Colors.red
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Widget> content() {
|
List<Widget> content() {
|
||||||
|
@ -226,11 +82,11 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
icon: Icons.shield_rounded,
|
icon: Icons.shield_rounded,
|
||||||
title: AppLocalizations.of(context)!.currentStatus,
|
title: AppLocalizations.of(context)!.currentStatus,
|
||||||
subtitleWidget: Text(
|
subtitleWidget: Text(
|
||||||
enabled == true
|
list!.enabled == true
|
||||||
? AppLocalizations.of(context)!.enabled
|
? AppLocalizations.of(context)!.enabled
|
||||||
: AppLocalizations.of(context)!.disabled,
|
: AppLocalizations.of(context)!.disabled,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: enabled == true
|
color: list.enabled == true
|
||||||
? appConfigProvider.useThemeColorForStatus == true
|
? appConfigProvider.useThemeColorForStatus == true
|
||||||
? Theme.of(context).colorScheme.primary
|
? Theme.of(context).colorScheme.primary
|
||||||
: Colors.green
|
: Colors.green
|
||||||
|
@ -250,7 +106,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
CustomListTile(
|
CustomListTile(
|
||||||
icon: Icons.badge_rounded,
|
icon: Icons.badge_rounded,
|
||||||
title: AppLocalizations.of(context)!.name,
|
title: AppLocalizations.of(context)!.name,
|
||||||
subtitle: name,
|
subtitle: list.name,
|
||||||
padding: widget.dialog == true
|
padding: widget.dialog == true
|
||||||
? const EdgeInsets.symmetric(
|
? const EdgeInsets.symmetric(
|
||||||
horizontal: 24,
|
horizontal: 24,
|
||||||
|
@ -261,7 +117,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
CustomListTile(
|
CustomListTile(
|
||||||
icon: Icons.link_rounded,
|
icon: Icons.link_rounded,
|
||||||
title: "URL",
|
title: "URL",
|
||||||
subtitle: widget.list.url,
|
subtitle: list.url,
|
||||||
padding: widget.dialog == true
|
padding: widget.dialog == true
|
||||||
? const EdgeInsets.symmetric(
|
? const EdgeInsets.symmetric(
|
||||||
horizontal: 24,
|
horizontal: 24,
|
||||||
|
@ -272,7 +128,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
CustomListTile(
|
CustomListTile(
|
||||||
icon: Icons.list_rounded,
|
icon: Icons.list_rounded,
|
||||||
title: AppLocalizations.of(context)!.rules,
|
title: AppLocalizations.of(context)!.rules,
|
||||||
subtitle: widget.list.rulesCount.toString(),
|
subtitle: list.rulesCount.toString(),
|
||||||
padding: widget.dialog == true
|
padding: widget.dialog == true
|
||||||
? const EdgeInsets.symmetric(
|
? const EdgeInsets.symmetric(
|
||||||
horizontal: 24,
|
horizontal: 24,
|
||||||
|
@ -293,10 +149,10 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
if (widget.list.lastUpdated != null) CustomListTile(
|
if (list.lastUpdated != null) CustomListTile(
|
||||||
icon: Icons.schedule_rounded,
|
icon: Icons.schedule_rounded,
|
||||||
title: AppLocalizations.of(context)!.latestUpdate,
|
title: AppLocalizations.of(context)!.latestUpdate,
|
||||||
subtitle: convertTimestampLocalTimezone(widget.list.lastUpdated!, 'dd-MM-yyyy HH:mm'),
|
subtitle: convertTimestampLocalTimezone(list.lastUpdated!, 'dd-MM-yyyy HH:mm'),
|
||||||
padding: widget.dialog == true
|
padding: widget.dialog == true
|
||||||
? const EdgeInsets.symmetric(
|
? const EdgeInsets.symmetric(
|
||||||
horizontal: 24,
|
horizontal: 24,
|
||||||
|
@ -316,9 +172,31 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (ctx) => AddListModal(
|
builder: (ctx) => AddListModal(
|
||||||
list: widget.list,
|
list: list,
|
||||||
type: widget.type,
|
type: widget.type,
|
||||||
onEdit: confirmEditList,
|
onEdit: ({required Filter list, required String type}) async {
|
||||||
|
final result = await editList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list,
|
||||||
|
type: widget.type
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
dialog: true,
|
dialog: true,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -327,9 +205,31 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
showModalBottomSheet(
|
showModalBottomSheet(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (ctx) => AddListModal(
|
builder: (ctx) => AddListModal(
|
||||||
list: widget.list,
|
list: list,
|
||||||
type: widget.type,
|
type: widget.type,
|
||||||
onEdit: confirmEditList,
|
onEdit: ({required Filter list, required String type}) async {
|
||||||
|
final result = await editList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list,
|
||||||
|
type: widget.type
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
dialog: false,
|
dialog: false,
|
||||||
),
|
),
|
||||||
isScrollControlled: true,
|
isScrollControlled: true,
|
||||||
|
@ -344,8 +244,31 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => DeleteListModal(
|
builder: (c) => DeleteListModal(
|
||||||
onConfirm: () => deleteList(widget.list, widget.type),
|
onConfirm: () async {
|
||||||
|
final result = await deleteList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list!,
|
||||||
|
type: widget.type,
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDeleted,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
Navigator.pop(context);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listNotDeleted,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
@ -386,16 +309,38 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
Row(
|
if (list != null) Row(
|
||||||
children: [
|
children: [
|
||||||
IconButton(
|
IconButton(
|
||||||
onPressed: () => enableDisableList(widget.list, !enabled),
|
onPressed: () async {
|
||||||
|
final result = await enableDisableList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list!,
|
||||||
|
listType: widget.type,
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
icon: Icon(
|
icon: Icon(
|
||||||
enabled == true
|
list.enabled == true
|
||||||
? Icons.gpp_bad_rounded
|
? Icons.gpp_bad_rounded
|
||||||
: Icons.verified_user_rounded,
|
: Icons.verified_user_rounded,
|
||||||
),
|
),
|
||||||
tooltip: enabled == true
|
tooltip: list.enabled == true
|
||||||
? AppLocalizations.of(context)!.disableList
|
? AppLocalizations.of(context)!.disableList
|
||||||
: AppLocalizations.of(context)!.enableList,
|
: AppLocalizations.of(context)!.enableList,
|
||||||
),
|
),
|
||||||
|
@ -406,11 +351,20 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: SingleChildScrollView(
|
child: list != null
|
||||||
|
? SingleChildScrollView(
|
||||||
child: Wrap(
|
child: Wrap(
|
||||||
children: content(),
|
children: content(),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
: Center(
|
||||||
|
child: Text(
|
||||||
|
AppLocalizations.of(context)!.listNotAvailable,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 24,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -421,14 +375,22 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text(AppLocalizations.of(context)!.listDetails),
|
title: Text(AppLocalizations.of(context)!.listDetails),
|
||||||
actions: actions(),
|
actions: list != null ? actions() : null,
|
||||||
),
|
),
|
||||||
body: Stack(
|
body: Stack(
|
||||||
children: [
|
children: [
|
||||||
ListView(
|
if (list != null) ListView(
|
||||||
children: content(),
|
children: content(),
|
||||||
),
|
),
|
||||||
AnimatedPositioned(
|
if (list == null) Center(
|
||||||
|
child: Text(
|
||||||
|
AppLocalizations.of(context)!.listNotAvailable,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 24,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (list != null) AnimatedPositioned(
|
||||||
duration: const Duration(milliseconds: 100),
|
duration: const Duration(milliseconds: 100),
|
||||||
curve: Curves.easeInOut,
|
curve: Curves.easeInOut,
|
||||||
bottom: fabVisible ?
|
bottom: fabVisible ?
|
||||||
|
@ -437,9 +399,31 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
||||||
: -70,
|
: -70,
|
||||||
right: 20,
|
right: 20,
|
||||||
child: FloatingActionButton(
|
child: FloatingActionButton(
|
||||||
onPressed: () => enableDisableList(widget.list, !enabled),
|
onPressed: () async {
|
||||||
|
final result = await enableDisableList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list!,
|
||||||
|
listType: widget.type,
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
child: Icon(
|
child: Icon(
|
||||||
enabled == true
|
list.enabled == true
|
||||||
? Icons.gpp_bad_rounded
|
? Icons.gpp_bad_rounded
|
||||||
: Icons.verified_user_rounded,
|
: Icons.verified_user_rounded,
|
||||||
),
|
),
|
||||||
|
|
141
lib/screens/filters/list_functions.dart
Normal file
141
lib/screens/filters/list_functions.dart
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
// ignore_for_file: use_build_context_synchronously
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||||
|
import 'package:adguard_home_manager/models/filtering.dart';
|
||||||
|
import 'package:adguard_home_manager/constants/enums.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';
|
||||||
|
|
||||||
|
Future<bool> enableDisableList({
|
||||||
|
required BuildContext context,
|
||||||
|
required ServersProvider serversProvider,
|
||||||
|
required AppConfigProvider appConfigProvider,
|
||||||
|
required Filter list,
|
||||||
|
required String listType,
|
||||||
|
}) async {
|
||||||
|
ProcessModal processModal = ProcessModal(context: context);
|
||||||
|
processModal.open(
|
||||||
|
list.enabled == true
|
||||||
|
? AppLocalizations.of(context)!.disablingList
|
||||||
|
: AppLocalizations.of(context)!.enablingList,
|
||||||
|
);
|
||||||
|
|
||||||
|
final result = await updateFilterList(server: serversProvider.selectedServer!, data: {
|
||||||
|
"data": {
|
||||||
|
"enabled": !list.enabled,
|
||||||
|
"name": list.name,
|
||||||
|
"url": list.url
|
||||||
|
},
|
||||||
|
"url": list.url,
|
||||||
|
"whitelist": listType == 'whitelist' ? true : false
|
||||||
|
});
|
||||||
|
|
||||||
|
processModal.close();
|
||||||
|
|
||||||
|
if (result['result'] == 'success') {
|
||||||
|
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
||||||
|
|
||||||
|
if (result2['result'] == 'success') {
|
||||||
|
serversProvider.setFilteringData(result2['data']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
appConfigProvider.addLog(result2['log']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.error, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
appConfigProvider.addLog(result['log']);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> editList({
|
||||||
|
required BuildContext context,
|
||||||
|
required ServersProvider serversProvider,
|
||||||
|
required AppConfigProvider appConfigProvider,
|
||||||
|
required Filter list,
|
||||||
|
required String type
|
||||||
|
}) async {
|
||||||
|
ProcessModal processModal = ProcessModal(context: context);
|
||||||
|
processModal.open(AppLocalizations.of(context)!.updatingListData);
|
||||||
|
|
||||||
|
final result1 = await updateFilterList(server: serversProvider.selectedServer!, data: {
|
||||||
|
"data": {
|
||||||
|
"enabled": list.enabled,
|
||||||
|
"name": list.name,
|
||||||
|
"url": list.url
|
||||||
|
},
|
||||||
|
"url": list.url,
|
||||||
|
"whitelist": type == 'whitelist' ? true : false
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result1['result'] == 'success') {
|
||||||
|
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
||||||
|
|
||||||
|
if (result2['result'] == 'success') {
|
||||||
|
serversProvider.setFilteringData(result2['data']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
appConfigProvider.addLog(result2['log']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.error, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
processModal.close();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
processModal.close();
|
||||||
|
appConfigProvider.addLog(result1['log']);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> deleteList({
|
||||||
|
required BuildContext context,
|
||||||
|
required ServersProvider serversProvider,
|
||||||
|
required AppConfigProvider appConfigProvider,
|
||||||
|
required Filter list,
|
||||||
|
required String type
|
||||||
|
}) async {
|
||||||
|
ProcessModal processModal = ProcessModal(context: context);
|
||||||
|
processModal.open(AppLocalizations.of(context)!.deletingList);
|
||||||
|
|
||||||
|
final result1 = await deleteFilterList(server: serversProvider.selectedServer!, data: {
|
||||||
|
"url": list.url,
|
||||||
|
"whitelist": type == 'whitelist' ? true : false
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result1['result'] == 'success') {
|
||||||
|
final result2 = await getFiltering(server: serversProvider.selectedServer!);
|
||||||
|
|
||||||
|
if (result2['result'] == 'success') {
|
||||||
|
serversProvider.setFilteringData(result2['data']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.loaded, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
appConfigProvider.addLog(result2['log']);
|
||||||
|
serversProvider.setFilteringLoadStatus(LoadStatus.loading, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
processModal.close();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
processModal.close();
|
||||||
|
appConfigProvider.addLog(result1['log']);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
120
lib/screens/filters/list_options_menu.dart
Normal file
120
lib/screens/filters/list_options_menu.dart
Normal file
|
@ -0,0 +1,120 @@
|
||||||
|
// ignore_for_file: use_build_context_synchronously
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:contextmenu/contextmenu.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/screens/filters/list_functions.dart';
|
||||||
|
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
|
||||||
|
import 'package:adguard_home_manager/widgets/options_modal.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||||
|
import 'package:adguard_home_manager/models/filtering.dart';
|
||||||
|
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
|
||||||
|
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
||||||
|
|
||||||
|
class ListOptionsMenu extends StatelessWidget {
|
||||||
|
final Filter list;
|
||||||
|
final Widget child;
|
||||||
|
final String listType;
|
||||||
|
|
||||||
|
const ListOptionsMenu({
|
||||||
|
Key? key,
|
||||||
|
required this.list,
|
||||||
|
required this.child,
|
||||||
|
required this.listType,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final serversProvider = Provider.of<ServersProvider>(context);
|
||||||
|
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||||
|
|
||||||
|
void enableDisable() async {
|
||||||
|
final result = await enableDisableList(
|
||||||
|
context: context,
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
list: list,
|
||||||
|
listType: listType,
|
||||||
|
);
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ContextMenuArea(
|
||||||
|
builder: (context) => [
|
||||||
|
CustomListTile(
|
||||||
|
title: list.enabled == true
|
||||||
|
? AppLocalizations.of(context)!.disable
|
||||||
|
: AppLocalizations.of(context)!.enable,
|
||||||
|
icon: list.enabled == true
|
||||||
|
? Icons.gpp_bad_rounded
|
||||||
|
: Icons.verified_user_rounded,
|
||||||
|
onTap: () {
|
||||||
|
Navigator.pop(context); // Closes the context menu
|
||||||
|
enableDisable();
|
||||||
|
}
|
||||||
|
),
|
||||||
|
CustomListTile(
|
||||||
|
title: AppLocalizations.of(context)!.copyListUrl,
|
||||||
|
icon: Icons.copy_rounded,
|
||||||
|
onTap: () {
|
||||||
|
Navigator.pop(context); // Closes the context menu
|
||||||
|
copyToClipboard(
|
||||||
|
context: context,
|
||||||
|
value: list.url,
|
||||||
|
successMessage: AppLocalizations.of(context)!.listUrlCopied
|
||||||
|
);
|
||||||
|
}
|
||||||
|
),
|
||||||
|
],
|
||||||
|
child: Material(
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: InkWell(
|
||||||
|
onLongPress: () => showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => OptionsModal(
|
||||||
|
options: [
|
||||||
|
MenuOption(
|
||||||
|
title: list.enabled == true
|
||||||
|
? AppLocalizations.of(context)!.disable
|
||||||
|
: AppLocalizations.of(context)!.enable,
|
||||||
|
icon: list.enabled == true
|
||||||
|
? Icons.gpp_bad_rounded
|
||||||
|
: Icons.verified_user_rounded,
|
||||||
|
action: enableDisable
|
||||||
|
),
|
||||||
|
MenuOption(
|
||||||
|
title: AppLocalizations.of(context)!.copyListUrl,
|
||||||
|
icon: Icons.copy_rounded,
|
||||||
|
action: () => copyToClipboard(
|
||||||
|
context: context,
|
||||||
|
value: list.url,
|
||||||
|
successMessage: AppLocalizations.of(context)!.listUrlCopied
|
||||||
|
)
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
),
|
||||||
|
child: child
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue