diff --git a/lib/domain/cbj_comp/cbj_comp_entity.dart b/lib/domain/cbj_comp/cbj_comp_entity.dart index 5c99d72f..f404caf0 100644 --- a/lib/domain/cbj_comp/cbj_comp_entity.dart +++ b/lib/domain/cbj_comp/cbj_comp_entity.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_value_objects.dart'; import 'package:dartz/dartz.dart'; diff --git a/lib/domain/cbj_comp/cbj_comp_validators.dart b/lib/domain/cbj_comp/cbj_comp_validators.dart index a7146c72..dd19d349 100644 --- a/lib/domain/cbj_comp/cbj_comp_validators.dart +++ b/lib/domain/cbj_comp/cbj_comp_validators.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:dartz/dartz.dart'; import 'package:kt_dart/kt.dart'; diff --git a/lib/domain/cbj_comp/cbj_comp_value_objects.dart b/lib/domain/cbj_comp/cbj_comp_value_objects.dart index 28f9ecbe..51d5680d 100644 --- a/lib/domain/cbj_comp/cbj_comp_value_objects.dart +++ b/lib/domain/cbj_comp/cbj_comp_value_objects.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_errors.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_validators.dart'; diff --git a/lib/domain/cbj_comp/i_cbj_comp_repository.dart b/lib/domain/cbj_comp/i_cbj_comp_repository.dart index 5d576d0f..c4ef939d 100644 --- a/lib/domain/cbj_comp/i_cbj_comp_repository.dart +++ b/lib/domain/cbj_comp/i_cbj_comp_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:cybearjinni/infrastructure/cbj_app_server_d.dart'; diff --git a/lib/domain/connections_service.dart b/lib/domain/connections_service.dart index ec131ba0..70f12c98 100644 --- a/lib/domain/connections_service.dart +++ b/lib/domain/connections_service.dart @@ -1,12 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/demo_connection_service_integrations_controller.dart'; -import 'package:cbj_integrations_controller/infrastructure/devices_service.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/search_devices.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/network_utilities_flutter.dart'; part 'package:cybearjinni/infrastructure/connection_service/app_connection_service.dart'; diff --git a/lib/domain/device/devices_validators.dart b/lib/domain/device/devices_validators.dart index 2c196b77..07018491 100644 --- a/lib/domain/device/devices_validators.dart +++ b/lib/domain/device/devices_validators.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/devices_failures.dart'; import 'package:dartz/dartz.dart'; diff --git a/lib/domain/device/i_device_repository.dart b/lib/domain/device/i_device_repository.dart index 20f408ae..70366bf9 100644 --- a/lib/domain/device/i_device_repository.dart +++ b/lib/domain/device/i_device_repository.dart @@ -2,31 +2,7 @@ import 'dart:async'; import 'dart:collection'; import 'dart:io'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/devices/device_helper/device_helper.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_dto_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_value_objects.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/devices_failures.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:cybearjinni/infrastructure/hub_client/hub_requests_routing.dart'; diff --git a/lib/domain/i_hub_connection_repository.dart b/lib/domain/i_hub_connection_repository.dart index 437ad1db..4ec8e8e1 100644 --- a/lib/domain/i_hub_connection_repository.dart +++ b/lib/domain/i_hub_connection_repository.dart @@ -1,15 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:cbj_integrations_controller/domain/hub/hub_entity.dart'; -import 'package:cbj_integrations_controller/domain/hub/hub_failures.dart'; -import 'package:cbj_integrations_controller/domain/hub/hub_value_objects.dart'; -import 'package:cbj_integrations_controller/domain/local_db/local_db_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/core/utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client_demo.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_dtos.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:cybearjinni/domain/i_local_db_repository.dart'; import 'package:cybearjinni/infrastructure/core/injection.dart'; diff --git a/lib/domain/i_local_db_repository.dart b/lib/domain/i_local_db_repository.dart index 6e60e566..92e4c29d 100644 --- a/lib/domain/i_local_db_repository.dart +++ b/lib/domain/i_local_db_repository.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/domain/local_db/local_db_failures.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:cybearjinni/infrastructure/isar_local_db/isar_objects/home_entity_isar_model.dart'; import 'package:cybearjinni/infrastructure/isar_local_db/isar_objects/hub_entity_isar_model.dart'; diff --git a/lib/domain/security_bear/i_security_bear_connection_repository.dart b/lib/domain/security_bear/i_security_bear_connection_repository.dart index 9119d5cc..6ca72b63 100644 --- a/lib/domain/security_bear/i_security_bear_connection_repository.dart +++ b/lib/domain/security_bear/i_security_bear_connection_repository.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/domain/manage_network/i_manage_network_repository.dart'; diff --git a/lib/domain/software_info/i_software_info_repository.dart b/lib/domain/software_info/i_software_info_repository.dart index b912ea43..75792e1a 100644 --- a/lib/domain/software_info/i_software_info_repository.dart +++ b/lib/domain/software_info/i_software_info_repository.dart @@ -1,12 +1,6 @@ import 'dart:io'; -import 'package:cbj_integrations_controller/domain/hub/hub_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/proto_gen_date.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/proto_gen_date.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/proto_gen_date.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/i_hub_connection_repository.dart'; import 'package:cybearjinni/domain/security_bear/i_security_bear_connection_repository.dart'; import 'package:cybearjinni/domain/security_bear/security_bear_failures.dart'; diff --git a/lib/domain/software_info/software_info_entity.dart b/lib/domain/software_info/software_info_entity.dart index 17f61a3d..53bf021c 100644 --- a/lib/domain/software_info/software_info_entity.dart +++ b/lib/domain/software_info/software_info_entity.dart @@ -1,6 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/software_info/software_info_failures.dart'; import 'package:cybearjinni/domain/software_info/software_info_value_objects.dart'; import 'package:cybearjinni/infrastructure/software_info/software_info_dtos.dart'; diff --git a/lib/infrastructure/app_commands.dart b/lib/infrastructure/app_commands.dart index 4574596d..b92ee6cc 100644 --- a/lib/infrastructure/app_commands.dart +++ b/lib/infrastructure/app_commands.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:cbj_integrations_controller/infrastructure/system_commands/phone_commands_d/common_batch_commands_d.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/lib/infrastructure/cbj_app_server_d.dart b/lib/infrastructure/cbj_app_server_d.dart index 3e46a5e0..32c440b1 100644 --- a/lib/infrastructure/cbj_app_server_d.dart +++ b/lib/infrastructure/cbj_app_server_d.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:grpc/grpc.dart'; diff --git a/lib/infrastructure/connection_service/app_connection_service.dart b/lib/infrastructure/connection_service/app_connection_service.dart index 14b2534a..b4203c66 100644 --- a/lib/infrastructure/connection_service/app_connection_service.dart +++ b/lib/infrastructure/connection_service/app_connection_service.dart @@ -10,7 +10,7 @@ class _AppConnectionService implements ConnectionsService { @override Future> get getAllEntities async => - DevicesService().getEntities(); + EntitiesService().getEntities(); @override Future searchDevices() => @@ -18,7 +18,7 @@ class _AppConnectionService implements ConnectionsService { @override Stream> watchEntities() => - DevicesService().watchEntities(); + EntitiesService().watchEntities(); @override void setEntityState({ @@ -27,7 +27,7 @@ class _AppConnectionService implements ConnectionsService { required EntityActions actionType, HashMap? value, }) => - DevicesService().setEntityState( + EntitiesService().setEntityState( uniqueIdByVendor: uniqueIdByVendor, action: actionType, property: property, diff --git a/lib/infrastructure/core/injection.dart b/lib/infrastructure/core/injection.dart index f676fbd4..512fd02b 100644 --- a/lib/infrastructure/core/injection.dart +++ b/lib/infrastructure/core/injection.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/core/injection.config.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:get_it/get_it.dart'; import 'package:injectable/injectable.dart'; diff --git a/lib/infrastructure/hub_client/hub_requests_routing.dart b/lib/infrastructure/hub_client/hub_requests_routing.dart index ecca8b61..287eb41a 100644 --- a/lib/infrastructure/hub_client/hub_requests_routing.dart +++ b/lib/infrastructure/hub_client/hub_requests_routing.dart @@ -1,26 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_empty_entity/generic_empty_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_ping_entity/generic_ping_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_printer_entity/generic_printer_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_security_camera_entity/generic_security_camera_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_device_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart'; -import 'package:cbj_integrations_controller/infrastructure/scenes/scene_cbj_dtos.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/domain/i_hub_connection_repository.dart'; diff --git a/lib/infrastructure/mqtt.dart b/lib/infrastructure/mqtt.dart index d2ec34be..281bc2bb 100644 --- a/lib/infrastructure/mqtt.dart +++ b/lib/infrastructure/mqtt.dart @@ -1,14 +1,6 @@ import 'dart:convert'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/i_mqtt_server_repository.dart'; -import 'package:cbj_integrations_controller/infrastructure/area/area_entity_dtos.dart'; -import 'package:cbj_integrations_controller/infrastructure/devices/device_helper/device_helper.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_dto_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/value_objects_core.dart'; -import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:mqtt_client/mqtt_client.dart'; import 'package:mqtt_client/mqtt_server_client.dart'; diff --git a/lib/infrastructure/network_utilities_flutter.dart b/lib/infrastructure/network_utilities_flutter.dart index bb1de669..22304b14 100644 --- a/lib/infrastructure/network_utilities_flutter.dart +++ b/lib/infrastructure/network_utilities_flutter.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:cbj_integrations_controller/domain/i_network_utilities.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:network_tools_flutter/network_tools_flutter.dart' as network_flutter; diff --git a/lib/infrastructure/security_bear_client/security_bear_server_client.dart b/lib/infrastructure/security_bear_client/security_bear_server_client.dart index 6c2a8cd1..48627657 100644 --- a/lib/infrastructure/security_bear_client/security_bear_server_client.dart +++ b/lib/infrastructure/security_bear_client/security_bear_server_client.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/logger.dart'; import 'package:grpc/grpc.dart'; diff --git a/lib/main.dart b/lib/main.dart index 3315c4d0..c28244d9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/core/injection.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/infrastructure/core/injection.dart'; import 'package:cybearjinni/presentation/core/app_widget.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.dart'; diff --git a/lib/presentation/atoms/switch_atom.dart b/lib/presentation/atoms/switch_atom.dart index 6a5b51bd..95b9d296 100644 --- a/lib/presentation/atoms/switch_atom.dart +++ b/lib/presentation/atoms/switch_atom.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/presentation/core/entities_utils.dart b/lib/presentation/core/entities_utils.dart index 3f5fca76..9ecb5a5b 100644 --- a/lib/presentation/core/entities_utils.dart +++ b/lib/presentation/core/entities_utils.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; diff --git a/lib/presentation/molecules/device_by_type_molecule.dart b/lib/presentation/molecules/device_by_type_molecule.dart index a3ed4927..a9560ecb 100644 --- a/lib/presentation/molecules/device_by_type_molecule.dart +++ b/lib/presentation/molecules/device_by_type_molecule.dart @@ -1,17 +1,4 @@ -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_printer_entity/generic_printer_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_security_camera_entity/generic_security_camera_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/molecules/devices/blind_molecule.dart b/lib/presentation/molecules/devices/blind_molecule.dart index 495a27c2..6f7973b2 100644 --- a/lib/presentation/molecules/devices/blind_molecule.dart +++ b/lib/presentation/molecules/devices/blind_molecule.dart @@ -1,9 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/blinds_card_molecule.dart b/lib/presentation/molecules/devices/blinds_card_molecule.dart index 2e8a9e1e..933d98d3 100644 --- a/lib/presentation/molecules/devices/blinds_card_molecule.dart +++ b/lib/presentation/molecules/devices/blinds_card_molecule.dart @@ -1,5 +1,4 @@ -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/molecules/devices/boiler_molecule.dart b/lib/presentation/molecules/devices/boiler_molecule.dart index 184abcde..254c2bf1 100644 --- a/lib/presentation/molecules/devices/boiler_molecule.dart +++ b/lib/presentation/molecules/devices/boiler_molecule.dart @@ -1,9 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/dimmable_light_molecule.dart b/lib/presentation/molecules/devices/dimmable_light_molecule.dart index 369fc574..89832d31 100644 --- a/lib/presentation/molecules/devices/dimmable_light_molecule.dart +++ b/lib/presentation/molecules/devices/dimmable_light_molecule.dart @@ -1,9 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/light_card_molecule.dart b/lib/presentation/molecules/devices/light_card_molecule.dart index d166a711..eb6d16c2 100644 --- a/lib/presentation/molecules/devices/light_card_molecule.dart +++ b/lib/presentation/molecules/devices/light_card_molecule.dart @@ -1,7 +1,4 @@ -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/value_objects_core.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_value_objects.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/molecules/devices/light_molecule.dart b/lib/presentation/molecules/devices/light_molecule.dart index 563c104c..18102e8a 100644 --- a/lib/presentation/molecules/devices/light_molecule.dart +++ b/lib/presentation/molecules/devices/light_molecule.dart @@ -1,8 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/printer_molecule.dart b/lib/presentation/molecules/devices/printer_molecule.dart index 9efa171c..a6e4efcb 100644 --- a/lib/presentation/molecules/devices/printer_molecule.dart +++ b/lib/presentation/molecules/devices/printer_molecule.dart @@ -1,5 +1,5 @@ import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_printer_entity/generic_printer_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/molecules/devices/rgb_light_molecule.dart b/lib/presentation/molecules/devices/rgb_light_molecule.dart index 7eb120af..43833558 100644 --- a/lib/presentation/molecules/devices/rgb_light_molecule.dart +++ b/lib/presentation/molecules/devices/rgb_light_molecule.dart @@ -1,9 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; diff --git a/lib/presentation/molecules/devices/security_camera_molecule.dart b/lib/presentation/molecules/devices/security_camera_molecule.dart index e1305e1c..a0d481b8 100644 --- a/lib/presentation/molecules/devices/security_camera_molecule.dart +++ b/lib/presentation/molecules/devices/security_camera_molecule.dart @@ -1,6 +1,6 @@ import 'package:another_flushbar/flushbar_helper.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_security_camera_entity/generic_security_camera_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/smart_computer_molecule.dart b/lib/presentation/molecules/devices/smart_computer_molecule.dart index 1636e81e..d1059909 100644 --- a/lib/presentation/molecules/devices/smart_computer_molecule.dart +++ b/lib/presentation/molecules/devices/smart_computer_molecule.dart @@ -1,5 +1,5 @@ import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/smart_plug_molecule.dart b/lib/presentation/molecules/devices/smart_plug_molecule.dart index 06748da4..5c99b552 100644 --- a/lib/presentation/molecules/devices/smart_plug_molecule.dart +++ b/lib/presentation/molecules/devices/smart_plug_molecule.dart @@ -1,9 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/smart_tv_molecule.dart b/lib/presentation/molecules/devices/smart_tv_molecule.dart index 4ca4e789..7cad80bf 100644 --- a/lib/presentation/molecules/devices/smart_tv_molecule.dart +++ b/lib/presentation/molecules/devices/smart_tv_molecule.dart @@ -1,10 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/molecules/devices/switch_molecule.dart b/lib/presentation/molecules/devices/switch_molecule.dart index b62bbe07..116e94c9 100644 --- a/lib/presentation/molecules/devices/switch_molecule.dart +++ b/lib/presentation/molecules/devices/switch_molecule.dart @@ -1,9 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/organisms/devices_list_view.dart b/lib/presentation/organisms/devices_list_view.dart index c888350a..0ce68d74 100644 --- a/lib/presentation/organisms/devices_list_view.dart +++ b/lib/presentation/organisms/devices_list_view.dart @@ -1,7 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/entities_utils.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/organisms/open_area_organism.dart b/lib/presentation/organisms/open_area_organism.dart index a4752a83..cf9c98a4 100644 --- a/lib/presentation/organisms/open_area_organism.dart +++ b/lib/presentation/organisms/open_area_organism.dart @@ -1,6 +1,4 @@ -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; import 'package:cybearjinni/presentation/organisms/organisms.dart'; diff --git a/lib/presentation/pages/add_action_page.dart b/lib/presentation/pages/add_action_page.dart index 1d4ebd62..8be4b729 100644 --- a/lib/presentation/pages/add_action_page.dart +++ b/lib/presentation/pages/add_action_page.dart @@ -1,6 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; diff --git a/lib/presentation/pages/add_bindings/widgets/add_binding_widget.dart b/lib/presentation/pages/add_bindings/widgets/add_binding_widget.dart index 5a252bec..b266443f 100644 --- a/lib/presentation/pages/add_bindings/widgets/add_binding_widget.dart +++ b/lib/presentation/pages/add_bindings/widgets/add_binding_widget.dart @@ -1,9 +1,6 @@ import 'package:adaptive_action_sheet/adaptive_action_sheet.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/binding/i_binding_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/core_login_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/add_bindings/widgets/binding_action_widget.dart b/lib/presentation/pages/add_bindings/widgets/binding_action_widget.dart index 3e0ee4bb..b31ccf64 100644 --- a/lib/presentation/pages/add_bindings/widgets/binding_action_widget.dart +++ b/lib/presentation/pages/add_bindings/widgets/binding_action_widget.dart @@ -1,5 +1,5 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/presentation/pages/add_new_area_page.dart b/lib/presentation/pages/add_new_area_page.dart index acd868c7..18c9c51e 100644 --- a/lib/presentation/pages/add_new_area_page.dart +++ b/lib/presentation/pages/add_new_area_page.dart @@ -1,7 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_failures.dart'; -import 'package:cbj_integrations_controller/domain/area/value_objects_area.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:dartz/dartz.dart' as dartz; diff --git a/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendor_widget.dart b/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendor_widget.dart index 12cd2dac..b28c48f1 100644 --- a/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendor_widget.dart +++ b/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendor_widget.dart @@ -1,6 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; diff --git a/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendors_list.dart b/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendors_list.dart index bffc9b86..f14efa69 100644 --- a/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendors_list.dart +++ b/lib/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendors_list.dart @@ -1,5 +1,4 @@ -import 'package:cbj_integrations_controller/domain/vendors/i_vendor_repository.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/pages/add_new_devices_process/choose_device_vendor_to_add/widgets/vendor_widget.dart'; import 'package:flutter/material.dart'; import 'package:kt_dart/kt.dart'; diff --git a/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart b/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart index e707cffb..c5de27c4 100644 --- a/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart +++ b/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart @@ -1,7 +1,5 @@ import 'package:another_flushbar/flushbar_helper.dart'; -import 'package:cbj_integrations_controller/infrastructure/core/utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/value_objects_core.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_value_objects.dart'; diff --git a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart index 2a7f1ade..d892863e 100644 --- a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart +++ b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart @@ -1,8 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/core/utils.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/value_objects_core.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_value_objects.dart'; diff --git a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card.dart b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card.dart index 78a225d6..b46cace9 100644 --- a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card.dart +++ b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card.dart @@ -1,6 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card_with_devices_controll.dart b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card_with_devices_controll.dart index fb879b16..a51554c5 100644 --- a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card_with_devices_controll.dart +++ b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/cbj_comp_card_with_devices_controll.dart @@ -1,6 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/add_routine/add_routine_page.dart b/lib/presentation/pages/add_routine/add_routine_page.dart index fe27d822..c6f3ffc7 100644 --- a/lib/presentation/pages/add_routine/add_routine_page.dart +++ b/lib/presentation/pages/add_routine/add_routine_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/routine/value_objects_routine_cbj.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; import 'package:cybearjinni/presentation/pages/add_routine/widgets/add_routine_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_routine/widgets/add_routine_widget.dart b/lib/presentation/pages/add_routine/widgets/add_routine_widget.dart index 1a89553b..0384729d 100644 --- a/lib/presentation/pages/add_routine/widgets/add_routine_widget.dart +++ b/lib/presentation/pages/add_routine/widgets/add_routine_widget.dart @@ -1,10 +1,6 @@ import 'package:adaptive_action_sheet/adaptive_action_sheet.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/routine/i_routine_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/routine/value_objects_routine_cbj.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/core_login_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/add_routine/widgets/routine_action_widget.dart b/lib/presentation/pages/add_routine/widgets/routine_action_widget.dart index c5fd6c2c..592dcc57 100644 --- a/lib/presentation/pages/add_routine/widgets/routine_action_widget.dart +++ b/lib/presentation/pages/add_routine/widgets/routine_action_widget.dart @@ -1,5 +1,5 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/presentation/pages/add_scene/widgets/add_scene_widget.dart b/lib/presentation/pages/add_scene/widgets/add_scene_widget.dart index fbdafc51..425a227c 100644 --- a/lib/presentation/pages/add_scene/widgets/add_scene_widget.dart +++ b/lib/presentation/pages/add_scene/widgets/add_scene_widget.dart @@ -1,10 +1,6 @@ import 'package:adaptive_action_sheet/adaptive_action_sheet.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/core_login_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/add_scene/widgets/scene_action_widget.dart b/lib/presentation/pages/add_scene/widgets/scene_action_widget.dart index 9fe0dcf3..34bff0b8 100644 --- a/lib/presentation/pages/add_scene/widgets/scene_action_widget.dart +++ b/lib/presentation/pages/add_scene/widgets/scene_action_widget.dart @@ -1,5 +1,5 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/add_esphome_vendor_page.dart b/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/add_esphome_vendor_page.dart index 0b302b54..b2d2d58c 100644 --- a/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/add_esphome_vendor_page.dart +++ b/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/add_esphome_vendor_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/pages/add_vendors_pages/add_esphome_vendor/widgets/esphome_sign_in_form.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/widgets/esphome_sign_in_form.dart b/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/widgets/esphome_sign_in_form.dart index df9eae27..31d43e77 100644 --- a/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/widgets/esphome_sign_in_form.dart +++ b/lib/presentation/pages/add_vendors_pages/add_esphome_vendor/widgets/esphome_sign_in_form.dart @@ -1,9 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/esphome_login/generic_esphome_login_entity.dart'; -import 'package:cbj_integrations_controller/domain/vendors/esphome_login/generic_esphome_login_value_objects.dart'; -import 'package:cbj_integrations_controller/domain/vendors/i_vendor_repository.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/value_login_objects_core.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/add_ewelink_vendor_page.dart b/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/add_ewelink_vendor_page.dart index bdb19a4e..b6f5a048 100644 --- a/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/add_ewelink_vendor_page.dart +++ b/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/add_ewelink_vendor_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/pages/add_vendors_pages/add_ewelink_vendor/widgets/ewelink_sign_in_form.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/widgets/ewelink_sign_in_form.dart b/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/widgets/ewelink_sign_in_form.dart index ebc20b7f..c6a00314 100644 --- a/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/widgets/ewelink_sign_in_form.dart +++ b/lib/presentation/pages/add_vendors_pages/add_ewelink_vendor/widgets/ewelink_sign_in_form.dart @@ -1,9 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/ewelink_login/generic_ewelink_login_entity.dart'; -import 'package:cbj_integrations_controller/domain/vendors/ewelink_login/generic_ewelink_login_value_objects.dart'; -import 'package:cbj_integrations_controller/domain/vendors/i_vendor_repository.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/value_login_objects_core.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/add_lifx_vendor_page.dart b/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/add_lifx_vendor_page.dart index 4bf965d8..0eea2c53 100644 --- a/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/add_lifx_vendor_page.dart +++ b/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/add_lifx_vendor_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/pages/add_vendors_pages/add_lifx_vendor/widgets/lifx_sign_in_form.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/widgets/lifx_sign_in_form.dart b/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/widgets/lifx_sign_in_form.dart index dd24f614..659d38c3 100644 --- a/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/widgets/lifx_sign_in_form.dart +++ b/lib/presentation/pages/add_vendors_pages/add_lifx_vendor/widgets/lifx_sign_in_form.dart @@ -1,9 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/vendors/i_vendor_repository.dart'; -import 'package:cbj_integrations_controller/domain/vendors/lifx_login/generic_lifx_login_entity.dart'; -import 'package:cbj_integrations_controller/domain/vendors/lifx_login/generic_lifx_login_value_objects.dart'; -import 'package:cbj_integrations_controller/domain/vendors/login_abstract/value_login_objects_core.dart'; -import 'package:cbj_integrations_controller/domain/vendors/vendor_data.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/change_area_for_devices_page.dart b/lib/presentation/pages/change_area_for_devices_page.dart index 961d1a0d..56295232 100644 --- a/lib/presentation/pages/change_area_for_devices_page.dart +++ b/lib/presentation/pages/change_area_for_devices_page.dart @@ -1,7 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/area/value_objects_area.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; diff --git a/lib/presentation/pages/connect_to_hub/widgets/cbj_hub_in_network_widget.dart b/lib/presentation/pages/connect_to_hub/widgets/cbj_hub_in_network_widget.dart index f388b71d..967edd8a 100644 --- a/lib/presentation/pages/connect_to_hub/widgets/cbj_hub_in_network_widget.dart +++ b/lib/presentation/pages/connect_to_hub/widgets/cbj_hub_in_network_widget.dart @@ -1,8 +1,7 @@ import 'dart:collection'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/hub/hub_failures.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/connect_to_hub_more_page.dart b/lib/presentation/pages/connect_to_hub_more_page.dart index 37065e76..7d89f66d 100644 --- a/lib/presentation/pages/connect_to_hub_more_page.dart +++ b/lib/presentation/pages/connect_to_hub_more_page.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/domain/device/devices_failures.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; diff --git a/lib/presentation/pages/entities_in_area_page.dart b/lib/presentation/pages/entities_in_area_page.dart index 9340708c..34ea1a2c 100644 --- a/lib/presentation/pages/entities_in_area_page.dart +++ b/lib/presentation/pages/entities_in_area_page.dart @@ -1,7 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/circular_progress_indicator_atom.dart'; import 'package:cybearjinni/presentation/organisms/organisms.dart'; diff --git a/lib/presentation/pages/entities_in_network_page.dart b/lib/presentation/pages/entities_in_network_page.dart index b0175e24..2c0e13cb 100644 --- a/lib/presentation/pages/entities_in_network_page.dart +++ b/lib/presentation/pages/entities_in_network_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/theme_data.dart'; diff --git a/lib/presentation/pages/home_page/tabs/scenes_in_folders_tab/widgets/scenes_in_folders_l.dart b/lib/presentation/pages/home_page/tabs/scenes_in_folders_tab/widgets/scenes_in_folders_l.dart index 846b2c96..adb2c738 100644 --- a/lib/presentation/pages/home_page/tabs/scenes_in_folders_tab/widgets/scenes_in_folders_l.dart +++ b/lib/presentation/pages/home_page/tabs/scenes_in_folders_tab/widgets/scenes_in_folders_l.dart @@ -1,7 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/scene/scene_cbj_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/area_widget.dart b/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/area_widget.dart index 73ecfdbd..11209958 100644 --- a/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/area_widget.dart +++ b/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/area_widget.dart @@ -1,8 +1,7 @@ import 'dart:collection'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:cybearjinni/presentation/organisms/organisms.dart'; diff --git a/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/areas_list_view_widget.dart b/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/areas_list_view_widget.dart index 71f4cc64..4c6db4fe 100644 --- a/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/areas_list_view_widget.dart +++ b/lib/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/areas_list_view_widget.dart @@ -1,7 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/pages/home_page/tabs/smart_devices_tab/areas_widgets/area_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_areas.dart b/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_areas.dart index f1102a52..f6b943cc 100644 --- a/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_areas.dart +++ b/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_areas.dart @@ -1,10 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/area/value_objects_area.dart'; -import 'package:cbj_integrations_controller/domain/core/request_types.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; diff --git a/lib/presentation/pages/introduction_screen/introduction_screen_body.dart b/lib/presentation/pages/introduction_screen/introduction_screen_body.dart index 2b9d9849..d4312805 100644 --- a/lib/presentation/pages/introduction_screen/introduction_screen_body.dart +++ b/lib/presentation/pages/introduction_screen/introduction_screen_body.dart @@ -1,7 +1,7 @@ import 'dart:collection'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_base.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; diff --git a/lib/presentation/pages/pick_repeat_time_page.dart b/lib/presentation/pages/pick_repeat_time_page.dart index 2b2f285c..ea7db761 100644 --- a/lib/presentation/pages/pick_repeat_time_page.dart +++ b/lib/presentation/pages/pick_repeat_time_page.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/routine/value_objects_routine_cbj.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; @@ -121,9 +121,9 @@ class PickRepeatTimePage extends StatelessWidget { minutesToRepeat != null) { context.router.push( AddRoutineRoute( - daysToRepeat: daysToRepeat!, - hourToRepeat: hourToRepeat!, - minutesToRepeat: minutesToRepeat!, + daysToRepeat: daysToRepeat, + hourToRepeat: hourToRepeat, + minutesToRepeat: minutesToRepeat, ), ); } else { diff --git a/lib/presentation/pages/plus_button.dart b/lib/presentation/pages/plus_button.dart index 37b72f94..70926494 100644 --- a/lib/presentation/pages/plus_button.dart +++ b/lib/presentation/pages/plus_button.dart @@ -1,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/hub/hub_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/domain/i_hub_connection_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; diff --git a/lib/presentation/pages/remote_pipes_page.dart b/lib/presentation/pages/remote_pipes_page.dart index 77474fc7..1662f52b 100644 --- a/lib/presentation/pages/remote_pipes_page.dart +++ b/lib/presentation/pages/remote_pipes_page.dart @@ -1,8 +1,6 @@ import 'package:adaptive_action_sheet/adaptive_action_sheet.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/remote_pipes/i_remote_pipes_repository.dart'; -import 'package:cbj_integrations_controller/domain/remote_pipes/remote_pipes_entity.dart'; -import 'package:cbj_integrations_controller/domain/remote_pipes/remote_pipes_value_objects.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/pages/scenes/scenes_page.dart b/lib/presentation/pages/scenes/scenes_page.dart index 3985b58d..92551268 100644 --- a/lib/presentation/pages/scenes/scenes_page.dart +++ b/lib/presentation/pages/scenes/scenes_page.dart @@ -2,7 +2,7 @@ import 'dart:ui'; import 'package:adaptive_action_sheet/adaptive_action_sheet.dart'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; import 'package:cybearjinni/presentation/pages/scenes/widgets/folder_of_scenes.dart'; diff --git a/lib/presentation/pages/scenes/widgets/folder_of_scenes.dart b/lib/presentation/pages/scenes/widgets/folder_of_scenes.dart index bcb26be7..f3e3809d 100644 --- a/lib/presentation/pages/scenes/widgets/folder_of_scenes.dart +++ b/lib/presentation/pages/scenes/widgets/folder_of_scenes.dart @@ -1,7 +1,4 @@ -import 'package:cbj_integrations_controller/domain/area/area_entity.dart'; -import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/scene/scene_cbj_entity.dart'; -import 'package:cbj_integrations_controller/domain/scene/scene_cbj_failures.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/pages/scenes/widgets/scene_widget.dart'; import 'package:dartz/dartz.dart' as dartz; diff --git a/lib/presentation/pages/scenes/widgets/scene_widget.dart b/lib/presentation/pages/scenes/widgets/scene_widget.dart index 312048ff..12917a14 100644 --- a/lib/presentation/pages/scenes/widgets/scene_widget.dart +++ b/lib/presentation/pages/scenes/widgets/scene_widget.dart @@ -1,5 +1,4 @@ -import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; -import 'package:cbj_integrations_controller/domain/scene/scene_cbj_entity.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/snack_bar_service.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/pages/splash_page.dart b/lib/presentation/pages/splash_page.dart index 75efb2e8..ea0cda86 100644 --- a/lib/presentation/pages/splash_page.dart +++ b/lib/presentation/pages/splash_page.dart @@ -1,9 +1,7 @@ import 'dart:io'; import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/domain/local_db/i_local_db_repository.dart'; -import 'package:cbj_integrations_controller/infrastructure/node_red/node_red_repository.dart'; -import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart'; +import 'package:cbj_integrations_controller/integrations_controller.dart'; import 'package:cbj_smart_device_flutter/commands/flutter_commands.dart'; import 'package:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/domain/i_local_db_repository.dart';