mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-31 11:52:16 +00:00
Improved top items lists, improved menus and fixed units
This commit is contained in:
Juan Gilsanz Polo
parent
bc8aa3b670
commit
63d57245a7
19 changed files with 713 additions and 767 deletions
|
|
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
|
|||
class MenuOption {
|
||||
final IconData? icon;
|
||||
final String title;
|
||||
final void Function() action;
|
||||
final void Function(dynamic) action;
|
||||
final bool? disabled;
|
||||
|
||||
const MenuOption({
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:contextmenu/contextmenu.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/options_menu.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/models/menu_option.dart';
|
||||
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
|
||||
|
|
@ -16,54 +15,29 @@ class ActiveClientTile extends StatelessWidget {
|
|||
final AutoClient? selectedClient;
|
||||
|
||||
const ActiveClientTile({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.client,
|
||||
required this.onTap,
|
||||
required this.splitView,
|
||||
this.selectedClient
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
void openOptionsModal() {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) => OptionsModal(
|
||||
options: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: () {
|
||||
copyToClipboard(
|
||||
value: client.name != ''
|
||||
? client.name!
|
||||
: client.ip,
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
);
|
||||
},
|
||||
)
|
||||
]
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (splitView == true) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: ContextMenuArea(
|
||||
builder: (context) => [
|
||||
CustomListTile(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
child: OptionsMenu(
|
||||
options: [
|
||||
MenuOption(
|
||||
icon: Icons.copy_rounded,
|
||||
onTap: () {
|
||||
copyToClipboard(
|
||||
value: client.name != ''
|
||||
? client.name!
|
||||
: client.ip,
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
);
|
||||
Navigator.pop(context);
|
||||
},
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
action: (_) => copyToClipboard(
|
||||
value: client.name != ''
|
||||
? client.name!
|
||||
: client.ip,
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
)
|
||||
)
|
||||
],
|
||||
child: Material(
|
||||
|
|
@ -72,10 +46,6 @@ class ActiveClientTile extends StatelessWidget {
|
|||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
onTap: () => onTap(client),
|
||||
onLongPress: () {
|
||||
Navigator.pop(context);
|
||||
openOptionsModal();
|
||||
},
|
||||
child: Container(
|
||||
width: double.maxFinite,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
|
|
@ -128,20 +98,17 @@ class ActiveClientTile extends StatelessWidget {
|
|||
);
|
||||
}
|
||||
else {
|
||||
return ContextMenuArea(
|
||||
builder: (context) => [
|
||||
CustomListTile(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
return OptionsMenu(
|
||||
options: [
|
||||
MenuOption(
|
||||
icon: Icons.copy_rounded,
|
||||
onTap: () {
|
||||
copyToClipboard(
|
||||
value: client.name != ''
|
||||
? client.name!
|
||||
: client.ip,
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
);
|
||||
Navigator.pop(context);
|
||||
},
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
action: (_) => copyToClipboard(
|
||||
value: client.name != ''
|
||||
? client.name!
|
||||
: client.ip,
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
)
|
||||
)
|
||||
],
|
||||
child: CustomListTile(
|
||||
|
|
@ -158,7 +125,6 @@ class ActiveClientTile extends StatelessWidget {
|
|||
),
|
||||
),
|
||||
onTap: () => onTap(client),
|
||||
onLongPress: openOptionsModal,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
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/widgets/options_menu.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/functions/copy_clipboard.dart';
|
||||
import 'package:adguard_home_manager/models/clients.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
|
||||
class AddedClientTile extends StatelessWidget {
|
||||
class AddedClientTile extends StatefulWidget {
|
||||
final Client client;
|
||||
final void Function(Client) onTap;
|
||||
final void Function(Client) onLongPress;
|
||||
|
|
@ -29,60 +30,48 @@ class AddedClientTile extends StatelessWidget {
|
|||
required this.splitView,
|
||||
});
|
||||
|
||||
@override
|
||||
State<AddedClientTile> createState() => _AddedClientTileState();
|
||||
}
|
||||
|
||||
class _AddedClientTileState extends State<AddedClientTile> {
|
||||
bool _isHover = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
|
||||
if (splitView == true) {
|
||||
if (widget.splitView == true) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
child: ContextMenuArea(
|
||||
builder: (context) => [
|
||||
if (onEdit != null) CustomListTile(
|
||||
title: AppLocalizations.of(context)!.edit,
|
||||
icon: Icons.edit_rounded,
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
onEdit!(client);
|
||||
}
|
||||
),
|
||||
CustomListTile(
|
||||
title: AppLocalizations.of(context)!.delete,
|
||||
icon: Icons.delete_rounded,
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
onDelete(client);
|
||||
}
|
||||
),
|
||||
CustomListTile(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
child: OptionsMenu(
|
||||
options: [
|
||||
MenuOption(
|
||||
icon: Icons.copy_rounded,
|
||||
onTap: () {
|
||||
copyToClipboard(
|
||||
value: client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
action: (_) => copyToClipboard(
|
||||
value: widget.client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
)
|
||||
),
|
||||
],
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
onTap: () => onTap(client),
|
||||
onLongPress: () => onLongPress(client),
|
||||
onTap: () => widget.onTap(widget.client),
|
||||
onHover: (v) => setState(() => _isHover = v),
|
||||
child: Container(
|
||||
width: double.maxFinite,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
color: client == selectedClient
|
||||
color: widget.client == widget.selectedClient
|
||||
? Theme.of(context).colorScheme.primaryContainer
|
||||
: null
|
||||
),
|
||||
child: Row(
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Expanded(
|
||||
|
|
@ -94,7 +83,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
widget.client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w400,
|
||||
|
|
@ -107,7 +96,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.filter_list_rounded,
|
||||
size: 19,
|
||||
color: client.filteringEnabled == true
|
||||
color: widget.client.filteringEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -119,7 +108,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.vpn_lock_rounded,
|
||||
size: 18,
|
||||
color: client.safebrowsingEnabled == true
|
||||
color: widget.client.safebrowsingEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -131,7 +120,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.block,
|
||||
size: 18,
|
||||
color: client.parentalEnabled == true
|
||||
color: widget.client.parentalEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -143,7 +132,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.search_rounded,
|
||||
size: 19,
|
||||
color: client.safeSearch != null && client.safeSearch!.enabled == true
|
||||
color: widget.client.safeSearch != null && widget.client.safeSearch!.enabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -159,6 +148,14 @@ class AddedClientTile extends StatelessWidget {
|
|||
],
|
||||
),
|
||||
),
|
||||
if (widget.onEdit != null && _isHover == true) ...[
|
||||
const SizedBox(width: 8),
|
||||
IconButton(
|
||||
onPressed: () => widget.onEdit!(widget.client),
|
||||
icon: const Icon(Icons.file_open_rounded),
|
||||
tooltip: AppLocalizations.of(context)!.seeDetails,
|
||||
)
|
||||
]
|
||||
],
|
||||
)
|
||||
),
|
||||
|
|
@ -168,37 +165,30 @@ class AddedClientTile extends StatelessWidget {
|
|||
);
|
||||
}
|
||||
else {
|
||||
return ContextMenuArea(
|
||||
builder: (context) => [
|
||||
if (onEdit != null) CustomListTile(
|
||||
return OptionsMenu(
|
||||
options: [
|
||||
if (widget.onEdit != null) MenuOption(
|
||||
title: AppLocalizations.of(context)!.seeDetails,
|
||||
icon: Icons.file_open_rounded,
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
onEdit!(client);
|
||||
}
|
||||
action: (_) => widget.onEdit!(widget.client)
|
||||
),
|
||||
CustomListTile(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
MenuOption(
|
||||
icon: Icons.copy_rounded,
|
||||
onTap: () {
|
||||
copyToClipboard(
|
||||
value: client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
action: (_) => copyToClipboard(
|
||||
value: widget.client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
)
|
||||
),
|
||||
],
|
||||
child: CustomListTile(
|
||||
onLongPress: () => onLongPress(client),
|
||||
onTap: () => onTap(client),
|
||||
title: client.name,
|
||||
onTap: () => widget.onTap(widget.client),
|
||||
title: widget.client.name,
|
||||
subtitleWidget: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
widget.client.ids.toString().replaceAll(RegExp(r'^\[|\]$'), ''),
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).listTileTheme.textColor
|
||||
),
|
||||
|
|
@ -209,7 +199,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.filter_list_rounded,
|
||||
size: 19,
|
||||
color: client.filteringEnabled == true
|
||||
color: widget.client.filteringEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -221,7 +211,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.vpn_lock_rounded,
|
||||
size: 18,
|
||||
color: client.safebrowsingEnabled == true
|
||||
color: widget.client.safebrowsingEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -233,7 +223,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.block,
|
||||
size: 18,
|
||||
color: client.parentalEnabled == true
|
||||
color: widget.client.parentalEnabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
@ -245,7 +235,7 @@ class AddedClientTile extends StatelessWidget {
|
|||
Icon(
|
||||
Icons.search_rounded,
|
||||
size: 19,
|
||||
color: client.safeSearch != null && client.safeSearch!.enabled == true
|
||||
color: widget.client.safeSearch != null && widget.client.safeSearch!.enabled == true
|
||||
? appConfigProvider.useThemeColorForStatus == true
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.green
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import 'package:adguard_home_manager/screens/clients/clients_lists.dart';
|
|||
import 'package:adguard_home_manager/models/clients.dart';
|
||||
|
||||
class Clients extends StatefulWidget {
|
||||
const Clients({Key? key}) : super(key: key);
|
||||
const Clients({super.key});
|
||||
|
||||
@override
|
||||
State<Clients> createState() => _ClientsState();
|
||||
|
|
@ -20,36 +20,38 @@ class _ClientsState extends State<Clients> with TickerProviderStateMixin {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
if (constraints.maxWidth > 1000) {
|
||||
return SplitView.material(
|
||||
hideDivider: true,
|
||||
flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2),
|
||||
placeholder: Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.selectClientLeftColumn,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
return Scaffold(
|
||||
body: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
if (constraints.maxWidth > 1000) {
|
||||
return SplitView.material(
|
||||
hideDivider: true,
|
||||
flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2),
|
||||
placeholder: Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.selectClientLeftColumn,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
child: const ClientsLists(
|
||||
splitView: true,
|
||||
)
|
||||
);
|
||||
}
|
||||
else {
|
||||
return const ClientsLists(
|
||||
splitView: false,
|
||||
);
|
||||
}
|
||||
},
|
||||
child: const ClientsLists(
|
||||
splitView: true,
|
||||
)
|
||||
);
|
||||
}
|
||||
else {
|
||||
return const ClientsLists(
|
||||
splitView: false,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -18,9 +18,9 @@ class ClientsLists extends StatefulWidget {
|
|||
final bool splitView;
|
||||
|
||||
const ClientsLists({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.splitView,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
State<ClientsLists> createState() => _ClientsListsState();
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ class FiltersTripleColumn extends StatelessWidget {
|
|||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: () => copyToClipboard(
|
||||
action: (_) => copyToClipboard(
|
||||
value: filteringProvider.filtering!.userRules[index],
|
||||
successMessage: AppLocalizations.of(context)!.copiedClipboard,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -155,12 +155,12 @@ class ListOptionsMenu extends StatelessWidget {
|
|||
icon: list.enabled == true
|
||||
? Icons.gpp_bad_rounded
|
||||
: Icons.verified_user_rounded,
|
||||
action: enableDisable
|
||||
action: (_) => enableDisable()
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyListUrl,
|
||||
icon: Icons.copy_rounded,
|
||||
action: () => copyToClipboard(
|
||||
action: (_) => copyToClipboard(
|
||||
value: list.url,
|
||||
successMessage: AppLocalizations.of(context)!.listUrlCopied
|
||||
)
|
||||
|
|
@ -168,12 +168,12 @@ class ListOptionsMenu extends StatelessWidget {
|
|||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.openListUrl,
|
||||
icon: Icons.open_in_browser_rounded,
|
||||
action: () => openUrl(list.url)
|
||||
action: (_) => openUrl(list.url)
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.selectionMode,
|
||||
icon: Icons.check_rounded,
|
||||
action: openSelectionMode
|
||||
action: (_) => openSelectionMode()
|
||||
),
|
||||
]
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ import 'package:provider/provider.dart';
|
|||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/home/server_status.dart';
|
||||
import 'package:adguard_home_manager/screens/home/top_items/top_items_lists.dart';
|
||||
import 'package:adguard_home_manager/screens/home/combined_chart.dart';
|
||||
import 'package:adguard_home_manager/screens/home/appbar.dart';
|
||||
import 'package:adguard_home_manager/screens/home/fab.dart';
|
||||
import 'package:adguard_home_manager/screens/home/top_items/top_items.dart';
|
||||
import 'package:adguard_home_manager/screens/home/chart.dart';
|
||||
|
||||
import 'package:adguard_home_manager/functions/number_format.dart';
|
||||
|
|
@ -21,7 +21,7 @@ import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
|||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||
|
||||
class Home extends StatefulWidget {
|
||||
const Home({Key? key}) : super(key: key);
|
||||
const Home({super.key});
|
||||
|
||||
@override
|
||||
State<Home> createState() => _HomeState();
|
||||
|
|
@ -236,97 +236,4 @@ class _HomeState extends State<Home> {
|
|||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TopItemsLists extends StatelessWidget {
|
||||
final List<HomeTopItems> order;
|
||||
|
||||
const TopItemsLists({
|
||||
super.key,
|
||||
required this.order,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
|
||||
List<Widget> bottom = [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Divider(
|
||||
thickness: 1,
|
||||
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.2),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
];
|
||||
|
||||
return Column(
|
||||
children: order.asMap().entries.map((item) {
|
||||
switch (item.value) {
|
||||
case HomeTopItems.queriedDomains:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topQueriedDomains,
|
||||
type: HomeTopItems.queriedDomains,
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.blockedDomains:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topBlockedDomains,
|
||||
type: HomeTopItems.blockedDomains,
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.recurrentClients:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topClients,
|
||||
type: HomeTopItems.recurrentClients,
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.topUpstreams:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamResponses != null
|
||||
? Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topUpstreams,
|
||||
type: HomeTopItems.topUpstreams,
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
)
|
||||
: const SizedBox();
|
||||
|
||||
case HomeTopItems.avgUpstreamResponseTime:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamsAvgTime != null
|
||||
? Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.averageUpstreamResponseTime,
|
||||
type: HomeTopItems.avgUpstreamResponseTime,
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
)
|
||||
: const SizedBox();
|
||||
|
||||
default:
|
||||
return const SizedBox();
|
||||
}
|
||||
}).toList(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,12 +2,10 @@ import 'package:flutter/material.dart';
|
|||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/domain_options.dart';
|
||||
import 'package:adguard_home_manager/widgets/options_menu.dart';
|
||||
|
||||
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||
import 'package:adguard_home_manager/constants/enums.dart';
|
||||
import 'package:adguard_home_manager/models/applied_filters.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/logs_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
|
||||
class RowItem extends StatefulWidget {
|
||||
|
|
@ -18,6 +16,8 @@ class RowItem extends StatefulWidget {
|
|||
final bool clients;
|
||||
final bool showColor;
|
||||
final String? unit;
|
||||
final List<MenuOption> options;
|
||||
final void Function(dynamic)? onTapEntry;
|
||||
|
||||
const RowItem({
|
||||
super.key,
|
||||
|
|
@ -27,6 +27,8 @@ class RowItem extends StatefulWidget {
|
|||
required this.number,
|
||||
required this.clients,
|
||||
required this.showColor,
|
||||
required this.options,
|
||||
this.onTapEntry,
|
||||
this.unit,
|
||||
});
|
||||
|
||||
|
|
@ -80,8 +82,6 @@ class _RowItemState extends State<RowItem> with TickerProviderStateMixin {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
final logsProvider = Provider.of<LogsProvider>(context);
|
||||
|
||||
String? name;
|
||||
if (widget.clients == true) {
|
||||
|
|
@ -94,36 +94,10 @@ class _RowItemState extends State<RowItem> with TickerProviderStateMixin {
|
|||
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: DomainOptions(
|
||||
item: widget.domain,
|
||||
isDomain: widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains,
|
||||
isBlocked: widget.type == HomeTopItems.blockedDomains,
|
||||
onTap: () {
|
||||
if (widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains) {
|
||||
logsProvider.setSearchText(widget.domain);
|
||||
logsProvider.setSelectedClients(null);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: widget.domain,
|
||||
clients: null
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
}
|
||||
else if (widget.type == HomeTopItems.recurrentClients) {
|
||||
logsProvider.setSearchText(null);
|
||||
logsProvider.setSelectedClients([widget.domain]);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: null,
|
||||
clients: [widget.domain]
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
}
|
||||
},
|
||||
child: OptionsMenu(
|
||||
value: widget.domain,
|
||||
options: widget.options,
|
||||
onTap: widget.onTapEntry,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 20,
|
||||
|
|
|
|||
|
|
@ -1,193 +0,0 @@
|
|||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/custom_pie_chart.dart';
|
||||
import 'package:adguard_home_manager/screens/home/top_items/row_item.dart';
|
||||
|
||||
import 'package:adguard_home_manager/constants/enums.dart';
|
||||
|
||||
class TopItemExpansionPanel extends StatefulWidget {
|
||||
final HomeTopItems type;
|
||||
final String label;
|
||||
final List<Map<String, dynamic>> data;
|
||||
final Map<String, double> chartData;
|
||||
final bool withChart;
|
||||
|
||||
const TopItemExpansionPanel({
|
||||
super.key,
|
||||
required this.type,
|
||||
required this.label,
|
||||
required this.data,
|
||||
required this.chartData,
|
||||
required this.withChart
|
||||
});
|
||||
|
||||
@override
|
||||
State<TopItemExpansionPanel> createState() => _TopItemExpansionPanelState();
|
||||
}
|
||||
|
||||
class _TopItemExpansionPanelState extends State<TopItemExpansionPanel> {
|
||||
bool _showChart = true;
|
||||
|
||||
final colors = [
|
||||
Colors.red,
|
||||
Colors.green,
|
||||
Colors.blue,
|
||||
Colors.orange,
|
||||
Colors.teal,
|
||||
Colors.grey
|
||||
];
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final width = MediaQuery.of(context).size.width;
|
||||
|
||||
if (widget.withChart == true) {
|
||||
return Column(
|
||||
children: [
|
||||
ExpansionPanelList(
|
||||
expandedHeaderPadding: const EdgeInsets.all(0),
|
||||
elevation: 0,
|
||||
expansionCallback: (_, isExpanded) => setState(() => _showChart = isExpanded),
|
||||
animationDuration: const Duration(milliseconds: 250),
|
||||
children: [
|
||||
ExpansionPanel(
|
||||
headerBuilder: (context, isExpanded) => Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||
child: Row(
|
||||
mainAxisAlignment: width <= 700
|
||||
? MainAxisAlignment.spaceBetween
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.label,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 16),
|
||||
child: Column(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 150,
|
||||
child: CustomPieChart(
|
||||
data: widget.chartData,
|
||||
colors: colors
|
||||
)
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
),
|
||||
),
|
||||
isExpanded: _showChart
|
||||
),
|
||||
],
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 8),
|
||||
child: _ItemsList(
|
||||
colors: colors,
|
||||
data: widget.data,
|
||||
clients: widget.type == HomeTopItems.recurrentClients,
|
||||
type: widget.type,
|
||||
showChart: _showChart,
|
||||
unit: widget.type == HomeTopItems.avgUpstreamResponseTime ? 'ms' : null,
|
||||
),
|
||||
),
|
||||
if (widget.type != HomeTopItems.avgUpstreamResponseTime) OthersRowItem(
|
||||
items: widget.data,
|
||||
showColor: _showChart,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
);
|
||||
}
|
||||
else {
|
||||
return Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18),
|
||||
child: Row(
|
||||
mainAxisAlignment: width <= 700
|
||||
? MainAxisAlignment.spaceBetween
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.label,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 16),
|
||||
child: _ItemsList(
|
||||
colors: colors,
|
||||
data: widget.data,
|
||||
clients: widget.type == HomeTopItems.recurrentClients,
|
||||
type: widget.type,
|
||||
showChart: false,
|
||||
unit: widget.type == HomeTopItems.avgUpstreamResponseTime ? 'ms' : null,
|
||||
),
|
||||
),
|
||||
if (widget.type != HomeTopItems.avgUpstreamResponseTime) OthersRowItem(
|
||||
items: widget.data,
|
||||
showColor: false,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _ItemsList extends StatelessWidget {
|
||||
final List<Color> colors;
|
||||
final List<Map<String, dynamic>> data;
|
||||
final bool? clients;
|
||||
final HomeTopItems type;
|
||||
final bool showChart;
|
||||
final String? unit;
|
||||
|
||||
const _ItemsList({
|
||||
required this.colors,
|
||||
required this.data,
|
||||
required this.clients,
|
||||
required this.type,
|
||||
required this.showChart,
|
||||
this.unit,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: data.sublist(
|
||||
0, data.length > 5 ? 5 : data.length
|
||||
).asMap().entries.map((e) => RowItem(
|
||||
clients: clients ?? false,
|
||||
domain: e.value.keys.toList()[0],
|
||||
number: e.value.values.toList()[0].runtimeType == double
|
||||
? "${e.value.values.toList()[0].toStringAsFixed(2)}${unit != null ? ' $unit' : ''}"
|
||||
: "${e.value.values.toList()[0].toString()}${unit != null ? ' $unit' : ''}",
|
||||
type: type,
|
||||
chartColor: colors[e.key],
|
||||
showColor: showChart,
|
||||
)).toList()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -7,23 +7,34 @@ import 'package:provider/provider.dart';
|
|||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/home/top_items/row_item.dart';
|
||||
import 'package:adguard_home_manager/screens/home/top_items/top_item_expansion_panel.dart';
|
||||
import 'package:adguard_home_manager/screens/top_items/top_items_modal.dart';
|
||||
import 'package:adguard_home_manager/screens/top_items/top_items.dart';
|
||||
import 'package:adguard_home_manager/widgets/custom_pie_chart.dart';
|
||||
|
||||
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||
import 'package:adguard_home_manager/constants/enums.dart';
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
|
||||
class TopItems extends StatefulWidget {
|
||||
final HomeTopItems type;
|
||||
final String label;
|
||||
final List<Map<String, dynamic>> data;
|
||||
final bool withChart;
|
||||
final bool withProgressBar;
|
||||
final String Function(dynamic) buildValue;
|
||||
final List<MenuOption> menuOptions;
|
||||
final void Function(dynamic)? onTapEntry;
|
||||
|
||||
const TopItems({
|
||||
super.key,
|
||||
required this.type,
|
||||
required this.label,
|
||||
required this.data,
|
||||
required this.withChart,
|
||||
required this.withProgressBar,
|
||||
required this.buildValue,
|
||||
required this.menuOptions,
|
||||
this.onTapEntry,
|
||||
});
|
||||
|
||||
@override
|
||||
|
|
@ -50,47 +61,21 @@ class _TopItemsState extends State<TopItems> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
|
||||
final width = MediaQuery.of(context).size.width;
|
||||
|
||||
List<Map<String, dynamic>> generateData() {
|
||||
switch (widget.type) {
|
||||
case HomeTopItems.queriedDomains:
|
||||
return statusProvider.serverStatus!.stats.topQueriedDomains;
|
||||
|
||||
case HomeTopItems.blockedDomains:
|
||||
return statusProvider.serverStatus!.stats.topBlockedDomains;
|
||||
|
||||
case HomeTopItems.recurrentClients:
|
||||
return statusProvider.serverStatus!.stats.topClients;
|
||||
|
||||
case HomeTopItems.topUpstreams:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamResponses ?? [];
|
||||
|
||||
case HomeTopItems.avgUpstreamResponseTime:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamsAvgTime ?? [];
|
||||
|
||||
default:
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
final data = generateData();
|
||||
|
||||
final withChart = widget.type != HomeTopItems.avgUpstreamResponseTime;
|
||||
|
||||
Map<String, double> chartData() {
|
||||
Map<String, double> values = {};
|
||||
data.sublist(0, data.length > 5 ? 5 : data.length).forEach((element) {
|
||||
widget.data.sublist(0, widget.data.length > 5 ? 5 : widget.data.length).forEach((element) {
|
||||
values = {
|
||||
...values,
|
||||
element.keys.first: element.values.first.toDouble()
|
||||
};
|
||||
});
|
||||
if (data.length > 5) {
|
||||
if (widget.data.length > 5) {
|
||||
final int rest = List<int>.from(
|
||||
data.sublist(5, data.length).map((e) => e.values.first.toInt())
|
||||
widget.data.sublist(5, widget.data.length).map((e) => e.values.first.toInt())
|
||||
).reduce((a, b) => a + b);
|
||||
values = {
|
||||
...values,
|
||||
|
|
@ -117,8 +102,8 @@ class _TopItemsState extends State<TopItems> {
|
|||
return SizedBox(
|
||||
child: Column(
|
||||
children: [
|
||||
if (data.isEmpty) noItems,
|
||||
if (data.isNotEmpty && width > 700) Padding(
|
||||
if (widget.data.isEmpty) noItems,
|
||||
if (widget.data.isNotEmpty && width > 700) Padding(
|
||||
padding: EdgeInsets.only(bottom: withChart == false ? 16 : 0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||
|
|
@ -157,14 +142,16 @@ class _TopItemsState extends State<TopItems> {
|
|||
),
|
||||
_ItemsList(
|
||||
colors: colors,
|
||||
data: data,
|
||||
data: widget.data,
|
||||
clients: widget.type == HomeTopItems.recurrentClients,
|
||||
type: widget.type,
|
||||
showChart: withChart == true ? _showChart : false,
|
||||
unit: widget.type == HomeTopItems.avgUpstreamResponseTime ? 'ms' : null,
|
||||
buildValue: widget.buildValue,
|
||||
menuOptions: widget.menuOptions,
|
||||
onTapEntry: widget.onTapEntry,
|
||||
),
|
||||
if (withChart == true) OthersRowItem(
|
||||
items: data,
|
||||
items: widget.data,
|
||||
showColor: true,
|
||||
)
|
||||
]
|
||||
|
|
@ -173,15 +160,128 @@ class _TopItemsState extends State<TopItems> {
|
|||
],
|
||||
),
|
||||
),
|
||||
if (data.isNotEmpty && width <= 700) TopItemExpansionPanel(
|
||||
type: widget.type,
|
||||
label: widget.label,
|
||||
data: data,
|
||||
chartData: chartData(),
|
||||
withChart: withChart
|
||||
if (widget.data.isNotEmpty && width <= 700) Builder(
|
||||
builder: (context) {
|
||||
if (widget.withChart == true) {
|
||||
return Column(
|
||||
children: [
|
||||
ExpansionPanelList(
|
||||
expandedHeaderPadding: const EdgeInsets.all(0),
|
||||
elevation: 0,
|
||||
expansionCallback: (_, isExpanded) => setState(() => _showChart = isExpanded),
|
||||
animationDuration: const Duration(milliseconds: 250),
|
||||
children: [
|
||||
ExpansionPanel(
|
||||
headerBuilder: (context, isExpanded) => Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||
child: Row(
|
||||
mainAxisAlignment: width <= 700
|
||||
? MainAxisAlignment.spaceBetween
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.label,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 16),
|
||||
child: Column(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 150,
|
||||
child: CustomPieChart(
|
||||
data: chartData(),
|
||||
colors: colors
|
||||
)
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
),
|
||||
),
|
||||
isExpanded: _showChart
|
||||
),
|
||||
],
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 8),
|
||||
child: _ItemsList(
|
||||
colors: colors,
|
||||
data: widget.data,
|
||||
clients: widget.type == HomeTopItems.recurrentClients,
|
||||
type: widget.type,
|
||||
showChart: _showChart,
|
||||
buildValue: widget.buildValue,
|
||||
menuOptions: widget.menuOptions,
|
||||
onTapEntry: widget.onTapEntry,
|
||||
),
|
||||
),
|
||||
if (widget.withChart == true) OthersRowItem(
|
||||
items: widget.data,
|
||||
showColor: _showChart,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
);
|
||||
}
|
||||
else {
|
||||
return Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18),
|
||||
child: Row(
|
||||
mainAxisAlignment: width <= 700
|
||||
? MainAxisAlignment.spaceBetween
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.label,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 16),
|
||||
child: _ItemsList(
|
||||
colors: colors,
|
||||
data: widget.data,
|
||||
clients: widget.type == HomeTopItems.recurrentClients,
|
||||
type: widget.type,
|
||||
showChart: false,
|
||||
buildValue: widget.buildValue,
|
||||
menuOptions: widget.menuOptions,
|
||||
onTapEntry: widget.onTapEntry,
|
||||
),
|
||||
),
|
||||
if (widget.withChart == true) OthersRowItem(
|
||||
items: widget.data,
|
||||
showColor: false,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
||||
if (data.length > 5) ...[
|
||||
if (widget.data.length > 5) ...[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(right: 20),
|
||||
child: Row(
|
||||
|
|
@ -197,9 +297,11 @@ class _TopItemsState extends State<TopItems> {
|
|||
type: widget.type,
|
||||
title: widget.label,
|
||||
isClient: widget.type == HomeTopItems.recurrentClients,
|
||||
data: generateData(),
|
||||
withProgressBar: widget.type != HomeTopItems.avgUpstreamResponseTime,
|
||||
unit: widget.type == HomeTopItems.avgUpstreamResponseTime ? 'ms' : null,
|
||||
data: widget.data,
|
||||
withProgressBar: widget.withProgressBar,
|
||||
buildValue: widget.buildValue,
|
||||
options: widget.menuOptions,
|
||||
onTapEntry: widget.onTapEntry,
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -210,9 +312,11 @@ class _TopItemsState extends State<TopItems> {
|
|||
type: widget.type,
|
||||
title: widget.label,
|
||||
isClient: widget.type == HomeTopItems.recurrentClients,
|
||||
data: generateData(),
|
||||
withProgressBar: widget.type != HomeTopItems.avgUpstreamResponseTime,
|
||||
unit: widget.type == HomeTopItems.avgUpstreamResponseTime ? 'ms' : null,
|
||||
data: widget.data,
|
||||
withProgressBar: widget.withProgressBar,
|
||||
buildValue: widget.buildValue,
|
||||
menuOptions: widget.menuOptions,
|
||||
onTapEntry: widget.onTapEntry,
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
@ -247,7 +351,9 @@ class _ItemsList extends StatelessWidget {
|
|||
final bool? clients;
|
||||
final HomeTopItems type;
|
||||
final bool showChart;
|
||||
final String? unit;
|
||||
final String Function(dynamic) buildValue;
|
||||
final List<MenuOption> menuOptions;
|
||||
final void Function(dynamic)? onTapEntry;
|
||||
|
||||
const _ItemsList({
|
||||
required this.colors,
|
||||
|
|
@ -255,7 +361,9 @@ class _ItemsList extends StatelessWidget {
|
|||
required this.clients,
|
||||
required this.type,
|
||||
required this.showChart,
|
||||
this.unit,
|
||||
required this.buildValue,
|
||||
required this.menuOptions,
|
||||
this.onTapEntry,
|
||||
});
|
||||
|
||||
@override
|
||||
|
|
@ -266,12 +374,12 @@ class _ItemsList extends StatelessWidget {
|
|||
).asMap().entries.map((e) => RowItem(
|
||||
clients: clients ?? false,
|
||||
domain: e.value.keys.toList()[0],
|
||||
number: e.value.values.toList()[0].runtimeType == double
|
||||
? "${e.value.values.toList()[0].toStringAsFixed(2)}${unit != null ? ' $unit' : ''}"
|
||||
: "${e.value.values.toList()[0].toString()}${unit != null ? ' $unit' : ''}",
|
||||
number: buildValue(e.value.values.toList()[0]),
|
||||
type: type,
|
||||
chartColor: colors[e.key],
|
||||
showColor: showChart,
|
||||
options: menuOptions,
|
||||
onTapEntry: onTapEntry,
|
||||
)).toList()
|
||||
);
|
||||
}
|
||||
|
|
|
|||
239
lib/screens/home/top_items/top_items_lists.dart
Normal file
239
lib/screens/home/top_items/top_items_lists.dart
Normal file
|
|
@ -0,0 +1,239 @@
|
|||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/home/top_items/top_items.dart';
|
||||
|
||||
import 'package:adguard_home_manager/functions/number_format.dart';
|
||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||
import 'package:adguard_home_manager/models/applied_filters.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/logs_provider.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/status_provider.dart';
|
||||
import 'package:adguard_home_manager/constants/enums.dart';
|
||||
|
||||
class TopItemsLists extends StatelessWidget {
|
||||
final List<HomeTopItems> order;
|
||||
|
||||
const TopItemsLists({
|
||||
super.key,
|
||||
required this.order,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
final logsProvider = Provider.of<LogsProvider>(context);
|
||||
|
||||
List<Widget> bottom = [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Divider(
|
||||
thickness: 1,
|
||||
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.2),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
];
|
||||
|
||||
void filterDomainLogs({required String value}) {
|
||||
logsProvider.setSearchText(value);
|
||||
logsProvider.setSelectedClients(null);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: value,
|
||||
clients: null
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
}
|
||||
|
||||
void filterClientLogs({required String value}) {
|
||||
logsProvider.setSearchText(null);
|
||||
logsProvider.setSelectedClients([value]);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: null,
|
||||
clients: [value]
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
}
|
||||
|
||||
void blockUnblock({required String domain, required String newStatus}) async {
|
||||
final ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.savingUserFilters);
|
||||
|
||||
final rules = await statusProvider.blockUnblockDomain(
|
||||
domain: domain,
|
||||
newStatus: newStatus
|
||||
);
|
||||
|
||||
processModal.close();
|
||||
|
||||
if (!context.mounted) return;
|
||||
if (rules == true) {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void copyValueClipboard(value) {
|
||||
copyToClipboard(value: value, successMessage: AppLocalizations.of(context)!.copiedClipboard);
|
||||
}
|
||||
|
||||
return Column(
|
||||
children: order.asMap().entries.map((item) {
|
||||
switch (item.value) {
|
||||
case HomeTopItems.queriedDomains:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topQueriedDomains,
|
||||
type: HomeTopItems.queriedDomains,
|
||||
data: statusProvider.serverStatus?.stats.topQueriedDomains ?? [],
|
||||
withChart: true,
|
||||
withProgressBar: true,
|
||||
buildValue: (v) => v.toString(),
|
||||
menuOptions: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.blockDomain,
|
||||
icon: Icons.block_rounded,
|
||||
action: (v) => blockUnblock(domain: v.toString(), newStatus: 'block')
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: copyValueClipboard
|
||||
),
|
||||
],
|
||||
onTapEntry: (v) => filterDomainLogs(value: v.toString()),
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.blockedDomains:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topBlockedDomains,
|
||||
type: HomeTopItems.blockedDomains,
|
||||
data: statusProvider.serverStatus?.stats.topBlockedDomains ?? [],
|
||||
withChart: true,
|
||||
withProgressBar: true,
|
||||
buildValue: (v) => v.toString(),
|
||||
menuOptions: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.unblockDomain,
|
||||
icon: Icons.check_rounded,
|
||||
action: (v) => blockUnblock(domain: v, newStatus: 'unblock')
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: copyValueClipboard
|
||||
)
|
||||
],
|
||||
onTapEntry: (v) => filterDomainLogs(value: v),
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.recurrentClients:
|
||||
return Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topClients,
|
||||
type: HomeTopItems.recurrentClients,
|
||||
data: statusProvider.serverStatus?.stats.topClients ?? [],
|
||||
withChart: true,
|
||||
withProgressBar: true,
|
||||
buildValue: (v) => v.toString(),
|
||||
menuOptions: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: copyValueClipboard
|
||||
)
|
||||
],
|
||||
onTapEntry: (v) => filterClientLogs(value: v),
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
);
|
||||
|
||||
case HomeTopItems.topUpstreams:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamResponses != null
|
||||
? Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.topUpstreams,
|
||||
type: HomeTopItems.topUpstreams,
|
||||
data: statusProvider.serverStatus?.stats.topUpstreamResponses ?? [],
|
||||
withChart: true,
|
||||
withProgressBar: true,
|
||||
buildValue: (v) => v.toString(),
|
||||
menuOptions: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: copyValueClipboard
|
||||
)
|
||||
],
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
)
|
||||
: const SizedBox();
|
||||
|
||||
case HomeTopItems.avgUpstreamResponseTime:
|
||||
return statusProvider.serverStatus!.stats.topUpstreamsAvgTime != null
|
||||
? Column(
|
||||
children: [
|
||||
TopItems(
|
||||
label: AppLocalizations.of(context)!.averageUpstreamResponseTime,
|
||||
type: HomeTopItems.avgUpstreamResponseTime,
|
||||
data: statusProvider.serverStatus?.stats.topUpstreamsAvgTime ?? [],
|
||||
withChart: false,
|
||||
withProgressBar: false,
|
||||
buildValue: (v) => "${doubleFormat(v*1000, Platform.localeName)} ms",
|
||||
menuOptions: [
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: copyValueClipboard
|
||||
)
|
||||
],
|
||||
),
|
||||
if (item.key < order.length - 1) ...bottom
|
||||
],
|
||||
)
|
||||
: const SizedBox();
|
||||
|
||||
default:
|
||||
return const SizedBox();
|
||||
}
|
||||
}).toList(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,9 +2,15 @@
|
|||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/domain_options.dart';
|
||||
import 'package:adguard_home_manager/widgets/options_menu.dart';
|
||||
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||
import 'package:adguard_home_manager/functions/snackbar.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/functions/get_filtered_status.dart';
|
||||
import 'package:adguard_home_manager/models/logs.dart';
|
||||
|
|
@ -20,7 +26,7 @@ class LogTile extends StatelessWidget {
|
|||
final bool twoColumns;
|
||||
|
||||
const LogTile({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.log,
|
||||
required this.length,
|
||||
required this.index,
|
||||
|
|
@ -28,11 +34,12 @@ class LogTile extends StatelessWidget {
|
|||
required this.onLogTap,
|
||||
this.useAlwaysNormalTile,
|
||||
required this.twoColumns,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
|
||||
Widget logStatusWidget({
|
||||
required IconData icon,
|
||||
|
|
@ -83,16 +90,63 @@ class LogTile extends StatelessWidget {
|
|||
}
|
||||
}
|
||||
|
||||
void blockUnblock({required String domain, required String newStatus}) async {
|
||||
final ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.savingUserFilters);
|
||||
|
||||
final rules = await statusProvider.blockUnblockDomain(
|
||||
domain: domain,
|
||||
newStatus: newStatus
|
||||
);
|
||||
|
||||
processModal.close();
|
||||
|
||||
if (!context.mounted) return;
|
||||
if (rules == true) {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
final domainBlocked = isDomainBlocked(log.reason);
|
||||
|
||||
if (twoColumns && !(useAlwaysNormalTile == true)) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
child: DomainOptions(
|
||||
onTap: () => onLogTap(log),
|
||||
child: OptionsMenu(
|
||||
onTap: (_) => onLogTap(log),
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
item: log.question.name,
|
||||
isBlocked: isDomainBlocked(log.reason),
|
||||
options: [
|
||||
if (log.question.name != null) MenuOption(
|
||||
title: domainBlocked == true
|
||||
? AppLocalizations.of(context)!.unblockDomain
|
||||
: AppLocalizations.of(context)!.blockDomain,
|
||||
icon: domainBlocked == true
|
||||
? Icons.check_rounded
|
||||
: Icons.block_rounded,
|
||||
action: (_) => blockUnblock(
|
||||
domain: log.question.name!,
|
||||
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
||||
)
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: (v) => copyToClipboard(value: v, successMessage: AppLocalizations.of(context)!.copiedClipboard)
|
||||
)
|
||||
],
|
||||
child: Container(
|
||||
width: double.maxFinite,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
|
|
@ -250,10 +304,27 @@ class LogTile extends StatelessWidget {
|
|||
else {
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: DomainOptions(
|
||||
onTap: () => onLogTap(log),
|
||||
item: log.question.name,
|
||||
isBlocked: isDomainBlocked(log.reason),
|
||||
child: OptionsMenu(
|
||||
onTap: (_) => onLogTap(log),
|
||||
options: [
|
||||
if (log.question.name != null) MenuOption(
|
||||
title: domainBlocked == true
|
||||
? AppLocalizations.of(context)!.unblockDomain
|
||||
: AppLocalizations.of(context)!.blockDomain,
|
||||
icon: domainBlocked == true
|
||||
? Icons.check_rounded
|
||||
: Icons.block_rounded,
|
||||
action: (_) => blockUnblock(
|
||||
domain: log.question.name!,
|
||||
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
||||
)
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy_rounded,
|
||||
action: (v) => copyToClipboard(value: v, successMessage: AppLocalizations.of(context)!.copiedClipboard)
|
||||
)
|
||||
],
|
||||
child: Container(
|
||||
width: double.maxFinite,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
// ignore_for_file: use_build_context_synchronously
|
||||
|
||||
import 'package:adguard_home_manager/models/logs.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/logs/logs_list.dart';
|
||||
import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
|
||||
|
||||
import 'package:adguard_home_manager/models/logs.dart';
|
||||
|
||||
class Logs extends StatefulWidget {
|
||||
const Logs({Key? key}) : super(key: key);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,11 @@ import 'package:percent_indicator/percent_indicator.dart';
|
|||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/domain_options.dart';
|
||||
import 'package:adguard_home_manager/widgets/options_menu.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/constants/enums.dart';
|
||||
import 'package:adguard_home_manager/models/applied_filters.dart';
|
||||
import 'package:adguard_home_manager/providers/logs_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||
import 'package:adguard_home_manager/functions/number_format.dart';
|
||||
|
|
@ -24,7 +23,9 @@ class TopItemsScreen extends StatefulWidget {
|
|||
final bool? isClient;
|
||||
final List<Map<String, dynamic>> data;
|
||||
final bool withProgressBar;
|
||||
final String? unit;
|
||||
final String Function(dynamic) buildValue;
|
||||
final List<MenuOption> menuOptions;
|
||||
final void Function(dynamic)? onTapEntry;
|
||||
|
||||
const TopItemsScreen({
|
||||
super.key,
|
||||
|
|
@ -33,7 +34,9 @@ class TopItemsScreen extends StatefulWidget {
|
|||
this.isClient,
|
||||
required this.data,
|
||||
required this.withProgressBar,
|
||||
this.unit,
|
||||
required this.buildValue,
|
||||
required this.menuOptions,
|
||||
this.onTapEntry,
|
||||
});
|
||||
|
||||
@override
|
||||
|
|
@ -63,7 +66,6 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
|
|||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
final logsProvider = Provider.of<LogsProvider>(context);
|
||||
|
||||
double total = 0;
|
||||
for (var element in data) {
|
||||
|
|
@ -157,44 +159,19 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
|
|||
}
|
||||
}
|
||||
|
||||
return DomainOptions(
|
||||
item: screenData[index].keys.toList()[0],
|
||||
isBlocked: widget.type == HomeTopItems.blockedDomains,
|
||||
isDomain: widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains,
|
||||
onTap: () {
|
||||
if (widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains) {
|
||||
logsProvider.setSearchText(screenData[index].keys.toList()[0]);
|
||||
logsProvider.setSelectedClients(null);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: screenData[index].keys.toList()[0],
|
||||
clients: null
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
else if (widget.type == HomeTopItems.recurrentClients) {
|
||||
logsProvider.setSearchText(null);
|
||||
logsProvider.setSelectedClients([screenData[index].keys.toList()[0]]);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: null,
|
||||
clients: [screenData[index].keys.toList()[0]]
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
},
|
||||
return OptionsMenu(
|
||||
value: screenData[index].keys.toList()[0],
|
||||
options: widget.menuOptions,
|
||||
onTap: widget.onTapEntry != null
|
||||
? (v) {
|
||||
widget.onTapEntry!(v);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
: null,
|
||||
child: CustomListTile(
|
||||
title: screenData[index].keys.toList()[0],
|
||||
trailing: Text(
|
||||
screenData[index].values.toList()[0].runtimeType == double
|
||||
? "${screenData[index].values.toList()[0].toStringAsFixed(2)}${widget.unit != null ? ' ${widget.unit}' : ''}"
|
||||
: "${screenData[index].values.toList()[0].toString()}${widget.unit != null ? ' ${widget.unit}' : ''}",
|
||||
widget.buildValue(screenData[index].values.toList()[0]),
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
),
|
||||
|
|
|
|||
|
|
@ -7,15 +7,13 @@ import 'package:percent_indicator/percent_indicator.dart';
|
|||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/domain_options.dart';
|
||||
import 'package:adguard_home_manager/widgets/options_menu.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/constants/enums.dart';
|
||||
import 'package:adguard_home_manager/models/applied_filters.dart';
|
||||
import 'package:adguard_home_manager/providers/logs_provider.dart';
|
||||
import 'package:adguard_home_manager/functions/number_format.dart';
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
|
||||
class TopItemsModal extends StatefulWidget {
|
||||
final HomeTopItems type;
|
||||
|
|
@ -23,7 +21,9 @@ class TopItemsModal extends StatefulWidget {
|
|||
final bool? isClient;
|
||||
final List<Map<String, dynamic>> data;
|
||||
final bool withProgressBar;
|
||||
final String? unit;
|
||||
final String Function(dynamic) buildValue;
|
||||
final List<MenuOption> options;
|
||||
final void Function(dynamic)? onTapEntry;
|
||||
|
||||
const TopItemsModal({
|
||||
super.key,
|
||||
|
|
@ -32,7 +32,9 @@ class TopItemsModal extends StatefulWidget {
|
|||
this.isClient,
|
||||
required this.data,
|
||||
required this.withProgressBar,
|
||||
this.unit,
|
||||
required this.buildValue,
|
||||
required this.options,
|
||||
this.onTapEntry,
|
||||
});
|
||||
|
||||
@override
|
||||
|
|
@ -61,8 +63,6 @@ class _TopItemsModalState extends State<TopItemsModal> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
final logsProvider = Provider.of<LogsProvider>(context);
|
||||
|
||||
double total = 0;
|
||||
for (var element in data) {
|
||||
|
|
@ -133,44 +133,19 @@ class _TopItemsModalState extends State<TopItemsModal> {
|
|||
}
|
||||
}
|
||||
|
||||
return DomainOptions(
|
||||
isBlocked: widget.type == HomeTopItems.blockedDomains,
|
||||
isDomain: widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains,
|
||||
item: screenData[index].keys.toList()[0],
|
||||
onTap: () {
|
||||
if (widget.type == HomeTopItems.queriedDomains || widget.type == HomeTopItems.blockedDomains) {
|
||||
logsProvider.setSearchText(screenData[index].keys.toList()[0]);
|
||||
logsProvider.setSelectedClients(null);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: screenData[index].keys.toList()[0],
|
||||
clients: null
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
else if (widget.type == HomeTopItems.recurrentClients) {
|
||||
logsProvider.setSearchText(null);
|
||||
logsProvider.setSelectedClients([screenData[index].keys.toList()[0]]);
|
||||
logsProvider.setAppliedFilters(
|
||||
AppliedFiters(
|
||||
selectedResultStatus: 'all',
|
||||
searchText: null,
|
||||
clients: [screenData[index].keys.toList()[0]]
|
||||
)
|
||||
);
|
||||
appConfigProvider.setSelectedScreen(2);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
},
|
||||
return OptionsMenu(
|
||||
options: widget.options,
|
||||
value: screenData[index].keys.toList()[0],
|
||||
onTap: widget.onTapEntry != null
|
||||
? (v) {
|
||||
widget.onTapEntry!(v);
|
||||
Navigator.pop(context);
|
||||
}
|
||||
: null,
|
||||
child: CustomListTile(
|
||||
title: screenData[index].keys.toList()[0],
|
||||
trailing: Text(
|
||||
screenData[index].values.toList()[0].runtimeType == double
|
||||
? "${screenData[index].values.toList()[0].toStringAsFixed(2)}${widget.unit != null ? ' ${widget.unit}' : ''}"
|
||||
: "${screenData[index].values.toList()[0].toString()}${widget.unit != null ? ' ${widget.unit}' : ''}",
|
||||
widget.buildValue(screenData[index].values.toList()[0]),
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,136 +0,0 @@
|
|||
// ignore_for_file: use_build_context_synchronously
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:contextmenu/contextmenu.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.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.dart';
|
||||
|
||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||
|
||||
class DomainOptions extends StatelessWidget {
|
||||
final bool isBlocked;
|
||||
final bool? isDomain;
|
||||
final String? item;
|
||||
final Widget child;
|
||||
final void Function() onTap;
|
||||
final BorderRadius? borderRadius;
|
||||
|
||||
const DomainOptions({
|
||||
super.key,
|
||||
required this.isBlocked,
|
||||
this.isDomain,
|
||||
required this.item,
|
||||
required this.child,
|
||||
required this.onTap,
|
||||
this.borderRadius
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final statusProvider = Provider.of<StatusProvider>(context);
|
||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||
|
||||
void blockUnblock(String domain, String newStatus) async {
|
||||
final ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.savingUserFilters);
|
||||
|
||||
final rules = await statusProvider.blockUnblockDomain(
|
||||
domain: domain,
|
||||
newStatus: newStatus
|
||||
);
|
||||
|
||||
processModal.close();
|
||||
|
||||
if (rules == true) {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated,
|
||||
color: Colors.red
|
||||
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void copyDomainClipboard(String domain) async {
|
||||
await Clipboard.setData(
|
||||
ClipboardData(text: domain)
|
||||
);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.domainCopiedClipboard),
|
||||
backgroundColor: Colors.green,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
List<MenuOption> generateOptions() {
|
||||
return [
|
||||
if (isDomain == true && isBlocked == true) MenuOption(
|
||||
title: AppLocalizations.of(context)!.unblock,
|
||||
icon: Icons.check,
|
||||
action: () => blockUnblock(item!, 'unblock')
|
||||
),
|
||||
if (isDomain == true && isBlocked == false) MenuOption(
|
||||
title: AppLocalizations.of(context)!.block,
|
||||
icon: Icons.block,
|
||||
action: () => blockUnblock(item!, 'block')
|
||||
),
|
||||
MenuOption(
|
||||
title: AppLocalizations.of(context)!.copyClipboard,
|
||||
icon: Icons.copy,
|
||||
action: () => copyDomainClipboard(item!)
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
void openOptionsModal() {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) => OptionsModal(
|
||||
options: generateOptions(),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (item != null) {
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
borderRadius: borderRadius,
|
||||
child: ContextMenuArea(
|
||||
builder: (context) => generateOptions().map((opt) => CustomListTile(
|
||||
title: opt.title,
|
||||
icon: opt.icon,
|
||||
onTap: () {
|
||||
opt.action();
|
||||
Navigator.pop(context);
|
||||
},
|
||||
)).toList(),
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
onLongPress: openOptionsModal,
|
||||
borderRadius: borderRadius,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
else {
|
||||
return child;
|
||||
}
|
||||
}
|
||||
}
|
||||
63
lib/widgets/options_menu.dart
Normal file
63
lib/widgets/options_menu.dart
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
import 'dart:io';
|
||||
|
||||
import 'package:contextmenu/contextmenu.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:adguard_home_manager/widgets/options_modal.dart';
|
||||
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
|
||||
|
||||
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||
|
||||
class OptionsMenu extends StatelessWidget {
|
||||
final Widget child;
|
||||
final List<MenuOption> options;
|
||||
final dynamic value;
|
||||
final BorderRadius? borderRadius;
|
||||
final void Function(dynamic)? onTap;
|
||||
|
||||
const OptionsMenu({
|
||||
super.key,
|
||||
required this.child,
|
||||
required this.options,
|
||||
this.value,
|
||||
this.borderRadius,
|
||||
this.onTap,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
void openOptionsModal() {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) => OptionsModal(
|
||||
options: options,
|
||||
value: value
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: ContextMenuArea(
|
||||
builder: (context) => options.map((opt) => CustomListTile(
|
||||
title: opt.title,
|
||||
icon: opt.icon,
|
||||
onTap: () {
|
||||
opt.action(value);
|
||||
Navigator.pop(context);
|
||||
},
|
||||
)).toList(),
|
||||
child: InkWell(
|
||||
onTap: onTap != null
|
||||
? () => onTap!(value)
|
||||
: null,
|
||||
onLongPress: (Platform.isAndroid || Platform.isIOS)
|
||||
? () => openOptionsModal()
|
||||
: null,
|
||||
borderRadius: borderRadius,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -6,10 +6,12 @@ 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
|
||||
|
|
@ -43,7 +45,7 @@ class OptionsModal extends StatelessWidget {
|
|||
icon: opt.icon,
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
opt.action();
|
||||
opt.action(value);
|
||||
},
|
||||
)).toList()
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue