mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-06-10 16:39:39 +00:00
Fixed most of the warnings
This commit is contained in:
parent
715ca0ab3f
commit
f7c3ba0374
87 changed files with 252 additions and 250 deletions
|
@ -42,14 +42,14 @@ class AddFiltersButton extends StatelessWidget {
|
|||
|
||||
if (!context.mounted) return;
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.ruleAddedSuccessfully,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.ruleNotAdded,
|
||||
color: Colors.red
|
||||
|
@ -67,14 +67,14 @@ class AddFiltersButton extends StatelessWidget {
|
|||
|
||||
if (!context.mounted) return;
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.customRulesUpdatedSuccessfully,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.customRulesNotUpdated,
|
||||
color: Colors.red
|
||||
|
@ -146,28 +146,28 @@ class AddFiltersButton extends StatelessWidget {
|
|||
|
||||
if (!context.mounted) return;
|
||||
if (result['success'] == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: "${AppLocalizations.of(context)!.listAdded} ${result['data']}.",
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else if (result['success'] == false && result['error'] == 'invalid_url') {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listUrlInvalid,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
else if (result['success'] == false && result['error'] == 'url_exists') {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listAlreadyAdded,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listNotAdded,
|
||||
color: Colors.red
|
||||
|
|
|
@ -163,7 +163,7 @@ class _CustomRulesListState extends State<CustomRulesList> {
|
|||
onPressed: () async {
|
||||
final result = await filteringProvider.fetchFilters();
|
||||
if (result == false) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.errorLoadFilters,
|
||||
color: Colors.red
|
||||
|
@ -203,7 +203,7 @@ class _CustomRulesListState extends State<CustomRulesList> {
|
|||
onRefresh: () async {
|
||||
final result = await filteringProvider.fetchFilters();
|
||||
if (result == false) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.errorLoadFilters,
|
||||
color: Colors.red
|
||||
|
|
|
@ -94,14 +94,14 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
|||
);
|
||||
processModal.close();
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||
color: Colors.red
|
||||
|
@ -175,6 +175,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
|||
_Content(
|
||||
isDialog: widget.dialog,
|
||||
list: list,
|
||||
type: widget.type,
|
||||
)
|
||||
],
|
||||
),
|
||||
|
@ -216,6 +217,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
|||
_Content(
|
||||
isDialog: widget.dialog,
|
||||
list: list,
|
||||
type: widget.type,
|
||||
)
|
||||
],
|
||||
),
|
||||
|
@ -261,10 +263,12 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
|
|||
class _Content extends StatelessWidget {
|
||||
final Filter list;
|
||||
final bool isDialog;
|
||||
final String type;
|
||||
|
||||
const _Content({
|
||||
required this.list,
|
||||
required this.isDialog
|
||||
required this.isDialog,
|
||||
required this.type,
|
||||
});
|
||||
|
||||
@override
|
||||
|
@ -339,7 +343,7 @@ class _Content extends StatelessWidget {
|
|||
CustomListTile(
|
||||
icon: Icons.shield_rounded,
|
||||
title: AppLocalizations.of(context)!.listType,
|
||||
subtitle: isDialog == 'whitelist'
|
||||
subtitle: type == 'whitelist'
|
||||
? AppLocalizations.of(context)!.whitelist
|
||||
: AppLocalizations.of(context)!.blacklist,
|
||||
padding: isDialog == true
|
||||
|
@ -431,7 +435,7 @@ class _Actions extends StatelessWidget {
|
|||
);
|
||||
processModal.close();
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listDeleted,
|
||||
color: Colors.green
|
||||
|
@ -439,7 +443,7 @@ class _Actions extends StatelessWidget {
|
|||
Navigator.pop(context);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listNotDeleted,
|
||||
color: Colors.red
|
||||
|
|
|
@ -24,7 +24,7 @@ import 'package:adguard_home_manager/constants/enums.dart';
|
|||
import 'package:adguard_home_manager/models/clients.dart';
|
||||
|
||||
class Filters extends StatefulWidget {
|
||||
const Filters({Key? key}) : super(key: key);
|
||||
const Filters({super.key});
|
||||
|
||||
@override
|
||||
State<Filters> createState() => _FiltersState();
|
||||
|
@ -57,14 +57,14 @@ class _FiltersState extends State<Filters> {
|
|||
if (!mounted) return;
|
||||
processModal.close();
|
||||
if (result['success'] == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: "${result['data']['updated']} ${AppLocalizations.of(context)!.listsUpdated}",
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listsNotUpdated,
|
||||
color: Colors.red
|
||||
|
@ -109,14 +109,14 @@ class _FiltersState extends State<Filters> {
|
|||
processModal.close();
|
||||
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.filteringStatusUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.filteringStatusNotUpdated,
|
||||
color: Colors.red
|
||||
|
@ -133,14 +133,14 @@ class _FiltersState extends State<Filters> {
|
|||
processModal.close();
|
||||
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.updateFrequencyChanged,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.updateFrequencyNotChanged,
|
||||
color: Colors.red
|
||||
|
@ -163,14 +163,14 @@ class _FiltersState extends State<Filters> {
|
|||
processModal.close();
|
||||
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.ruleRemovedSuccessfully,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.ruleNotRemoved,
|
||||
color: Colors.red
|
||||
|
|
|
@ -27,13 +27,13 @@ class FiltersList extends StatefulWidget {
|
|||
final void Function(Filter, String) onOpenDetailsScreen;
|
||||
|
||||
const FiltersList({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.loadStatus,
|
||||
required this.scrollController,
|
||||
required this.data,
|
||||
required this.type,
|
||||
required this.onOpenDetailsScreen
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
State<FiltersList> createState() => _FiltersListState();
|
||||
|
@ -133,7 +133,7 @@ class _FiltersListState extends State<FiltersList> {
|
|||
onPressed: () async {
|
||||
final result = await filteringProvider.fetchFilters();
|
||||
if (result == false && mounted) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.errorLoadFilters,
|
||||
color: Colors.red
|
||||
|
@ -173,7 +173,7 @@ class _FiltersListState extends State<FiltersList> {
|
|||
onRefresh: () async {
|
||||
final result = await filteringProvider.fetchFilters();
|
||||
if (result == false && mounted) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.errorLoadFilters,
|
||||
color: Colors.red
|
||||
|
|
|
@ -84,7 +84,7 @@ class FiltersTripleColumn extends StatelessWidget {
|
|||
onPressed: () async {
|
||||
final result = await filteringProvider.fetchFilters();
|
||||
if (result == false && context.mounted) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.errorLoadFilters,
|
||||
color: Colors.red
|
||||
|
|
|
@ -59,14 +59,14 @@ class ListOptionsMenu extends StatelessWidget {
|
|||
|
||||
if (!context.mounted) return;
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listDataUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.listDataNotUpdated,
|
||||
color: Colors.red
|
||||
|
|
|
@ -68,14 +68,14 @@ class _BlockedServicesScreenStateWidget extends State<BlockedServicesScreen> {
|
|||
processModal.close();
|
||||
|
||||
if (result == true) {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesUpdated,
|
||||
color: Colors.green
|
||||
);
|
||||
}
|
||||
else {
|
||||
showSnacbkar(
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.blockedServicesNotUpdated,
|
||||
color: Colors.red
|
||||
|
|
|
@ -5,9 +5,9 @@ class RemoveCustomRule extends StatelessWidget {
|
|||
final void Function() onConfirm;
|
||||
|
||||
const RemoveCustomRule({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.onConfirm
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
|
|
@ -235,10 +235,10 @@ class _Content extends StatelessWidget {
|
|||
}
|
||||
: null,
|
||||
style: ButtonStyle(
|
||||
overlayColor: MaterialStateProperty.all(
|
||||
overlayColor: WidgetStateProperty.all(
|
||||
Theme.of(context).colorScheme.primary.withOpacity(0.1)
|
||||
),
|
||||
foregroundColor: MaterialStateProperty.all(
|
||||
foregroundColor: WidgetStateProperty.all(
|
||||
selectedOption != null
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Colors.grey,
|
||||
|
|
|
@ -9,11 +9,11 @@ class DeleteSelectionModal extends StatefulWidget {
|
|||
final void Function() onDelete;
|
||||
|
||||
const DeleteSelectionModal({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.selectedBlacklists,
|
||||
required this.selectedWhitelists,
|
||||
required this.onDelete,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
State<DeleteSelectionModal> createState() => _DeleteSelectionModalState();
|
||||
|
|
|
@ -9,11 +9,11 @@ class EnableDisableSelectionModal extends StatefulWidget {
|
|||
final void Function() onDelete;
|
||||
|
||||
const EnableDisableSelectionModal({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.selectedBlacklists,
|
||||
required this.selectedWhitelists,
|
||||
required this.onDelete,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
State<EnableDisableSelectionModal> createState() => _EnableDisableSelectionModalState();
|
||||
|
|
|
@ -13,13 +13,13 @@ class SelectionList extends StatelessWidget {
|
|||
final void Function() unselectAll;
|
||||
|
||||
const SelectionList({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.lists,
|
||||
required this.selectedLists,
|
||||
required this.onSelect,
|
||||
required this.selectAll,
|
||||
required this.unselectAll,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
@ -231,11 +231,10 @@ class _CheckboxTile extends StatelessWidget {
|
|||
final bool isSelected;
|
||||
|
||||
const _CheckboxTile({
|
||||
Key? key,
|
||||
required this.list,
|
||||
required this.onSelect,
|
||||
required this.isSelected,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
|
|
@ -82,8 +82,8 @@ class _SelectionScreenState extends State<SelectionScreen> with TickerProviderSt
|
|||
blacklists: _selectedBlacklists,
|
||||
whitelists: _selectedWhitelists
|
||||
);
|
||||
if (!mounted) return;
|
||||
processModal.close();
|
||||
if (!context.mounted) return;
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (ctx) => SelectionResultModal(
|
||||
|
@ -113,8 +113,8 @@ class _SelectionScreenState extends State<SelectionScreen> with TickerProviderSt
|
|||
blacklists: _selectedBlacklists,
|
||||
whitelists: _selectedWhitelists
|
||||
);
|
||||
if (!mounted) return;
|
||||
processModal.close();
|
||||
if (!context.mounted) return;
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (ctx) => SelectionResultModal(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue