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

Changed options menus

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-26 22:42:05 +01:00
parent 0c0f78c8d8
commit f53a498c03
10 changed files with 225 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/screens/clients/added_list.dart
View file

@ -11,7 +11,6 @@ import 'package:adguard_home_manager/screens/clients/client/client_screen_functi
import 'package:adguard_home_manager/screens/clients/client/added_client_tile.dart'; import 'package:adguard_home_manager/screens/clients/client/added_client_tile.dart';
import 'package:adguard_home_manager/screens/clients/client/remove_client_modal.dart'; import 'package:adguard_home_manager/screens/clients/client/remove_client_modal.dart';
import 'package:adguard_home_manager/screens/clients/fab.dart'; import 'package:adguard_home_manager/screens/clients/fab.dart';
import 'package:adguard_home_manager/screens/clients/options_modal.dart';
import 'package:adguard_home_manager/widgets/tab_content_list.dart'; import 'package:adguard_home_manager/widgets/tab_content_list.dart';
import 'package:adguard_home_manager/functions/snackbar.dart'; import 'package:adguard_home_manager/functions/snackbar.dart';
@ -144,16 +143,6 @@ class _AddedListState extends State<AddedList> {
); );
} }
void openOptionsModal(Client client) {
showModal(
context: context,
builder: (ctx) => OptionsModal(
onDelete: () => openDeleteModal(client),
onEdit: () => openClientModal(client),
)
);
}
return CustomTabContentList( return CustomTabContentList(
listPadding: widget.splitView == true listPadding: widget.splitView == true
? const EdgeInsets.only(top: 8) ? const EdgeInsets.only(top: 8)
@ -182,7 +171,6 @@ class _AddedListState extends State<AddedList> {
selectedClient: widget.selectedClient, selectedClient: widget.selectedClient,
client: widget.data[index], client: widget.data[index],
onTap: widget.onClientSelected, onTap: widget.onClientSelected,
onLongPress: openOptionsModal,
onEdit: statusProvider.serverStatus != null onEdit: statusProvider.serverStatus != null
? (c) => openClientModal(c) ? (c) => openClientModal(c)
: null, : null,

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

@ -13,7 +13,6 @@ import 'package:adguard_home_manager/providers/app_config_provider.dart';
class AddedClientTile extends StatefulWidget { class AddedClientTile extends StatefulWidget {
final Client client; final Client client;
final void Function(Client) onTap; final void Function(Client) onTap;
final void Function(Client) onLongPress;
final void Function(Client)? onEdit; final void Function(Client)? onEdit;
final void Function(Client) onDelete; final void Function(Client) onDelete;
final Client? selectedClient; final Client? selectedClient;
@ -23,7 +22,6 @@ class AddedClientTile extends StatefulWidget {
super.key, super.key,
required this.client, required this.client,
required this.onTap, required this.onTap,
required this.onLongPress,
this.onEdit, this.onEdit,
required this.onDelete, required this.onDelete,
this.selectedClient, this.selectedClient,

4
lib/screens/clients/clients_list.dart
View file

@ -16,12 +16,12 @@ class ClientsList extends StatelessWidget {
final bool splitView; final bool splitView;
const ClientsList({ const ClientsList({
Key? key, super.key,
required this.data, required this.data,
required this.onClientSelected, required this.onClientSelected,
this.selectedClient, this.selectedClient,
required this.splitView, required this.splitView,
}) : super(key: key); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

72
lib/screens/clients/options_modal.dart
View file

@ -1,72 +0,0 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile_dialog.dart';
class OptionsModal extends StatelessWidget {
final void Function() onEdit;
final void Function() onDelete;
const OptionsModal({
Key? key,
required this.onDelete,
required this.onEdit,
}) : super(key: key);
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
return AlertDialog(
contentPadding: const EdgeInsets.symmetric(
horizontal: 0,
vertical: 16
),
title: Column(
children: [
Icon(
Icons.more_horiz,
color: Theme.of(context).listTileTheme.iconColor
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context)!.options,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(height: 24),
if (statusProvider.serverStatus != null) CustomListTileDialog(
onTap: () {
Navigator.pop(context);
onEdit();
},
title: AppLocalizations.of(context)!.edit,
icon: Icons.edit,
),
CustomListTileDialog(
onTap: () {
Navigator.pop(context);
onDelete();
},
title: AppLocalizations.of(context)!.delete,
icon: Icons.delete,
),
],
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.close)
)
],
);
}
}

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

@ -7,11 +7,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/client/remove_client_modal.dart'; import 'package:adguard_home_manager/screens/clients/client/remove_client_modal.dart';
import 'package:adguard_home_manager/screens/clients/client/client_screen_functions.dart'; import 'package:adguard_home_manager/screens/clients/client/client_screen_functions.dart';
import 'package:adguard_home_manager/screens/clients/options_modal.dart'; import 'package:adguard_home_manager/widgets/options_menu.dart';
import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/widgets/section_label.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/models/menu_option.dart';
import 'package:adguard_home_manager/classes/process_modal.dart'; import 'package:adguard_home_manager/classes/process_modal.dart';
import 'package:adguard_home_manager/functions/snackbar.dart'; import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart';
@ -151,15 +152,15 @@ class _SearchClientsState extends State<SearchClients> {
); );
} }
void openOptionsModal(Client client) { // void openOptionsModal(Client client) {
showModal( // showModal(
context: context, // context: context,
builder: (ctx) => OptionsModal( // builder: (ctx) => OptionsModal(
onDelete: () => openDeleteModal(client), // onDelete: () => openDeleteModal(client),
onEdit: () => openClientModal(client), // onEdit: () => openClientModal(client),
) // )
); // );
} // }
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
@ -224,82 +225,96 @@ class _SearchClientsState extends State<SearchClients> {
primary: false, primary: false,
itemCount: clientsScreen.length, itemCount: clientsScreen.length,
padding: const EdgeInsets.only(bottom: 0), padding: const EdgeInsets.only(bottom: 0),
itemBuilder: (context, index) => ListTile( itemBuilder: (context, index) => OptionsMenu(
contentPadding: index == 0 options: [
? const EdgeInsets.only(left: 20, right: 20, bottom: 15) MenuOption(
: const EdgeInsets.symmetric(horizontal: 20, vertical: 15), icon: Icons.edit_rounded,
isThreeLine: true, title: AppLocalizations.of(context)!.edit,
onLongPress: () => openOptionsModal(clientsScreen[index]), action: (v) => openClientModal(v)
onTap: statusProvider.serverStatus != null ),
? () => openClientModal(clientsScreen[index]) MenuOption(
: null, icon: Icons.delete_rounded,
title: Padding( title: AppLocalizations.of(context)!.delete,
padding: const EdgeInsets.only(bottom: 5), action: (v) => openDeleteModal(v)
child: Text( ),
clientsScreen[index].name, ],
style: const TextStyle( value: clientsScreen[index],
fontSize: 18, child: ListTile(
fontWeight: FontWeight.normal contentPadding: index == 0
? const EdgeInsets.only(left: 20, right: 20, bottom: 15)
: const EdgeInsets.symmetric(horizontal: 20, vertical: 15),
isThreeLine: true,
onTap: statusProvider.serverStatus != null
? () => openClientModal(clientsScreen[index])
: null,
title: Padding(
padding: const EdgeInsets.only(bottom: 5),
child: Text(
clientsScreen[index].name,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.normal
),
), ),
), ),
), subtitle: Column(
subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Text(clientsScreen[index].ids.toString().replaceAll(RegExp(r'^\[|\]$'), '')),
Text(clientsScreen[index].ids.toString().replaceAll(RegExp(r'^\[|\]$'), '')), const SizedBox(height: 7),
const SizedBox(height: 7), Row(
Row( children: [
children: [ Icon(
Icon( Icons.filter_list_rounded,
Icons.filter_list_rounded, size: 19,
size: 19, color: clientsScreen[index].filteringEnabled == true
color: clientsScreen[index].filteringEnabled == true ? appConfigProvider.useThemeColorForStatus == true
? appConfigProvider.useThemeColorForStatus == true ? Theme.of(context).colorScheme.primary
? Theme.of(context).colorScheme.primary : Colors.green
: Colors.green : appConfigProvider.useThemeColorForStatus == true
: appConfigProvider.useThemeColorForStatus == true ? Colors.grey
? Colors.grey : Colors.red,
: Colors.red, ),
), const SizedBox(width: 10),
const SizedBox(width: 10), Icon(
Icon( Icons.vpn_lock_rounded,
Icons.vpn_lock_rounded, size: 18,
size: 18, color: clientsScreen[index].safebrowsingEnabled == true
color: clientsScreen[index].safebrowsingEnabled == true ? appConfigProvider.useThemeColorForStatus == true
? appConfigProvider.useThemeColorForStatus == true ? Theme.of(context).colorScheme.primary
? Theme.of(context).colorScheme.primary : Colors.green
: Colors.green : appConfigProvider.useThemeColorForStatus == true
: appConfigProvider.useThemeColorForStatus == true ? Colors.grey
? Colors.grey : Colors.red,
: Colors.red, ),
), const SizedBox(width: 10),
const SizedBox(width: 10), Icon(
Icon( Icons.block,
Icons.block, size: 18,
size: 18, color: clientsScreen[index].parentalEnabled == true
color: clientsScreen[index].parentalEnabled == true ? appConfigProvider.useThemeColorForStatus == true
? appConfigProvider.useThemeColorForStatus == true ? Theme.of(context).colorScheme.primary
? Theme.of(context).colorScheme.primary : Colors.green
: Colors.green : appConfigProvider.useThemeColorForStatus == true
: appConfigProvider.useThemeColorForStatus == true ? Colors.grey
? Colors.grey : Colors.red,
: Colors.red, ),
), const SizedBox(width: 10),
const SizedBox(width: 10), Icon(
Icon( Icons.search_rounded,
Icons.search_rounded, size: 19,
size: 19, color: clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true
color: clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true ? appConfigProvider.useThemeColorForStatus == true
? appConfigProvider.useThemeColorForStatus == true ? Theme.of(context).colorScheme.primary
? Theme.of(context).colorScheme.primary : Colors.green
: Colors.green : appConfigProvider.useThemeColorForStatus == true
: appConfigProvider.useThemeColorForStatus == true ? Colors.grey
? Colors.grey : Colors.red
: Colors.red )
) ],
], )
) ],
], ),
), ),
) )
) )

45
lib/screens/filters/filters_triple_column.dart
View file

@ -7,10 +7,10 @@ import 'package:contextmenu/contextmenu.dart';
import 'package:provider/provider.dart'; 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/widgets/options_menu.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/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/constants/enums.dart'; import 'package:adguard_home_manager/constants/enums.dart';
import 'package:adguard_home_manager/functions/desktop_mode.dart'; import 'package:adguard_home_manager/functions/desktop_mode.dart';
@ -28,11 +28,11 @@ class FiltersTripleColumn extends StatelessWidget {
final List<Widget> actions; final List<Widget> actions;
const FiltersTripleColumn({ const FiltersTripleColumn({
Key? key, super.key,
required this.onRemoveCustomRule, required this.onRemoveCustomRule,
required this.onOpenDetailsModal, required this.onOpenDetailsModal,
required this.actions, required this.actions,
}) : super(key: key); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -282,28 +282,25 @@ class FiltersTripleColumn extends StatelessWidget {
} }
), ),
], ],
child: CustomListTile( child: OptionsMenu(
onLongPress: () => showDialog( options: [
context: context, MenuOption(
builder: (context) => OptionsModal( title: AppLocalizations.of(context)!.copyClipboard,
options: [ icon: Icons.copy_rounded,
MenuOption( action: (_) => copyToClipboard(
title: AppLocalizations.of(context)!.copyClipboard, value: filteringProvider.filtering!.userRules[index],
icon: Icons.copy_rounded, successMessage: AppLocalizations.of(context)!.copiedClipboard,
action: (_) => copyToClipboard( )
value: filteringProvider.filtering!.userRules[index],
successMessage: AppLocalizations.of(context)!.copiedClipboard,
)
)
]
) )
), ],
title: filteringProvider.filtering!.userRules[index], child: CustomListTile(
subtitleWidget: generateSubtitle(filteringProvider.filtering!.userRules[index]), title: filteringProvider.filtering!.userRules[index],
trailing: IconButton( subtitleWidget: generateSubtitle(filteringProvider.filtering!.userRules[index]),
onPressed: () => onRemoveCustomRule(filteringProvider.filtering!.userRules[index]), trailing: IconButton(
icon: const Icon(Icons.delete), onPressed: () => onRemoveCustomRule(filteringProvider.filtering!.userRules[index]),
tooltip: AppLocalizations.of(context)!.delete, icon: const Icon(Icons.delete),
tooltip: AppLocalizations.of(context)!.delete,
),
), ),
), ),
), ),

72
lib/screens/filters/list_options_menu.dart
View file

@ -8,7 +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/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_menu.dart';
import 'package:adguard_home_manager/screens/filters/selection/selection_screen.dart'; import 'package:adguard_home_manager/screens/filters/selection/selection_screen.dart';
import 'package:adguard_home_manager/functions/open_url.dart'; import 'package:adguard_home_manager/functions/open_url.dart';
@ -144,41 +144,41 @@ class ListOptionsMenu extends StatelessWidget {
child: Material( child: Material(
color: Colors.transparent, color: Colors.transparent,
child: InkWell( child: InkWell(
onLongPress: Platform.isAndroid || Platform.isIOS ? () => showDialog( child: OptionsMenu(
context: context, options: [
builder: (context) => OptionsModal( MenuOption(
options: [ title: list.enabled == true
MenuOption( ? AppLocalizations.of(context)!.disable
title: list.enabled == true : AppLocalizations.of(context)!.enable,
? AppLocalizations.of(context)!.disable icon: list.enabled == true
: AppLocalizations.of(context)!.enable, ? Icons.gpp_bad_rounded
icon: list.enabled == true : Icons.verified_user_rounded,
? Icons.gpp_bad_rounded action: (_) => enableDisable()
: Icons.verified_user_rounded, ),
action: (_) => enableDisable() MenuOption(
), title: AppLocalizations.of(context)!.copyListUrl,
MenuOption( icon: Icons.copy_rounded,
title: AppLocalizations.of(context)!.copyListUrl, action: (_) => copyToClipboard(
icon: Icons.copy_rounded, value: list.url,
action: (_) => copyToClipboard( successMessage: AppLocalizations.of(context)!.listUrlCopied
value: list.url, )
successMessage: AppLocalizations.of(context)!.listUrlCopied ),
) MenuOption(
), title: AppLocalizations.of(context)!.openListUrl,
MenuOption( icon: Icons.open_in_browser_rounded,
title: AppLocalizations.of(context)!.openListUrl, action: (_) => openUrl(list.url)
icon: Icons.open_in_browser_rounded, ),
action: (_) => openUrl(list.url) MenuOption(
), title: AppLocalizations.of(context)!.selectionMode,
MenuOption( icon: Icons.check_rounded,
title: AppLocalizations.of(context)!.selectionMode, action: (_) => Future.delayed(
icon: Icons.check_rounded, const Duration(milliseconds: 0),
action: (_) => openSelectionMode() () => openSelectionMode()
), )
] ),
) ],
) : null, child: child
child: child )
), ),
), ),
); );

4
lib/widgets/custom_list_tile_dialog.dart
View file

@ -6,11 +6,11 @@ class CustomListTileDialog extends StatelessWidget {
final void Function()? onTap; final void Function()? onTap;
const CustomListTileDialog({ const CustomListTileDialog({
Key? key, super.key,
required this.title, required this.title,
this.icon, this.icon,
this.onTap this.onTap
}) : super(key: key); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

67
lib/widgets/options_menu.dart
View file

@ -2,8 +2,9 @@ import 'dart:io';
import 'package:contextmenu/contextmenu.dart'; import 'package:contextmenu/contextmenu.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/options_modal.dart'; import 'package:adguard_home_manager/widgets/custom_list_tile_dialog.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/models/menu_option.dart'; import 'package:adguard_home_manager/models/menu_option.dart';
@ -29,7 +30,7 @@ class OptionsMenu extends StatelessWidget {
void openOptionsModal() { void openOptionsModal() {
showDialog( showDialog(
context: context, context: context,
builder: (context) => OptionsModal( builder: (context) => _OptionsModal(
options: options, options: options,
value: value value: value
) )
@ -61,3 +62,65 @@ class OptionsMenu extends StatelessWidget {
); );
} }
} }
class _OptionsModal extends StatelessWidget {
final List<MenuOption> options;
final dynamic value;
const _OptionsModal({
super.key,
required this.options,
this.value,
});
@override
Widget build(BuildContext context) {
return AlertDialog(
contentPadding: const EdgeInsets.symmetric(vertical: 16),
title: Column(
children: [
Icon(
Icons.more_horiz,
size: 24,
color: Theme.of(context).listTileTheme.iconColor
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context)!.options,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
content: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 400
),
child: SingleChildScrollView(
child: Wrap(
children: options.map((opt) => CustomListTileDialog(
title: opt.title,
icon: opt.icon,
onTap: () {
Navigator.pop(context);
opt.action(value);
},
)).toList()
),
),
),
actions: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.cancel)
)
],
)
],
);
}
}

67
lib/widgets/options_modal.dart
View file

@ -1,67 +0,0 @@
import 'package:adguard_home_manager/models/menu_option.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile_dialog.dart';
class OptionsModal extends StatelessWidget {
final List<MenuOption> options;
final dynamic value;
const OptionsModal({
super.key,
required this.options,
this.value,
});
@override
Widget build(BuildContext context) {
return AlertDialog(
contentPadding: const EdgeInsets.symmetric(vertical: 16),
title: Column(
children: [
Icon(
Icons.more_horiz,
size: 24,
color: Theme.of(context).listTileTheme.iconColor
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context)!.options,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
content: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 400
),
child: SingleChildScrollView(
child: Wrap(
children: options.map((opt) => CustomListTileDialog(
title: opt.title,
icon: opt.icon,
onTap: () {
Navigator.pop(context);
opt.action(value);
},
)).toList()
),
),
),
actions: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.cancel)
)
],
)
],
);
}
}