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

Added option to hide charts with zero value

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-04 15:43:16 +02:00
parent 5fc90615f1
commit 786b14e9ba
8 changed files with 223 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/l10n/app_en.arb
View file

@ -162,5 +162,9 @@
"average": "Average",
"blockedFilters": "Blocked by filters",
"malwarePhisingBlocked": "Blocked malware/phising",
"blockedAdultWebsites": "Blocked adult websites"
"blockedAdultWebsites": "Blocked adult websites",
"generalSettings": "General settings",
"generalSettingsDescription": "Various different settings",
"hideZeroValues": "Hide zero values",
"hideZeroValuesDescription": "On homescreen, hide blocks with zero value"
}

6
lib/l10n/app_es.arb
View file

@ -162,5 +162,9 @@
"average": "Promedio",
"blockedFilters": "Bloqueado por filtros",
"malwarePhisingBlocked": "Malware/phising bloqueado",
"blockedAdultWebsites": "Sitios para adultos bloqueados"
"blockedAdultWebsites": "Sitios para adultos bloqueados",
"generalSettings": "Ajustes generales",
"generalSettingsDescription": "Varios ajustes generales",
"hideZeroValues": "Oculta valores a cero",
"hideZeroValuesDescription": "En la pantalla de inicio, oculta bloqueos con valor cero"
}

31
lib/providers/app_config_provider.dart
View file

@ -21,6 +21,8 @@ class AppConfigProvider with ChangeNotifier {
int _overrideSslCheck = 0;
int _hideZeroValues = 0;
PackageInfo? get getAppInfo {
return _appInfo;
}
@ -67,6 +69,10 @@ class AppConfigProvider with ChangeNotifier {
return _overrideSslCheck == 1 ? true : false;
}
bool get hideZeroValues {
return _hideZeroValues == 1 ? true : false;
}
void setDbInstance(Database db) {
_dbInstance = db;
}
@ -105,6 +111,17 @@ class AppConfigProvider with ChangeNotifier {
}
}
Future<bool> setHideZeroValues(bool status) async {
final updated = await _updateSetHideZeroValues(status == true ? 1 : 0);
if (updated == true) {
_hideZeroValues = status == true ? 1 : 0;
notifyListeners();
return true;
}
else {
return false;
}
}
Future<bool> setSelectedTheme(int value) async {
final updated = await _updateThemeDb(value);
@ -144,9 +161,23 @@ class AppConfigProvider with ChangeNotifier {
}
}
Future<bool> _updateSetHideZeroValues(int value) async {
try {
return await _dbInstance!.transaction((txn) async {
await txn.rawUpdate(
'UPDATE appConfig SET hideZeroValues = $value',
);
return true;
});
} catch (e) {
return false;
}
}
void saveFromDb(Database dbInstance, Map<String, dynamic> dbData) {
_selectedTheme = dbData['theme'];
_overrideSslCheck = dbData['overrideSslCheck'];
_hideZeroValues = dbData['hideZeroValues'];
_dbInstance = dbInstance;
notifyListeners();

23
lib/screens/home/chart.dart
View file

@ -1,7 +1,10 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:adguard_home_manager/widgets/line_chart.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
class HomeChart extends StatelessWidget {
final List<int> data;
final String label;
@ -20,6 +23,8 @@ class HomeChart extends StatelessWidget {
@override
Widget build(BuildContext context) {
final appConfigProvider = Provider.of<AppConfigProvider>(context);
bool isEmpty = true;
for (int item in data) {
if (item > 0) {
@ -28,7 +33,10 @@ class HomeChart extends StatelessWidget {
}
}
return Padding(
if (!(appConfigProvider.hideZeroValues == true && isEmpty == true)) {
return Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: Column(
children: [
@ -101,6 +109,19 @@ class HomeChart extends StatelessWidget {
),
],
),
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Divider(
thickness: 1,
),
),
const SizedBox(height: 20),
],
);
}
else {
return const SizedBox();
}
}
}

28
lib/screens/home/home.dart
View file

@ -65,13 +65,6 @@ class Home extends StatelessWidget {
secondaryValue: "${doubleFormat(serversProvider.serverStatus.data!.stats.avgProcessingTime*1000, Platform.localeName)} ms",
color: Colors.blue,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Divider(
thickness: 1,
),
),
const SizedBox(height: 20),
HomeChart(
data: serversProvider.serverStatus.data!.stats.blockedFiltering,
@ -80,13 +73,6 @@ class Home extends StatelessWidget {
secondaryValue: "${doubleFormat((serversProvider.serverStatus.data!.stats.numBlockedFiltering/serversProvider.serverStatus.data!.stats.numDnsQueries)*100, Platform.localeName)}%",
color: Colors.red,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Divider(
thickness: 1,
),
),
const SizedBox(height: 20),
HomeChart(
data: serversProvider.serverStatus.data!.stats.replacedSafebrowsing,
@ -95,13 +81,6 @@ class Home extends StatelessWidget {
secondaryValue: "${doubleFormat((serversProvider.serverStatus.data!.stats.numReplacedSafebrowsing/serversProvider.serverStatus.data!.stats.numDnsQueries)*100, Platform.localeName)}%",
color: Colors.green,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Divider(
thickness: 1,
),
),
const SizedBox(height: 20),
HomeChart(
data: serversProvider.serverStatus.data!.stats.replacedParental,
@ -110,13 +89,6 @@ class Home extends StatelessWidget {
secondaryValue: "${doubleFormat((serversProvider.serverStatus.data!.stats.numReplacedParental/serversProvider.serverStatus.data!.stats.numDnsQueries)*100, Platform.localeName)}%",
color: Colors.orange,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Divider(
thickness: 1,
),
),
const SizedBox(height: 20),
TopItems(
label: AppLocalizations.of(context)!.topQueriedDomains,

65
lib/screens/settings/general_settings.dart Normal file
View file

@ -0,0 +1,65 @@
// ignore_for_file: use_build_context_synchronously
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/settings/custom_list_tile.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
class GeneralSettings extends StatelessWidget {
const GeneralSettings({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
final appConfigProvider = Provider.of<AppConfigProvider>(context);
Future updateHideZeroValues(bool newStatus) async {
final result = await appConfigProvider.setHideZeroValues(newStatus);
if (result == true) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.settingsUpdatedSuccessfully),
backgroundColor: Colors.green,
)
);
}
else {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.cannotUpdateSettings),
backgroundColor: Colors.red,
)
);
}
}
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.generalSettings) ,
),
body: ListView(
children: [
CustomListTile(
leadingIcon: Icons.exposure_zero_rounded,
label: AppLocalizations.of(context)!.hideZeroValues,
description: AppLocalizations.of(context)!.hideZeroValuesDescription,
trailing: Switch(
value: appConfigProvider.hideZeroValues,
onChanged: updateHideZeroValues,
activeColor: Theme.of(context).primaryColor,
),
onTap: () => updateHideZeroValues(!appConfigProvider.hideZeroValues),
padding: const EdgeInsets.only(
top: 10,
bottom: 10,
left: 20,
right: 10
)
),
],
),
);
}
}

16
lib/screens/settings/settings.dart
View file

@ -1,4 +1,3 @@
import 'package:adguard_home_manager/screens/settings/advanced_setings.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -7,7 +6,8 @@ import 'package:adguard_home_manager/screens/settings/theme_modal.dart';
import 'package:adguard_home_manager/screens/settings/custom_list_tile.dart';
import 'package:adguard_home_manager/screens/settings/section_label.dart';
import 'package:adguard_home_manager/screens/servers/servers.dart';
import 'package:adguard_home_manager/screens/app_logs/app_logs.dart';
import 'package:adguard_home_manager/screens/settings/advanced_setings.dart';
import 'package:adguard_home_manager/screens/settings/general_settings.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
@ -79,6 +79,18 @@ class Settings extends StatelessWidget {
),
CustomListTile(
leadingIcon: Icons.settings,
label: AppLocalizations.of(context)!.generalSettings,
description: AppLocalizations.of(context)!.generalSettingsDescription,
onTap: () => {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const GeneralSettings()
)
)
},
),
CustomListTile(
leadingIcon: Icons.build_outlined,
label: AppLocalizations.of(context)!.advancedSettings,
description: AppLocalizations.of(context)!.advancedSetupDescription,
onTap: () => {

21
lib/services/database.dart
View file

@ -15,17 +15,32 @@ Future<Map<String, dynamic>> loadDb() async {
});
}
Future upgradeDbToV3(Database db) async {
await db.execute("ALTER TABLE appConfig ADD COLUMN hideZeroValues NUMERIC");
await db.execute("UPDATE appConfig SET hideZeroValues = 0");
await db.transaction((txn) async{
await txn.rawQuery(
'SELECT * FROM appConfig',
);
});
}
Database db = await openDatabase(
'adguard_home_manager.db',
version: 2,
version: 3,
onCreate: (Database db, int version) async {
await db.execute("CREATE TABLE servers (id TEXT PRIMARY KEY, name TEXT, connectionMethod TEXT, domain TEXT, path TEXT, port INTEGER, user TEXT, password TEXT, defaultServer INTEGER, authToken TEXT)");
await db.execute("CREATE TABLE appConfig (theme NUMERIC, overrideSslCheck NUMERIC)");
await db.execute("INSERT INTO appConfig (theme, overrideSslCheck) VALUES (0, 0)");
await db.execute("CREATE TABLE appConfig (theme NUMERIC, overrideSslCheck NUMERIC, hideZeroValues NUMERIC)");
await db.execute("INSERT INTO appConfig (theme, overrideSslCheck) VALUES (0, 0, 0)");
},
onUpgrade: (Database db, int oldVersion, int newVersion) async {
if (oldVersion == 1) {
await upgradeDbToV2(db);
await upgradeDbToV3(db);
}
if (oldVersion == 2) {
await upgradeDbToV3(db);
}
},
onOpen: (Database db) async {