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

Changed green and red with theme color and grey

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-26 16:51:39 +02:00
parent 6b593dc195
commit 5e30ac4986
11 changed files with 134 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/settings/encryption/encryption.dart
View file

@ -542,7 +542,7 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
builder: (context) => EncryptionErrorModal(error: validDataError!)
)
} : null,
icon: generateStatus(localValidationValid, dataValidApi),
icon: generateStatus(context, appConfigProvider, localValidationValid, dataValidApi),
tooltip: generateStatusString(context, localValidationValid, dataValidApi)
),
IconButton(

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

@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
String? validateDomain(BuildContext context, String domain) {
RegExp regExp = RegExp(r'^([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+$');
if (regExp.hasMatch(domain)) {
@ -50,7 +52,7 @@ String? validatePath(BuildContext context, String cert) {
}
}
Widget generateStatus(bool localValidation, int dataValidApi) {
Widget generateStatus(BuildContext context, AppConfigProvider appConfigProvider, bool localValidation, int dataValidApi) {
if (localValidation == true) {
if (dataValidApi == 0) {
return const SizedBox(
@ -62,15 +64,19 @@ Widget generateStatus(bool localValidation, int dataValidApi) {
);
}
else if (dataValidApi == 1) {
return const Icon(
return Icon(
Icons.check_circle_rounded,
color: Colors.green,
color: appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).primaryColor
: Colors.green,
);
}
else if (dataValidApi == 2) {
return const Icon(
return Icon(
Icons.cancel_rounded,
color: Colors.red,
color: appConfigProvider.useThemeColorForStatus == true
? Theme.of(context).listTileTheme.iconColor
: Colors.red,
);
}
else {