Added search clients filter

This commit is contained in:
Juan Gilsanz Polo 2024-02-03 02:38:00 +01:00
parent 2585826a29
commit 5f448f0af0
2 changed files with 316 additions and 227 deletions

View file

@ -11,7 +11,17 @@ import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/providers/clients_provider.dart'; import 'package:adguard_home_manager/providers/clients_provider.dart';
import 'package:adguard_home_manager/providers/logs_provider.dart'; import 'package:adguard_home_manager/providers/logs_provider.dart';
class ClientsModal extends StatelessWidget { class _ClientLog {
final String ip;
final String? name;
const _ClientLog({
required this.ip,
required this.name
});
}
class ClientsModal extends StatefulWidget {
final List<String>? value; final List<String>? value;
final bool dialog; final bool dialog;
@ -22,196 +32,278 @@ class ClientsModal extends StatelessWidget {
}); });
@override @override
Widget build(BuildContext context) { State<ClientsModal> createState() => _ClientsModalState();
final clientsProvider = Provider.of<ClientsProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
if (dialog == true) {
return Dialog(
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 500
),
child: _ModalContent(
selectedClients: logsProvider.selectedClients,
onClientsSelected: (v) => logsProvider.setSelectedClients(v),
)
),
);
}
else {
return ListBottomSheet(
icon: Icons.smartphone_rounded,
title: AppLocalizations.of(context)!.clients,
children: [
Card(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
Icon(
Icons.info_rounded,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
const SizedBox(width: 16),
Flexible(
child: Text(AppLocalizations.of(context)!.selectClientsFiltersInfo)
)
],
),
),
),
CustomCheckboxListTile(
padding: const EdgeInsets.only(
left: 24,
top: 8,
right: 12,
bottom: 8
),
value: logsProvider.selectedClients.length == clientsProvider.clients!.autoClients.length,
onChanged: (v) {
if (v == true) {
logsProvider.setSelectedClients(clientsProvider.clients!.autoClients.map((e) => e.ip).toList());
}
else {
logsProvider.setSelectedClients([]);
}
},
title: AppLocalizations.of(context)!.selectAll
),
ListView.builder(
shrinkWrap: true,
primary: false,
itemCount: clientsProvider.clients!.autoClients.length,
itemBuilder: (context, index) => _ListItem(
label: clientsProvider.clients!.autoClients[index].ip,
checkboxActive: logsProvider.selectedClients.contains(clientsProvider.clients!.autoClients[index].ip),
onChanged: (isSelected) {
if (isSelected == true) {
logsProvider.setSelectedClients([
...logsProvider.selectedClients,
clientsProvider.clients!.autoClients[index].ip
]);
}
else {
logsProvider.setSelectedClients(
logsProvider.selectedClients.where(
(item) => item != clientsProvider.clients!.autoClients[index].ip
).toList()
);
}
}
)
)
]
);
}
}
} }
class _ModalContent extends StatelessWidget { class _ClientsModalState extends State<ClientsModal> {
final List<String> selectedClients; List<_ClientLog> _filteredClients = [];
final void Function(List<String>) onClientsSelected; final _searchController = TextEditingController();
const _ModalContent({ @override
required this.selectedClients, void initState() {
required this.onClientsSelected, final clientsProvider = Provider.of<ClientsProvider>(context, listen: false);
}); final statusProvider = Provider.of<StatusProvider>(context, listen: false);
_filteredClients = clientsProvider.clients!.autoClients.map((e) {
String? name;
try {
name = statusProvider.serverStatus!.clients.firstWhere((c) => c.ids.contains(e.ip)).name;
} catch (e) {
// ---- //
}
return _ClientLog(
ip: e.ip,
name: name
);
}).toList();
super.initState();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final clientsProvider = Provider.of<ClientsProvider>(context); final clientsProvider = Provider.of<ClientsProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context); final logsProvider = Provider.of<LogsProvider>(context);
final statusProvider = Provider.of<StatusProvider>(context);
return Column( void onSearch(String value) {
mainAxisSize: MainAxisSize.min, final filtered = clientsProvider.clients!.autoClients.map((e) {
children: [ String? name;
Padding( try {
padding: const EdgeInsets.all(16), name = statusProvider.serverStatus!.clients.firstWhere((c) => c.ids.contains(e.ip)).name;
child: Row( } catch (e) {
children: [ // ---- //
CloseButton( }
onPressed: () => Navigator.pop(context), return _ClientLog(
), ip: e.ip,
const SizedBox(width: 12), name: name
Text( );
AppLocalizations.of(context)!.clients, }).where(
style: const TextStyle( (c) => c.ip.contains(value.toLowerCase()) || (c.name != null && c.name!.toLowerCase().contains(value.toLowerCase()))
fontSize: 22 ).toList();
), setState(() => _filteredClients = filtered);
) }
],
if (widget.dialog == true) {
return Dialog(
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 500
), ),
), child: Column(
Flexible( mainAxisSize: MainAxisSize.min,
child: ListView(
children: [ children: [
Card( Padding(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), padding: const EdgeInsets.all(16),
child: Padding( child: Row(
padding: const EdgeInsets.all(16), children: [
child: Row( CloseButton(
children: [ onPressed: () => Navigator.pop(context),
Icon( ),
Icons.info_rounded, const SizedBox(width: 12),
color: Theme.of(context).colorScheme.onSurfaceVariant, Text(
AppLocalizations.of(context)!.clients,
style: const TextStyle(
fontSize: 22
), ),
const SizedBox(width: 16), )
Flexible( ],
child: Text(AppLocalizations.of(context)!.selectClientsFiltersInfo) ),
),
Flexible(
child: ListView(
children: [
_SearchField(
controller: _searchController,
onClear: () => setState(() => _searchController.text = ""),
onSearch: onSearch
),
Card(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
Icon(
Icons.info_rounded,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
const SizedBox(width: 16),
Flexible(
child: Text(AppLocalizations.of(context)!.selectClientsFiltersInfo)
)
],
),
),
),
CustomCheckboxListTile(
padding: const EdgeInsets.only(
left: 24,
top: 8,
right: 12,
bottom: 8
),
value: logsProvider.selectedClients.length == clientsProvider.clients!.autoClients.length,
onChanged: (v) {
if (v == true) {
logsProvider.setSelectedClients(clientsProvider.clients!.autoClients.map((e) => e.ip).toList());
}
else {
logsProvider.setSelectedClients([]);
}
},
title: AppLocalizations.of(context)!.selectAll
),
ListView.builder(
primary: false,
shrinkWrap: true,
itemCount: _filteredClients.length,
itemBuilder: (context, index) => _ListItem(
label: _filteredClients[index].ip,
checkboxActive: logsProvider.selectedClients.contains(_filteredClients[index].ip),
onChanged: (isSelected) {
if (isSelected == true) {
logsProvider.setSelectedClients([
...logsProvider.selectedClients,
_filteredClients[index].ip
]);
}
else {
logsProvider.setSelectedClients(
logsProvider.selectedClients.where(
(item) => item != _filteredClients[index].ip
).toList()
);
}
}
) )
], ),
), ],
),
),
CustomCheckboxListTile(
padding: const EdgeInsets.only(
left: 24,
top: 8,
right: 12,
bottom: 8
),
value: logsProvider.selectedClients.length == clientsProvider.clients!.autoClients.length,
onChanged: (v) {
if (v == true) {
logsProvider.setSelectedClients(clientsProvider.clients!.autoClients.map((e) => e.ip).toList());
}
else {
logsProvider.setSelectedClients([]);
}
},
title: AppLocalizations.of(context)!.selectAll
),
ListView.builder(
primary: false,
shrinkWrap: true,
itemCount: clientsProvider.clients!.autoClients.length,
itemBuilder: (context, index) => _ListItem(
label: clientsProvider.clients!.autoClients[index].ip,
checkboxActive: selectedClients.contains(clientsProvider.clients!.autoClients[index].ip),
onChanged: (isSelected) {
if (isSelected == true) {
onClientsSelected([
...selectedClients,
clientsProvider.clients!.autoClients[index].ip
]);
}
else {
onClientsSelected(
selectedClients.where(
(item) => item != clientsProvider.clients!.autoClients[index].ip
).toList()
);
}
}
) )
), ),
if (Platform.isIOS) const SizedBox(height: 16)
], ],
) )
), ),
if (Platform.isIOS) const SizedBox(height: 16) );
], }
else {
return Padding(
padding: MediaQuery.of(context).viewInsets,
child: ListBottomSheet(
icon: Icons.smartphone_rounded,
title: AppLocalizations.of(context)!.clients,
children: [
_SearchField(
controller: _searchController,
onClear: () => setState(() => _searchController.text = ""),
onSearch: onSearch
),
Card(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
Icon(
Icons.info_rounded,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
const SizedBox(width: 16),
Flexible(
child: Text(AppLocalizations.of(context)!.selectClientsFiltersInfo)
)
],
),
),
),
CustomCheckboxListTile(
padding: const EdgeInsets.only(
left: 24,
top: 8,
right: 12,
bottom: 8
),
value: logsProvider.selectedClients.length == clientsProvider.clients!.autoClients.length,
onChanged: (v) {
if (v == true) {
logsProvider.setSelectedClients(clientsProvider.clients!.autoClients.map((e) => e.ip).toList());
}
else {
logsProvider.setSelectedClients([]);
}
},
title: AppLocalizations.of(context)!.selectAll
),
ListView.builder(
shrinkWrap: true,
primary: false,
itemCount: _filteredClients.length,
itemBuilder: (context, index) => _ListItem(
label: _filteredClients[index].ip,
checkboxActive: logsProvider.selectedClients.contains(_filteredClients[index].ip),
onChanged: (isSelected) {
if (isSelected == true) {
logsProvider.setSelectedClients([
...logsProvider.selectedClients,
_filteredClients[index].ip
]);
}
else {
logsProvider.setSelectedClients(
logsProvider.selectedClients.where(
(item) => item != _filteredClients[index].ip
).toList()
);
}
}
)
)
]
),
);
}
}
}
class _SearchField extends StatelessWidget {
final TextEditingController controller;
final void Function(String) onSearch;
final void Function() onClear;
const _SearchField({
required this.controller,
required this.onClear,
required this.onSearch,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: TextFormField(
controller: controller,
onChanged: onSearch,
decoration: InputDecoration(
hintText: AppLocalizations.of(context)!.search,
prefixIcon: const Icon(Icons.search_rounded),
border: InputBorder.none,
filled: true,
fillColor: Colors.grey.withOpacity(0.2),
suffixIcon: controller.text != ""
? IconButton(
onPressed: onClear,
icon: const Icon(
Icons.close_rounded,
size: 20,
),
tooltip: AppLocalizations.of(context)!.clearSearch,
)
: null
),
),
),
); );
} }
} }

View file

@ -20,67 +20,64 @@ class ListBottomSheet extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return DraggableScrollableSheet(
onTap: () => Navigator.of(context).pop(), initialChildSize: initialChildSize ?? 0.6,
child: DraggableScrollableSheet( minChildSize: minChildSize ?? 0.3,
initialChildSize: initialChildSize ?? 0.6, maxChildSize: maxChildSize ?? 1,
minChildSize: minChildSize ?? 0.3, builder: (context, controller) {
maxChildSize: maxChildSize ?? 1, return Container(
builder: (context, controller) { decoration: BoxDecoration(
return Container( color: Theme.of(context).colorScheme.surface,
decoration: BoxDecoration( borderRadius: const BorderRadius.only(
color: Theme.of(context).colorScheme.surface, topLeft: Radius.circular(28),
borderRadius: const BorderRadius.only( topRight: Radius.circular(28),
topLeft: Radius.circular(28),
topRight: Radius.circular(28),
),
), ),
child: SafeArea( ),
child: ListView( child: SafeArea(
controller: controller, child: ListView(
children: [ controller: controller,
Row( children: [
mainAxisAlignment: MainAxisAlignment.center, Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
margin: const EdgeInsets.all(16),
width: 36,
height: 4,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
color: Colors.grey
),
),
],
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(
children: [ children: [
Container( Icon(
margin: const EdgeInsets.all(16), icon,
width: 36, size: 24,
height: 4, color: Theme.of(context).listTileTheme.iconColor
decoration: BoxDecoration( ),
borderRadius: BorderRadius.circular(20), const SizedBox(height: 16),
color: Colors.grey Text(
title,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurface
), ),
), ),
], ],
), ),
Padding( ),
padding: const EdgeInsets.symmetric(vertical: 16), ...children
child: Column( ],
children: [
Icon(
icon,
size: 24,
color: Theme.of(context).listTileTheme.iconColor
),
const SizedBox(height: 16),
Text(
title,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurface
),
),
],
),
),
...children
],
),
), ),
); ),
}, );
), },
); );
} }
} }