diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart index f67fcd16..4efb6e3c 100644 --- a/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart +++ b/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart @@ -1,6 +1,5 @@ import 'package:account/src/core/data/models/change_password_request_model.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../../../features/change_password/domain/models/entities/change_password_request_entity.dart'; diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart index 14fd6a88..558e8012 100644 --- a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart +++ b/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart @@ -1,7 +1,6 @@ import 'package:account/src/core/data/models/update_device_request_model.dart'; import 'package:account/src/features/linked_devices/domain/entities/update_device_request_entity.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'devices_remote_datasource.dart'; diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart index da3d7cb0..308e0781 100644 --- a/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart +++ b/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart @@ -3,7 +3,6 @@ import 'package:account/src/core/data/models/get_app_users_response_model.dart'; import 'package:account/src/core/data/models/update_user_request_model.dart'; import 'package:account/src/features/personal_data/domain/entities/update_user_request_entity.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_shared/sf_shared.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/account_settings/presentation/state/account_settings_view_model.dart b/modules/legacy/modules/account/lib/src/features/account_settings/presentation/state/account_settings_view_model.dart index 42c7d5f1..c6677e47 100644 --- a/modules/legacy/modules/account/lib/src/features/account_settings/presentation/state/account_settings_view_model.dart +++ b/modules/legacy/modules/account/lib/src/features/account_settings/presentation/state/account_settings_view_model.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'package:account/src/features/account_settings/presentation/state/account_settings_view_state.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:legacy_auth/legacy_auth.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/delete_account/presentation/state/delete_account_view_model.dart b/modules/legacy/modules/account/lib/src/features/delete_account/presentation/state/delete_account_view_model.dart index 3f432977..956fa32f 100644 --- a/modules/legacy/modules/account/lib/src/features/delete_account/presentation/state/delete_account_view_model.dart +++ b/modules/legacy/modules/account/lib/src/features/delete_account/presentation/state/delete_account_view_model.dart @@ -5,7 +5,6 @@ import 'package:account/src/core/providers/users_repository_provider.dart'; import 'package:account/src/features/delete_account/presentation/state/delete_account_view_state.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart index 25500f2e..da983bcf 100644 --- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart +++ b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart @@ -4,7 +4,6 @@ import 'package:account/src/features/linked_devices/domain/entities/update_devic import 'package:account/src/features/linked_devices/presentation/state/linked_devices_view_state.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/control_panel/lib/control_panel.dart b/modules/legacy/modules/control_panel/lib/control_panel.dart index 147f836c..a278c22b 100644 --- a/modules/legacy/modules/control_panel/lib/control_panel.dart +++ b/modules/legacy/modules/control_panel/lib/control_panel.dart @@ -1,10 +1,3 @@ -export 'src/core/data/models/latest_positions_response_model.dart'; -export 'src/core/domain/entities/address_entity.dart'; -export 'src/core/domain/entities/network_entity.dart'; -export 'src/core/domain/entities/position_entity.dart'; -export 'src/core/utils/battery_utils.dart'; -export 'src/core/utils/date_format_utils.dart'; export 'src/features/alerts/alerts_builder.dart' show DeviceAlertsBuilder; export 'src/features/control_panel/control_panel_builder.dart'; -export 'src/features/control_panel/presentation/state/control_panel_view_model.dart'; export 'src/shared/widgets/device_map.dart'; diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource.dart b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource.dart index 50423a49..f94cf672 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource.dart +++ b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource.dart @@ -1,5 +1,4 @@ import '../../domain/entities/alert_entity.dart'; -import '../models/alerts_response_model.dart'; abstract class AlertsRemoteDatasource { Future<(List, int totalPages)> getAlerts({ diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource_impl.dart b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource_impl.dart index 5ee97443..6975736e 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource_impl.dart +++ b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/alerts_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource.dart b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource.dart deleted file mode 100644 index 93832063..00000000 --- a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; - -abstract class ControlPanelRemoteDatasource { - Future> getLatestPositions({required String deviceId}); -} diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/repositories/control_panel_repository_impl.dart b/modules/legacy/modules/control_panel/lib/src/core/data/repositories/control_panel_repository_impl.dart deleted file mode 100644 index 9231fdff..00000000 --- a/modules/legacy/modules/control_panel/lib/src/core/data/repositories/control_panel_repository_impl.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:control_panel/src/core/data/datasource/control_panel_remote_datasource.dart'; -import 'package:control_panel/src/core/domain/repositories/control_panel_repository.dart'; -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; - -class ControlPanelRepositoryImpl implements ControlPanelRepository { - const ControlPanelRepositoryImpl(this._remote); - - final ControlPanelRemoteDatasource _remote; - - @override - Future> getLatestPositions({ - required String deviceId, - }) async { - return _remote.getLatestPositions(deviceId: deviceId); - } -} diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/repositories/control_panel_repository.dart b/modules/legacy/modules/control_panel/lib/src/core/domain/repositories/control_panel_repository.dart deleted file mode 100644 index 2545a70a..00000000 --- a/modules/legacy/modules/control_panel/lib/src/core/domain/repositories/control_panel_repository.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; - -abstract class ControlPanelRepository { - Future> getLatestPositions({required String deviceId}); -} diff --git a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart b/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart deleted file mode 100644 index dbb91354..00000000 --- a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:control_panel/src/core/data/datasource/control_panel_remote_datasource.dart'; -import 'package:control_panel/src/core/data/datasource/control_panel_remote_datasource_impl.dart'; -import 'package:sf_infrastructure/sf_infrastructure.dart'; - -final controlPanelRemoteDatasourceProvider = - Provider((ref) { - final saveFamilyRepository = getIt(); - return ControlPanelRemoteDatasourceImpl(saveFamilyRepository); - }); diff --git a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_repository_provider.dart b/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_repository_provider.dart deleted file mode 100644 index 6be3d8d7..00000000 --- a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_repository_provider.dart +++ /dev/null @@ -1,9 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:control_panel/src/core/data/repositories/control_panel_repository_impl.dart'; -import 'package:control_panel/src/core/domain/repositories/control_panel_repository.dart'; -import 'package:control_panel/src/core/providers/control_panel_remote_datasource_provider.dart'; - -final controlPanelRepositoryProvider = Provider((ref) { - final remote = ref.read(controlPanelRemoteDatasourceProvider); - return ControlPanelRepositoryImpl(remote); -}); diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart index a691fcb4..dd3d9976 100644 --- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart +++ b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart @@ -1,11 +1,11 @@ import 'package:flutter_svg/svg.dart'; -import 'package:control_panel/src/features/control_panel/presentation/state/control_panel_view_model.dart'; -import 'package:control_panel/src/features/control_panel/presentation/state/control_panel_view_state.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:control_panel/src/shared/widgets/device_map.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:legacy_shared/legacy_shared.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_shared/sf_shared.dart'; @@ -19,10 +19,10 @@ class ControlPanelScreen extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final theme = ref.watch(themePortProvider); - final asyncState = ref.watch(controlPanelViewModelProvider); + final asyncState = ref.watch(legacyDeviceViewModelProvider); ref.listen( - controlPanelViewModelProvider.select( + legacyDeviceViewModelProvider.select( (async) => async.value?.positionsError ?? false, ), (_, hasError) { @@ -44,8 +44,8 @@ class ControlPanelScreen extends ConsumerWidget { error: (error, _) => RefreshableErrorState( message: formatErrorMessage(error), onRefresh: () async { - ref.invalidate(controlPanelViewModelProvider); - await ref.read(controlPanelViewModelProvider.future); + ref.invalidate(legacyDeviceViewModelProvider); + await ref.read(legacyDeviceViewModelProvider.future); }, ), data: (state) => SafeArea( @@ -64,7 +64,7 @@ class ControlPanelScreen extends ConsumerWidget { color: theme.getColorFor(ThemeCode.legacyPrimary), onRefresh: () async { ref.invalidate(legacyDevicesProvider); - await ref.read(controlPanelViewModelProvider.future); + await ref.read(legacyDeviceViewModelProvider.future); }, child: SingleChildScrollView( physics: const AlwaysScrollableScrollPhysics(), @@ -97,14 +97,14 @@ class ControlPanelScreen extends ConsumerWidget { } class _Header extends ConsumerWidget { - final ControlPanelViewState state; + final LegacyDeviceViewState state; final NavigationContract navigationContract; const _Header({required this.state, required this.navigationContract}); @override Widget build(BuildContext context, WidgetRef ref) { - final vm = ref.read(controlPanelViewModelProvider.notifier); + final vm = ref.read(legacyDeviceViewModelProvider.notifier); return Stack( alignment: Alignment.center, @@ -254,7 +254,7 @@ class _SectionButton extends ConsumerWidget { } class _MapSection extends ConsumerWidget { - final ControlPanelViewState state; + final LegacyDeviceViewState state; final NavigationContract navigationContract; const _MapSection({ @@ -265,7 +265,7 @@ class _MapSection extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final theme = ref.read(themePortProvider); - final vm = ref.read(controlPanelViewModelProvider.notifier); + final vm = ref.read(legacyDeviceViewModelProvider.notifier); return GestureDetector( onTap: () => navigationContract.goTo(AppRoutes.legacyLocation), diff --git a/modules/legacy/modules/control_panel/lib/src/shared/widgets/device_map.dart b/modules/legacy/modules/control_panel/lib/src/shared/widgets/device_map.dart index 2c8bef86..2c9bf5e2 100644 --- a/modules/legacy/modules/control_panel/lib/src/shared/widgets/device_map.dart +++ b/modules/legacy/modules/control_panel/lib/src/shared/widgets/device_map.dart @@ -1,6 +1,3 @@ -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; -import 'package:control_panel/src/core/utils/battery_utils.dart'; -import 'package:control_panel/src/core/utils/date_format_utils.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; diff --git a/modules/legacy/modules/control_panel/pubspec.yaml b/modules/legacy/modules/control_panel/pubspec.yaml index 45ae3bbb..bfa59bc6 100644 --- a/modules/legacy/modules/control_panel/pubspec.yaml +++ b/modules/legacy/modules/control_panel/pubspec.yaml @@ -50,6 +50,8 @@ dependencies: path: ../../../../packages/utils legacy_shared: path: ../../packages/legacy_shared + legacy_device_state: + path: ../../packages/legacy_device_state sf_shared: path: ../../../../packages/sf_shared #dependencies go here diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart index 30eed2ac..9b320350 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/get_app_usage_times_response_model.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart index e400b9df..1d3c8bbb 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart @@ -1,7 +1,6 @@ import 'package:dio/dio.dart'; import 'package:get_it/get_it.dart'; -import 'package:legacy_shared/legacy_shared.dart'; -import 'package:sf_infrastructure/configure_dependencies.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/get_background_image_response_model.dart'; import 'background_image_remote_datasource.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart index bef65dc2..ec9965ae 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/create_contact_request_model.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart index 7e1a806d..25049324 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/get_heartbeats_response_model.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart index 8a6753c9..23b6cbf4 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart @@ -2,7 +2,6 @@ import 'package:device_management/src/core/data/datasources/pictures_remote_data import 'package:device_management/src/core/data/models/get_pictures_response_model.dart'; import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; class PicturesRemoteDatasourceImpl implements PicturesRemoteDatasource { diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart index 494df188..bed4295d 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/create_scheduled_activity_request_model.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart index e99562d2..62bd64ac 100644 --- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart +++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../models/get_steps_response_model.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/state/apps_use_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/state/apps_use_view_model.dart index fe1b48fa..3e9bd048 100644 --- a/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/state/apps_use_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/state/apps_use_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/state/background_image_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/state/background_image_view_model.dart index ed3c1657..b7592628 100644 --- a/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/state/background_image_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/state/background_image_view_model.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart index 55ceed3f..54d93ff0 100644 --- a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart +++ b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'call_history_entity.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_model.dart index 1ece5587..ed1e93c0 100644 --- a/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart index 7e1aed08..7f8c06fd 100644 --- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/state/do_not_disturb_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/state/do_not_disturb_view_model.dart index 6fa9f2a6..abda21f1 100644 --- a/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/state/do_not_disturb_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/state/do_not_disturb_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/state/scheduled_activities_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/state/scheduled_activities_view_model.dart index f4712e3e..6976e94c 100644 --- a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/state/scheduled_activities_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/state/scheduled_activities_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart index ba7240eb..a4868692 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:legacy_auth/src/core/data/models/two_fa_secret_response_model.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'auth_remote_datasource.dart'; diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart index 6db4d517..4dabbe4a 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart @@ -1,7 +1,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:legacy_auth/src/core/data/datasource/login_remote_datasource.dart'; import 'package:legacy_auth/src/core/data/models/login_response_model.dart'; -import 'package:legacy_shared/legacy_shared.dart'; class LegacyLoginRemoteDatasourceImpl implements LegacyLoginRemoteDatasource { const LegacyLoginRemoteDatasourceImpl(this._repository); diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart index 21c9c861..fc4ce9c9 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart @@ -1,6 +1,5 @@ import 'package:legacy_auth/src/core/data/models/sign_up_request_model.dart'; import 'package:legacy_auth/src/core/data/models/sign_up_response_model.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'sign_up_remote_datasource.dart'; diff --git a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/state/device_setup_view_model.dart b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/state/device_setup_view_model.dart index 2852e83c..e225edd8 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/state/device_setup_view_model.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/state/device_setup_view_model.dart @@ -9,7 +9,6 @@ import 'package:legacy_auth/src/features/device_setup/presentation/state/device_ import 'package:legacy_auth/src/features/device_setup/presentation/enums/add_kid_step.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/state/login_view_model.dart b/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/state/login_view_model.dart index 47c2f152..625a1471 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/state/login_view_model.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/state/login_view_model.dart @@ -7,7 +7,7 @@ import 'package:legacy_auth/src/features/login/presentation/mixins/login_form_va import 'package:legacy_auth/src/features/login/presentation/state/login_view_state.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/legacy_auth/lib/src/features/sign_up/presentation/state/sign_up_view_model.dart b/modules/legacy/modules/legacy_auth/lib/src/features/sign_up/presentation/state/sign_up_view_model.dart index 8973cae6..284e27fe 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/features/sign_up/presentation/state/sign_up_view_model.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/features/sign_up/presentation/state/sign_up_view_model.dart @@ -10,7 +10,7 @@ import 'package:legacy_auth/src/features/sign_up/domain/entities/legacy_signup_e import 'package:legacy_auth/src/features/sign_up/domain/entities/sign_up_request_entity.dart'; import 'package:legacy_auth/src/features/sign_up/presentation/mixins/sign_up_form_validation.dart'; import 'package:legacy_auth/src/features/sign_up/presentation/state/sign_up_view_state.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource.dart b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource.dart index e8f6f9e2..0ffe617e 100644 --- a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource.dart +++ b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:location/src/core/data/models/create_frequent_place_request_model.dart'; import 'package:location/src/core/data/models/create_geofence_request_model.dart'; import 'package:location/src/core/data/models/update_frequent_place_request_model.dart'; diff --git a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart index 0813e9de..e7df4342 100644 --- a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart +++ b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart @@ -1,7 +1,6 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:utils/utils.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:location/src/core/data/datasource/location_remote_datasource.dart'; import 'package:location/src/core/data/models/create_frequent_place_request_model.dart'; import 'package:location/src/core/data/models/create_frequent_place_response_model.dart'; diff --git a/modules/legacy/modules/location/lib/src/core/data/models/position_history_response_model.dart b/modules/legacy/modules/location/lib/src/core/data/models/position_history_response_model.dart index 5cbc03d8..7779793f 100644 --- a/modules/legacy/modules/location/lib/src/core/data/models/position_history_response_model.dart +++ b/modules/legacy/modules/location/lib/src/core/data/models/position_history_response_model.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; part 'position_history_response_model.freezed.dart'; diff --git a/modules/legacy/modules/location/lib/src/core/data/repositories/location_repository_impl.dart b/modules/legacy/modules/location/lib/src/core/data/repositories/location_repository_impl.dart index e942ddcd..d56e040e 100644 --- a/modules/legacy/modules/location/lib/src/core/data/repositories/location_repository_impl.dart +++ b/modules/legacy/modules/location/lib/src/core/data/repositories/location_repository_impl.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:location/src/core/data/datasource/location_remote_datasource.dart'; import 'package:location/src/core/data/models/create_frequent_place_request_model.dart'; import 'package:location/src/core/data/models/create_geofence_request_model.dart'; diff --git a/modules/legacy/modules/location/lib/src/core/domain/repositories/location_repository.dart b/modules/legacy/modules/location/lib/src/core/domain/repositories/location_repository.dart index 386f9979..c0fc9660 100644 --- a/modules/legacy/modules/location/lib/src/core/domain/repositories/location_repository.dart +++ b/modules/legacy/modules/location/lib/src/core/domain/repositories/location_repository.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:location/src/core/data/models/create_frequent_place_request_model.dart'; import 'package:location/src/core/data/models/create_geofence_request_model.dart'; import 'package:location/src/core/data/models/update_frequent_place_request_model.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/location_screen.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/location_screen.dart index 9ba5207e..e21bd47e 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/location_screen.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/location_screen.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -14,7 +14,7 @@ class LocationScreen extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final theme = ref.watch(themePortProvider); - final asyncControlPanelState = ref.watch(controlPanelViewModelProvider); + final asyncDeviceState = ref.watch(legacyDeviceViewModelProvider); final asyncLocationState = ref.watch(locationViewModelProvider); ref.listen( @@ -85,7 +85,7 @@ class LocationScreen extends ConsumerWidget { }, ); - ref.listen(controlPanelViewModelProvider, (previous, next) { + ref.listen(legacyDeviceViewModelProvider, (previous, next) { if (next.hasError && previous != null && !previous.hasError) { showTopSnackbar( context, @@ -105,10 +105,10 @@ class LocationScreen extends ConsumerWidget { } }); - final controlPanelState = asyncControlPanelState.value; + final deviceState = asyncDeviceState.value; final locationState = asyncLocationState.value; - final isLoading = asyncControlPanelState.isLoading && - controlPanelState == null; + final isLoading = asyncDeviceState.isLoading && + deviceState == null; return LegacyPageLayout( theme: theme, @@ -116,19 +116,19 @@ class LocationScreen extends ConsumerWidget { showBack: false, body: isLoading ? const Center(child: CircularProgressIndicator()) - : controlPanelState == null + : deviceState == null ? RefreshableErrorState( onRefresh: () async { - ref.invalidate(controlPanelViewModelProvider); + ref.invalidate(legacyDeviceViewModelProvider); ref.invalidate(locationViewModelProvider); - await ref.read(controlPanelViewModelProvider.future); + await ref.read(legacyDeviceViewModelProvider.future); }, ) : LocationMap( - selectedPosition: controlPanelState.selectedPosition, - selectedDevice: controlPanelState.selectedDevice, - devices: controlPanelState.devices, - positions: controlPanelState.positions, + selectedPosition: deviceState.selectedPosition, + selectedDevice: deviceState.selectedDevice, + devices: deviceState.devices, + positions: deviceState.positions, geofences: locationState?.geofences ?? const [], frequentPlaces: locationState?.frequentPlaces ?? const [], positionHistory: locationState?.positionHistory ?? const [], @@ -136,12 +136,12 @@ class LocationScreen extends ConsumerWidget { isLoadingHistory: locationState?.isLoadingHistory ?? false, onDeviceChanged: (device) { ref - .read(controlPanelViewModelProvider.notifier) + .read(legacyDeviceViewModelProvider.notifier) .setSelectedDevice(device); }, onRefreshPosition: () { ref - .read(controlPanelViewModelProvider.notifier) + .read(legacyDeviceViewModelProvider.notifier) .refreshPositions(); }, ), diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_model.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_model.dart index 6ba1498d..1b68657f 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_model.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_model.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:latlong2/latlong.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_state.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_state.dart index 4ba695bf..304580c8 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_state.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_map_view_state.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:latlong2/latlong.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_state.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_state.dart index 4f4b070f..886d0cf2 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_state.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_state.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; import 'package:location/src/core/domain/entities/frequent_place_entity.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/device_banner.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/device_banner.dart index 3dbaddea..1ceeb5a4 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/device_banner.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/device_banner.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_list_sheet.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_list_sheet.dart index 5d6e7c64..7a51bb17 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_list_sheet.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_list_sheet.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart index 8badc1d2..ea899e82 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:control_panel/control_panel.dart'; import 'package:share_plus/share_plus.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_info_cards/history_position_info_card.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_info_cards/history_position_info_card.dart index 4be4e60f..fe6df141 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_info_cards/history_position_info_card.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_info_cards/history_position_info_card.dart @@ -1,4 +1,4 @@ -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:flutter/material.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/route_history_layer.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/route_history_layer.dart index 478a3f59..504e37fd 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/route_history_layer.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/route_history_layer.dart @@ -1,6 +1,6 @@ import 'dart:math' as math; -import 'package:control_panel/control_panel.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:intl/intl.dart'; diff --git a/modules/legacy/modules/location/pubspec.yaml b/modules/legacy/modules/location/pubspec.yaml index b8eafe67..7b0c0770 100644 --- a/modules/legacy/modules/location/pubspec.yaml +++ b/modules/legacy/modules/location/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: flutter: sdk: flutter - control_panel: - path: ../control_panel + legacy_device_state: + path: ../../packages/legacy_device_state design_system: path: ../../../../packages/design_system sf_localizations: diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart index 6b787076..23c1bc98 100644 --- a/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart +++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:settings/src/core/data/datasources/alarm_remote_datasource.dart'; import 'package:settings/src/core/data/models/get_alarms_response_model.dart'; import 'package:settings/src/features/alarm/domain/entities/alarm_entity.dart'; diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart index 79151a12..7126242a 100644 --- a/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart +++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:settings/src/core/data/models/get_contact_lists_response_model.dart'; diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart index 17f08de1..c4fc2e61 100644 --- a/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart +++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import '../../../features/wifi_settings/domain/entities/wifi_network_entity.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/state/alarm_view_model.dart b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/state/alarm_view_model.dart index 3bba07d3..ae93e635 100644 --- a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/state/alarm_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/state/alarm_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:settings/src/core/domain/repositories/alarm_repository.dart'; import 'package:settings/src/core/providers/alarm_repository_provider.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/state/block_phone_view_model.dart b/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/state/block_phone_view_model.dart index 30030dc9..331012d1 100644 --- a/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/state/block_phone_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/state/block_phone_view_model.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:settings/src/core/domain/entities/contact_list_contact_entity.dart'; import 'package:settings/src/core/domain/repositories/block_phone_repository.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/language/presentation/state/language_view_model.dart b/modules/legacy/modules/settings/lib/src/features/language/presentation/state/language_view_model.dart index eebd70e3..b288f147 100644 --- a/modules/legacy/modules/settings/lib/src/features/language/presentation/state/language_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/language/presentation/state/language_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:settings/src/core/domain/repositories/language_repository.dart'; import 'package:settings/src/core/providers/language_repository_provider.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/settings/presentation/settings_screen.dart b/modules/legacy/modules/settings/lib/src/features/settings/presentation/settings_screen.dart index c73c6bbc..bc9e78b6 100644 --- a/modules/legacy/modules/settings/lib/src/features/settings/presentation/settings_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/settings/presentation/settings_screen.dart @@ -2,7 +2,6 @@ import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:legacy_shared/legacy_shared.dart'; -import 'package:sf_shared/sf_shared.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/sos_contacts/presentation/state/sos_contacts_view_model.dart b/modules/legacy/modules/settings/lib/src/features/sos_contacts/presentation/state/sos_contacts_view_model.dart index a4130af0..1e8d8064 100644 --- a/modules/legacy/modules/settings/lib/src/features/sos_contacts/presentation/state/sos_contacts_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/sos_contacts/presentation/state/sos_contacts_view_model.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:settings/src/core/domain/entities/contact_list_contact_entity.dart'; import 'package:settings/src/core/domain/repositories/sos_contacts_repository.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/state/sync_clock_view_model.dart b/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/state/sync_clock_view_model.dart index 6cefd4ef..c973e0a6 100644 --- a/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/state/sync_clock_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/state/sync_clock_view_model.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/packages/legacy_device_state/lib/legacy_device_state.dart b/modules/legacy/packages/legacy_device_state/lib/legacy_device_state.dart new file mode 100644 index 00000000..4a514561 --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/legacy_device_state.dart @@ -0,0 +1,8 @@ +export 'src/legacy_device_repository.dart'; +export 'src/legacy_device_repository_impl.dart'; +export 'src/legacy_device_remote_datasource.dart'; +export 'src/legacy_device_remote_datasource_impl.dart'; +export 'src/legacy_device_repository_provider.dart'; +export 'src/legacy_device_remote_datasource_provider.dart'; +export 'src/legacy_device_view_model.dart'; +export 'src/legacy_device_view_state.dart'; diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource.dart new file mode 100644 index 00000000..6366b8e0 --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource.dart @@ -0,0 +1,5 @@ +import 'package:legacy_shared/legacy_shared.dart'; + +abstract class LegacyDeviceRemoteDatasource { + Future> getLatestPositions({required String deviceId}); +} diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart similarity index 68% rename from modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart rename to modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart index fdd55f98..90a8cbbb 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart @@ -1,12 +1,10 @@ -import 'package:control_panel/src/core/data/datasource/control_panel_remote_datasource.dart'; +import 'legacy_device_remote_datasource.dart'; import 'package:dio/dio.dart'; -import 'package:control_panel/src/core/data/models/latest_positions_response_model.dart'; -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; import 'package:legacy_shared/legacy_shared.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; -class ControlPanelRemoteDatasourceImpl implements ControlPanelRemoteDatasource { - ControlPanelRemoteDatasourceImpl(this._repository); +class LegacyDeviceRemoteDatasourceImpl implements LegacyDeviceRemoteDatasource { + LegacyDeviceRemoteDatasourceImpl(this._repository); final SaveFamilyRepository _repository; diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_provider.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_provider.dart new file mode 100644 index 00000000..1abb4a78 --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_provider.dart @@ -0,0 +1,10 @@ +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'legacy_device_remote_datasource.dart'; +import 'legacy_device_remote_datasource_impl.dart'; +import 'package:sf_infrastructure/sf_infrastructure.dart'; + +final legacyDeviceRemoteDatasourceProvider = + Provider((ref) { + final saveFamilyRepository = getIt(); + return LegacyDeviceRemoteDatasourceImpl(saveFamilyRepository); + }); diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository.dart new file mode 100644 index 00000000..cbde437d --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository.dart @@ -0,0 +1,5 @@ +import 'package:legacy_shared/legacy_shared.dart'; + +abstract class LegacyDeviceRepository { + Future> getLatestPositions({required String deviceId}); +} diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_impl.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_impl.dart new file mode 100644 index 00000000..bb17d790 --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_impl.dart @@ -0,0 +1,16 @@ +import 'legacy_device_remote_datasource.dart'; +import 'legacy_device_repository.dart'; +import 'package:legacy_shared/legacy_shared.dart'; + +class LegacyDeviceRepositoryImpl implements LegacyDeviceRepository { + const LegacyDeviceRepositoryImpl(this._remote); + + final LegacyDeviceRemoteDatasource _remote; + + @override + Future> getLatestPositions({ + required String deviceId, + }) async { + return _remote.getLatestPositions(deviceId: deviceId); + } +} diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_provider.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_provider.dart new file mode 100644 index 00000000..34c2ff17 --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_repository_provider.dart @@ -0,0 +1,9 @@ +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'legacy_device_repository_impl.dart'; +import 'legacy_device_repository.dart'; +import 'legacy_device_remote_datasource_provider.dart'; + +final legacyDeviceRepositoryProvider = Provider((ref) { + final remote = ref.read(legacyDeviceRemoteDatasourceProvider); + return LegacyDeviceRepositoryImpl(remote); +}); diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_model.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart similarity index 78% rename from modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_model.dart rename to modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart index b5fda4a5..f5a3833c 100644 --- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_model.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart @@ -1,29 +1,28 @@ import 'dart:async'; -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; -import 'package:control_panel/src/core/domain/repositories/control_panel_repository.dart'; -import 'package:control_panel/src/core/providers/control_panel_repository_provider.dart'; -import 'package:control_panel/src/features/control_panel/presentation/state/control_panel_view_state.dart'; +import 'legacy_device_repository.dart'; +import 'legacy_device_repository_provider.dart'; +import 'legacy_device_view_state.dart'; import 'package:legacy_shared/legacy_shared.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; -final controlPanelViewModelProvider = AsyncNotifierProvider.autoDispose< - ControlPanelViewModel, - ControlPanelViewState>(ControlPanelViewModel.new); +final legacyDeviceViewModelProvider = AsyncNotifierProvider.autoDispose< + LegacyDeviceViewModel, + LegacyDeviceViewState>(LegacyDeviceViewModel.new); -class ControlPanelViewModel extends AsyncNotifier { - late ControlPanelRepository _controlPanelRepository; +class LegacyDeviceViewModel extends AsyncNotifier { + late LegacyDeviceRepository _legacyDeviceRepository; late SfTrackingRepository _tracking; @override - Future build() async { - _controlPanelRepository = ref.read(controlPanelRepositoryProvider); + Future build() async { + _legacyDeviceRepository = ref.read(legacyDeviceRepositoryProvider); _tracking = ref.read(sfTrackingProvider); final devices = await ref.watch(legacyDevicesProvider.future); - if (devices.isEmpty) return const ControlPanelViewState(); + if (devices.isEmpty) return const LegacyDeviceViewState(); final selected = await ref.watch(selectedDeviceProvider.future); @@ -34,7 +33,7 @@ class ControlPanelViewModel extends AsyncNotifier { .firstOrNull : null; - return ControlPanelViewState( + return LegacyDeviceViewState( devices: devices, selectedDevice: selected, positions: latestPositions, @@ -77,7 +76,7 @@ class ControlPanelViewModel extends AsyncNotifier { var hadError = false; final positionLists = await Future.wait>( devices.map( - (device) => _controlPanelRepository + (device) => _legacyDeviceRepository .getLatestPositions(deviceId: device.identificator) .catchError((_) { hadError = true; diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart similarity index 55% rename from modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.dart rename to modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart index 5523fa65..46a15fde 100644 --- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart @@ -1,16 +1,16 @@ -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; +import 'package:legacy_shared/legacy_shared.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:sf_shared/sf_shared.dart'; -part 'control_panel_view_state.freezed.dart'; +part 'legacy_device_view_state.freezed.dart'; @freezed -abstract class ControlPanelViewState with _$ControlPanelViewState { - const factory ControlPanelViewState({ +abstract class LegacyDeviceViewState with _$LegacyDeviceViewState { + const factory LegacyDeviceViewState({ @Default([]) List devices, DeviceEntity? selectedDevice, @Default([]) List positions, PositionEntity? selectedPosition, @Default(false) bool positionsError, - }) = _ControlPanelViewState; + }) = _LegacyDeviceViewState; } diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.freezed.dart similarity index 80% rename from modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.freezed.dart index 43dd2ff7..cc1818d4 100644 --- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_state.freezed.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.freezed.dart @@ -3,7 +3,7 @@ // ignore_for_file: type=lint // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark -part of 'control_panel_view_state.dart'; +part of 'legacy_device_view_state.dart'; // ************************************************************************** // FreezedGenerator @@ -12,20 +12,20 @@ part of 'control_panel_view_state.dart'; // dart format off T _$identity(T value) => value; /// @nodoc -mixin _$ControlPanelViewState { +mixin _$LegacyDeviceViewState { List get devices; DeviceEntity? get selectedDevice; List get positions; PositionEntity? get selectedPosition; bool get positionsError; -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @pragma('vm:prefer-inline') -$ControlPanelViewStateCopyWith get copyWith => _$ControlPanelViewStateCopyWithImpl(this as ControlPanelViewState, _$identity); +$LegacyDeviceViewStateCopyWith get copyWith => _$LegacyDeviceViewStateCopyWithImpl(this as LegacyDeviceViewState, _$identity); @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is ControlPanelViewState&&const DeepCollectionEquality().equals(other.devices, devices)&&(identical(other.selectedDevice, selectedDevice) || other.selectedDevice == selectedDevice)&&const DeepCollectionEquality().equals(other.positions, positions)&&(identical(other.selectedPosition, selectedPosition) || other.selectedPosition == selectedPosition)&&(identical(other.positionsError, positionsError) || other.positionsError == positionsError)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is LegacyDeviceViewState&&const DeepCollectionEquality().equals(other.devices, devices)&&(identical(other.selectedDevice, selectedDevice) || other.selectedDevice == selectedDevice)&&const DeepCollectionEquality().equals(other.positions, positions)&&(identical(other.selectedPosition, selectedPosition) || other.selectedPosition == selectedPosition)&&(identical(other.positionsError, positionsError) || other.positionsError == positionsError)); } @@ -34,15 +34,15 @@ int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash( @override String toString() { - return 'ControlPanelViewState(devices: $devices, selectedDevice: $selectedDevice, positions: $positions, selectedPosition: $selectedPosition, positionsError: $positionsError)'; + return 'LegacyDeviceViewState(devices: $devices, selectedDevice: $selectedDevice, positions: $positions, selectedPosition: $selectedPosition, positionsError: $positionsError)'; } } /// @nodoc -abstract mixin class $ControlPanelViewStateCopyWith<$Res> { - factory $ControlPanelViewStateCopyWith(ControlPanelViewState value, $Res Function(ControlPanelViewState) _then) = _$ControlPanelViewStateCopyWithImpl; +abstract mixin class $LegacyDeviceViewStateCopyWith<$Res> { + factory $LegacyDeviceViewStateCopyWith(LegacyDeviceViewState value, $Res Function(LegacyDeviceViewState) _then) = _$LegacyDeviceViewStateCopyWithImpl; @useResult $Res call({ List devices, DeviceEntity? selectedDevice, List positions, PositionEntity? selectedPosition, bool positionsError @@ -53,14 +53,14 @@ $DeviceEntityCopyWith<$Res>? get selectedDevice;$PositionEntityCopyWith<$Res>? g } /// @nodoc -class _$ControlPanelViewStateCopyWithImpl<$Res> - implements $ControlPanelViewStateCopyWith<$Res> { - _$ControlPanelViewStateCopyWithImpl(this._self, this._then); +class _$LegacyDeviceViewStateCopyWithImpl<$Res> + implements $LegacyDeviceViewStateCopyWith<$Res> { + _$LegacyDeviceViewStateCopyWithImpl(this._self, this._then); - final ControlPanelViewState _self; - final $Res Function(ControlPanelViewState) _then; + final LegacyDeviceViewState _self; + final $Res Function(LegacyDeviceViewState) _then; -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({Object? devices = null,Object? selectedDevice = freezed,Object? positions = null,Object? selectedPosition = freezed,Object? positionsError = null,}) { return _then(_self.copyWith( @@ -72,7 +72,7 @@ as PositionEntity?,positionsError: null == positionsError ? _self.positionsError as bool, )); } -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') @@ -84,7 +84,7 @@ $DeviceEntityCopyWith<$Res>? get selectedDevice { return $DeviceEntityCopyWith<$Res>(_self.selectedDevice!, (value) { return _then(_self.copyWith(selectedDevice: value)); }); -}/// Create a copy of ControlPanelViewState +}/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') @@ -100,8 +100,8 @@ $PositionEntityCopyWith<$Res>? get selectedPosition { } -/// Adds pattern-matching-related methods to [ControlPanelViewState]. -extension ControlPanelViewStatePatterns on ControlPanelViewState { +/// Adds pattern-matching-related methods to [LegacyDeviceViewState]. +extension LegacyDeviceViewStatePatterns on LegacyDeviceViewState { /// A variant of `map` that fallback to returning `orElse`. /// /// It is equivalent to doing: @@ -114,10 +114,10 @@ extension ControlPanelViewStatePatterns on ControlPanelViewState { /// } /// ``` -@optionalTypeArgs TResult maybeMap(TResult Function( _ControlPanelViewState value)? $default,{required TResult orElse(),}){ +@optionalTypeArgs TResult maybeMap(TResult Function( _LegacyDeviceViewState value)? $default,{required TResult orElse(),}){ final _that = this; switch (_that) { -case _ControlPanelViewState() when $default != null: +case _LegacyDeviceViewState() when $default != null: return $default(_that);case _: return orElse(); @@ -136,10 +136,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult map(TResult Function( _ControlPanelViewState value) $default,){ +@optionalTypeArgs TResult map(TResult Function( _LegacyDeviceViewState value) $default,){ final _that = this; switch (_that) { -case _ControlPanelViewState(): +case _LegacyDeviceViewState(): return $default(_that);case _: throw StateError('Unexpected subclass'); @@ -157,10 +157,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult? mapOrNull(TResult? Function( _ControlPanelViewState value)? $default,){ +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _LegacyDeviceViewState value)? $default,){ final _that = this; switch (_that) { -case _ControlPanelViewState() when $default != null: +case _LegacyDeviceViewState() when $default != null: return $default(_that);case _: return null; @@ -180,7 +180,7 @@ return $default(_that);case _: @optionalTypeArgs TResult maybeWhen(TResult Function( List devices, DeviceEntity? selectedDevice, List positions, PositionEntity? selectedPosition, bool positionsError)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { -case _ControlPanelViewState() when $default != null: +case _LegacyDeviceViewState() when $default != null: return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selectedPosition,_that.positionsError);case _: return orElse(); @@ -201,7 +201,7 @@ return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selecte @optionalTypeArgs TResult when(TResult Function( List devices, DeviceEntity? selectedDevice, List positions, PositionEntity? selectedPosition, bool positionsError) $default,) {final _that = this; switch (_that) { -case _ControlPanelViewState(): +case _LegacyDeviceViewState(): return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selectedPosition,_that.positionsError);case _: throw StateError('Unexpected subclass'); @@ -221,7 +221,7 @@ return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selecte @optionalTypeArgs TResult? whenOrNull(TResult? Function( List devices, DeviceEntity? selectedDevice, List positions, PositionEntity? selectedPosition, bool positionsError)? $default,) {final _that = this; switch (_that) { -case _ControlPanelViewState() when $default != null: +case _LegacyDeviceViewState() when $default != null: return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selectedPosition,_that.positionsError);case _: return null; @@ -233,8 +233,8 @@ return $default(_that.devices,_that.selectedDevice,_that.positions,_that.selecte /// @nodoc -class _ControlPanelViewState implements ControlPanelViewState { - const _ControlPanelViewState({final List devices = const [], this.selectedDevice, final List positions = const [], this.selectedPosition, this.positionsError = false}): _devices = devices,_positions = positions; +class _LegacyDeviceViewState implements LegacyDeviceViewState { + const _LegacyDeviceViewState({final List devices = const [], this.selectedDevice, final List positions = const [], this.selectedPosition, this.positionsError = false}): _devices = devices,_positions = positions; final List _devices; @@ -255,17 +255,17 @@ class _ControlPanelViewState implements ControlPanelViewState { @override final PositionEntity? selectedPosition; @override@JsonKey() final bool positionsError; -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @JsonKey(includeFromJson: false, includeToJson: false) @pragma('vm:prefer-inline') -_$ControlPanelViewStateCopyWith<_ControlPanelViewState> get copyWith => __$ControlPanelViewStateCopyWithImpl<_ControlPanelViewState>(this, _$identity); +_$LegacyDeviceViewStateCopyWith<_LegacyDeviceViewState> get copyWith => __$LegacyDeviceViewStateCopyWithImpl<_LegacyDeviceViewState>(this, _$identity); @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _ControlPanelViewState&&const DeepCollectionEquality().equals(other._devices, _devices)&&(identical(other.selectedDevice, selectedDevice) || other.selectedDevice == selectedDevice)&&const DeepCollectionEquality().equals(other._positions, _positions)&&(identical(other.selectedPosition, selectedPosition) || other.selectedPosition == selectedPosition)&&(identical(other.positionsError, positionsError) || other.positionsError == positionsError)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _LegacyDeviceViewState&&const DeepCollectionEquality().equals(other._devices, _devices)&&(identical(other.selectedDevice, selectedDevice) || other.selectedDevice == selectedDevice)&&const DeepCollectionEquality().equals(other._positions, _positions)&&(identical(other.selectedPosition, selectedPosition) || other.selectedPosition == selectedPosition)&&(identical(other.positionsError, positionsError) || other.positionsError == positionsError)); } @@ -274,15 +274,15 @@ int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash( @override String toString() { - return 'ControlPanelViewState(devices: $devices, selectedDevice: $selectedDevice, positions: $positions, selectedPosition: $selectedPosition, positionsError: $positionsError)'; + return 'LegacyDeviceViewState(devices: $devices, selectedDevice: $selectedDevice, positions: $positions, selectedPosition: $selectedPosition, positionsError: $positionsError)'; } } /// @nodoc -abstract mixin class _$ControlPanelViewStateCopyWith<$Res> implements $ControlPanelViewStateCopyWith<$Res> { - factory _$ControlPanelViewStateCopyWith(_ControlPanelViewState value, $Res Function(_ControlPanelViewState) _then) = __$ControlPanelViewStateCopyWithImpl; +abstract mixin class _$LegacyDeviceViewStateCopyWith<$Res> implements $LegacyDeviceViewStateCopyWith<$Res> { + factory _$LegacyDeviceViewStateCopyWith(_LegacyDeviceViewState value, $Res Function(_LegacyDeviceViewState) _then) = __$LegacyDeviceViewStateCopyWithImpl; @override @useResult $Res call({ List devices, DeviceEntity? selectedDevice, List positions, PositionEntity? selectedPosition, bool positionsError @@ -293,17 +293,17 @@ $Res call({ } /// @nodoc -class __$ControlPanelViewStateCopyWithImpl<$Res> - implements _$ControlPanelViewStateCopyWith<$Res> { - __$ControlPanelViewStateCopyWithImpl(this._self, this._then); +class __$LegacyDeviceViewStateCopyWithImpl<$Res> + implements _$LegacyDeviceViewStateCopyWith<$Res> { + __$LegacyDeviceViewStateCopyWithImpl(this._self, this._then); - final _ControlPanelViewState _self; - final $Res Function(_ControlPanelViewState) _then; + final _LegacyDeviceViewState _self; + final $Res Function(_LegacyDeviceViewState) _then; -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $Res call({Object? devices = null,Object? selectedDevice = freezed,Object? positions = null,Object? selectedPosition = freezed,Object? positionsError = null,}) { - return _then(_ControlPanelViewState( + return _then(_LegacyDeviceViewState( devices: null == devices ? _self._devices : devices // ignore: cast_nullable_to_non_nullable as List,selectedDevice: freezed == selectedDevice ? _self.selectedDevice : selectedDevice // ignore: cast_nullable_to_non_nullable as DeviceEntity?,positions: null == positions ? _self._positions : positions // ignore: cast_nullable_to_non_nullable @@ -313,7 +313,7 @@ as bool, )); } -/// Create a copy of ControlPanelViewState +/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') @@ -325,7 +325,7 @@ $DeviceEntityCopyWith<$Res>? get selectedDevice { return $DeviceEntityCopyWith<$Res>(_self.selectedDevice!, (value) { return _then(_self.copyWith(selectedDevice: value)); }); -}/// Create a copy of ControlPanelViewState +}/// Create a copy of LegacyDeviceViewState /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') diff --git a/modules/legacy/packages/legacy_device_state/pubspec.yaml b/modules/legacy/packages/legacy_device_state/pubspec.yaml new file mode 100644 index 00000000..dba169de --- /dev/null +++ b/modules/legacy/packages/legacy_device_state/pubspec.yaml @@ -0,0 +1,36 @@ +name: legacy_device_state +description: "Shared device state (selected device + latest positions) consumed by legacy modules (control_panel, location)." +publish_to: 'none' +resolution: workspace +version: 1.0.0+1 + +environment: + sdk: ^3.9.2 + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + legacy_shared: + path: ../legacy_shared + sf_infrastructure: + path: ../../../../packages/sf_infrastructure + sf_shared: + path: ../../../../packages/sf_shared + sf_tracking: + path: ../../../../packages/sf_tracking + flutter_riverpod: ^3.0.3 + freezed_annotation: ^3.1.0 + json_annotation: ^4.9.0 + dio: ^5.9.2 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + build_runner: ^2.7.1 + freezed: ^3.2.3 + json_serializable: ^6.11.2 + +flutter: + uses-material-design: true diff --git a/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart b/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart index f598b02f..1762ff71 100644 --- a/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart +++ b/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart @@ -7,8 +7,13 @@ export 'src/widgets/week_day_chips.dart'; export 'src/components/menu_button.dart'; export 'src/data/models/device_response_model.dart'; export 'src/data/models/send_command_request_model.dart'; -export 'package:sf_infrastructure/src/network/dio_error_mapper.dart'; +export 'src/data/models/entities/position_entity.dart'; +export 'src/data/models/entities/address_entity.dart'; +export 'src/data/models/entities/network_entity.dart'; +export 'src/data/models/latest_positions_response_model.dart'; export 'src/utils/device_csv_builder.dart'; +export 'src/utils/battery_utils.dart'; +export 'src/utils/date_format_utils.dart'; export 'src/domain/repositories/command_repository.dart'; export 'src/providers/commands_repository_provider.dart'; export 'src/data/datasources/device_settings_update_datasource.dart'; diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/address_entity.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/address_entity.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/address_entity.freezed.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.freezed.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/address_entity.freezed.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.freezed.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/network_entity.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/network_entity.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/network_entity.freezed.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.freezed.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/network_entity.freezed.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.freezed.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/position_entity.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.dart similarity index 82% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/position_entity.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.dart index 4e4ba11a..9da997b1 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/position_entity.dart +++ b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.dart @@ -1,6 +1,6 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -import 'package:control_panel/src/core/domain/entities/address_entity.dart'; -import 'package:control_panel/src/core/domain/entities/network_entity.dart'; +import 'address_entity.dart'; +import 'network_entity.dart'; part 'position_entity.freezed.dart'; diff --git a/modules/legacy/modules/control_panel/lib/src/core/domain/entities/position_entity.freezed.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.freezed.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/domain/entities/position_entity.freezed.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.freezed.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.dart similarity index 94% rename from modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.dart index a6a119e1..708a2a64 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart +++ b/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.dart @@ -1,9 +1,9 @@ // ignore_for_file: non_constant_identifier_names import 'package:freezed_annotation/freezed_annotation.dart'; -import 'package:control_panel/src/core/domain/entities/address_entity.dart'; -import 'package:control_panel/src/core/domain/entities/network_entity.dart'; -import 'package:control_panel/src/core/domain/entities/position_entity.dart'; +import 'entities/address_entity.dart'; +import 'entities/network_entity.dart'; +import 'entities/position_entity.dart'; part 'latest_positions_response_model.freezed.dart'; part 'latest_positions_response_model.g.dart'; diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.freezed.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.freezed.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart b/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.g.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart rename to modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.g.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/utils/battery_utils.dart b/modules/legacy/packages/legacy_shared/lib/src/utils/battery_utils.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/utils/battery_utils.dart rename to modules/legacy/packages/legacy_shared/lib/src/utils/battery_utils.dart diff --git a/modules/legacy/modules/control_panel/lib/src/core/utils/date_format_utils.dart b/modules/legacy/packages/legacy_shared/lib/src/utils/date_format_utils.dart similarity index 100% rename from modules/legacy/modules/control_panel/lib/src/core/utils/date_format_utils.dart rename to modules/legacy/packages/legacy_shared/lib/src/utils/date_format_utils.dart diff --git a/pubspec.yaml b/pubspec.yaml index 69ed1442..af1d669d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,6 +24,7 @@ workspace: - modules/legacy/modules/location - modules/legacy/modules/settings - modules/legacy/packages/legacy_shared + - modules/legacy/packages/legacy_device_state - packages/design_system - packages/flutter_treezor_entrust_sdk_bridge - packages/flutter_treezor_entrust_sdk_bridge/example