Added option to block and unblock clients from home screen

This commit is contained in:
Juan Gilsanz Polo 2023-12-17 22:09:13 +01:00
parent 71b870b42f
commit 569ab7d569
16 changed files with 139 additions and 53 deletions

View file

@ -16,7 +16,7 @@ class RowItem extends StatefulWidget {
final bool clients;
final bool showColor;
final String? unit;
final List<MenuOption> options;
final List<MenuOption> Function(dynamic) options;
final void Function(dynamic)? onTapEntry;
const RowItem({

View file

@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/home/top_items/top_items_section.dart';
import 'package:adguard_home_manager/providers/clients_provider.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';
@ -30,6 +31,7 @@ class TopItemsLists extends StatelessWidget {
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
final clientsProvider = Provider.of<ClientsProvider>(context);
List<Widget> bottom = [
Padding(
@ -96,10 +98,53 @@ class TopItemsLists extends StatelessWidget {
}
}
void copyValueClipboard(value) {
void copyValueClipboard(dynamic value) {
copyToClipboard(value: value, successMessage: AppLocalizations.of(context)!.copiedClipboard);
}
void blockUnblockClient(dynamic client) async {
final currentList = clientsProvider.checkClientList(client);
final newList = currentList == AccessSettingsList.allowed || currentList == null
? AccessSettingsList.disallowed
: AccessSettingsList.allowed;
ProcessModal processModal = ProcessModal();
processModal.open(
currentList == AccessSettingsList.allowed || currentList == null
? AppLocalizations.of(context)!.blockingClient
: AppLocalizations.of(context)!.unblockingClient
);
final result = await clientsProvider.addClientList(client, newList);
if (!context.mounted) return;
processModal.close();
if (result.successful == true) {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.clientAddedSuccessfully,
color: Colors.green
);
}
else if (result.successful == false && result.content == 'client_another_list') {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.clientAnotherList,
color: Colors.red
);
}
else {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: newList == AccessSettingsList.allowed || newList == AccessSettingsList.disallowed
? AppLocalizations.of(context)!.clientNotRemoved
: AppLocalizations.of(context)!.domainNotAdded,
color: Colors.red
);
}
}
return Column(
children: order.asMap().entries.map((item) {
switch (item.value) {
@ -113,16 +158,16 @@ class TopItemsLists extends StatelessWidget {
withChart: true,
withProgressBar: true,
buildValue: (v) => v.toString(),
menuOptions: [
menuOptions: (v) => [
MenuOption(
title: AppLocalizations.of(context)!.blockDomain,
icon: Icons.block_rounded,
action: (v) => blockUnblock(domain: v.toString(), newStatus: 'block')
action: () => blockUnblock(domain: v.toString(), newStatus: 'block')
),
MenuOption(
title: AppLocalizations.of(context)!.copyClipboard,
icon: Icons.copy_rounded,
action: copyValueClipboard
action: () => copyValueClipboard(v)
),
],
onTapEntry: (v) => filterDomainLogs(value: v.toString()),
@ -141,16 +186,16 @@ class TopItemsLists extends StatelessWidget {
withChart: true,
withProgressBar: true,
buildValue: (v) => v.toString(),
menuOptions: [
menuOptions: (v) => [
MenuOption(
title: AppLocalizations.of(context)!.unblockDomain,
icon: Icons.check_rounded,
action: (v) => blockUnblock(domain: v, newStatus: 'unblock')
action: () => blockUnblock(domain: v, newStatus: 'unblock')
),
MenuOption(
title: AppLocalizations.of(context)!.copyClipboard,
icon: Icons.copy_rounded,
action: copyValueClipboard
action: () => copyValueClipboard(v)
)
],
onTapEntry: (v) => filterDomainLogs(value: v),
@ -169,12 +214,21 @@ class TopItemsLists extends StatelessWidget {
withChart: true,
withProgressBar: true,
buildValue: (v) => v.toString(),
menuOptions: [
menuOptions: (v) => [
if (clientsProvider.clients?.clientsAllowedBlocked != null) MenuOption(
title: clientsProvider.checkClientList(v) == AccessSettingsList.allowed || clientsProvider.checkClientList(v) == null
? AppLocalizations.of(context)!.blockClient
: AppLocalizations.of(context)!.unblockClient,
icon: clientsProvider.checkClientList(v) == AccessSettingsList.allowed || clientsProvider.checkClientList(v) == null
? Icons.block_rounded
: Icons.check_rounded,
action: () => blockUnblockClient(v)
),
MenuOption(
title: AppLocalizations.of(context)!.copyClipboard,
icon: Icons.copy_rounded,
action: copyValueClipboard
)
action: () => copyValueClipboard(v)
),
],
onTapEntry: (v) => filterClientLogs(value: v),
),
@ -193,11 +247,11 @@ class TopItemsLists extends StatelessWidget {
withChart: true,
withProgressBar: true,
buildValue: (v) => v.toString(),
menuOptions: [
menuOptions: (v) => [
MenuOption(
title: AppLocalizations.of(context)!.copyClipboard,
icon: Icons.copy_rounded,
action: copyValueClipboard
action: () => copyValueClipboard(v)
)
],
),
@ -217,11 +271,11 @@ class TopItemsLists extends StatelessWidget {
withChart: false,
withProgressBar: false,
buildValue: (v) => "${doubleFormat(v*1000, Platform.localeName)} ms",
menuOptions: [
menuOptions: (v) => [
MenuOption(
title: AppLocalizations.of(context)!.copyClipboard,
icon: Icons.copy_rounded,
action: copyValueClipboard
action: () => copyValueClipboard(v)
)
],
),

View file

@ -24,7 +24,7 @@ class TopItemsScreen extends StatefulWidget {
final List<Map<String, dynamic>> data;
final bool withProgressBar;
final String Function(dynamic) buildValue;
final List<MenuOption> options;
final List<MenuOption> Function(dynamic) options;
final void Function(dynamic)? onTapEntry;
final bool isFullscreen;
@ -263,7 +263,7 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
class _Content extends StatelessWidget {
final List<Map<String, dynamic>> screenData;
final bool? isClient;
final List<MenuOption> options;
final List<MenuOption> Function(dynamic) options;
final bool withProgressBar;
final void Function(dynamic)? onTapEntry;
final String Function(dynamic) buildValue;

View file

@ -21,7 +21,7 @@ class TopItemsSection extends StatefulWidget {
final bool withChart;
final bool withProgressBar;
final String Function(dynamic) buildValue;
final List<MenuOption> menuOptions;
final List<MenuOption> Function(dynamic) menuOptions;
final void Function(dynamic)? onTapEntry;
const TopItemsSection({
@ -350,7 +350,7 @@ class _ItemsList extends StatelessWidget {
final HomeTopItems type;
final bool showChart;
final String Function(dynamic) buildValue;
final List<MenuOption> menuOptions;
final List<MenuOption> Function(dynamic) menuOptions;
final void Function(dynamic)? onTapEntry;
const _ItemsList({