diff --git a/lib/core/cloud/linksys_cloud_repository.dart b/lib/core/cloud/linksys_cloud_repository.dart index 61abfe7dd..860d6a0aa 100644 --- a/lib/core/cloud/linksys_cloud_repository.dart +++ b/lib/core/cloud/linksys_cloud_repository.dart @@ -24,9 +24,9 @@ import 'package:privacy_gui/core/cloud/model/cloud_communication_method.dart'; import 'package:privacy_gui/core/cloud/model/cloud_network_model.dart'; import 'package:privacy_gui/core/cloud/model/cloud_session_model.dart'; import 'package:privacy_gui/providers/connectivity/_connectivity.dart'; -import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart' - if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart'; +import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart' + if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart'; final cloudRepositoryProvider = Provider((ref) => LinksysCloudRepository( httpClient: LinksysHttpClient(getHost: () { diff --git a/lib/core/cloud/linksys_device_cloud_service.dart b/lib/core/cloud/linksys_device_cloud_service.dart index d83609dfd..7f783d5d9 100644 --- a/lib/core/cloud/linksys_device_cloud_service.dart +++ b/lib/core/cloud/linksys_device_cloud_service.dart @@ -8,14 +8,14 @@ import 'package:privacy_gui/core/cloud/linksys_requests/cloud2_service.dart'; import 'package:privacy_gui/core/cloud/linksys_requests/guardians_remote_assistance_service.dart'; import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart'; import 'package:privacy_gui/core/http/linksys_http_client.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/providers/connectivity/connectivity_info.dart'; import 'package:privacy_gui/providers/connectivity/connectivity_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart' - if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart'; +import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart' + if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart'; final deviceCloudServiceProvider = Provider((ref) => DeviceCloudService( httpClient: LinksysHttpClient(getHost: () { diff --git a/lib/core/cloud/providers/geolocation/geolocation_provider.dart b/lib/core/cloud/providers/geolocation/geolocation_provider.dart index 194a1f529..728b8348a 100644 --- a/lib/core/cloud/providers/geolocation/geolocation_provider.dart +++ b/lib/core/cloud/providers/geolocation/geolocation_provider.dart @@ -2,8 +2,8 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/cloud/linksys_device_cloud_service.dart'; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/providers/app_settings/app_settings_provider.dart'; diff --git a/lib/core/cloud/providers/remote_assistance/remote_client_provider.dart b/lib/core/cloud/providers/remote_assistance/remote_client_provider.dart index a7495b14f..2e0dedffc 100644 --- a/lib/core/cloud/providers/remote_assistance/remote_client_provider.dart +++ b/lib/core/cloud/providers/remote_assistance/remote_client_provider.dart @@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/cloud/linksys_device_cloud_service.dart'; import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart'; import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/utils/logger.dart'; final remoteClientProvider = diff --git a/lib/core/jnap/providers/dashboard_manager_provider.dart b/lib/core/data/providers/dashboard_manager_provider.dart similarity index 91% rename from lib/core/jnap/providers/dashboard_manager_provider.dart rename to lib/core/data/providers/dashboard_manager_provider.dart index e552bda11..886a67f8a 100644 --- a/lib/core/jnap/providers/dashboard_manager_provider.dart +++ b/lib/core/data/providers/dashboard_manager_provider.dart @@ -1,9 +1,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/constants/_constants.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/services/dashboard_manager_service.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/services/dashboard_manager_service.dart'; import 'package:privacy_gui/core/utils/bench_mark.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/core/jnap/providers/dashboard_manager_state.dart b/lib/core/data/providers/dashboard_manager_state.dart similarity index 100% rename from lib/core/jnap/providers/dashboard_manager_state.dart rename to lib/core/data/providers/dashboard_manager_state.dart diff --git a/lib/core/jnap/providers/device_manager_provider.dart b/lib/core/data/providers/device_manager_provider.dart similarity index 96% rename from lib/core/jnap/providers/device_manager_provider.dart rename to lib/core/data/providers/device_manager_provider.dart index 01830a9b1..2bfa2d9bc 100644 --- a/lib/core/jnap/providers/device_manager_provider.dart +++ b/lib/core/data/providers/device_manager_provider.dart @@ -1,8 +1,8 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/services/device_manager_service.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/services/device_manager_service.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_device_category.dart'; diff --git a/lib/core/jnap/providers/device_manager_state.dart b/lib/core/data/providers/device_manager_state.dart similarity index 100% rename from lib/core/jnap/providers/device_manager_state.dart rename to lib/core/data/providers/device_manager_state.dart diff --git a/lib/core/jnap/providers/firmware_update_provider.dart b/lib/core/data/providers/firmware_update_provider.dart similarity index 96% rename from lib/core/jnap/providers/firmware_update_provider.dart rename to lib/core/data/providers/firmware_update_provider.dart index 81c8b378d..3dfad1c93 100644 --- a/lib/core/jnap/providers/firmware_update_provider.dart +++ b/lib/core/data/providers/firmware_update_provider.dart @@ -3,10 +3,10 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; -import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart'; +import 'package:privacy_gui/core/data/services/firmware_update_service.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart'; diff --git a/lib/core/jnap/providers/firmware_update_state.dart b/lib/core/data/providers/firmware_update_state.dart similarity index 100% rename from lib/core/jnap/providers/firmware_update_state.dart rename to lib/core/data/providers/firmware_update_state.dart diff --git a/lib/core/jnap/providers/node_wan_status_provider.dart b/lib/core/data/providers/node_internet_status_provider.dart similarity index 95% rename from lib/core/jnap/providers/node_wan_status_provider.dart rename to lib/core/data/providers/node_internet_status_provider.dart index ceda72414..53a48b0a7 100644 --- a/lib/core/jnap/providers/node_wan_status_provider.dart +++ b/lib/core/data/providers/node_internet_status_provider.dart @@ -1,7 +1,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/utils/logger.dart'; diff --git a/lib/core/jnap/providers/polling_provider.dart b/lib/core/data/providers/polling_provider.dart similarity index 97% rename from lib/core/jnap/providers/polling_provider.dart rename to lib/core/data/providers/polling_provider.dart index 328d2fbf9..b73a117ce 100644 --- a/lib/core/jnap/providers/polling_provider.dart +++ b/lib/core/data/providers/polling_provider.dart @@ -5,9 +5,9 @@ import 'package:privacy_gui/constants/build_config.dart'; import 'package:privacy_gui/core/cache/linksys_cache_manager.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; -import 'package:privacy_gui/core/jnap/services/polling_service.dart'; +import 'package:privacy_gui/core/data/services/polling_service.dart'; import 'package:privacy_gui/core/utils/bench_mark.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/health_check/providers/health_check_provider.dart'; diff --git a/lib/core/jnap/providers/side_effect_provider.dart b/lib/core/data/providers/side_effect_provider.dart similarity index 98% rename from lib/core/jnap/providers/side_effect_provider.dart rename to lib/core/data/providers/side_effect_provider.dart index 47b0711f0..2ff7c7957 100644 --- a/lib/core/jnap/providers/side_effect_provider.dart +++ b/lib/core/data/providers/side_effect_provider.dart @@ -17,7 +17,7 @@ // dependency. // // 3. Design Rationale -// Located in `lib/core/jnap/providers/`, this component is explicitly part +// Located in `lib/core/data/providers/`, this component is explicitly part // of the JNAP infrastructure, not a feature provider in `lib/page/`. // Its responsibility is to handle JNAP operation side effects, which // inherently belongs to the Data Layer. @@ -27,7 +27,7 @@ import 'package:equatable/equatable.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:privacy_gui/constants/_constants.dart'; diff --git a/lib/core/jnap/services/dashboard_manager_service.dart b/lib/core/data/services/dashboard_manager_service.dart similarity index 98% rename from lib/core/jnap/services/dashboard_manager_service.dart rename to lib/core/data/services/dashboard_manager_service.dart index 3fadca873..85b504ef6 100644 --- a/lib/core/jnap/services/dashboard_manager_service.dart +++ b/lib/core/data/services/dashboard_manager_service.dart @@ -6,8 +6,8 @@ import 'package:privacy_gui/core/jnap/models/device_info.dart'; import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; import 'package:privacy_gui/core/jnap/models/soft_sku_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; diff --git a/lib/core/jnap/services/device_manager_service.dart b/lib/core/data/services/device_manager_service.dart similarity index 99% rename from lib/core/jnap/services/device_manager_service.dart rename to lib/core/data/services/device_manager_service.dart index 37a3c9b0e..ffb14e54c 100644 --- a/lib/core/jnap/services/device_manager_service.dart +++ b/lib/core/data/services/device_manager_service.dart @@ -12,8 +12,8 @@ import 'package:privacy_gui/core/jnap/models/node_wireless_connection.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; import 'package:privacy_gui/core/jnap/models/wirless_connection.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/core/jnap/services/firmware_update_service.dart b/lib/core/data/services/firmware_update_service.dart similarity index 98% rename from lib/core/jnap/services/firmware_update_service.dart rename to lib/core/data/services/firmware_update_service.dart index 668ec0a88..026ff40f5 100644 --- a/lib/core/jnap/services/firmware_update_service.dart +++ b/lib/core/data/services/firmware_update_service.dart @@ -11,8 +11,8 @@ import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status_nodes.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/bench_mark.dart'; diff --git a/lib/core/jnap/services/polling_service.dart b/lib/core/data/services/polling_service.dart similarity index 100% rename from lib/core/jnap/services/polling_service.dart rename to lib/core/data/services/polling_service.dart diff --git a/lib/core/jnap/providers/mocks/mock_firmware_update_provider.dart b/lib/core/jnap/providers/mocks/mock_firmware_update_provider.dart deleted file mode 100644 index 5942d71eb..000000000 --- a/lib/core/jnap/providers/mocks/mock_firmware_update_provider.dart +++ /dev/null @@ -1,166 +0,0 @@ -import 'dart:async'; - -import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; -import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart'; - -/// To use this mock for manual testing, you can override the `firmwareUpdateProvider` -/// in the `ProviderScope` at the root of your app. -/// -/// Example in your main.dart: -/// -/// ```dart -/// ProviderScope( -/// overrides: [ -/// firmwareUpdateProvider.overrideWith(() => MockFirmwareUpdateNotifier()), -/// ], -/// child: MyApp(), -/// ) -/// ``` - -class MockFirmwareUpdateNotifier extends FirmwareUpdateNotifier { - @override - FirmwareUpdateState build() { - return FirmwareUpdateState( - settings: FirmwareUpdateSettings( - updatePolicy: FirmwareUpdateSettings.firmwareUpdatePolicyAuto, - autoUpdateWindow: FirmwareAutoUpdateWindow.simple(), - ), - nodesStatus: [ - FirmwareUpdateUIModel( - deviceId: '1', - deviceName: 'Mock Master Node', - isMaster: true, - lastSuccessfulCheckTime: DateTime.now().toIso8601String(), - modelNumber: 'MX4200', - currentFirmwareVersion: '1.0.0.1', - availableUpdate: const AvailableUpdateUIModel( - version: '1.1.0.5', - date: '2025-11-18', - description: 'New features and bug fixes'), - ), - FirmwareUpdateUIModel( - deviceId: '2', - deviceName: 'Mock Child Node 1', - isMaster: false, - lastSuccessfulCheckTime: DateTime.now().toIso8601String(), - modelNumber: 'MX4200', - currentFirmwareVersion: '1.0.0.1', - availableUpdate: null, - ), - FirmwareUpdateUIModel( - deviceId: '3', - deviceName: 'Mock Child Node 2', - isMaster: false, - lastSuccessfulCheckTime: DateTime.now().toIso8601String(), - modelNumber: 'MX4200', - currentFirmwareVersion: '1.0.0.1', - availableUpdate: const AvailableUpdateUIModel( - version: '1.1.0.5', - date: '2025-11-18', - description: 'New features and bug fixes'), - ), - ], - ); - } - - @override - Future updateFirmware() async { - state = state.copyWith(isUpdating: true); - ref.read(firmwareUpdateCandidateProvider.notifier).state = - state.nodesStatus; - - final nodesToUpdate = - state.nodesStatus?.where((n) => n.availableUpdate != null).toList() ?? - []; - - // Simulate downloading - for (var i = 0; i <= 100; i += 10) { - await Future.delayed(const Duration(milliseconds: 200)); - final newStatus = state.nodesStatus?.map((node) { - if (nodesToUpdate.any((n) => n.deviceId == node.deviceId)) { - return node.copyWith(operation: 'downloading', progressPercent: i); - } - return node; - }).toList(); - state = state.copyWith(nodesStatus: newStatus); - } - - // Simulate installing - for (var i = 0; i <= 100; i += 10) { - await Future.delayed(const Duration(milliseconds: 300)); - final newStatus = state.nodesStatus?.map((node) { - if (nodesToUpdate.any((n) => n.deviceId == node.deviceId)) { - return node.copyWith(operation: 'installing', progressPercent: i); - } - return node; - }).toList(); - state = state.copyWith(nodesStatus: newStatus); - } - - // Simulate rebooting - for (var i = 0; i <= 100; i += 5) { - await Future.delayed(const Duration(milliseconds: 500)); - final newStatus = state.nodesStatus?.map((node) { - if (nodesToUpdate.any((n) => n.deviceId == node.deviceId)) { - return node.copyWith(operation: 'rebooting', progressPercent: i); - } - return node; - }).toList(); - state = state.copyWith(nodesStatus: newStatus); - } - - // Finish update - final finalStatus = state.nodesStatus?.map((node) { - if (nodesToUpdate.any((n) => n.deviceId == node.deviceId)) { - return node.copyWith( - currentFirmwareVersion: node.availableUpdate?.version, - availableUpdate: null, - operation: null, - progressPercent: 0, - ); - } - return node; - }).toList(); - - state = state.copyWith( - nodesStatus: finalStatus, - isUpdating: false, - isWaitingChildrenAfterUpdating: true, - ); - - await Future.delayed(const Duration(seconds: 5)); - state = state.copyWith(isWaitingChildrenAfterUpdating: false); - } - - @override - Future fetchAvailableFirmwareUpdates() async { - // In mock, we don't need to fetch anything. - return Future.value(); - } - - @override - int getAvailableUpdateNumber() { - return state.nodesStatus?.where((s) => s.availableUpdate != null).length ?? - 0; - } - - @override - bool isFailedCheckFirmwareUpdate() { - return false; - } - - @override - Future finishFirmwareUpdate() async { - state = state.copyWith(isUpdating: false); - return Future.value(); - } - - @override - Future setFirmwareUpdatePolicy(String policy) async { - final newSettings = state.settings.copyWith(updatePolicy: policy); - state = state.copyWith(settings: newSettings); - return Future.value(); - } -} diff --git a/lib/core/jnap/router_repository.dart b/lib/core/jnap/router_repository.dart index 1279bb0d9..632c2ad4e 100644 --- a/lib/core/jnap/router_repository.dart +++ b/lib/core/jnap/router_repository.dart @@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:privacy_gui/core/cache/utility.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; import 'package:privacy_gui/providers/auth/_auth.dart'; import 'package:privacy_gui/providers/auth/auth_provider.dart'; import 'package:privacy_gui/providers/connectivity/_connectivity.dart'; @@ -23,13 +23,13 @@ import 'package:privacy_gui/core/jnap/jnap_command_queue.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/spec/jnap_spec.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/utils.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'providers/ip_getter/get_local_ip.dart' - if (dart.library.io) 'providers/ip_getter/mobile_get_local_ip.dart' - if (dart.library.html) 'providers/ip_getter/web_get_local_ip.dart'; +import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart' + if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart'; enum CommandType { remote, diff --git a/lib/core/usp/usp_mapper_repository.dart b/lib/core/usp/usp_mapper_repository.dart index 8b8f5181b..50f120267 100644 --- a/lib/core/usp/usp_mapper_repository.dart +++ b/lib/core/usp/usp_mapper_repository.dart @@ -8,7 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:usp_client_core/usp_client_core.dart'; diff --git a/lib/core/jnap/providers/assign_ip/base_assign_ip.dart b/lib/core/utils/assign_ip/base_assign_ip.dart similarity index 100% rename from lib/core/jnap/providers/assign_ip/base_assign_ip.dart rename to lib/core/utils/assign_ip/base_assign_ip.dart diff --git a/lib/core/jnap/providers/assign_ip/web_assign_ip.dart b/lib/core/utils/assign_ip/web_assign_ip.dart similarity index 100% rename from lib/core/jnap/providers/assign_ip/web_assign_ip.dart rename to lib/core/utils/assign_ip/web_assign_ip.dart diff --git a/lib/core/utils/devices.dart b/lib/core/utils/devices.dart index b2d07565c..7948281fc 100644 --- a/lib/core/utils/devices.dart +++ b/lib/core/utils/devices.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; import 'package:privacy_gui/core/jnap/models/device.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; /// An extension on [RawDevice] providing utility methods for accessing device information. extension DeviceUtil on RawDevice { diff --git a/lib/core/jnap/providers/ip_getter/get_local_ip.dart b/lib/core/utils/ip_getter/get_local_ip.dart similarity index 100% rename from lib/core/jnap/providers/ip_getter/get_local_ip.dart rename to lib/core/utils/ip_getter/get_local_ip.dart diff --git a/lib/core/jnap/providers/ip_getter/mobile_get_local_ip.dart b/lib/core/utils/ip_getter/mobile_get_local_ip.dart similarity index 100% rename from lib/core/jnap/providers/ip_getter/mobile_get_local_ip.dart rename to lib/core/utils/ip_getter/mobile_get_local_ip.dart diff --git a/lib/core/jnap/providers/ip_getter/web_get_local_ip.dart b/lib/core/utils/ip_getter/web_get_local_ip.dart similarity index 100% rename from lib/core/jnap/providers/ip_getter/web_get_local_ip.dart rename to lib/core/utils/ip_getter/web_get_local_ip.dart diff --git a/lib/demo/jnap/demo_router_repository.dart b/lib/demo/jnap/demo_router_repository.dart index 03336f1f2..78699fad0 100644 --- a/lib/demo/jnap/demo_router_repository.dart +++ b/lib/demo/jnap/demo_router_repository.dart @@ -5,10 +5,10 @@ library; import 'package:flutter/foundation.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/demo/jnap/jnap_mock_registry.dart'; diff --git a/lib/demo/providers/demo_overrides.dart b/lib/demo/providers/demo_overrides.dart index 469a1c016..0ff881cc8 100644 --- a/lib/demo/providers/demo_overrides.dart +++ b/lib/demo/providers/demo_overrides.dart @@ -12,7 +12,7 @@ import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_provide import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart'; import 'package:privacy_gui/core/jnap/models/auto_configuration_settings.dart'; import 'package:privacy_gui/demo/jnap/demo_router_repository.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/instant_setup/providers/pnp_provider.dart'; import 'package:privacy_gui/providers/auth/auth_provider.dart'; diff --git a/lib/page/advanced_settings/internet_settings/services/internet_settings_service.dart b/lib/page/advanced_settings/internet_settings/services/internet_settings_service.dart index c2271ef63..3399f905a 100644 --- a/lib/page/advanced_settings/internet_settings/services/internet_settings_service.dart +++ b/lib/page/advanced_settings/internet_settings/services/internet_settings_service.dart @@ -10,8 +10,8 @@ import 'package:privacy_gui/core/jnap/models/lan_settings.dart'; import 'package:privacy_gui/core/jnap/models/mac_address_clone_settings.dart'; import 'package:privacy_gui/core/jnap/models/wan_settings.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/page/advanced_settings/internet_settings/views/internet_settings_view.dart b/lib/page/advanced_settings/internet_settings/views/internet_settings_view.dart index 6340dba5d..a0b839b57 100644 --- a/lib/page/advanced_settings/internet_settings/views/internet_settings_view.dart +++ b/lib/page/advanced_settings/internet_settings/views/internet_settings_view.dart @@ -22,8 +22,8 @@ import 'package:privacy_gui/page/components/views/arguments_view.dart'; import 'package:privacy_gui/providers/redirection/redirection_provider.dart'; import 'package:privacy_gui/util/error_code_helper.dart'; import 'package:ui_kit_library/ui_kit.dart'; -import 'package:privacy_gui/core/jnap/providers/assign_ip/base_assign_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/assign_ip/web_assign_ip.dart'; +import 'package:privacy_gui/core/utils/assign_ip/base_assign_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/assign_ip/web_assign_ip.dart'; enum InternetSettingsViewType { ipv4, diff --git a/lib/page/advanced_settings/internet_settings/views/release_and_renew_view.dart b/lib/page/advanced_settings/internet_settings/views/release_and_renew_view.dart index 6c1e3c79f..e7be881f2 100644 --- a/lib/page/advanced_settings/internet_settings/views/release_and_renew_view.dart +++ b/lib/page/advanced_settings/internet_settings/views/release_and_renew_view.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; diff --git a/lib/page/advanced_settings/local_network_settings/services/local_network_settings_service.dart b/lib/page/advanced_settings/local_network_settings/services/local_network_settings_service.dart index 184b6eccd..6d478af87 100644 --- a/lib/page/advanced_settings/local_network_settings/services/local_network_settings_service.dart +++ b/lib/page/advanced_settings/local_network_settings/services/local_network_settings_service.dart @@ -2,7 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/lan_settings.dart'; import 'package:privacy_gui/core/jnap/models/set_lan_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/models/dhcp_reservation_ui_model.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/providers/local_network_settings_state.dart'; diff --git a/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart b/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart index de8abfcc6..99a5c59c1 100644 --- a/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart +++ b/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/models/dhcp_reservation_ui_model.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/providers/dhcp_reservations_provider.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/providers/dhcp_reservations_state.dart'; diff --git a/lib/page/advanced_settings/local_network_settings/views/local_network_settings_view.dart b/lib/page/advanced_settings/local_network_settings/views/local_network_settings_view.dart index d54f4ce2b..765600e9d 100644 --- a/lib/page/advanced_settings/local_network_settings/views/local_network_settings_view.dart +++ b/lib/page/advanced_settings/local_network_settings/views/local_network_settings_view.dart @@ -18,8 +18,8 @@ import 'package:privacy_gui/page/advanced_settings/local_network_settings/provid import 'package:privacy_gui/page/instant_safety/providers/instant_safety_provider.dart'; import 'package:privacy_gui/providers/redirection/redirection_provider.dart'; import 'package:ui_kit_library/ui_kit.dart'; -import 'package:privacy_gui/core/jnap/providers/assign_ip/base_assign_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/assign_ip/web_assign_ip.dart'; +import 'package:privacy_gui/core/utils/assign_ip/base_assign_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/assign_ip/web_assign_ip.dart'; class LocalNetworkSettingsView extends ArgumentsConsumerStatefulView { const LocalNetworkSettingsView({ diff --git a/lib/page/components/shortcuts/dialogs.dart b/lib/page/components/shortcuts/dialogs.dart index eaec4eafc..44d8c0fd5 100644 --- a/lib/page/components/shortcuts/dialogs.dart +++ b/lib/page/components/shortcuts/dialogs.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/providers/redirection/redirection_provider.dart'; diff --git a/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart b/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart index e710fa18f..42c35ed9e 100644 --- a/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart +++ b/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client_provider.dart'; import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/customs/timer_countdown_widget.dart'; import 'package:privacy_gui/page/dashboard/views/components/remote_assistance_animation.dart'; diff --git a/lib/page/components/styled/top_bar.dart b/lib/page/components/styled/top_bar.dart index 3ca58c262..486f1cf38 100644 --- a/lib/page/components/styled/top_bar.dart +++ b/lib/page/components/styled/top_bar.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/di.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; import 'package:privacy_gui/page/components/styled/menus/menu_consts.dart'; diff --git a/lib/page/dashboard/providers/dashboard_home_provider.dart b/lib/page/dashboard/providers/dashboard_home_provider.dart index eb3cf5785..480a9ce8d 100644 --- a/lib/page/dashboard/providers/dashboard_home_provider.dart +++ b/lib/page/dashboard/providers/dashboard_home_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart'; import 'package:privacy_gui/page/dashboard/services/dashboard_home_service.dart'; import 'package:privacy_gui/page/health_check/providers/health_check_provider.dart'; diff --git a/lib/page/dashboard/services/dashboard_home_service.dart b/lib/page/dashboard/services/dashboard_home_service.dart index ad3237068..6552c62c6 100644 --- a/lib/page/dashboard/services/dashboard_home_service.dart +++ b/lib/page/dashboard/services/dashboard_home_service.dart @@ -2,8 +2,8 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/core/utils/nodes.dart'; diff --git a/lib/page/dashboard/views/components/home_title.dart b/lib/page/dashboard/views/components/home_title.dart index 02daa001c..1eb85edcd 100644 --- a/lib/page/dashboard/views/components/home_title.dart +++ b/lib/page/dashboard/views/components/home_title.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; import 'package:privacy_gui/page/dashboard/views/components/loading_tile.dart'; diff --git a/lib/page/dashboard/views/components/internet_status.dart b/lib/page/dashboard/views/components/internet_status.dart index 0083bef77..aea55060d 100644 --- a/lib/page/dashboard/views/components/internet_status.dart +++ b/lib/page/dashboard/views/components/internet_status.dart @@ -3,8 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_provider.dart'; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/customs/animated_refresh_container.dart'; import 'package:privacy_gui/page/components/shared_widgets.dart'; diff --git a/lib/page/dashboard/views/components/networks.dart b/lib/page/dashboard/views/components/networks.dart index f8b260f57..5c94e814b 100644 --- a/lib/page/dashboard/views/components/networks.dart +++ b/lib/page/dashboard/views/components/networks.dart @@ -3,10 +3,10 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/topology_adapter.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; diff --git a/lib/page/dashboard/views/components/port_and_speed.dart b/lib/page/dashboard/views/components/port_and_speed.dart index 80c6b1a9f..ad3be0c41 100644 --- a/lib/page/dashboard/views/components/port_and_speed.dart +++ b/lib/page/dashboard/views/components/port_and_speed.dart @@ -4,8 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/constants/build_config.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart'; diff --git a/lib/page/dashboard/views/components/quick_panel.dart b/lib/page/dashboard/views/components/quick_panel.dart index 63ac5e9e4..86777f13c 100644 --- a/lib/page/dashboard/views/components/quick_panel.dart +++ b/lib/page/dashboard/views/components/quick_panel.dart @@ -3,8 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/utils/nodes.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; diff --git a/lib/page/dashboard/views/components/wifi_grid.dart b/lib/page/dashboard/views/components/wifi_grid.dart index 0c54301cb..27f9d5a43 100644 --- a/lib/page/dashboard/views/components/wifi_grid.dart +++ b/lib/page/dashboard/views/components/wifi_grid.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; diff --git a/lib/page/dashboard/views/dashboard_home_view.dart b/lib/page/dashboard/views/dashboard_home_view.dart index f28cbfa10..46a531d1c 100644 --- a/lib/page/dashboard/views/dashboard_home_view.dart +++ b/lib/page/dashboard/views/dashboard_home_view.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/constants/pref_key.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/di.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/styled/menus/menu_consts.dart'; @@ -19,8 +19,8 @@ import 'package:privacy_gui/page/dashboard/views/components/quick_panel.dart'; import 'package:privacy_gui/page/dashboard/views/components/wifi_grid.dart'; import 'package:privacy_gui/page/vpn/views/vpn_status_tile.dart'; import 'package:ui_kit_library/ui_kit.dart'; -import 'package:privacy_gui/core/jnap/providers/assign_ip/base_assign_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/assign_ip/web_assign_ip.dart'; +import 'package:privacy_gui/core/utils/assign_ip/base_assign_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/assign_ip/web_assign_ip.dart'; import 'package:shared_preferences/shared_preferences.dart'; class DashboardHomeView extends ConsumerStatefulWidget { diff --git a/lib/page/dashboard/views/dashboard_menu_view.dart b/lib/page/dashboard/views/dashboard_menu_view.dart index 25f69faf3..dbb3f1cc6 100644 --- a/lib/page/dashboard/views/dashboard_menu_view.dart +++ b/lib/page/dashboard/views/dashboard_menu_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/constants/build_config.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/di.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; diff --git a/lib/page/dashboard/views/prepare_dashboard_view.dart b/lib/page/dashboard/views/prepare_dashboard_view.dart index 960e33394..0e8cd6413 100644 --- a/lib/page/dashboard/views/prepare_dashboard_view.dart +++ b/lib/page/dashboard/views/prepare_dashboard_view.dart @@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/cache/linksys_cache_manager.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; @@ -14,7 +14,7 @@ import 'package:privacy_gui/providers/connectivity/_connectivity.dart'; import 'package:privacy_gui/providers/connectivity/connectivity_provider.dart'; import 'package:privacy_gui/constants/_constants.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/page/select_network/providers/select_network_provider.dart'; import 'package:privacy_gui/route/constants.dart'; import 'package:ui_kit_library/ui_kit.dart'; diff --git a/lib/page/firmware_update/models/firmware_update_ui_model.dart b/lib/page/firmware_update/models/firmware_update_ui_model.dart index f38ae78fd..623c28427 100644 --- a/lib/page/firmware_update/models/firmware_update_ui_model.dart +++ b/lib/page/firmware_update/models/firmware_update_ui_model.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:equatable/equatable.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status_nodes.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; class FirmwareUpdateUIModel extends Equatable { diff --git a/lib/page/firmware_update/views/firmware_update_detail_view.dart b/lib/page/firmware_update/views/firmware_update_detail_view.dart index db5f00267..cb2a1ce48 100644 --- a/lib/page/firmware_update/views/firmware_update_detail_view.dart +++ b/lib/page/firmware_update/views/firmware_update_detail_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; import 'package:privacy_gui/core/utils/device_image_helper.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/core/utils/logger.dart'; diff --git a/lib/page/firmware_update/views/firmware_update_process_view.dart b/lib/page/firmware_update/views/firmware_update_process_view.dart index 1c3f261f5..49e4db27e 100644 --- a/lib/page/firmware_update/views/firmware_update_process_view.dart +++ b/lib/page/firmware_update/views/firmware_update_process_view.dart @@ -2,7 +2,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:ui_kit_library/ui_kit.dart'; diff --git a/lib/page/firmware_update/views/firmware_update_table.dart b/lib/page/firmware_update/views/firmware_update_table.dart index 6764aa17c..db106166a 100644 --- a/lib/page/firmware_update/views/firmware_update_table.dart +++ b/lib/page/firmware_update/views/firmware_update_table.dart @@ -2,7 +2,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/device_image_helper.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; diff --git a/lib/page/health_check/providers/health_check_provider.dart b/lib/page/health_check/providers/health_check_provider.dart index e200fea03..d7d0c301c 100644 --- a/lib/page/health_check/providers/health_check_provider.dart +++ b/lib/page/health_check/providers/health_check_provider.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:math'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/page/health_check/models/health_check_enum.dart'; import 'package:privacy_gui/page/health_check/models/speed_test_event.dart'; import 'package:privacy_gui/page/health_check/models/speed_test_ui_model.dart'; diff --git a/lib/page/instant_admin/providers/manual_firmware_update_provider.dart b/lib/page/instant_admin/providers/manual_firmware_update_provider.dart index 134d8a4a2..f7a5e1819 100644 --- a/lib/page/instant_admin/providers/manual_firmware_update_provider.dart +++ b/lib/page/instant_admin/providers/manual_firmware_update_provider.dart @@ -1,14 +1,14 @@ import 'dart:typed_data'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/page/instant_admin/providers/manual_firmware_update_state.dart'; import 'package:privacy_gui/page/instant_admin/services/manual_firmware_update_service.dart'; import 'package:privacy_gui/providers/auth/auth_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart' - if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart'; +import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart' + if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart'; final manualFirmwareUpdateProvider = NotifierProvider.autoDispose< ManualFirmwareUpdateNotifier, ManualFirmwareUpdateState>( diff --git a/lib/page/instant_admin/providers/power_table_provider.dart b/lib/page/instant_admin/providers/power_table_provider.dart index f990dbf28..eb64fbe5d 100644 --- a/lib/page/instant_admin/providers/power_table_provider.dart +++ b/lib/page/instant_admin/providers/power_table_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/instant_admin/providers/_providers.dart'; import 'package:privacy_gui/page/instant_admin/services/power_table_service.dart'; diff --git a/lib/page/instant_admin/providers/timezone_provider.dart b/lib/page/instant_admin/providers/timezone_provider.dart index 992f6e2d4..607b905a6 100644 --- a/lib/page/instant_admin/providers/timezone_provider.dart +++ b/lib/page/instant_admin/providers/timezone_provider.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/page/instant_admin/providers/timezone_state.dart'; import 'package:privacy_gui/page/instant_admin/services/timezone_service.dart'; import 'package:privacy_gui/providers/preservable_contract.dart'; diff --git a/lib/page/instant_admin/views/instant_admin_view.dart b/lib/page/instant_admin/views/instant_admin_view.dart index 4ce694ae7..2127815bc 100644 --- a/lib/page/instant_admin/views/instant_admin_view.dart +++ b/lib/page/instant_admin/views/instant_admin_view.dart @@ -5,9 +5,9 @@ import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/constants/build_config.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; diff --git a/lib/page/instant_device/providers/device_filtered_list_provider.dart b/lib/page/instant_device/providers/device_filtered_list_provider.dart index 0ee1f42ff..8a6ae0027 100644 --- a/lib/page/instant_device/providers/device_filtered_list_provider.dart +++ b/lib/page/instant_device/providers/device_filtered_list_provider.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/instant_device/providers/device_filtered_list_state.dart'; diff --git a/lib/page/instant_device/providers/device_list_provider.dart b/lib/page/instant_device/providers/device_list_provider.dart index 429662477..7da1cb9b7 100644 --- a/lib/page/instant_device/providers/device_list_provider.dart +++ b/lib/page/instant_device/providers/device_list_provider.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/page/instant_device/_instant_device.dart'; diff --git a/lib/page/instant_device/providers/device_list_state.dart b/lib/page/instant_device/providers/device_list_state.dart index d7dd8a797..7e006a743 100644 --- a/lib/page/instant_device/providers/device_list_state.dart +++ b/lib/page/instant_device/providers/device_list_state.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; class DeviceListState extends Equatable { final List devices; diff --git a/lib/page/instant_device/views/device_detail_view.dart b/lib/page/instant_device/views/device_detail_view.dart index af94cb4a0..2c711ebb8 100644 --- a/lib/page/instant_device/views/device_detail_view.dart +++ b/lib/page/instant_device/views/device_detail_view.dart @@ -4,8 +4,8 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/utils/extension.dart'; import 'package:privacy_gui/core/utils/icon_device_category.dart'; diff --git a/lib/page/instant_device/views/devices_filter_widget.dart b/lib/page/instant_device/views/devices_filter_widget.dart index f41288971..c00ec5d02 100644 --- a/lib/page/instant_device/views/devices_filter_widget.dart +++ b/lib/page/instant_device/views/devices_filter_widget.dart @@ -1,8 +1,8 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/utils/extension.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/instant_device/_instant_device.dart'; diff --git a/lib/page/instant_device/views/instant_device_view.dart b/lib/page/instant_device/views/instant_device_view.dart index 21bbe2de4..7dcf1d70c 100644 --- a/lib/page/instant_device/views/instant_device_view.dart +++ b/lib/page/instant_device/views/instant_device_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/customs/animated_refresh_container.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; diff --git a/lib/page/instant_privacy/providers/instant_privacy_device_list_provider.dart b/lib/page/instant_privacy/providers/instant_privacy_device_list_provider.dart index 4ca390736..d5c926873 100644 --- a/lib/page/instant_privacy/providers/instant_privacy_device_list_provider.dart +++ b/lib/page/instant_privacy/providers/instant_privacy_device_list_provider.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/page/instant_device/_instant_device.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_provider.dart'; diff --git a/lib/page/instant_privacy/providers/instant_privacy_provider.dart b/lib/page/instant_privacy/providers/instant_privacy_provider.dart index 91a64aad7..26f495230 100644 --- a/lib/page/instant_privacy/providers/instant_privacy_provider.dart +++ b/lib/page/instant_privacy/providers/instant_privacy_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart'; import 'package:privacy_gui/page/instant_privacy/services/instant_privacy_service.dart'; diff --git a/lib/page/instant_privacy/services/instant_privacy_service.dart b/lib/page/instant_privacy/services/instant_privacy_service.dart index ff909bf32..477862d4e 100644 --- a/lib/page/instant_privacy/services/instant_privacy_service.dart +++ b/lib/page/instant_privacy/services/instant_privacy_service.dart @@ -6,7 +6,7 @@ import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/mac_filter_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/page/instant_safety/services/instant_safety_service.dart b/lib/page/instant_safety/services/instant_safety_service.dart index 88b656f5c..568be4e6f 100644 --- a/lib/page/instant_safety/services/instant_safety_service.dart +++ b/lib/page/instant_safety/services/instant_safety_service.dart @@ -5,7 +5,7 @@ import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; import 'package:privacy_gui/core/jnap/models/lan_settings.dart'; import 'package:privacy_gui/core/jnap/models/set_lan_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/extension.dart'; diff --git a/lib/page/instant_setup/pnp_setup_view.dart b/lib/page/instant_setup/pnp_setup_view.dart index b60cee182..76c13f2e5 100644 --- a/lib/page/instant_setup/pnp_setup_view.dart +++ b/lib/page/instant_setup/pnp_setup_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart' as service; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/mixin/page_snackbar_mixin.dart'; diff --git a/lib/page/instant_setup/services/pnp_service.dart b/lib/page/instant_setup/services/pnp_service.dart index 80297be13..5a8f165f9 100644 --- a/lib/page/instant_setup/services/pnp_service.dart +++ b/lib/page/instant_setup/services/pnp_service.dart @@ -14,10 +14,10 @@ import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; import 'package:privacy_gui/core/jnap/models/simple_wifi_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/page/instant_topology/providers/instant_topology_provider.dart b/lib/page/instant_topology/providers/instant_topology_provider.dart index ea94a6ce0..937e6e8fc 100644 --- a/lib/page/instant_topology/providers/instant_topology_provider.dart +++ b/lib/page/instant_topology/providers/instant_topology_provider.dart @@ -1,8 +1,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/constants/_constants.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/core/utils/logger.dart'; diff --git a/lib/page/instant_topology/services/instant_topology_service.dart b/lib/page/instant_topology/services/instant_topology_service.dart index 60687712c..5113fc0ca 100644 --- a/lib/page/instant_topology/services/instant_topology_service.dart +++ b/lib/page/instant_topology/services/instant_topology_service.dart @@ -4,7 +4,7 @@ import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/page/instant_topology/views/instant_topology_view.dart b/lib/page/instant_topology/views/instant_topology_view.dart index 6f40deffa..0ea985bd8 100644 --- a/lib/page/instant_topology/views/instant_topology_view.dart +++ b/lib/page/instant_topology/views/instant_topology_view.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/core/utils/topology_adapter.dart'; diff --git a/lib/page/instant_verify/providers/instant_verify_provider.dart b/lib/page/instant_verify/providers/instant_verify_provider.dart index ec31ae8d5..aa89d5edf 100644 --- a/lib/page/instant_verify/providers/instant_verify_provider.dart +++ b/lib/page/instant_verify/providers/instant_verify_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_provider.dart'; import 'package:privacy_gui/page/instant_verify/models/instant_verify_ui_models.dart'; import 'package:privacy_gui/page/instant_verify/providers/instant_verify_state.dart'; import 'package:privacy_gui/page/instant_verify/services/instant_verify_service.dart'; diff --git a/lib/core/jnap/providers/wan_external_provider.dart b/lib/page/instant_verify/providers/wan_external_provider.dart similarity index 88% rename from lib/core/jnap/providers/wan_external_provider.dart rename to lib/page/instant_verify/providers/wan_external_provider.dart index 428dbe527..dd3fc1ad8 100644 --- a/lib/core/jnap/providers/wan_external_provider.dart +++ b/lib/page/instant_verify/providers/wan_external_provider.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_state.dart'; -import 'package:privacy_gui/core/jnap/services/wan_external_service.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_state.dart'; +import 'package:privacy_gui/page/instant_verify/services/wan_external_service.dart'; import 'package:privacy_gui/core/utils/logger.dart'; final wanExternalProvider = diff --git a/lib/core/jnap/providers/wan_external_state.dart b/lib/page/instant_verify/providers/wan_external_state.dart similarity index 100% rename from lib/core/jnap/providers/wan_external_state.dart rename to lib/page/instant_verify/providers/wan_external_state.dart diff --git a/lib/page/instant_verify/services/instant_verify_pdf_service.dart b/lib/page/instant_verify/services/instant_verify_pdf_service.dart index 74fcfd6ac..0a5b14dc9 100644 --- a/lib/page/instant_verify/services/instant_verify_pdf_service.dart +++ b/lib/page/instant_verify/services/instant_verify_pdf_service.dart @@ -6,8 +6,8 @@ import 'package:pdf/widgets.dart' as pw; import 'package:printing/printing.dart'; import 'package:privacy_gui/core/jnap/models/back_haul_info.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/core/utils/wifi.dart'; diff --git a/lib/core/jnap/services/wan_external_service.dart b/lib/page/instant_verify/services/wan_external_service.dart similarity index 100% rename from lib/core/jnap/services/wan_external_service.dart rename to lib/page/instant_verify/services/wan_external_service.dart diff --git a/lib/page/instant_verify/views/instant_verify_view.dart b/lib/page/instant_verify/views/instant_verify_view.dart index cd4a834f6..36a07af5d 100644 --- a/lib/page/instant_verify/views/instant_verify_view.dart +++ b/lib/page/instant_verify/views/instant_verify_view.dart @@ -3,11 +3,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/constants/build_config.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; diff --git a/lib/page/login/auto_parent/providers/auto_parent_first_login_provider.dart b/lib/page/login/auto_parent/providers/auto_parent_first_login_provider.dart index 401748502..f7a5f77c6 100644 --- a/lib/page/login/auto_parent/providers/auto_parent_first_login_provider.dart +++ b/lib/page/login/auto_parent/providers/auto_parent_first_login_provider.dart @@ -2,8 +2,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/retry_strategy/retry.dart'; import 'package:privacy_gui/core/utils/logger.dart'; diff --git a/lib/page/login/auto_parent/views/auto_parent_first_login_view.dart b/lib/page/login/auto_parent/views/auto_parent_first_login_view.dart index e2e12eb7f..8b7dd4481 100644 --- a/lib/page/login/auto_parent/views/auto_parent_first_login_view.dart +++ b/lib/page/login/auto_parent/views/auto_parent_first_login_view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; diff --git a/lib/page/login/views/login_local_view.dart b/lib/page/login/views/login_local_view.dart index e41abe866..55aa5c351 100644 --- a/lib/page/login/views/login_local_view.dart +++ b/lib/page/login/views/login_local_view.dart @@ -6,7 +6,7 @@ import 'package:go_router/go_router.dart'; import 'package:privacy_gui/constants/error_code.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; import 'package:privacy_gui/page/components/styled/bottom_bar.dart'; import 'package:privacy_gui/page/components/ui_kit_page_view.dart'; diff --git a/lib/page/nodes/providers/add_nodes_provider.dart b/lib/page/nodes/providers/add_nodes_provider.dart index b99aff227..7287b392d 100644 --- a/lib/page/nodes/providers/add_nodes_provider.dart +++ b/lib/page/nodes/providers/add_nodes_provider.dart @@ -3,8 +3,8 @@ import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/back_haul_info.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/bench_mark.dart'; diff --git a/lib/page/nodes/providers/add_nodes_state.dart b/lib/page/nodes/providers/add_nodes_state.dart index e118b0db6..666fa8db5 100644 --- a/lib/page/nodes/providers/add_nodes_state.dart +++ b/lib/page/nodes/providers/add_nodes_state.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:equatable/equatable.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; class AddNodesState extends Equatable { final bool? onboardingProceed; diff --git a/lib/page/nodes/providers/add_wired_nodes_provider.dart b/lib/page/nodes/providers/add_wired_nodes_provider.dart index cc562728f..7e53e175a 100644 --- a/lib/page/nodes/providers/add_wired_nodes_provider.dart +++ b/lib/page/nodes/providers/add_wired_nodes_provider.dart @@ -4,9 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/back_haul_info.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/bench_mark.dart'; diff --git a/lib/page/nodes/providers/add_wired_nodes_state.dart b/lib/page/nodes/providers/add_wired_nodes_state.dart index 83f2a550a..5ecc9fa15 100644 --- a/lib/page/nodes/providers/add_wired_nodes_state.dart +++ b/lib/page/nodes/providers/add_wired_nodes_state.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'package:equatable/equatable.dart'; import 'package:privacy_gui/core/jnap/models/back_haul_info.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; class AddWiredNodesState extends Equatable { final bool? onboardingProceed; diff --git a/lib/page/nodes/providers/node_detail_provider.dart b/lib/page/nodes/providers/node_detail_provider.dart index a3906315c..09041e8ae 100644 --- a/lib/page/nodes/providers/node_detail_provider.dart +++ b/lib/page/nodes/providers/node_detail_provider.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/instant_device/_instant_device.dart'; import 'package:privacy_gui/page/nodes/_nodes.dart'; diff --git a/lib/core/jnap/providers/node_light_settings_provider.dart b/lib/page/nodes/providers/node_light_settings_provider.dart similarity index 94% rename from lib/core/jnap/providers/node_light_settings_provider.dart rename to lib/page/nodes/providers/node_light_settings_provider.dart index 705345d70..44fc6b6f9 100644 --- a/lib/core/jnap/providers/node_light_settings_provider.dart +++ b/lib/page/nodes/providers/node_light_settings_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/services/node_light_settings_service.dart'; +import 'package:privacy_gui/page/nodes/services/node_light_settings_service.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/nodes/providers/node_detail_state.dart'; diff --git a/lib/page/nodes/services/node_detail_service.dart b/lib/page/nodes/services/node_detail_service.dart index 39187eb9a..03dcc88df 100644 --- a/lib/page/nodes/services/node_detail_service.dart +++ b/lib/page/nodes/services/node_detail_service.dart @@ -5,7 +5,7 @@ import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/devices.dart'; diff --git a/lib/core/jnap/services/node_light_settings_service.dart b/lib/page/nodes/services/node_light_settings_service.dart similarity index 100% rename from lib/core/jnap/services/node_light_settings_service.dart rename to lib/page/nodes/services/node_light_settings_service.dart diff --git a/lib/page/nodes/views/add_nodes_view.dart b/lib/page/nodes/views/add_nodes_view.dart index 00aa60acf..dffcd6d23 100644 --- a/lib/page/nodes/views/add_nodes_view.dart +++ b/lib/page/nodes/views/add_nodes_view.dart @@ -3,7 +3,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/core/utils/logger.dart'; diff --git a/lib/page/nodes/views/node_detail_view.dart b/lib/page/nodes/views/node_detail_view.dart index d54d243ff..2cfab7482 100644 --- a/lib/page/nodes/views/node_detail_view.dart +++ b/lib/page/nodes/views/node_detail_view.dart @@ -6,11 +6,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/core/utils/nodes.dart'; import 'package:privacy_gui/core/utils/wifi.dart'; diff --git a/lib/page/select_network/views/select_network_view.dart b/lib/page/select_network/views/select_network_view.dart index 318f1f620..9d2a706c3 100644 --- a/lib/page/select_network/views/select_network_view.dart +++ b/lib/page/select_network/views/select_network_view.dart @@ -3,7 +3,7 @@ import 'package:animated_list_plus/transitions.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; import 'package:privacy_gui/core/utils/device_image_helper.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/components/ui_kit_page_view.dart'; diff --git a/lib/page/vpn/views/vpn_status_tile.dart b/lib/page/vpn/views/vpn_status_tile.dart index a02903a31..0aeff05ef 100644 --- a/lib/page/vpn/views/vpn_status_tile.dart +++ b/lib/page/vpn/views/vpn_status_tile.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/localization/localization_hook.dart'; import 'package:privacy_gui/page/components/shortcuts/dialogs.dart'; import 'package:privacy_gui/page/dashboard/_dashboard.dart'; diff --git a/lib/page/wifi_settings/providers/channelfinder_provider.dart b/lib/page/wifi_settings/providers/channelfinder_provider.dart index 9eceac0d9..2a000b14c 100644 --- a/lib/page/wifi_settings/providers/channelfinder_provider.dart +++ b/lib/page/wifi_settings/providers/channelfinder_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/wifi_settings/_wifi_settings.dart'; import 'package:privacy_gui/page/wifi_settings/services/channel_finder_service.dart'; diff --git a/lib/page/wifi_settings/providers/wifi_bundle_provider.dart b/lib/page/wifi_settings/providers/wifi_bundle_provider.dart index c30bd0baf..4a3cc842b 100644 --- a/lib/page/wifi_settings/providers/wifi_bundle_provider.dart +++ b/lib/page/wifi_settings/providers/wifi_bundle_provider.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart'; import 'package:privacy_gui/page/wifi_settings/providers/wifi_advanced_state.dart'; diff --git a/lib/page/wifi_settings/services/channel_finder_service.dart b/lib/page/wifi_settings/services/channel_finder_service.dart index a0499cfa6..2278d2d86 100644 --- a/lib/page/wifi_settings/services/channel_finder_service.dart +++ b/lib/page/wifi_settings/services/channel_finder_service.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; diff --git a/lib/page/wifi_settings/services/wifi_settings_service.dart b/lib/page/wifi_settings/services/wifi_settings_service.dart index 9eeadf701..7e4b8cbb3 100644 --- a/lib/page/wifi_settings/services/wifi_settings_service.dart +++ b/lib/page/wifi_settings/services/wifi_settings_service.dart @@ -5,7 +5,7 @@ import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/models/mac_filter_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; diff --git a/lib/providers/auth/auth_provider.dart b/lib/providers/auth/auth_provider.dart index f65a300f2..63fa48a63 100644 --- a/lib/providers/auth/auth_provider.dart +++ b/lib/providers/auth/auth_provider.dart @@ -9,9 +9,9 @@ import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart'; import 'package:privacy_gui/core/cloud/model/region_code.dart'; import 'package:privacy_gui/core/http/linksys_http_client.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; diff --git a/lib/route/router_provider.dart b/lib/route/router_provider.dart index 86db549f7..daad82d64 100644 --- a/lib/route/router_provider.dart +++ b/lib/route/router_provider.dart @@ -9,8 +9,8 @@ import 'package:privacy_gui/core/cache/linksys_cache_manager.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/auto_configuration_settings.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/core/utils/logger.dart'; import 'package:privacy_gui/page/advanced_settings/local_network_settings/providers/dhcp_reservations_provider.dart'; @@ -61,9 +61,9 @@ import 'package:privacy_gui/route/route_model.dart'; import 'package:privacy_gui/route/router_logger.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'constants.dart'; -import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart' - if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart' - if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart'; +import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart' + if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart' + if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart'; import 'package:privacy_gui/page/instant_safety/providers/_providers.dart'; import 'package:privacy_gui/page/ai_assistant/views/router_assistant_view.dart'; diff --git a/test/common/test_helper.dart b/test/common/test_helper.dart index 198b001af..d7b192ffa 100644 --- a/test/common/test_helper.dart +++ b/test/common/test_helper.dart @@ -7,7 +7,7 @@ import 'package:mockito/mockito.dart'; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; import 'package:privacy_gui/di.dart'; import 'package:privacy_gui/l10n/gen/app_localizations.dart'; import 'package:privacy_gui/core/utils/device_image_helper.dart'; @@ -78,23 +78,23 @@ import 'screen.dart'; import 'testable_router.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_provider.dart'; import 'package:privacy_gui/page/instant_topology/providers/instant_topology_provider.dart'; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/page/vpn/providers/vpn_notifier.dart'; import 'package:privacy_gui/page/instant_device/providers/device_list_provider.dart'; import '../test_data/_index.dart'; import 'package:privacy_gui/page/advanced_settings/apps_and_gaming/providers/apps_and_gaming_state.dart'; import 'package:privacy_gui/page/advanced_settings/apps_and_gaming/ddns/providers/ddns_state.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart'; class TestHelper { diff --git a/test/core/jnap/providers/dashboard_manager_provider_test.dart b/test/core/jnap/providers/dashboard_manager_provider_test.dart index c9619ed58..722318568 100644 --- a/test/core/jnap/providers/dashboard_manager_provider_test.dart +++ b/test/core/jnap/providers/dashboard_manager_provider_test.dart @@ -3,10 +3,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/services/dashboard_manager_service.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/services/dashboard_manager_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../../../mocks/test_data/dashboard_manager_test_data.dart'; diff --git a/test/core/jnap/providers/dashboard_manager_state_test.dart b/test/core/jnap/providers/dashboard_manager_state_test.dart index 14a1403f4..f986345f9 100644 --- a/test/core/jnap/providers/dashboard_manager_state_test.dart +++ b/test/core/jnap/providers/dashboard_manager_state_test.dart @@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; import '../../../mocks/test_data/dashboard_manager_test_data.dart'; diff --git a/test/core/jnap/providers/device_manager_provider_test.dart b/test/core/jnap/providers/device_manager_provider_test.dart index 28cc9f426..508c46f23 100644 --- a/test/core/jnap/providers/device_manager_provider_test.dart +++ b/test/core/jnap/providers/device_manager_provider_test.dart @@ -2,10 +2,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/models/device.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/services/device_manager_service.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/services/device_manager_service.dart'; import '../../../mocks/test_data/device_manager_test_data.dart'; diff --git a/test/core/jnap/providers/device_manager_state_test.dart b/test/core/jnap/providers/device_manager_state_test.dart index 245faf7cd..8ee900228 100644 --- a/test/core/jnap/providers/device_manager_state_test.dart +++ b/test/core/jnap/providers/device_manager_state_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:flutter_test/flutter_test.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import '../../../mocks/test_data/device_manager_test_data.dart'; diff --git a/test/core/jnap/providers/firmware_update_provider_test.dart b/test/core/jnap/providers/firmware_update_provider_test.dart index e03ebeff4..c5178d08c 100644 --- a/test/core/jnap/providers/firmware_update_provider_test.dart +++ b/test/core/jnap/providers/firmware_update_provider_test.dart @@ -2,11 +2,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/services/firmware_update_service.dart'; import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart'; import '../../../mocks/_index.dart'; diff --git a/test/core/jnap/providers/node_light_settings_provider_test.dart b/test/core/jnap/providers/node_light_settings_provider_test.dart index e59551d6d..042e2f392 100644 --- a/test/core/jnap/providers/node_light_settings_provider_test.dart +++ b/test/core/jnap/providers/node_light_settings_provider_test.dart @@ -2,8 +2,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; -import 'package:privacy_gui/core/jnap/services/node_light_settings_service.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/page/nodes/services/node_light_settings_service.dart'; import 'package:privacy_gui/page/nodes/providers/node_detail_state.dart'; class MockNodeLightSettingsService extends Mock diff --git a/test/core/jnap/providers/polling_provider_test.dart b/test/core/jnap/providers/polling_provider_test.dart index db2e0cb1d..050062932 100644 --- a/test/core/jnap/providers/polling_provider_test.dart +++ b/test/core/jnap/providers/polling_provider_test.dart @@ -2,9 +2,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; -import 'package:privacy_gui/core/jnap/services/polling_service.dart'; +import 'package:privacy_gui/core/data/services/polling_service.dart'; import '../../../mocks/test_data/polling_test_data.dart'; diff --git a/test/core/jnap/providers/wan_external_provider_test.dart b/test/core/jnap/providers/wan_external_provider_test.dart index 6ef2fcb87..86a38f49a 100644 --- a/test/core/jnap/providers/wan_external_provider_test.dart +++ b/test/core/jnap/providers/wan_external_provider_test.dart @@ -4,9 +4,9 @@ import 'package:get_it/get_it.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/page/instant_verify/models/instant_verify_ui_models.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_state.dart'; -import 'package:privacy_gui/core/jnap/services/wan_external_service.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_provider.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_state.dart'; +import 'package:privacy_gui/page/instant_verify/services/wan_external_service.dart'; class MockWanExternalService extends Mock implements WanExternalService {} diff --git a/test/core/jnap/providers/wan_external_state_test.dart b/test/core/jnap/providers/wan_external_state_test.dart index f70cb1029..a6f752300 100644 --- a/test/core/jnap/providers/wan_external_state_test.dart +++ b/test/core/jnap/providers/wan_external_state_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:privacy_gui/page/instant_verify/models/instant_verify_ui_models.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_state.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_state.dart'; void main() { group('WANExternalState', () { diff --git a/test/core/jnap/services/dashboard_manager_service_test.dart b/test/core/jnap/services/dashboard_manager_service_test.dart index cd65190e5..3723de515 100644 --- a/test/core/jnap/services/dashboard_manager_service_test.dart +++ b/test/core/jnap/services/dashboard_manager_service_test.dart @@ -3,11 +3,11 @@ import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/device_info.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/dashboard_manager_service.dart'; +import 'package:privacy_gui/core/data/services/dashboard_manager_service.dart'; import '../../../mocks/test_data/dashboard_manager_test_data.dart'; diff --git a/test/core/jnap/services/device_manager_service_test.dart b/test/core/jnap/services/device_manager_service_test.dart index 2a8efb233..fc798a08c 100644 --- a/test/core/jnap/services/device_manager_service_test.dart +++ b/test/core/jnap/services/device_manager_service_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/device_manager_service.dart'; +import 'package:privacy_gui/core/data/services/device_manager_service.dart'; import '../../../mocks/test_data/device_manager_test_data.dart'; diff --git a/test/core/jnap/services/firmware_update_service_test.dart b/test/core/jnap/services/firmware_update_service_test.dart index ab1ad97e8..a4be3260a 100644 --- a/test/core/jnap/services/firmware_update_service_test.dart +++ b/test/core/jnap/services/firmware_update_service_test.dart @@ -9,11 +9,11 @@ import 'package:privacy_gui/core/jnap/command/base_command.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart'; import 'package:privacy_gui/core/jnap/models/firmware_update_status_nodes.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart'; +import 'package:privacy_gui/core/data/services/firmware_update_service.dart'; import 'package:privacy_gui/core/utils/devices.dart'; import 'package:privacy_gui/di.dart'; import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart'; diff --git a/test/core/jnap/services/node_light_settings_service_test.dart b/test/core/jnap/services/node_light_settings_service_test.dart index 09e3fc89a..8950824e8 100644 --- a/test/core/jnap/services/node_light_settings_service_test.dart +++ b/test/core/jnap/services/node_light_settings_service_test.dart @@ -4,7 +4,7 @@ import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/node_light_settings_service.dart'; +import 'package:privacy_gui/page/nodes/services/node_light_settings_service.dart'; import '../../../mocks/test_data/node_light_settings_test_data.dart'; diff --git a/test/core/jnap/services/polling_service_test.dart b/test/core/jnap/services/polling_service_test.dart index 0c3715153..eadd3e671 100644 --- a/test/core/jnap/services/polling_service_test.dart +++ b/test/core/jnap/services/polling_service_test.dart @@ -5,7 +5,7 @@ import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/polling_service.dart'; +import 'package:privacy_gui/core/data/services/polling_service.dart'; import 'package:privacy_gui/di.dart'; import '../../../mocks/jnap_service_supported_mocks.dart'; diff --git a/test/core/jnap/services/wan_external_service_test.dart b/test/core/jnap/services/wan_external_service_test.dart index 0aa6d9bf2..46dbd13d0 100644 --- a/test/core/jnap/services/wan_external_service_test.dart +++ b/test/core/jnap/services/wan_external_service_test.dart @@ -4,7 +4,7 @@ import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/page/instant_verify/models/instant_verify_ui_models.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; -import 'package:privacy_gui/core/jnap/services/wan_external_service.dart'; +import 'package:privacy_gui/page/instant_verify/services/wan_external_service.dart'; import '../../../mocks/test_data/wan_external_test_data.dart'; diff --git a/test/mocks/add_nodes_notifier_mocks.dart b/test/mocks/add_nodes_notifier_mocks.dart index e18d3fdcb..30b7d5807 100644 --- a/test/mocks/add_nodes_notifier_mocks.dart +++ b/test/mocks/add_nodes_notifier_mocks.dart @@ -8,7 +8,7 @@ import 'dart:async' as _i5; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; import 'package:privacy_gui/core/jnap/models/back_haul_info.dart' as _i8; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i7; import 'package:privacy_gui/core/jnap/result/jnap_result.dart' as _i6; import 'package:privacy_gui/page/nodes/providers/add_nodes_provider.dart' diff --git a/test/mocks/dashboard_home_notifier_mocks.dart b/test/mocks/dashboard_home_notifier_mocks.dart index 86092253c..41387cbe1 100644 --- a/test/mocks/dashboard_home_notifier_mocks.dart +++ b/test/mocks/dashboard_home_notifier_mocks.dart @@ -5,9 +5,9 @@ // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart' +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart' as _i5; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i6; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart' as _i4; diff --git a/test/mocks/dashboard_manager_notifier_mocks.dart b/test/mocks/dashboard_manager_notifier_mocks.dart index 41181a3f1..cef772235 100644 --- a/test/mocks/dashboard_manager_notifier_mocks.dart +++ b/test/mocks/dashboard_manager_notifier_mocks.dart @@ -8,11 +8,11 @@ import 'dart:async' as _i12; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; import 'package:privacy_gui/core/jnap/models/device_info.dart' as _i4; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart' +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart' as _i10; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart' +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart' as _i3; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart' as _i11; +import 'package:privacy_gui/core/data/providers/polling_provider.dart' as _i11; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values diff --git a/test/mocks/device_list_notifier_mock.dart b/test/mocks/device_list_notifier_mock.dart index 877a1ec9b..898282fd2 100644 --- a/test/mocks/device_list_notifier_mock.dart +++ b/test/mocks/device_list_notifier_mock.dart @@ -5,7 +5,7 @@ // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i4; import 'package:privacy_gui/page/instant_device/_instant_device.dart' as _i3; diff --git a/test/mocks/device_manager_notifier_mocks.dart b/test/mocks/device_manager_notifier_mocks.dart index d183c6deb..ffea14779 100644 --- a/test/mocks/device_manager_notifier_mocks.dart +++ b/test/mocks/device_manager_notifier_mocks.dart @@ -8,11 +8,11 @@ import 'dart:async' as _i8; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; import 'package:mockito/src/dummies.dart' as _i7; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart' +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart' as _i5; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i3; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart' as _i6; +import 'package:privacy_gui/core/data/providers/polling_provider.dart' as _i6; import 'package:privacy_gui/core/utils/icon_device_category.dart' as _i9; // ignore_for_file: type=lint diff --git a/test/mocks/firmware_update_notifier_mocks.dart b/test/mocks/firmware_update_notifier_mocks.dart index 40a460389..13debfe50 100644 --- a/test/mocks/firmware_update_notifier_mocks.dart +++ b/test/mocks/firmware_update_notifier_mocks.dart @@ -7,9 +7,9 @@ import 'dart:async' as _i5; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart' +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart' as _i4; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart' +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart' as _i3; // ignore_for_file: type=lint diff --git a/test/mocks/firmware_update_service_mocks.dart b/test/mocks/firmware_update_service_mocks.dart index f599d1bfc..df8ec5476 100644 --- a/test/mocks/firmware_update_service_mocks.dart +++ b/test/mocks/firmware_update_service_mocks.dart @@ -8,7 +8,7 @@ import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart' as _i2; -import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart' +import 'package:privacy_gui/core/data/services/firmware_update_service.dart' as _i3; import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart' as _i5; diff --git a/test/mocks/geolocation_notifier_mocks.dart b/test/mocks/geolocation_notifier_mocks.dart index c4f2a0c24..f7f1b4525 100644 --- a/test/mocks/geolocation_notifier_mocks.dart +++ b/test/mocks/geolocation_notifier_mocks.dart @@ -11,7 +11,7 @@ import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_provide as _i4; import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart' as _i3; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i6; // ignore_for_file: type=lint diff --git a/test/mocks/mockito_specs/dashboard_manager_notifier_spec.dart b/test/mocks/mockito_specs/dashboard_manager_notifier_spec.dart index 160bbd186..296beeae8 100644 --- a/test/mocks/mockito_specs/dashboard_manager_notifier_spec.dart +++ b/test/mocks/mockito_specs/dashboard_manager_notifier_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; diff --git a/test/mocks/mockito_specs/device_manager_notifier_spec.dart b/test/mocks/mockito_specs/device_manager_notifier_spec.dart index fee406d33..838792cfd 100644 --- a/test/mocks/mockito_specs/device_manager_notifier_spec.dart +++ b/test/mocks/mockito_specs/device_manager_notifier_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; diff --git a/test/mocks/mockito_specs/firmware_update_notifier_spec.dart b/test/mocks/mockito_specs/firmware_update_notifier_spec.dart index d17a5e91a..1b2b200ad 100644 --- a/test/mocks/mockito_specs/firmware_update_notifier_spec.dart +++ b/test/mocks/mockito_specs/firmware_update_notifier_spec.dart @@ -1,3 +1,3 @@ @GenerateNiceMocks([MockSpec()]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_provider.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_provider.dart'; diff --git a/test/mocks/mockito_specs/firmware_update_service_spec.dart b/test/mocks/mockito_specs/firmware_update_service_spec.dart index f04e9d605..6556ef174 100644 --- a/test/mocks/mockito_specs/firmware_update_service_spec.dart +++ b/test/mocks/mockito_specs/firmware_update_service_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart'; +import 'package:privacy_gui/core/data/services/firmware_update_service.dart'; diff --git a/test/mocks/mockito_specs/node_light_settings_notifier_spec.dart b/test/mocks/mockito_specs/node_light_settings_notifier_spec.dart index e0699d13d..7b7b0ea85 100644 --- a/test/mocks/mockito_specs/node_light_settings_notifier_spec.dart +++ b/test/mocks/mockito_specs/node_light_settings_notifier_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart'; +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart'; diff --git a/test/mocks/mockito_specs/polling_notifier_spec.dart b/test/mocks/mockito_specs/polling_notifier_spec.dart index 3ced08519..613dee662 100644 --- a/test/mocks/mockito_specs/polling_notifier_spec.dart +++ b/test/mocks/mockito_specs/polling_notifier_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; diff --git a/test/mocks/mockito_specs/side_effect_notifier_spec.dart b/test/mocks/mockito_specs/side_effect_notifier_spec.dart index 4e52abc4b..0b82c1c03 100644 --- a/test/mocks/mockito_specs/side_effect_notifier_spec.dart +++ b/test/mocks/mockito_specs/side_effect_notifier_spec.dart @@ -2,4 +2,4 @@ MockSpec(), ]) import 'package:mockito/annotations.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; diff --git a/test/mocks/node_detail_notifier_mocks.dart b/test/mocks/node_detail_notifier_mocks.dart index 8769a6461..06262ca01 100644 --- a/test/mocks/node_detail_notifier_mocks.dart +++ b/test/mocks/node_detail_notifier_mocks.dart @@ -7,7 +7,7 @@ import 'dart:async' as _i6; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart' +import 'package:privacy_gui/core/data/providers/device_manager_state.dart' as _i5; import 'package:privacy_gui/core/jnap/result/jnap_result.dart' as _i4; import 'package:privacy_gui/page/nodes/_nodes.dart' as _i3; diff --git a/test/mocks/node_light_settings_notifier_mocks.dart b/test/mocks/node_light_settings_notifier_mocks.dart index 3ac226fad..1cdc773f8 100644 --- a/test/mocks/node_light_settings_notifier_mocks.dart +++ b/test/mocks/node_light_settings_notifier_mocks.dart @@ -8,7 +8,7 @@ import 'dart:async' as _i5; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart' as _i3; -import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart' +import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart' as _i4; // ignore_for_file: type=lint diff --git a/test/mocks/polling_notifier_mocks.dart b/test/mocks/polling_notifier_mocks.dart index 9e3667351..c5d2cd77d 100644 --- a/test/mocks/polling_notifier_mocks.dart +++ b/test/mocks/polling_notifier_mocks.dart @@ -8,7 +8,7 @@ import 'dart:async' as _i4; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; import 'package:mockito/src/dummies.dart' as _i5; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart' as _i3; +import 'package:privacy_gui/core/data/providers/polling_provider.dart' as _i3; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values diff --git a/test/mocks/router_repository_mocks.dart b/test/mocks/router_repository_mocks.dart index 3e4654845..62ba28056 100644 --- a/test/mocks/router_repository_mocks.dart +++ b/test/mocks/router_repository_mocks.dart @@ -13,7 +13,7 @@ import 'package:privacy_gui/core/jnap/command/base_command.dart' as _i7; import 'package:privacy_gui/core/jnap/command/http/base_http_command.dart' as _i5; import 'package:privacy_gui/core/jnap/jnap_command_executor_mixin.dart' as _i3; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart' +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart' as _i11; import 'package:privacy_gui/core/jnap/result/jnap_result.dart' as _i4; import 'package:privacy_gui/core/jnap/router_repository.dart' as _i8; diff --git a/test/mocks/side_effect_notifier_mocks.dart b/test/mocks/side_effect_notifier_mocks.dart index 93a6375f5..e05b2ba0a 100644 --- a/test/mocks/side_effect_notifier_mocks.dart +++ b/test/mocks/side_effect_notifier_mocks.dart @@ -7,7 +7,7 @@ import 'dart:async' as _i5; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart' +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart' as _i3; import 'package:privacy_gui/core/jnap/result/jnap_result.dart' as _i4; diff --git a/test/mocks/test_data/dashboard_home_test_data.dart b/test/mocks/test_data/dashboard_home_test_data.dart index 0931fb2b2..e8e021623 100644 --- a/test/mocks/test_data/dashboard_home_test_data.dart +++ b/test/mocks/test_data/dashboard_home_test_data.dart @@ -3,8 +3,8 @@ import 'package:privacy_gui/core/jnap/models/device_info.dart'; import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart'; import 'package:privacy_gui/core/jnap/models/radio_info.dart'; import 'package:privacy_gui/core/jnap/models/wan_status.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; /// Test data builder for DashboardHomeService tests. /// diff --git a/test/mocks/test_data/dashboard_manager_test_data.dart b/test/mocks/test_data/dashboard_manager_test_data.dart index 66e0bf023..cbea3eea3 100644 --- a/test/mocks/test_data/dashboard_manager_test_data.dart +++ b/test/mocks/test_data/dashboard_manager_test_data.dart @@ -1,5 +1,5 @@ import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; /// Test data builder for DashboardManagerService tests. diff --git a/test/mocks/test_data/device_manager_test_data.dart b/test/mocks/test_data/device_manager_test_data.dart index 122d816b0..fe5490e19 100644 --- a/test/mocks/test_data/device_manager_test_data.dart +++ b/test/mocks/test_data/device_manager_test_data.dart @@ -1,5 +1,5 @@ import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; /// Test data builder for DeviceManagerService tests. diff --git a/test/mocks/test_data/instant_privacy_test_data.dart b/test/mocks/test_data/instant_privacy_test_data.dart index db59255e3..4f26b48e7 100644 --- a/test/mocks/test_data/instant_privacy_test_data.dart +++ b/test/mocks/test_data/instant_privacy_test_data.dart @@ -1,5 +1,5 @@ import 'package:privacy_gui/core/jnap/models/device.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; /// Test data builder for InstantPrivacyService tests diff --git a/test/page/advanced_settings/internet_settings/services/internet_settings_service_test.dart b/test/page/advanced_settings/internet_settings/services/internet_settings_service_test.dart index b70675f6c..e0af32cdd 100644 --- a/test/page/advanced_settings/internet_settings/services/internet_settings_service_test.dart +++ b/test/page/advanced_settings/internet_settings/services/internet_settings_service_test.dart @@ -5,7 +5,7 @@ import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/advanced_settings/internet_settings/models/_models.dart'; diff --git a/test/page/dashboard/localizations/dashboard_home_view_test.dart b/test/page/dashboard/localizations/dashboard_home_view_test.dart index cd41fdec7..258f855b0 100644 --- a/test/page/dashboard/localizations/dashboard_home_view_test.dart +++ b/test/page/dashboard/localizations/dashboard_home_view_test.dart @@ -4,9 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; import 'package:privacy_gui/page/dashboard/_dashboard.dart'; import 'package:privacy_gui/page/dashboard/views/components/home_title.dart'; import 'package:privacy_gui/page/dashboard/views/components/networks.dart'; diff --git a/test/page/dashboard/providers/dashboard_home_provider_test.dart b/test/page/dashboard/providers/dashboard_home_provider_test.dart index 1b9100ffd..19ab1b964 100644 --- a/test/page/dashboard/providers/dashboard_home_provider_test.dart +++ b/test/page/dashboard/providers/dashboard_home_provider_test.dart @@ -1,9 +1,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart'; import 'package:privacy_gui/page/dashboard/services/dashboard_home_service.dart'; diff --git a/test/page/firmware_update/views/localizations/firmware_update_detail_view_test.dart b/test/page/firmware_update/views/localizations/firmware_update_detail_view_test.dart index 03e5d3d96..477f43375 100644 --- a/test/page/firmware_update/views/localizations/firmware_update_detail_view_test.dart +++ b/test/page/firmware_update/views/localizations/firmware_update_detail_view_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart'; import 'package:privacy_gui/page/firmware_update/views/firmware_update_detail_view.dart'; import 'package:privacy_gui/route/route_model.dart'; diff --git a/test/page/health_check/providers/health_check_provider_test.dart b/test/page/health_check/providers/health_check_provider_test.dart index d8ac8529e..c5fb6a206 100644 --- a/test/page/health_check/providers/health_check_provider_test.dart +++ b/test/page/health_check/providers/health_check_provider_test.dart @@ -4,7 +4,7 @@ import 'package:fake_async/fake_async.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/page/health_check/models/health_check_enum.dart'; import 'package:privacy_gui/page/health_check/models/speed_test_event.dart'; import 'package:privacy_gui/page/health_check/models/speed_test_ui_model.dart'; diff --git a/test/page/instant_admin/providers/manual_firmware_update_provider_test.dart b/test/page/instant_admin/providers/manual_firmware_update_provider_test.dart index 8582b209b..30757074a 100644 --- a/test/page/instant_admin/providers/manual_firmware_update_provider_test.dart +++ b/test/page/instant_admin/providers/manual_firmware_update_provider_test.dart @@ -3,8 +3,8 @@ import 'dart:typed_data'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/side_effect_provider.dart'; import 'package:privacy_gui/page/instant_admin/providers/manual_firmware_update_provider.dart'; import 'package:privacy_gui/page/instant_admin/providers/manual_firmware_update_state.dart'; import 'package:privacy_gui/page/instant_admin/services/manual_firmware_update_service.dart'; diff --git a/test/page/instant_privacy/providers/instant_privacy_provider_test.dart b/test/page/instant_privacy/providers/instant_privacy_provider_test.dart index 2f11eb983..7f297b7d8 100644 --- a/test/page/instant_privacy/providers/instant_privacy_provider_test.dart +++ b/test/page/instant_privacy/providers/instant_privacy_provider_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_provider.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart'; import 'package:privacy_gui/page/instant_privacy/services/instant_privacy_service.dart'; diff --git a/test/page/instant_topology/providers/instant_topology_provider_test.dart b/test/page/instant_topology/providers/instant_topology_provider_test.dart index 4613f8db3..757698027 100644 --- a/test/page/instant_topology/providers/instant_topology_provider_test.dart +++ b/test/page/instant_topology/providers/instant_topology_provider_test.dart @@ -4,7 +4,7 @@ import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/page/instant_topology/providers/instant_topology_provider.dart'; import 'package:privacy_gui/page/instant_topology/services/instant_topology_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; class MockInstantTopologyService extends Mock implements InstantTopologyService {} diff --git a/test/page/instant_verify/providers/instant_verify_provider_test.dart b/test/page/instant_verify/providers/instant_verify_provider_test.dart index 816e14c3a..aaeaec778 100644 --- a/test/page/instant_verify/providers/instant_verify_provider_test.dart +++ b/test/page/instant_verify/providers/instant_verify_provider_test.dart @@ -7,9 +7,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/actions/better_action.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/wan_external_state.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_provider.dart'; +import 'package:privacy_gui/page/instant_verify/providers/wan_external_state.dart'; import 'package:privacy_gui/core/jnap/result/jnap_result.dart'; import 'package:privacy_gui/page/instant_verify/models/instant_verify_ui_models.dart'; import 'package:privacy_gui/page/instant_verify/providers/instant_verify_provider.dart'; diff --git a/test/page/instant_verify/views/localizations/instant_verify_view_test.dart b/test/page/instant_verify/views/localizations/instant_verify_view_test.dart index 59641a17d..13f3c30f5 100644 --- a/test/page/instant_verify/views/localizations/instant_verify_view_test.dart +++ b/test/page/instant_verify/views/localizations/instant_verify_view_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; -import 'package:privacy_gui/core/jnap/providers/node_wan_status_provider.dart'; +import 'package:privacy_gui/core/data/providers/node_internet_status_provider.dart'; import 'package:privacy_gui/page/health_check/providers/health_check_state.dart'; import 'package:privacy_gui/page/health_check/widgets/speed_test_widget.dart'; // import 'package:privacy_gui/page/instant_topology/views/instant_topology_view.dart'; diff --git a/test/page/nodes/localizations/node_detail_view_test.dart b/test/page/nodes/localizations/node_detail_view_test.dart index 7a154a582..dc8e8909e 100644 --- a/test/page/nodes/localizations/node_detail_view_test.dart +++ b/test/page/nodes/localizations/node_detail_view_test.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; import 'package:privacy_gui/core/jnap/models/node_light_settings.dart'; -import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart'; +import 'package:privacy_gui/core/data/providers/firmware_update_state.dart'; import 'package:privacy_gui/core/utils/icon_rules.dart'; import 'package:privacy_gui/page/instant_device/providers/device_filtered_list_provider.dart'; import 'package:privacy_gui/page/instant_device/providers/device_filtered_list_state.dart'; diff --git a/test/page/nodes/providers/node_detail_provider_test.dart b/test/page/nodes/providers/node_detail_provider_test.dart index d04eb536e..10b3069e2 100644 --- a/test/page/nodes/providers/node_detail_provider_test.dart +++ b/test/page/nodes/providers/node_detail_provider_test.dart @@ -3,8 +3,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; import 'package:privacy_gui/core/jnap/models/device.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/instant_device/providers/device_list_provider.dart'; import 'package:privacy_gui/page/instant_device/providers/device_list_state.dart'; import 'package:privacy_gui/page/nodes/providers/node_detail_id_provider.dart'; diff --git a/test/page/nodes/views/localizations/add_nodes_view_test.dart b/test/page/nodes/views/localizations/add_nodes_view_test.dart index ca813f0d8..1e154e4c9 100644 --- a/test/page/nodes/views/localizations/add_nodes_view_test.dart +++ b/test/page/nodes/views/localizations/add_nodes_view_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/nodes/providers/add_nodes_state.dart'; import 'package:privacy_gui/page/nodes/views/add_nodes_view.dart'; import 'package:privacy_gui/page/nodes/views/light_different_color_modal.dart'; diff --git a/test/page/wifi_settings/providers/wifi_bundle_provider_test.dart b/test/page/wifi_settings/providers/wifi_bundle_provider_test.dart index 7c49993fa..2b241fde2 100644 --- a/test/page/wifi_settings/providers/wifi_bundle_provider_test.dart +++ b/test/page/wifi_settings/providers/wifi_bundle_provider_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:get_it/get_it.dart'; import 'package:mocktail/mocktail.dart'; import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart'; import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart'; diff --git a/test/page/wifi_settings/services/wifi_settings_service_test.dart b/test/page/wifi_settings/services/wifi_settings_service_test.dart index 4aae84796..5a17b4742 100644 --- a/test/page/wifi_settings/services/wifi_settings_service_test.dart +++ b/test/page/wifi_settings/services/wifi_settings_service_test.dart @@ -8,7 +8,7 @@ import 'package:privacy_gui/core/jnap/router_repository.dart'; import 'package:privacy_gui/page/instant_device/providers/device_list_state.dart'; import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart'; import 'package:privacy_gui/core/jnap/command/base_command.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; import 'package:privacy_gui/page/wifi_settings/providers/guest_wifi_item.dart'; import 'package:privacy_gui/page/wifi_settings/providers/wifi_advanced_state.dart'; import 'package:privacy_gui/page/wifi_settings/providers/wifi_item.dart'; diff --git a/test/providers/auth/auth_provider_test.dart b/test/providers/auth/auth_provider_test.dart index 2c0842dc8..0880a6735 100644 --- a/test/providers/auth/auth_provider_test.dart +++ b/test/providers/auth/auth_provider_test.dart @@ -7,9 +7,9 @@ import 'package:privacy_gui/constants/pref_key.dart'; import 'package:privacy_gui/core/cloud/model/cloud_session_model.dart'; import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart'; import 'package:privacy_gui/core/errors/service_error.dart'; -import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart'; -import 'package:privacy_gui/core/jnap/providers/polling_provider.dart'; +import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_provider.dart'; +import 'package:privacy_gui/core/data/providers/polling_provider.dart'; import 'package:privacy_gui/providers/auth/auth_provider.dart'; import 'package:privacy_gui/providers/auth/auth_result.dart'; import 'package:privacy_gui/providers/auth/auth_service.dart'; diff --git a/test/test_data/firmware_update_test_state.dart b/test/test_data/firmware_update_test_state.dart index 80c134dd6..3e7a9d973 100644 --- a/test/test_data/firmware_update_test_state.dart +++ b/test/test_data/firmware_update_test_state.dart @@ -1,5 +1,5 @@ import 'package:privacy_gui/core/jnap/models/firmware_update_status_nodes.dart'; -import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart'; +import 'package:privacy_gui/core/data/providers/device_manager_state.dart'; // Objects of LinksysDevice const _firmwareUpdateNodeMaster = '''