luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-20 22:09:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added log filtering by response status

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-02 05:32:24 +02:00
parent a5ba156e95
commit 97a25fb8e9
8 changed files with 283 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/config/theme.dart
View file

@ -71,6 +71,11 @@ ThemeData lightTheme(ColorScheme? dynamicColorScheme) => ThemeData(
)
)
),
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.all(
dynamicColorScheme != null ? dynamicColorScheme.primary : primaryColor
),
),
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
);
@ -138,6 +143,11 @@ ThemeData darkTheme(ColorScheme? dynamicColorScheme) => ThemeData(
)
)
),
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.all(
dynamicColorScheme != null ? dynamicColorScheme.primary : primaryColor
),
),
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
);
@ -220,7 +230,9 @@ ThemeData lightThemeOldVersions() => ThemeData(
color: primaryColor
),
indicatorColor: primaryColor,
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.all(primaryColor),
),
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
);
@ -310,5 +322,8 @@ ThemeData darkThemeOldVersions() => ThemeData(
color: primaryColor
),
indicatorColor: primaryColor,
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.all(primaryColor),
),
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
);

7
lib/l10n/app_en.arb
View file

@ -149,5 +149,10 @@
"notSelected": "Not selected",
"resetFilters": "Reset filters",
"noLogsDisplay": "No logs to display",
"noLogsThatOld": "It's possible that there are no logs saved for that selected time. Try selecting a more recent time."
"noLogsThatOld": "It's possible that there are no logs saved for that selected time. Try selecting a more recent time.",
"apply": "Apply",
"selectAll": "Select all",
"unselectAll": "Unselect all",
"all": "All",
"filtered": "Filtered"
}

7
lib/l10n/app_es.arb
View file

@ -149,5 +149,10 @@
"notSelected": "No seleccionado",
"resetFilters": "Resetear filtros",
"noLogsDisplay": "No hay registros para mostrar",
"noLogsThatOld": "Es posible que no haya registros guardados para ese tiempo seleccionado. Prueba a seleccionar un tiempo más reciente."
"noLogsThatOld": "Es posible que no haya registros guardados para ese tiempo seleccionado. Prueba a seleccionar un tiempo más reciente.",
"apply": "Aplicar",
"selectAll": "Seleccionar todo",
"unselectAll": "Deseleccionar todo",
"all": "Todas",
"filtered": "Filtrada"
}

12
lib/providers/logs_provider.dart
View file

@ -6,6 +6,7 @@ class LogsProvider with ChangeNotifier {
LogsData? _logsData;
DateTime? _logsOlderThan;
String _selectedResultStatus = 'all';
int _logsQuantity = 100;
int _offset = 0;
@ -22,6 +23,10 @@ class LogsProvider with ChangeNotifier {
return _logsOlderThan;
}
String get selectedResultStatus {
return _selectedResultStatus;
}
int get logsQuantity {
return _logsQuantity;
}
@ -30,6 +35,7 @@ class LogsProvider with ChangeNotifier {
return _offset;
}
void setLoadStatus(int value) {
_loadStatus = value;
notifyListeners();
@ -48,6 +54,7 @@ class LogsProvider with ChangeNotifier {
void resetFilters() {
_logsOlderThan = null;
_offset = 0;
_selectedResultStatus = 'all';
notifyListeners();
}
@ -59,4 +66,9 @@ class LogsProvider with ChangeNotifier {
void setOffset(int value) {
_offset = value;
}
void setSelectedResultStatus(String value) {
_selectedResultStatus = value;
notifyListeners();
}
}

208
lib/screens/logs/filter_status_modal.dart Normal file
View file

@ -0,0 +1,208 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/providers/logs_provider.dart';
class FilterStatusModal extends StatefulWidget {
final String value;
const FilterStatusModal({
Key? key,
required this.value
}) : super(key: key);
@override
State<FilterStatusModal> createState() => _FilterStatusModalState();
}
class _FilterStatusModalState extends State<FilterStatusModal> {
String selectedResultStatus = 'all';
@override
void initState() {
setState(() => selectedResultStatus = widget.value);
super.initState();
}
@override
Widget build(BuildContext context) {
final logsProvider = Provider.of<LogsProvider>(context);
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
void apply() async {
logsProvider.setLoadStatus(0);
logsProvider.setSelectedResultStatus(selectedResultStatus);
Navigator.pop(context);
final result = await getLogs(
server: serversProvider.selectedServer!,
count: logsProvider.logsQuantity,
responseStatus: selectedResultStatus
);
if (result['result'] == 'success') {
logsProvider.setLogsData(result['data']);
logsProvider.setLoadStatus(1);
}
else {
appConfigProvider.addLog(result['log']);
logsProvider.setLoadStatus(2);
}
}
Widget filterStatusListItem({
required String id,
required IconData icon,
required String label,
required void Function(String?) onChanged
}) {
return Material(
color: Colors.transparent,
child: InkWell(
onTap: () => onChanged(id),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 5),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Icon(
icon,
size: 24,
color: Colors.grey,
),
const SizedBox(width: 20),
Text(
label,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500
),
)
],
),
Radio(
value: id,
groupValue: selectedResultStatus,
onChanged: onChanged
)
],
),
),
),
);
}
return DraggableScrollableSheet(
initialChildSize: 0.7,
minChildSize: 0.2,
maxChildSize: 0.7,
builder: (context, scrollController) => Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(28),
topRight: Radius.circular(28)
),
color: Theme.of(context).dialogBackgroundColor
),
child: Column(
children: [
const Padding(
padding: EdgeInsets.only(
top: 24,
bottom: 20,
),
child: Icon(
Icons.shield_rounded,
size: 26,
),
),
Text(
AppLocalizations.of(context)!.responseStatus,
style: const TextStyle(
fontSize: 24
),
),
const SizedBox(height: 20),
Expanded(
child: ListView(
controller: scrollController,
children: [
filterStatusListItem(
id: "all",
icon: Icons.shield_rounded,
label: AppLocalizations.of(context)!.all,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "filtered",
icon: Icons.shield_rounded,
label: AppLocalizations.of(context)!.filtered,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "processed",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processed,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "whitelisted",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processedWhitelist,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blocked,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_safebrowsing",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeBrowsing,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_parental",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedParental,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "safe_search",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeSearch,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
],
),
),
Padding(
padding: const EdgeInsets.all(20),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: apply,
child: Text(AppLocalizations.of(context)!.apply)
)
],
),
)
],
),
),
);
}
}

31
lib/screens/logs/logs_filters_modal.dart
View file

@ -4,6 +4,7 @@ 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/logs/filter_status_modal.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
@ -19,6 +20,17 @@ class LogsFiltersModal extends StatelessWidget {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final Map<String, String> translatedString = {
"all": AppLocalizations.of(context)!.all,
"filtered": AppLocalizations.of(context)!.filtered,
"processed": AppLocalizations.of(context)!.processed,
"whitelisted": AppLocalizations.of(context)!.processedWhitelist,
"blocked": AppLocalizations.of(context)!.blocked,
"blocked_safebrowsing": AppLocalizations.of(context)!.blockedSafeBrowsing,
"blocked_parental": AppLocalizations.of(context)!.blockedParental,
"safe_search": AppLocalizations.of(context)!.safeSearch,
};
void selectTime() async {
DateTime now = DateTime.now();
DateTime? dateValue = await showDatePicker(
@ -86,6 +98,17 @@ class LogsFiltersModal extends StatelessWidget {
}
}
void openSelectFilterStatus() {
showModalBottomSheet(
context: context,
builder: (context) => FilterStatusModal(
value: logsProvider.selectedResultStatus,
),
isScrollControlled: true,
backgroundColor: Colors.transparent
);
}
return Container(
height: 350,
decoration: BoxDecoration(
@ -162,7 +185,7 @@ class LogsFiltersModal extends StatelessWidget {
Material(
color: Colors.transparent,
child: InkWell(
onTap: () => {},
onTap: openSelectFilterStatus,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
child: Row(
@ -184,9 +207,9 @@ class LogsFiltersModal extends StatelessWidget {
),
),
const SizedBox(height: 5),
const Text(
"12/12/2000",
style: TextStyle(
Text(
"${translatedString[logsProvider.selectedResultStatus]}",
style: const TextStyle(
fontSize: 14,
color: Colors.grey
),

3
lib/services/http_requests.dart
View file

@ -365,9 +365,10 @@ Future getLogs({
required int count,
int? offset,
DateTime? olderThan,
String? responseStatus,
}) async {
final result = await getRequest(
urlPath: '/querylog?limit=$count${offset != null ? '&offset=$offset' : ''}${olderThan != null ? '&older_than=${olderThan.toIso8601String()}' : ''}',
urlPath: '/querylog?limit=$count${offset != null ? '&offset=$offset' : ''}${olderThan != null ? '&older_than=${olderThan.toIso8601String()}' : ''}${responseStatus != null ? '&response_status=$responseStatus' : ''}',
server: server
);

6
lib/widgets/bottom_nav_bar.dart
View file

@ -2,6 +2,7 @@ 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/logs_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/models/app_screen.dart';
@ -20,6 +21,7 @@ class BottomNavBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
String translatedName(String key) {
switch (key) {
@ -54,6 +56,10 @@ class BottomNavBar extends StatelessWidget {
if (value != 1) {
appConfigProvider.setSelectedClientsTab(0);
}
// Reset logs filters when changing screen
if (value != 2) {
logsProvider.resetFilters();
}
onSelect(value);
},
);