luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-16 23:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-04-15 02:19:33 +02:00
parent 743d6358d5
commit 37af353cda
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/clients/added_list.dart
View file

@ -274,7 +274,7 @@ class _AddedListState extends State<AddedList> {
referenceVersion: 'v0.107.28', referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33' referenceVersionBeta: 'v0.108.0-b.33'
) == true ) == true
? widget.data[index].safeSearch!.enabled == true ? widget.data[index].safeSearch != null && widget.data[index].safeSearch!.enabled == true
? appConfigProvider.useThemeColorForStatus == true ? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary ? Theme.of(context).colorScheme.primary
: Colors.green : Colors.green

20
lib/screens/clients/client_screen.dart
View file

@ -54,7 +54,9 @@ class _ClientScreenState extends State<ClientScreen> {
bool? enableSafeBrowsing; bool? enableSafeBrowsing;
bool? enableParentalControl; bool? enableParentalControl;
bool? enableSafeSearch; bool? enableSafeSearch;
SafeSearch safeSearch = SafeSearch( SafeSearch? safeSearch;
final SafeSearch defaultSafeSearch = SafeSearch(
enabled: false, enabled: false,
bing: false, bing: false,
duckduckgo: false, duckduckgo: false,
@ -109,7 +111,7 @@ class _ClientScreenState extends State<ClientScreen> {
enableParentalControl = widget.client!.parentalEnabled; enableParentalControl = widget.client!.parentalEnabled;
enableSafeBrowsing = widget.client!.safebrowsingEnabled; enableSafeBrowsing = widget.client!.safebrowsingEnabled;
if (version == true) { if (version == true) {
safeSearch = widget.client!.safeSearch!; safeSearch = widget.client!.safeSearch;
} }
else { else {
enableSafeSearch = widget.client!.safesearchEnabled ?? false; enableSafeSearch = widget.client!.safesearchEnabled ?? false;
@ -175,7 +177,7 @@ class _ClientScreenState extends State<ClientScreen> {
enableSafeBrowsing = false; enableSafeBrowsing = false;
enableParentalControl = false; enableParentalControl = false;
enableSafeSearch = false; enableSafeSearch = false;
safeSearch.enabled = false; safeSearch = defaultSafeSearch;
}); });
} }
else if (useGlobalSettingsFiltering == false) { else if (useGlobalSettingsFiltering == false) {
@ -186,7 +188,7 @@ class _ClientScreenState extends State<ClientScreen> {
enableSafeBrowsing = null; enableSafeBrowsing = null;
enableParentalControl = null; enableParentalControl = null;
enableSafeSearch = null; enableSafeSearch = null;
safeSearch.enabled = false; safeSearch = null;
}); });
} }
} }
@ -242,7 +244,7 @@ class _ClientScreenState extends State<ClientScreen> {
showDialog( showDialog(
context: context, context: context,
builder: (context) => SafeSearchModal( builder: (context) => SafeSearchModal(
safeSearch: safeSearch, safeSearch: safeSearch ?? defaultSafeSearch,
disabled: !editMode, disabled: !editMode,
onConfirm: (s) => setState(() => safeSearch = s) onConfirm: (s) => setState(() => safeSearch = s)
) )
@ -554,10 +556,14 @@ class _ClientScreenState extends State<ClientScreen> {
padding: const EdgeInsets.only(right: 16), padding: const EdgeInsets.only(right: 16),
child: Icon( child: Icon(
Icons.chevron_right_rounded, Icons.chevron_right_rounded,
color: Theme.of(context).colorScheme.onSurfaceVariant, color: useGlobalSettingsFiltering == true
? Colors.grey
: Theme.of(context).colorScheme.onSurfaceVariant,
), ),
), ),
onTap: openSafeSearchModal, onTap: useGlobalSettingsFiltering == false
? () => openSafeSearchModal()
: null,
), ),
if ( if (
serverVersionIsAhead( serverVersionIsAhead(

2
lib/screens/clients/search_clients.dart
View file

@ -344,7 +344,7 @@ class _SearchClientsWidgetState extends State<SearchClientsWidget> {
referenceVersion: 'v0.107.28', referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33' referenceVersionBeta: 'v0.108.0-b.33'
) == true ) == true
? clientsScreen[index].safeSearch!.enabled == true ? clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true
? appConfigProvider.useThemeColorForStatus == true ? appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).colorScheme.primary ? Theme.of(context).colorScheme.primary
: Colors.green : Colors.green