luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-06-11 08:59:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'beta'

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-07-17 16:08:32 +02:00
commit 6bfa18f7eb
5 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/constants/urls.dart
View file

@ -4,4 +4,5 @@ class Urls {
static const String customRuleDocs = "https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters";
static const String getReleasesGitHub = "https://api.github.com/repos/JGeek00/adguard-home-manager/releases";
static const String adGuardHomeReleasesTags = "https://api.github.com/repos/AdGuardTeam/AdGuardHome/releases/tags";
static const String googleSearchUrl = "https://www.google.com/search";
}

4
lib/l10n/app_en.arb
View file

@ -651,5 +651,7 @@
"december": "December",
"malwarePhising": "Malware/phising",
"queries": "Queries",
"adultSites": "Adult sites"
"adultSites": "Adult sites",
"quickFilters": "Quick filters",
"searchDomainInternet": "Search domain on the Internet"
}

4
lib/l10n/app_es.arb
View file

@ -651,5 +651,7 @@
"december": "Diciembre",
"malwarePhising": "Malware/phising",
"queries": "Peticiones",
"adultSites": "Sitios de adultos"
"adultSites": "Sitios de adultos",
"quickFilters": "Filtros rápidos",
"searchDomainInternet": "Buscar dominio en internet"
}

14
lib/screens/logs/log_details_screen.dart
View file

@ -8,6 +8,8 @@ import 'package:adguard_home_manager/widgets/section_label.dart';
import 'package:adguard_home_manager/screens/logs/log_list_tile.dart';
import 'package:adguard_home_manager/functions/open_url.dart';
import 'package:adguard_home_manager/constants/urls.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
import 'package:adguard_home_manager/functions/get_filtered_status.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
@ -223,7 +225,7 @@ class LogDetailsScreen extends StatelessWidget {
children: [
Row(
children: [
IconButton(
IconButton(
onPressed: () => Navigator.pop(context),
icon: const Icon(Icons.clear_rounded)
),
@ -238,6 +240,11 @@ class LogDetailsScreen extends StatelessWidget {
),
Row(
children: [
IconButton(
onPressed: () => openUrl("${Urls.googleSearchUrl}?q=${log.question.name}"),
icon: const Icon(Icons.travel_explore_rounded),
tooltip: AppLocalizations.of(context)!.searchDomainInternet
),
IconButton(
onPressed: log.question.name != null
? () => blockUnblock(
@ -276,6 +283,11 @@ class LogDetailsScreen extends StatelessWidget {
centerTitle: false,
title: Text(AppLocalizations.of(context)!.logDetails),
actions: [
IconButton(
onPressed: () => openUrl("${Urls.googleSearchUrl}?q=${log.question.name}"),
icon: const Icon(Icons.travel_explore_rounded),
tooltip: AppLocalizations.of(context)!.searchDomainInternet
),
if (statusProvider.filteringStatus != null) IconButton(
onPressed: log.question.name != null
? () => blockUnblock(

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

@ -8,6 +8,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/logs/clients_modal.dart';
import 'package:adguard_home_manager/screens/logs/filter_status_modal.dart';
import 'package:adguard_home_manager/widgets/section_label.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/constants/enums.dart';
@ -219,6 +220,38 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
)
: null,
),
SectionLabel(
label: AppLocalizations.of(context)!.quickFilters,
padding: const EdgeInsets.symmetric(
horizontal: 24,
vertical: 16
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
FilterChip(
selected: logsProvider.selectedResultStatus == "all",
label: Text(AppLocalizations.of(context)!.all),
onSelected: (_) => logsProvider.setSelectedResultStatus("all")
),
FilterChip(
selected: logsProvider.selectedResultStatus == "processed" ||
logsProvider.selectedResultStatus == "whitelisted",
label: Text(AppLocalizations.of(context)!.allowed),
onSelected: (_) => logsProvider.setSelectedResultStatus("processed")
),
FilterChip(
selected: logsProvider.selectedResultStatus == "blocked" ||
logsProvider.selectedResultStatus == "blocked_safebrowsing" ||
logsProvider.selectedResultStatus == "blocked_parental" ||
logsProvider.selectedResultStatus == "safe_search",
label: Text(AppLocalizations.of(context)!.blocked),
onSelected: (_) => logsProvider.setSelectedResultStatus("blocked")
),
],
),
const Padding(padding: EdgeInsets.all(8)),
CustomListTile(
title: AppLocalizations.of(context)!.responseStatus,
subtitle: "${translatedString[logsProvider.selectedResultStatus]}",