diff --git a/modules/legacy/modules/account/lib/src/features/account_settings/presentation/account_settings_screen.dart b/modules/legacy/modules/account/lib/src/features/account_settings/presentation/account_settings_screen.dart index 1162f04b..1a831343 100644 --- a/modules/legacy/modules/account/lib/src/features/account_settings/presentation/account_settings_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/account_settings/presentation/account_settings_screen.dart @@ -3,7 +3,7 @@ import 'package:legacy_theme/legacy_theme.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:legacy_ui/legacy_ui.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/app_users/presentation/app_users_screen.dart b/modules/legacy/modules/account/lib/src/features/app_users/presentation/app_users_screen.dart index 32ec1df1..752813be 100644 --- a/modules/legacy/modules/account/lib/src/features/app_users/presentation/app_users_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/app_users/presentation/app_users_screen.dart @@ -3,7 +3,7 @@ import 'package:legacy_theme/legacy_theme.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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_shared/sf_shared.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart b/modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart index eb76dd75..d108c664 100644 --- a/modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart @@ -3,7 +3,7 @@ import 'package:legacy_theme/legacy_theme.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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/delete_account/presentation/delete_account_screen.dart b/modules/legacy/modules/account/lib/src/features/delete_account/presentation/delete_account_screen.dart index 32785a9e..c41d92ec 100644 --- a/modules/legacy/modules/account/lib/src/features/delete_account/presentation/delete_account_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/delete_account/presentation/delete_account_screen.dart @@ -4,7 +4,7 @@ import 'package:account/src/features/delete_account/presentation/widgets/confirm 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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/edit_linked_device_screen.dart b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/edit_linked_device_screen.dart index a3d75234..b7d5d11a 100644 --- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/edit_linked_device_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/edit_linked_device_screen.dart @@ -4,7 +4,7 @@ import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart index 6ef701e8..edfd6f7b 100644 --- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart @@ -5,7 +5,7 @@ import 'package:account/src/features/linked_devices/presentation/widgets/delete_ 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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_shared/sf_shared.dart'; diff --git a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart index d8f0c69d..d4c12c2e 100644 --- a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart +++ b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart @@ -4,7 +4,7 @@ import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/account/pubspec.yaml b/modules/legacy/modules/account/pubspec.yaml index 3e494b05..fa9dd9d7 100644 --- a/modules/legacy/modules/account/pubspec.yaml +++ b/modules/legacy/modules/account/pubspec.yaml @@ -45,8 +45,10 @@ dependencies: path: ../../../../packages/utils fonts: path: ../../../../packages/fonts - legacy_shared: - path: ../../packages/legacy_shared + legacy_device_state: + path: ../../packages/legacy_device_state + legacy_ui: + path: ../../packages/legacy_ui sf_shared: path: ../../../../packages/sf_shared #dependencies go here 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 fbe7d0cf..2c2b1193 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 @@ -5,7 +5,7 @@ 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:legacy_ui/legacy_ui.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; 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 b415305e..05fd8d0a 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 @@ -3,7 +3,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:latlong2/latlong.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; +import 'package:utils/utils.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; const _defaultCenter = LatLng(40.4168, -3.7038); diff --git a/modules/legacy/modules/control_panel/pubspec.yaml b/modules/legacy/modules/control_panel/pubspec.yaml index e6b7cc51..5218d6ee 100644 --- a/modules/legacy/modules/control_panel/pubspec.yaml +++ b/modules/legacy/modules/control_panel/pubspec.yaml @@ -50,8 +50,8 @@ dependencies: path: ../../../../packages/sf_infrastructure utils: path: ../../../../packages/utils - legacy_shared: - path: ../../packages/legacy_shared + legacy_ui: + path: ../../packages/legacy_ui legacy_device_state: path: ../../packages/legacy_device_state sf_shared: diff --git a/modules/legacy/modules/customer_service/lib/src/presentation/contact_screen.dart b/modules/legacy/modules/customer_service/lib/src/presentation/contact_screen.dart index bfd1945e..296579dc 100644 --- a/modules/legacy/modules/customer_service/lib/src/presentation/contact_screen.dart +++ b/modules/legacy/modules/customer_service/lib/src/presentation/contact_screen.dart @@ -2,7 +2,7 @@ import 'package:customer_service/src/presentation/state/contact_view_model.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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/customer_service/lib/src/presentation/customer_service_screen.dart b/modules/legacy/modules/customer_service/lib/src/presentation/customer_service_screen.dart index 168349ba..087caf92 100644 --- a/modules/legacy/modules/customer_service/lib/src/presentation/customer_service_screen.dart +++ b/modules/legacy/modules/customer_service/lib/src/presentation/customer_service_screen.dart @@ -3,7 +3,7 @@ import 'package:legacy_theme/legacy_theme.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:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/customer_service/pubspec.yaml b/modules/legacy/modules/customer_service/pubspec.yaml index 8981c45a..3eb446cd 100644 --- a/modules/legacy/modules/customer_service/pubspec.yaml +++ b/modules/legacy/modules/customer_service/pubspec.yaml @@ -44,8 +44,8 @@ dependencies: path: ../../../../packages/utils fonts: path: ../../../../packages/fonts - legacy_shared: - path: ../../packages/legacy_shared + legacy_ui: + path: ../../packages/legacy_ui #dependencies go here flutter_svg: ^2.2.2 get_it: ^9.0.5 diff --git a/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/activity_meter_screen.dart b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/activity_meter_screen.dart index 6aef2b3b..1ca0a5ed 100644 --- a/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/activity_meter_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/activity_meter_screen.dart @@ -1,7 +1,7 @@ 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:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/state/activity_meter_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/state/activity_meter_view_model.dart index 05928d3c..f35a0317 100644 --- a/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/state/activity_meter_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/state/activity_meter_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:legacy_device_state/legacy_device_state.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/activity_meter/presentation/widgets/pedometer_toggle.dart b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/widgets/pedometer_toggle.dart index 0f77afec..839262f7 100644 --- a/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/widgets/pedometer_toggle.dart +++ b/modules/legacy/modules/device_management/lib/src/features/activity_meter/presentation/widgets/pedometer_toggle.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/apps_use_screen.dart b/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/apps_use_screen.dart index a583d661..9691ed86 100644 --- a/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/apps_use_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/apps_use/presentation/apps_use_screen.dart @@ -1,7 +1,7 @@ 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:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/background_image_screen.dart b/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/background_image_screen.dart index 61f7ecbf..2c1c8cc8 100644 --- a/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/background_image_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/background_image/presentation/background_image_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/call_history_screen.dart b/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/call_history_screen.dart index f31ceee4..f382badd 100644 --- a/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/call_history_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/call_history/presentation/call_history_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import '../data/call_history_entity.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/contacts_screen.dart b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/contacts_screen.dart index 82ebf1df..ed63c1c6 100644 --- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/contacts_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/contacts_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart b/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart index 6d1e1725..e5e8b41e 100644 --- a/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart @@ -3,7 +3,7 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:device_management/src/features/device_management/widgets/call_watch_dialog.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/do_not_disturb_screen.dart b/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/do_not_disturb_screen.dart index e7d3c916..411d6c80 100644 --- a/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/do_not_disturb_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/do_not_disturb/presentation/do_not_disturb_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/health/presentation/health_screen.dart b/modules/legacy/modules/device_management/lib/src/features/health/presentation/health_screen.dart index d996b937..9916c053 100644 --- a/modules/legacy/modules/device_management/lib/src/features/health/presentation/health_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/health/presentation/health_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:lottie/lottie.dart'; import 'package:navigation/navigation.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/health/presentation/state/health_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/health/presentation/state/health_view_model.dart index 083b9257..656da975 100644 --- a/modules/legacy/modules/device_management/lib/src/features/health/presentation/state/health_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/health/presentation/state/health_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:legacy_device_state/legacy_device_state.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/locate_device/presentation/locate_device_screen.dart b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/locate_device_screen.dart index 5c366051..8f856fac 100644 --- a/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/locate_device_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/locate_device_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/state/locate_device_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/state/locate_device_view_model.dart index 204d4ecb..73c1e9c6 100644 --- a/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/state/locate_device_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/state/locate_device_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:legacy_device_state/legacy_device_state.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/locate_device/presentation/widgets/locate_device_dialog.dart b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/widgets/locate_device_dialog.dart index 93b7d8d6..0b2b9d85 100644 --- a/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/widgets/locate_device_dialog.dart +++ b/modules/legacy/modules/device_management/lib/src/features/locate_device/presentation/widgets/locate_device_dialog.dart @@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import '../state/locate_device_view_model.dart'; import 'package:legacy_theme/legacy_theme.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart index cbb54642..f2147041 100644 --- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart @@ -9,7 +9,8 @@ import 'package:device_management/src/features/remote_connection/presentation/wi import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; class RemoteCameraScreen extends ConsumerWidget { final NavigationContract navigationContract; diff --git a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_connection_screen.dart b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_connection_screen.dart index ab792d08..df48b80e 100644 --- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_connection_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_connection_screen.dart @@ -4,7 +4,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:device_management/src/features/remote_connection/presentation/remote_camera_screen.dart'; import 'package:device_management/src/features/remote_connection/presentation/widgets/spy_call_dialog.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart index 9a84d461..d93a4777 100644 --- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart @@ -4,7 +4,7 @@ import 'package:device_management/src/core/providers/pictures_repository_provide import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:device_management/src/features/remote_connection/presentation/state/remote_connection_view_state.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/remote_connection/presentation/widgets/spy_call_dialog.dart b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/widgets/spy_call_dialog.dart index 4d5cc84b..0685f2c2 100644 --- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/widgets/spy_call_dialog.dart +++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/widgets/spy_call_dialog.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:device_management/src/features/remote_connection/presentation/state/remote_connection_view_model.dart'; import 'package:device_management/src/features/remote_connection/presentation/state/remote_connection_view_state.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/rewards_screen.dart b/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/rewards_screen.dart index 547a2cbc..5a2aabc8 100644 --- a/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/rewards_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/rewards_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_model.dart index 64716b4a..daa3ce49 100644 --- a/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_model.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/scheduled_activities_screen.dart b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/scheduled_activities_screen.dart index e0316dff..4dfdcff5 100644 --- a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/scheduled_activities_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/scheduled_activities_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/activity_form_sheet.dart b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/activity_form_sheet.dart index 28d610e3..ff3e5175 100644 --- a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/activity_form_sheet.dart +++ b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/activity_form_sheet.dart @@ -2,7 +2,8 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/day_timeline.dart b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/day_timeline.dart index 809b117f..cf80b4d8 100644 --- a/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/day_timeline.dart +++ b/modules/legacy/modules/device_management/lib/src/features/scheduled_activities/presentation/widgets/day_timeline.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/state/volume_control_view_model.dart b/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/state/volume_control_view_model.dart index 9ccf5486..fa9bfae0 100644 --- a/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/state/volume_control_view_model.dart +++ b/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/state/volume_control_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:legacy_device_state/legacy_device_state.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/volume_control/presentation/volume_control_screen.dart b/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/volume_control_screen.dart index cb64b4fc..b25f7419 100644 --- a/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/volume_control_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/volume_control/presentation/volume_control_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'state/volume_control_view_model.dart'; diff --git a/modules/legacy/modules/device_management/pubspec.yaml b/modules/legacy/modules/device_management/pubspec.yaml index df9a0eb3..d6e4ed1c 100644 --- a/modules/legacy/modules/device_management/pubspec.yaml +++ b/modules/legacy/modules/device_management/pubspec.yaml @@ -44,8 +44,10 @@ dependencies: path: ../../../../packages/utils fonts: path: ../../../../packages/fonts - legacy_shared: - path: ../../packages/legacy_shared + legacy_device_state: + path: ../../packages/legacy_device_state + legacy_ui: + path: ../../packages/legacy_ui sf_shared: path: ../../../../packages/sf_shared #dependencies go here diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource.dart index df0138d1..71b51ffa 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; abstract class LegacyDeviceSetupRemoteDatasource { Future generateActivationKey({required String identificator}); diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart index 3a57855e..cafbb98a 100644 --- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart +++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart @@ -1,5 +1,5 @@ import 'package:legacy_auth/src/core/data/datasource/device_setup_remote_datasource.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; class LegacyDeviceSetupRemoteDatasourceImpl diff --git a/modules/legacy/modules/legacy_auth/pubspec.yaml b/modules/legacy/modules/legacy_auth/pubspec.yaml index 48b7b9b6..9d1123c5 100644 --- a/modules/legacy/modules/legacy_auth/pubspec.yaml +++ b/modules/legacy/modules/legacy_auth/pubspec.yaml @@ -29,8 +29,8 @@ dependencies: path: ../../../../packages/sf_shared sf_tracking: path: ../../../../packages/sf_tracking - legacy_shared: - path: ../../packages/legacy_shared + legacy_device_state: + path: ../../packages/legacy_device_state fonts: path: ../../../../packages/fonts #dependencies go here 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 0ffe617e..33a42316 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 e7df4342..7e76191b 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,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:utils/utils.dart'; import 'package:dio/dio.dart'; import 'package:location/src/core/data/datasource/location_remote_datasource.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 7779793f..2682cfd5 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 d56e040e..4741b07f 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 c0fc9660..fab6bbee 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 6535f28b..c3b2eca7 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 @@ -2,7 +2,7 @@ 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'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:location/src/features/location/presentation/state/location_view_model.dart'; import 'package:location/src/features/location/presentation/state/location_view_state.dart'; import 'package:location/src/features/location/presentation/widgets/location_map.dart'; 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 1b68657f..266a2044 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 304580c8..7cd3ac13 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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_model.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_model.dart index 2a627559..72688011 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_view_model.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/state/location_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:legacy_device_state/legacy_device_state.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/frequent_places_response_model.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 886d0cf2..0b2b5489 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/create_frequent_place_sheet.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_frequent_place_sheet.dart index d28dfb25..fa19361b 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_frequent_place_sheet.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_frequent_place_sheet.dart @@ -2,7 +2,7 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:latlong2/latlong.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:location/src/core/domain/entities/frequent_place_entity.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_geofence_sheet.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_geofence_sheet.dart index 5b6e0d71..dfabe184 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_geofence_sheet.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/create_geofence_sheet.dart @@ -2,7 +2,7 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:latlong2/latlong.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.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 442f5d06..04e4acdc 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,5 @@ -import 'package:legacy_shared/legacy_shared.dart'; + +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:legacy_theme/legacy_theme.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 f53b3387..e6617c9f 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 50d985e4..ba81614f 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 @@ -6,7 +6,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:latlong2/latlong.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:location/src/core/domain/entities/geofence_entity.dart'; import 'package:location/src/core/domain/entities/frequent_place_entity.dart'; import 'package:location/src/features/location/presentation/state/location_map_view_model.dart'; diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_controls/map_style_selector.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_controls/map_style_selector.dart index 4c82f451..b4885659 100644 --- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_controls/map_style_selector.dart +++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/map_controls/map_style_selector.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:sf_tracking/sf_tracking.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 fe6df141..9cbec110 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 504e37fd..91e92fd8 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:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 59b3bdb2..46e6d69d 100644 --- a/modules/legacy/modules/location/pubspec.yaml +++ b/modules/legacy/modules/location/pubspec.yaml @@ -21,8 +21,8 @@ dependencies: path: ../../../../packages/sf_localizations sf_infrastructure: path: ../../../../packages/sf_infrastructure - legacy_shared: - path: ../../packages/legacy_shared + legacy_ui: + path: ../../packages/legacy_ui sf_shared: path: ../../../../packages/sf_shared sf_tracking: diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/language_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/language_remote_datasource_impl.dart index b8e50126..8e8a419c 100644 --- a/modules/legacy/modules/settings/lib/src/core/data/datasources/language_remote_datasource_impl.dart +++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/language_remote_datasource_impl.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'language_remote_datasource.dart'; diff --git a/modules/legacy/modules/settings/lib/src/core/providers/language_remote_datasource_provider.dart b/modules/legacy/modules/settings/lib/src/core/providers/language_remote_datasource_provider.dart index ca887253..594a0730 100644 --- a/modules/legacy/modules/settings/lib/src/core/providers/language_remote_datasource_provider.dart +++ b/modules/legacy/modules/settings/lib/src/core/providers/language_remote_datasource_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:settings/src/core/data/datasources/language_remote_datasource.dart'; import 'package:settings/src/core/data/datasources/language_remote_datasource_impl.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/alarm_screen.dart b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/alarm_screen.dart index 59392ead..92910701 100644 --- a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/alarm_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/alarm_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:navigation/navigation.dart'; import 'package:settings/src/features/alarm/domain/entities/alarm_entity.dart'; import 'package:settings/src/features/alarm/presentation/state/alarm_view_model.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/widgets/alarm_form_screen.dart b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/widgets/alarm_form_screen.dart index 10ad9a4a..8bf05b48 100644 --- a/modules/legacy/modules/settings/lib/src/features/alarm/presentation/widgets/alarm_form_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/alarm/presentation/widgets/alarm_form_screen.dart @@ -2,7 +2,7 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:settings/src/features/alarm/domain/entities/alarm_entity.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/alerts/presentation/alerts_screen.dart b/modules/legacy/modules/settings/lib/src/features/alerts/presentation/alerts_screen.dart index 3730334e..fde12777 100644 --- a/modules/legacy/modules/settings/lib/src/features/alerts/presentation/alerts_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/alerts/presentation/alerts_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/alerts/presentation/state/alerts_view_model.dart b/modules/legacy/modules/settings/lib/src/features/alerts/presentation/state/alerts_view_model.dart index 366437bc..4abf13a5 100644 --- a/modules/legacy/modules/settings/lib/src/features/alerts/presentation/state/alerts_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/alerts/presentation/state/alerts_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/app_store/presentation/app_store_screen.dart b/modules/legacy/modules/settings/lib/src/features/app_store/presentation/app_store_screen.dart index db816328..a61b4c13 100644 --- a/modules/legacy/modules/settings/lib/src/features/app_store/presentation/app_store_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/app_store/presentation/app_store_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; class AppStoreScreen extends ConsumerWidget { diff --git a/modules/legacy/modules/settings/lib/src/features/appearance/presentation/appearance_screen.dart b/modules/legacy/modules/settings/lib/src/features/appearance/presentation/appearance_screen.dart index 04fc4ead..10a93af6 100644 --- a/modules/legacy/modules/settings/lib/src/features/appearance/presentation/appearance_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/appearance/presentation/appearance_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/battery/presentation/battery_screen.dart b/modules/legacy/modules/settings/lib/src/features/battery/presentation/battery_screen.dart index e5ce5990..715b58fa 100644 --- a/modules/legacy/modules/settings/lib/src/features/battery/presentation/battery_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/battery/presentation/battery_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/battery/presentation/state/battery_view_model.dart b/modules/legacy/modules/settings/lib/src/features/battery/presentation/state/battery_view_model.dart index c9504189..46bb7c70 100644 --- a/modules/legacy/modules/settings/lib/src/features/battery/presentation/state/battery_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/battery/presentation/state/battery_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/block_phone_screen.dart b/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/block_phone_screen.dart index a75f3bca..87ab8e7e 100644 --- a/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/block_phone_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/block_phone/presentation/block_phone_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/disable_functions/presentation/disable_functions_screen.dart b/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/disable_functions_screen.dart index 68456eb2..45ab188e 100644 --- a/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/disable_functions_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/disable_functions_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import 'package:utils/utils.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/state/disable_functions_view_model.dart b/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/state/disable_functions_view_model.dart index 4676bc8f..af590928 100644 --- a/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/state/disable_functions_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/disable_functions/presentation/state/disable_functions_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/language/presentation/language_screen.dart b/modules/legacy/modules/settings/lib/src/features/language/presentation/language_screen.dart index 769a7310..b76cff97 100644 --- a/modules/legacy/modules/settings/lib/src/features/language/presentation/language_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/language/presentation/language_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:settings/src/features/language/presentation/state/language_view_model.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/legacy_notifications/presentation/legacy_notifications_screen.dart b/modules/legacy/modules/settings/lib/src/features/legacy_notifications/presentation/legacy_notifications_screen.dart index eafd7df8..7f1aab4e 100644 --- a/modules/legacy/modules/settings/lib/src/features/legacy_notifications/presentation/legacy_notifications_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/legacy_notifications/presentation/legacy_notifications_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; class LegacyNotificationsScreen extends ConsumerWidget { diff --git a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart index 13e61bd9..9ea5331f 100644 --- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:settings/src/features/remote_management/presentation/state/remote_management_view_model.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_model.dart b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_model.dart index 046ec09d..d7052e5b 100644 --- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/remote_on_off/presentation/remote_on_off_screen.dart b/modules/legacy/modules/settings/lib/src/features/remote_on_off/presentation/remote_on_off_screen.dart index 881115c4..45227713 100644 --- a/modules/legacy/modules/settings/lib/src/features/remote_on_off/presentation/remote_on_off_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/remote_on_off/presentation/remote_on_off_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; class RemoteOnOffScreen extends ConsumerWidget { 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 4d4cb6f0..0baf5b63 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 @@ -1,7 +1,7 @@ import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.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/sound/presentation/sound_screen.dart b/modules/legacy/modules/settings/lib/src/features/sound/presentation/sound_screen.dart index c16fb586..b0981444 100644 --- a/modules/legacy/modules/settings/lib/src/features/sound/presentation/sound_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/sound/presentation/sound_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/sound/presentation/state/sound_view_model.dart b/modules/legacy/modules/settings/lib/src/features/sound/presentation/state/sound_view_model.dart index bf62142e..6d2a8038 100644 --- a/modules/legacy/modules/settings/lib/src/features/sound/presentation/state/sound_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/sound/presentation/state/sound_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/sync_clock_screen.dart b/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/sync_clock_screen.dart index f1477f13..d5ad96a1 100644 --- a/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/sync_clock_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/sync_clock/presentation/sync_clock_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:navigation/navigation.dart'; import 'package:sf_localizations/sf_localizations.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/state/timezone_view_model.dart b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/state/timezone_view_model.dart index c8bcf408..7512fa61 100644 --- a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/state/timezone_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/state/timezone_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:legacy_device_state/legacy_device_state.dart'; import 'package:sf_shared/sf_shared.dart'; import 'package:sf_tracking/sf_tracking.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart index 918d0caa..68998e46 100644 --- a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart @@ -2,7 +2,8 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; +import 'package:legacy_ui/legacy_ui.dart'; import 'package:sf_localizations/sf_localizations.dart'; import '../timezone_data.dart'; diff --git a/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/state/wifi_settings_view_model.dart b/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/state/wifi_settings_view_model.dart index 07d29b07..b78621d7 100644 --- a/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/state/wifi_settings_view_model.dart +++ b/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/state/wifi_settings_view_model.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:get_it/get_it.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/settings/lib/src/features/wifi_settings/presentation/wifi_settings_screen.dart b/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/wifi_settings_screen.dart index 6b4b51e1..ac3d68d8 100644 --- a/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/wifi_settings_screen.dart +++ b/modules/legacy/modules/settings/lib/src/features/wifi_settings/presentation/wifi_settings_screen.dart @@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart'; import 'package:legacy_theme/legacy_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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/pubspec.yaml b/modules/legacy/modules/settings/pubspec.yaml index 037d654f..c6f8ba1a 100644 --- a/modules/legacy/modules/settings/pubspec.yaml +++ b/modules/legacy/modules/settings/pubspec.yaml @@ -44,8 +44,10 @@ dependencies: path: ../../../../packages/utils fonts: path: ../../../../packages/fonts - legacy_shared: - path: ../../packages/legacy_shared + legacy_device_state: + path: ../../packages/legacy_device_state + legacy_ui: + path: ../../packages/legacy_ui sf_shared: path: ../../../../packages/sf_shared #dependencies go here 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 index 4a514561..c7522ad6 100644 --- a/modules/legacy/packages/legacy_device_state/lib/legacy_device_state.dart +++ b/modules/legacy/packages/legacy_device_state/lib/legacy_device_state.dart @@ -1,3 +1,30 @@ +// Entities +export 'src/data/models/entities/position_entity.dart'; +export 'src/data/models/entities/address_entity.dart'; +export 'src/data/models/entities/network_entity.dart'; + +// Response models +export 'src/data/models/device_response_model.dart'; +export 'src/data/models/latest_positions_response_model.dart'; +export 'src/data/models/send_command_request_model.dart'; + +// Commands +export 'src/data/datasources/commands_remote_datatsource.dart'; +export 'src/data/datasources/commands_remote_datasource_impl.dart'; +export 'src/data/repositories/commands_repository_impl.dart'; +export 'src/domain/repositories/command_repository.dart'; +export 'src/providers/commands_remote_datasource_provider.dart'; +export 'src/providers/commands_repository_provider.dart'; + +// Device settings update +export 'src/data/datasources/device_settings_update_datasource.dart'; +export 'src/providers/device_settings_update_provider.dart'; + +// Utils +export 'src/utils/device_command_guard.dart'; +export 'src/utils/device_csv_builder.dart'; + +// State (positions polling — pre-existing) export 'src/legacy_device_repository.dart'; export 'src/legacy_device_repository_impl.dart'; export 'src/legacy_device_remote_datasource.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datasource_impl.dart similarity index 85% rename from modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datasource_impl.dart index c8af7519..9efdfb03 100644 --- a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datasource_impl.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/src/data/models/send_command_request_model.dart'; +import 'package:legacy_device_state/src/data/models/send_command_request_model.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; import 'commands_remote_datatsource.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datatsource.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datatsource.dart similarity index 56% rename from modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datatsource.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datatsource.dart index cb913857..c1d33bb3 100644 --- a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datatsource.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/data/datasources/commands_remote_datatsource.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/src/data/models/send_command_request_model.dart'; +import 'package:legacy_device_state/src/data/models/send_command_request_model.dart'; abstract class CommandsRemoteDatasource { Future send({required SendCommandRequestModel request}); diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/datasources/device_settings_update_datasource.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/datasources/device_settings_update_datasource.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.g.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.g.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/device_response_model.g.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/device_response_model.g.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/address_entity.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/address_entity.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/address_entity.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/address_entity.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/address_entity.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/device_entity.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/device_entity.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/device_entity.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/device_entity.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/device_entity.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/device_entity.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/device_entity.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/device_entity.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/network_entity.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/network_entity.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/network_entity.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/network_entity.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/network_entity.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/position_entity.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/position_entity.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/position_entity.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/entities/position_entity.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/entities/position_entity.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.g.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.g.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/latest_positions_response_model.g.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/latest_positions_response_model.g.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.freezed.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.freezed.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.freezed.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.freezed.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.g.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.g.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.g.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/models/send_command_request_model.g.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/repositories/commands_repository_impl.dart b/modules/legacy/packages/legacy_device_state/lib/src/data/repositories/commands_repository_impl.dart similarity index 65% rename from modules/legacy/packages/legacy_shared/lib/src/data/repositories/commands_repository_impl.dart rename to modules/legacy/packages/legacy_device_state/lib/src/data/repositories/commands_repository_impl.dart index 0f6946c3..649014a4 100644 --- a/modules/legacy/packages/legacy_shared/lib/src/data/repositories/commands_repository_impl.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/data/repositories/commands_repository_impl.dart @@ -1,5 +1,5 @@ -import 'package:legacy_shared/src/data/datasources/commands_remote_datatsource.dart'; -import 'package:legacy_shared/src/data/models/send_command_request_model.dart'; +import 'package:legacy_device_state/src/data/datasources/commands_remote_datatsource.dart'; +import 'package:legacy_device_state/src/data/models/send_command_request_model.dart'; import '../../domain/repositories/command_repository.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/domain/repositories/command_repository.dart b/modules/legacy/packages/legacy_device_state/lib/src/domain/repositories/command_repository.dart similarity index 54% rename from modules/legacy/packages/legacy_shared/lib/src/domain/repositories/command_repository.dart rename to modules/legacy/packages/legacy_device_state/lib/src/domain/repositories/command_repository.dart index cab56fd1..6758a866 100644 --- a/modules/legacy/packages/legacy_shared/lib/src/domain/repositories/command_repository.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/domain/repositories/command_repository.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/src/data/models/send_command_request_model.dart'; +import 'package:legacy_device_state/src/data/models/send_command_request_model.dart'; abstract class CommandsRepository { Future send({required SendCommandRequestModel request}); 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 index 6366b8e0..c06b593e 100644 --- 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 @@ -1,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; abstract class LegacyDeviceRemoteDatasource { Future> getLatestPositions({required String deviceId}); diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart index 90a8cbbb..6fe50856 100644 --- a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_remote_datasource_impl.dart @@ -1,6 +1,5 @@ -import 'legacy_device_remote_datasource.dart'; import 'package:dio/dio.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:sf_infrastructure/sf_infrastructure.dart'; class LegacyDeviceRemoteDatasourceImpl implements LegacyDeviceRemoteDatasource { 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 index cbde437d..e7b773a3 100644 --- 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 @@ -1,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.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 index bb17d790..540ddb2e 100644 --- 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 @@ -1,6 +1,4 @@ -import 'legacy_device_remote_datasource.dart'; -import 'legacy_device_repository.dart'; -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; class LegacyDeviceRepositoryImpl implements LegacyDeviceRepository { const LegacyDeviceRepositoryImpl(this._remote); diff --git a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart index f5a3833c..439be9ca 100644 --- a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_model.dart @@ -1,9 +1,6 @@ import 'dart:async'; -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:legacy_device_state/legacy_device_state.dart'; import 'package:flutter_riverpod/flutter_riverpod.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/src/legacy_device_view_state.dart b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart index 46a15fde..bac43296 100644 --- a/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart +++ b/modules/legacy/packages/legacy_device_state/lib/src/legacy_device_view_state.dart @@ -1,4 +1,4 @@ -import 'package:legacy_shared/legacy_shared.dart'; +import 'package:legacy_device_state/legacy_device_state.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:sf_shared/sf_shared.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart b/modules/legacy/packages/legacy_device_state/lib/src/providers/commands_remote_datasource_provider.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart rename to modules/legacy/packages/legacy_device_state/lib/src/providers/commands_remote_datasource_provider.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/commands_repository_provider.dart b/modules/legacy/packages/legacy_device_state/lib/src/providers/commands_repository_provider.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/providers/commands_repository_provider.dart rename to modules/legacy/packages/legacy_device_state/lib/src/providers/commands_repository_provider.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart b/modules/legacy/packages/legacy_device_state/lib/src/providers/device_settings_update_provider.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart rename to modules/legacy/packages/legacy_device_state/lib/src/providers/device_settings_update_provider.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/utils/device_command_guard.dart b/modules/legacy/packages/legacy_device_state/lib/src/utils/device_command_guard.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/utils/device_command_guard.dart rename to modules/legacy/packages/legacy_device_state/lib/src/utils/device_command_guard.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/utils/device_csv_builder.dart b/modules/legacy/packages/legacy_device_state/lib/src/utils/device_csv_builder.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/utils/device_csv_builder.dart rename to modules/legacy/packages/legacy_device_state/lib/src/utils/device_csv_builder.dart diff --git a/modules/legacy/packages/legacy_device_state/pubspec.yaml b/modules/legacy/packages/legacy_device_state/pubspec.yaml index dba169de..9cd9ddf4 100644 --- a/modules/legacy/packages/legacy_device_state/pubspec.yaml +++ b/modules/legacy/packages/legacy_device_state/pubspec.yaml @@ -11,18 +11,25 @@ environment: dependencies: flutter: sdk: flutter - legacy_shared: - path: ../legacy_shared + design_system: + path: ../../../../packages/design_system + navigation: + path: ../../../../packages/navigation sf_infrastructure: path: ../../../../packages/sf_infrastructure + sf_localizations: + path: ../../../../packages/sf_localizations sf_shared: path: ../../../../packages/sf_shared sf_tracking: path: ../../../../packages/sf_tracking + utils: + path: ../../../../packages/utils flutter_riverpod: ^3.0.3 freezed_annotation: ^3.1.0 json_annotation: ^4.9.0 dio: ^5.9.2 + get_it: ^9.0.5 dev_dependencies: flutter_test: diff --git a/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart b/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart deleted file mode 100644 index 1762ff71..00000000 --- a/modules/legacy/packages/legacy_shared/lib/legacy_shared.dart +++ /dev/null @@ -1,21 +0,0 @@ -export 'src/providers/map_style_provider.dart'; -export 'src/widgets/layouts/page_layout.dart'; -export 'src/components/section_button.dart'; -export 'src/widgets/pulsing_location_marker.dart'; -export 'src/widgets/refreshable_error_state.dart'; -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 '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'; -export 'src/providers/device_settings_update_provider.dart'; -export 'src/utils/device_command_guard.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/utils/dio_error_mapper.dart b/modules/legacy/packages/legacy_shared/lib/src/utils/dio_error_mapper.dart deleted file mode 100644 index bbb68273..00000000 --- a/modules/legacy/packages/legacy_shared/lib/src/utils/dio_error_mapper.dart +++ /dev/null @@ -1,54 +0,0 @@ -import 'dart:convert'; - -import 'package:dio/dio.dart'; - -Future safeCall(Future Function() call, String fallbackMsg) async { - try { - return await call(); - } on DioException catch (error) { - throw mapDioError(error, defaultMessage: fallbackMsg); - } -} - -Exception mapDioError(DioException error, {required String defaultMessage}) { - final apiMsg = _extractApiMessage(error.response?.data); - final msg = apiMsg ?? error.message ?? defaultMessage; - return Exception(msg); -} - -String? _extractApiMessage(Object? data) { - if (data == null) return null; - - if (data is Map) { - final errorObj = data['error']; - if (errorObj is Map && errorObj['message'] is String) { - return (errorObj['message'] as String).trim(); - } - if (data['message'] is String) { - return (data['message'] as String).trim(); - } - return null; - } - - if (data is String) { - final raw = data.trim(); - if (raw.isEmpty) return null; - - try { - final decoded = jsonDecode(raw); - return _extractApiMessage(decoded); - } catch (_) { - return raw; - } - } - - return null; -} - -String formatErrorMessage(Object error) { - final raw = error.toString(); - if (raw.startsWith('Exception: ')) { - return raw.substring('Exception: '.length); - } - return raw; -} diff --git a/modules/legacy/packages/legacy_shared/melos_legacy_shared.iml b/modules/legacy/packages/legacy_shared/melos_legacy_shared.iml deleted file mode 100644 index 9fc8ce79..00000000 --- a/modules/legacy/packages/legacy_shared/melos_legacy_shared.iml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/legacy/packages/legacy_shared/pubspec.yaml b/modules/legacy/packages/legacy_shared/pubspec.yaml deleted file mode 100644 index 654b71d9..00000000 --- a/modules/legacy/packages/legacy_shared/pubspec.yaml +++ /dev/null @@ -1,79 +0,0 @@ -name: legacy_shared -description: "A new Flutter project." -publish_to: 'none' -resolution: workspace -version: 0.0.1 -homepage: - -environment: - sdk: ^3.9.2 - flutter: ">=1.17.0" - -dependencies: - flutter: - sdk: flutter - #packages dependencies go here - design_system: - path: ../../../../packages/design_system - navigation: - path: ../../../../packages/navigation - sf_infrastructure: - path: ../../../../packages/sf_infrastructure - utils: - path: ../../../../packages/utils - sf_shared: - path: ../../../../packages/sf_shared - #dependencies go here - legacy_theme: - path: ../legacy_theme - dio: ^5.9.2 - get_it: ^9.0.5 - flutter_riverpod: ^3.0.3 - shared_preferences: ^2.5.5 - freezed_annotation: ^3.1.0 - freezed: ^3.2.3 - json_annotation: ^4.9.0 - json_serializable: ^6.11.2 - sf_localizations: ^0.0.1 - -dev_dependencies: - flutter_test: - sdk: flutter - flutter_lints: ^5.0.0 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. -flutter: - - # To add assets to your package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/to/asset-from-package - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/to/resolution-aware-images - - # To add custom fonts to your package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/to/font-from-package diff --git a/modules/legacy/packages/legacy_ui/lib/legacy_ui.dart b/modules/legacy/packages/legacy_ui/lib/legacy_ui.dart new file mode 100644 index 00000000..d2708bb7 --- /dev/null +++ b/modules/legacy/packages/legacy_ui/lib/legacy_ui.dart @@ -0,0 +1,7 @@ +export 'src/components/menu_button.dart'; +export 'src/components/section_button.dart'; +export 'src/widgets/layouts/page_layout.dart'; +export 'src/widgets/pulsing_location_marker.dart'; +export 'src/widgets/refreshable_error_state.dart'; +export 'src/widgets/week_day_chips.dart'; +export 'src/providers/map_style_provider.dart'; diff --git a/modules/legacy/packages/legacy_shared/lib/src/components/menu_button.dart b/modules/legacy/packages/legacy_ui/lib/src/components/menu_button.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/components/menu_button.dart rename to modules/legacy/packages/legacy_ui/lib/src/components/menu_button.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/components/section_button.dart b/modules/legacy/packages/legacy_ui/lib/src/components/section_button.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/components/section_button.dart rename to modules/legacy/packages/legacy_ui/lib/src/components/section_button.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/map_style_provider.dart b/modules/legacy/packages/legacy_ui/lib/src/providers/map_style_provider.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/providers/map_style_provider.dart rename to modules/legacy/packages/legacy_ui/lib/src/providers/map_style_provider.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/widgets/layouts/page_layout.dart b/modules/legacy/packages/legacy_ui/lib/src/widgets/layouts/page_layout.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/widgets/layouts/page_layout.dart rename to modules/legacy/packages/legacy_ui/lib/src/widgets/layouts/page_layout.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/widgets/pulsing_location_marker.dart b/modules/legacy/packages/legacy_ui/lib/src/widgets/pulsing_location_marker.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/widgets/pulsing_location_marker.dart rename to modules/legacy/packages/legacy_ui/lib/src/widgets/pulsing_location_marker.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/widgets/refreshable_error_state.dart b/modules/legacy/packages/legacy_ui/lib/src/widgets/refreshable_error_state.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/widgets/refreshable_error_state.dart rename to modules/legacy/packages/legacy_ui/lib/src/widgets/refreshable_error_state.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/widgets/week_day_chips.dart b/modules/legacy/packages/legacy_ui/lib/src/widgets/week_day_chips.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/widgets/week_day_chips.dart rename to modules/legacy/packages/legacy_ui/lib/src/widgets/week_day_chips.dart diff --git a/modules/legacy/packages/legacy_ui/pubspec.yaml b/modules/legacy/packages/legacy_ui/pubspec.yaml new file mode 100644 index 00000000..031223e5 --- /dev/null +++ b/modules/legacy/packages/legacy_ui/pubspec.yaml @@ -0,0 +1,32 @@ +name: legacy_ui +description: "Shared UI primitives (layouts, buttons, markers) for legacy app mode." +publish_to: 'none' +resolution: workspace +version: 1.0.0+1 + +environment: + sdk: ^3.9.2 + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + legacy_theme: + path: ../legacy_theme + navigation: + path: ../../../../packages/navigation + sf_localizations: + path: ../../../../packages/sf_localizations + utils: + path: ../../../../packages/utils + flutter_riverpod: ^3.0.3 + shared_preferences: ^2.5.5 + get_it: ^9.0.5 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + +flutter: + uses-material-design: true diff --git a/packages/sf_tracking/lib/src/providers/sf_tracking_provider.dart b/packages/sf_tracking/lib/src/providers/sf_tracking_provider.dart index 7266a67f..6d035e0f 100644 --- a/packages/sf_tracking/lib/src/providers/sf_tracking_provider.dart +++ b/packages/sf_tracking/lib/src/providers/sf_tracking_provider.dart @@ -15,9 +15,21 @@ late final SfTrackingRepository sfTracking; void initSfTracking() { sfTracking = SfTrackingRepository( clients: [ - // TODO: read consent from a persisted preference once the GDPR - // consent screen exists, and call `sfTracking.setConsentStatus(...)` - // when the user toggles it. + // TODO(gdpr): consentAnalytics is hardcoded to `true`. This ships + // Firebase Analytics events for every EU user WITHOUT explicit opt-in, + // which violates GDPR Art. 6/7. Sensitive context: this app tracks + // minors' location, so regulatory scrutiny is higher than baseline. + // + // To close this out: + // 1. Build an onboarding consent screen with separate toggles for + // analytics and crashlytics (granularity is required). + // 2. Persist the decision in SharedPreferences (key per client). + // 3. Read the stored preference here before constructing the client + // — default to `false` until the user has explicitly accepted. + // 4. Expose a "Privacy" entry in Settings that lets the user change + // their mind; on toggle, call + // `sfTracking.setConsentStatus(client: ..., granted: ...)`. + // 5. Add the privacy notice + data-processing summary in-app. FirebaseTrackingClient(consentAnalytics: true), if (kDebugMode) const DebugTrackingClient(), ], diff --git a/modules/legacy/packages/legacy_shared/lib/src/utils/battery_utils.dart b/packages/utils/lib/src/battery_utils.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/utils/battery_utils.dart rename to packages/utils/lib/src/battery_utils.dart diff --git a/modules/legacy/packages/legacy_shared/lib/src/utils/date_format_utils.dart b/packages/utils/lib/src/date_format_utils.dart similarity index 100% rename from modules/legacy/packages/legacy_shared/lib/src/utils/date_format_utils.dart rename to packages/utils/lib/src/date_format_utils.dart diff --git a/packages/utils/lib/utils.dart b/packages/utils/lib/utils.dart index de8e10c1..6d835800 100644 --- a/packages/utils/lib/utils.dart +++ b/packages/utils/lib/utils.dart @@ -3,3 +3,5 @@ export 'src/duration_format.dart'; export 'src/query_params_builder.dart'; export 'src/size_utils.dart'; export 'src/test.dart'; +export 'src/battery_utils.dart'; +export 'src/date_format_utils.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 24ec0f36..5169cb1b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,9 +23,9 @@ workspace: - modules/legacy/modules/legacy_dashboard_shell - modules/legacy/modules/location - modules/legacy/modules/settings - - modules/legacy/packages/legacy_shared - modules/legacy/packages/legacy_device_state - modules/legacy/packages/legacy_theme + - modules/legacy/packages/legacy_ui - packages/design_system - packages/flutter_treezor_entrust_sdk_bridge - packages/flutter_treezor_entrust_sdk_bridge/example