From ce9367b29f3c01b4c25013d960c26237f9bb33c1 Mon Sep 17 00:00:00 2001 From: Juan Gilsanz Polo Date: Mon, 10 Oct 2022 01:26:33 +0200 Subject: [PATCH] Moved some files and fixed issue modal access settings --- .../settings/{ => access_settings}/access_settings.dart | 2 +- .../settings/{ => access_settings}/add_client_modal.dart | 4 ++-- lib/screens/settings/{ => access_settings}/clients_list.dart | 2 +- .../settings/{ => server_info}/dns_addresses_modal.dart | 0 lib/screens/settings/{ => server_info}/server_info.dart | 2 +- lib/screens/settings/settings.dart | 4 ++-- lib/screens/settings/theme_modal.dart | 2 +- lib/{screens/settings => widgets}/custom_radio.dart | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename lib/screens/settings/{ => access_settings}/access_settings.dart (98%) rename lib/screens/settings/{ => access_settings}/add_client_modal.dart (99%) rename lib/screens/settings/{ => access_settings}/clients_list.dart (99%) rename lib/screens/settings/{ => server_info}/dns_addresses_modal.dart (100%) rename lib/screens/settings/{ => server_info}/server_info.dart (98%) rename lib/{screens/settings => widgets}/custom_radio.dart (100%) diff --git a/lib/screens/settings/access_settings.dart b/lib/screens/settings/access_settings/access_settings.dart similarity index 98% rename from lib/screens/settings/access_settings.dart rename to lib/screens/settings/access_settings/access_settings.dart index a8496ab..fd3e1dd 100644 --- a/lib/screens/settings/access_settings.dart +++ b/lib/screens/settings/access_settings/access_settings.dart @@ -2,7 +2,7 @@ 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/clients_list.dart'; +import 'package:adguard_home_manager/screens/settings/access_settings/clients_list.dart'; import 'package:adguard_home_manager/services/http_requests.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart'; diff --git a/lib/screens/settings/add_client_modal.dart b/lib/screens/settings/access_settings/add_client_modal.dart similarity index 99% rename from lib/screens/settings/add_client_modal.dart rename to lib/screens/settings/access_settings/add_client_modal.dart index dfad7d1..8e4d569 100644 --- a/lib/screens/settings/add_client_modal.dart +++ b/lib/screens/settings/access_settings/add_client_modal.dart @@ -99,9 +99,9 @@ class _AddClientModalState extends State { Radius.circular(10) ) ), - helperText: widget.type == 'allowed' || widget.type == 'blocked' + helperText: widget.type == 'allowed' || widget.type == 'disallowed' ? AppLocalizations.of(context)!.addClientFieldDescription : null, - labelText: widget.type == 'allowed' || widget.type == 'blocked' + labelText: widget.type == 'allowed' || widget.type == 'disallowed' ? AppLocalizations.of(context)!.clientIdentifier : AppLocalizations.of(context)!.domain, ), diff --git a/lib/screens/settings/clients_list.dart b/lib/screens/settings/access_settings/clients_list.dart similarity index 99% rename from lib/screens/settings/clients_list.dart rename to lib/screens/settings/access_settings/clients_list.dart index 0a00e13..59b74ce 100644 --- a/lib/screens/settings/clients_list.dart +++ b/lib/screens/settings/access_settings/clients_list.dart @@ -5,7 +5,7 @@ import 'package:flutter/rendering.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:adguard_home_manager/screens/settings/add_client_modal.dart'; +import 'package:adguard_home_manager/screens/settings/access_settings/add_client_modal.dart'; import 'package:adguard_home_manager/screens/clients/remove_client_modal.dart'; import 'package:adguard_home_manager/functions/snackbar.dart'; diff --git a/lib/screens/settings/dns_addresses_modal.dart b/lib/screens/settings/server_info/dns_addresses_modal.dart similarity index 100% rename from lib/screens/settings/dns_addresses_modal.dart rename to lib/screens/settings/server_info/dns_addresses_modal.dart diff --git a/lib/screens/settings/server_info.dart b/lib/screens/settings/server_info/server_info.dart similarity index 98% rename from lib/screens/settings/server_info.dart rename to lib/screens/settings/server_info/server_info.dart index 360d881..e443dbc 100644 --- a/lib/screens/settings/server_info.dart +++ b/lib/screens/settings/server_info/server_info.dart @@ -4,7 +4,7 @@ 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/screens/settings/dns_addresses_modal.dart'; +import 'package:adguard_home_manager/screens/settings/server_info/dns_addresses_modal.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart'; import 'package:adguard_home_manager/services/http_requests.dart'; diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart index 4e6660b..66940f2 100644 --- a/lib/screens/settings/settings.dart +++ b/lib/screens/settings/settings.dart @@ -6,8 +6,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; 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/server_info.dart'; -import 'package:adguard_home_manager/screens/settings/access_settings.dart'; +import 'package:adguard_home_manager/screens/settings/server_info/server_info.dart'; +import 'package:adguard_home_manager/screens/settings/access_settings/access_settings.dart'; import 'package:adguard_home_manager/screens/settings/section_label.dart'; import 'package:adguard_home_manager/screens/settings/appbar.dart'; import 'package:adguard_home_manager/screens/servers/servers.dart'; diff --git a/lib/screens/settings/theme_modal.dart b/lib/screens/settings/theme_modal.dart index b984eb1..d0f4b28 100644 --- a/lib/screens/settings/theme_modal.dart +++ b/lib/screens/settings/theme_modal.dart @@ -4,7 +4,7 @@ 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_radio.dart'; +import 'package:adguard_home_manager/widgets/custom_radio.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart'; diff --git a/lib/screens/settings/custom_radio.dart b/lib/widgets/custom_radio.dart similarity index 100% rename from lib/screens/settings/custom_radio.dart rename to lib/widgets/custom_radio.dart