diff --git a/lib/domain/cbj_comp/cbj_comp_entity.dart b/lib/domain/cbj_comp/cbj_comp_entity.dart index 35419a5f..b46515ae 100644 --- a/lib/domain/cbj_comp/cbj_comp_entity.dart +++ b/lib/domain/cbj_comp/cbj_comp_entity.dart @@ -8,38 +8,38 @@ import 'package:kt_dart/kt.dart'; part 'cbj_comp_entity.freezed.dart'; @freezed -abstract class CBJCompEntity implements _$CBJCompEntity { - const factory CBJCompEntity({ - required CBJCompUniqueId id, - required CBJCompRoomId roomId, - required CBJCompLastKnownIp lastKnownIp, - CBJCompDevices? cBJCompDevices, - CBJCompDefaultName? name, - CBJCompMacAddr? macAddr, - CBJCompOs? compOs, - CBJCompModel? compModel, - CBJCompType? compType, +abstract class CbjCompEntity implements _$CbjCompEntity { + const factory CbjCompEntity({ + required CbjCompUniqueId id, + required CbjCompRoomId roomId, + required CbjCompLastKnownIp lastKnownIp, + CbjCompDevices? cBJCompDevices, + CbjCompDefaultName? name, + CbjCompMacAddr? macAddr, + CbjCompOs? compOs, + CbjCompModel? compModel, + CbjCompType? compType, /// The comp uuid that it came with out of the factory - CBJCompUuid? compUuid, - }) = _CBJCompEntity; + CbjCompUuid? compUuid, + }) = _CbjCompEntity; - const CBJCompEntity._(); + const CbjCompEntity._(); - factory CBJCompEntity.empty() => CBJCompEntity( - id: CBJCompUniqueId(), - roomId: CBJCompRoomId(), - lastKnownIp: CBJCompLastKnownIp(''), - cBJCompDevices: CBJCompDevices([].toImmutableList()), - name: CBJCompDefaultName(''), - macAddr: CBJCompMacAddr(''), - compOs: CBJCompOs(''), - compModel: CBJCompModel(''), - compType: CBJCompType(''), - compUuid: CBJCompUuid(''), + factory CbjCompEntity.empty() => CbjCompEntity( + id: CbjCompUniqueId(), + roomId: CbjCompRoomId(), + lastKnownIp: CbjCompLastKnownIp(''), + cBJCompDevices: CbjCompDevices([].toImmutableList()), + name: CbjCompDefaultName(''), + macAddr: CbjCompMacAddr(''), + compOs: CbjCompOs(''), + compModel: CbjCompModel(''), + compType: CbjCompType(''), + compUuid: CbjCompUuid(''), ); - Option> get failureOption { + Option> get failureOption { return roomId.value.fold((f) => some(f), (_) => none()); } } diff --git a/lib/domain/cbj_comp/cbj_comp_errors.dart b/lib/domain/cbj_comp/cbj_comp_errors.dart index 8a9b84e1..10f1bf49 100644 --- a/lib/domain/cbj_comp/cbj_comp_errors.dart +++ b/lib/domain/cbj_comp/cbj_comp_errors.dart @@ -1,9 +1,9 @@ import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; -class CBJCompUnexpectedValueError extends Error { - CBJCompUnexpectedValueError(this.cBJCompFailure); +class CbjCompUnexpectedValueError extends Error { + CbjCompUnexpectedValueError(this.cBJCompFailure); - final CBJCompFailure cBJCompFailure; + final CbjCompFailure cBJCompFailure; @override String toString() { diff --git a/lib/domain/cbj_comp/cbj_comp_failures.dart b/lib/domain/cbj_comp/cbj_comp_failures.dart index e579ad6e..1c6f0891 100644 --- a/lib/domain/cbj_comp/cbj_comp_failures.dart +++ b/lib/domain/cbj_comp/cbj_comp_failures.dart @@ -3,24 +3,24 @@ import 'package:freezed_annotation/freezed_annotation.dart'; part 'cbj_comp_failures.freezed.dart'; @freezed -class CBJCompFailure { - const factory CBJCompFailure.empty({ +class CbjCompFailure { + const factory CbjCompFailure.empty({ required T failedValue, }) = _Empty; - const factory CBJCompFailure.actionExcecuter({ + const factory CbjCompFailure.actionExcecuter({ required T failedValue, }) = _ActionExcecuter; - const factory CBJCompFailure.exceedingLength({ + const factory CbjCompFailure.exceedingLength({ required T failedValue, required int max, }) = _ExceedingLength; - const factory CBJCompFailure.unexpected() = _Unexpected; + const factory CbjCompFailure.unexpected() = _Unexpected; - const factory CBJCompFailure.insufficientPermission() = + const factory CbjCompFailure.insufficientPermission() = _InsufficientPermission; - const factory CBJCompFailure.unableToUpdate() = _UnableToUpdate; + const factory CbjCompFailure.unableToUpdate() = _UnableToUpdate; } diff --git a/lib/domain/cbj_comp/cbj_comp_validators.dart b/lib/domain/cbj_comp/cbj_comp_validators.dart index 472d4850..a7146c72 100644 --- a/lib/domain/cbj_comp/cbj_comp_validators.dart +++ b/lib/domain/cbj_comp/cbj_comp_validators.dart @@ -3,24 +3,24 @@ import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart'; import 'package:dartz/dartz.dart'; import 'package:kt_dart/kt.dart'; -Either, String> validateCBJCompNotEmpty(String input) { +Either, String> validateCBJCompNotEmpty(String input) { if (input.isNotEmpty) { return right(input); } else { return left( - CBJCompFailure.empty( + CbjCompFailure.empty( failedValue: input, ), ); } } -Either>, KtList> +Either>, KtList> validateCBJCompDevicesNotNull(KtList input) { return right(input); } -Either, String> validateCBJCompMaxNameLength( +Either, String> validateCBJCompMaxNameLength( String input, int maxLength, ) { @@ -28,7 +28,7 @@ Either, String> validateCBJCompMaxNameLength( return right(input); } else { return left( - CBJCompFailure.exceedingLength( + CbjCompFailure.exceedingLength( failedValue: input, max: maxLength, ), @@ -36,21 +36,21 @@ Either, String> validateCBJCompMaxNameLength( } } -Either, String> validateCBJCompStateExist(String input) { +Either, String> validateCBJCompStateExist(String input) { return right(input); } -Either, String> validateCBJCompActionExist( +Either, String> validateCBJCompActionExist( String input, ) { return right(input); } -Either, String> validateCBJCompTypeExist(String input) { +Either, String> validateCBJCompTypeExist(String input) { return right(input); } -Either, String> validateCBJCompStateInTypeExist( +Either, String> validateCBJCompStateInTypeExist( String input, ) { return right(input); diff --git a/lib/domain/cbj_comp/cbj_comp_value_objects.dart b/lib/domain/cbj_comp/cbj_comp_value_objects.dart index a19e224f..4de24285 100644 --- a/lib/domain/cbj_comp/cbj_comp_value_objects.dart +++ b/lib/domain/cbj_comp/cbj_comp_value_objects.dart @@ -8,24 +8,24 @@ import 'package:kt_dart/collection.dart'; import 'package:uuid/uuid.dart'; @immutable -abstract class CBJCompValueObjectAbstract { - const CBJCompValueObjectAbstract(); +abstract class CbjCompValueObjectAbstract { + const CbjCompValueObjectAbstract(); - Either, T>? get value; + Either, T>? get value; - /// Throws [CBJCompUnexpectedValueError] containing the [CBJCompFailure] + /// Throws [CbjCompUnexpectedValueError] containing the [CbjCompFailure] T getOrCrash() { // id = identity - same as writing (right) => right - return value!.fold((f) => throw CBJCompUnexpectedValueError(f), id); + return value!.fold((f) => throw CbjCompUnexpectedValueError(f), id); } - /// Throws [CBJCompUnexpectedValueError] containing the [CBJCompFailure] + /// Throws [CbjCompUnexpectedValueError] containing the [CbjCompFailure] T? getOrNull() { // id = identity - same as writing (right) => right return value!.fold((f) => null, id); } - Either, Unit> get failureOrUnit { + Either, Unit> get failureOrUnit { return value!.fold((l) => left(l), (r) => right(unit)); } @@ -38,151 +38,151 @@ abstract class CBJCompValueObjectAbstract { @nonVirtual bool operator ==(Object o) { if (identical(this, o)) return true; - return o is CBJCompValueObjectAbstract && o.value == value; + return o is CbjCompValueObjectAbstract && o.value == value; } @override int get hashCode => value.hashCode; } -class CBJCompUniqueId extends CBJCompValueObjectAbstract { - factory CBJCompUniqueId() { - return CBJCompUniqueId._(right(const Uuid().v1())); +class CbjCompUniqueId extends CbjCompValueObjectAbstract { + factory CbjCompUniqueId() { + return CbjCompUniqueId._(right(const Uuid().v1())); } - const CBJCompUniqueId._(this.value); + const CbjCompUniqueId._(this.value); - factory CBJCompUniqueId.fromUniqueString(String uniqueId) { - return CBJCompUniqueId._(right(uniqueId)); + factory CbjCompUniqueId.fromUniqueString(String uniqueId) { + return CbjCompUniqueId._(right(uniqueId)); } @override - final Either, String> value; + final Either, String> value; } -class CBJCompRoomId extends CBJCompValueObjectAbstract { - factory CBJCompRoomId() { - return CBJCompRoomId._(right(const Uuid().v1())); +class CbjCompRoomId extends CbjCompValueObjectAbstract { + factory CbjCompRoomId() { + return CbjCompRoomId._(right(const Uuid().v1())); } - factory CBJCompRoomId.fromUniqueString(String uniqueId) { - return CBJCompRoomId._(right(uniqueId)); + factory CbjCompRoomId.fromUniqueString(String uniqueId) { + return CbjCompRoomId._(right(uniqueId)); } - const CBJCompRoomId._(this.value); + const CbjCompRoomId._(this.value); @override - final Either, String> value; + final Either, String> value; } -class CBJCompMacAddr extends CBJCompValueObjectAbstract { - factory CBJCompMacAddr(String input) { - return CBJCompMacAddr._( +class CbjCompMacAddr extends CbjCompValueObjectAbstract { + factory CbjCompMacAddr(String input) { + return CbjCompMacAddr._( validateCBJCompNotEmpty(input) .flatMap((a) => validateCBJCompMaxNameLength(input, maxLength)), ); } - const CBJCompMacAddr._(this.value); + const CbjCompMacAddr._(this.value); @override - final Either, String> value; + final Either, String> value; static const maxLength = 1000; } -class CBJCompDefaultName extends CBJCompValueObjectAbstract { - factory CBJCompDefaultName(String input) { - return CBJCompDefaultName._( +class CbjCompDefaultName extends CbjCompValueObjectAbstract { + factory CbjCompDefaultName(String input) { + return CbjCompDefaultName._( validateCBJCompNotEmpty(input) .flatMap((a) => validateCBJCompMaxNameLength(input, maxLength)), ); } - const CBJCompDefaultName._(this.value); + const CbjCompDefaultName._(this.value); @override - final Either, String> value; + final Either, String> value; static const maxLength = 1000; } -class CBJCompDevices - extends CBJCompValueObjectAbstract> { - factory CBJCompDevices(KtList input) { - return CBJCompDevices._(validateCBJCompDevicesNotNull(input)); +class CbjCompDevices + extends CbjCompValueObjectAbstract> { + factory CbjCompDevices(KtList input) { + return CbjCompDevices._(validateCBJCompDevicesNotNull(input)); } - const CBJCompDevices._(this.value); + const CbjCompDevices._(this.value); @override - final Either>, KtList> + final Either>, KtList> value; } -class CBJCompOs extends CBJCompValueObjectAbstract { - factory CBJCompOs(String input) { - return CBJCompOs._( +class CbjCompOs extends CbjCompValueObjectAbstract { + factory CbjCompOs(String input) { + return CbjCompOs._( validateCBJCompNotEmpty(input), ); } - const CBJCompOs._(this.value); + const CbjCompOs._(this.value); @override - final Either, String> value; + final Either, String> value; } -class CBJCompModel extends CBJCompValueObjectAbstract { - factory CBJCompModel(String input) { - return CBJCompModel._( +class CbjCompModel extends CbjCompValueObjectAbstract { + factory CbjCompModel(String input) { + return CbjCompModel._( validateCBJCompNotEmpty(input), ); } - const CBJCompModel._(this.value); + const CbjCompModel._(this.value); @override - final Either, String> value; + final Either, String> value; } -class CBJCompType extends CBJCompValueObjectAbstract { - factory CBJCompType(String input) { - return CBJCompType._( +class CbjCompType extends CbjCompValueObjectAbstract { + factory CbjCompType(String input) { + return CbjCompType._( validateCBJCompNotEmpty(input) .flatMap((a) => validateCBJCompTypeExist(input)), ); } - const CBJCompType._(this.value); + const CbjCompType._(this.value); @override - final Either, String> value; + final Either, String> value; } -class CBJCompUuid extends CBJCompValueObjectAbstract { - factory CBJCompUuid(String input) { - return CBJCompUuid._( +class CbjCompUuid extends CbjCompValueObjectAbstract { + factory CbjCompUuid(String input) { + return CbjCompUuid._( validateCBJCompNotEmpty(input), ); } - const CBJCompUuid._(this.value); + const CbjCompUuid._(this.value); @override - final Either, String> value; + final Either, String> value; } -class CBJCompLastKnownIp extends CBJCompValueObjectAbstract { - factory CBJCompLastKnownIp(String input) { - return CBJCompLastKnownIp._( +class CbjCompLastKnownIp extends CbjCompValueObjectAbstract { + factory CbjCompLastKnownIp(String input) { + return CbjCompLastKnownIp._( validateCBJCompNotEmpty(input) .flatMap((a) => validateCBJCompTypeExist(input)), ); } - const CBJCompLastKnownIp._(this.value); + const CbjCompLastKnownIp._(this.value); @override - final Either, String> value; + final Either, String> value; } diff --git a/lib/domain/cbj_comp/i_cbj_comp_repository.dart b/lib/domain/cbj_comp/i_cbj_comp_repository.dart index 3a058ece..5d576d0f 100644 --- a/lib/domain/cbj_comp/i_cbj_comp_repository.dart +++ b/lib/domain/cbj_comp/i_cbj_comp_repository.dart @@ -8,26 +8,26 @@ import 'package:dartz/dartz.dart'; part 'package:cybearjinni/infrastructure/cbj_comp_repository.dart'; -abstract interface class ICBJCompRepository { - static ICBJCompRepository? _instance; +abstract interface class ICbjCompRepository { + static ICbjCompRepository? _instance; - static ICBJCompRepository get instance { - return _instance ??= _CBJCompRepository(); + static ICbjCompRepository get instance { + return _instance ??= _CbjCompRepository(); } - Future> shutdownServer(); + Future> shutdownServer(); - Stream> getConnectedComputersIP(); + Stream> getConnectedComputersIP(); - Future> getInformationFromDeviceByIp( + Future> getInformationFromDeviceByIp( String compIp, ); - Future> firstSetup(CBJCompEntity cBJCompEntity); + Future> firstSetup(CbjCompEntity cBJCompEntity); - Future> devicesList(CBJCompEntity cBJCompEntity); + Future> devicesList(CbjCompEntity cBJCompEntity); - Future> create(CBJCompEntity cBJCompEntity); + Future> create(CbjCompEntity cBJCompEntity); - Future> updateCompInfo(CBJCompEntity compEntity); + Future> updateCompInfo(CbjCompEntity compEntity); } diff --git a/lib/domain/connections_service.dart b/lib/domain/connections_service.dart index 3e129780..ec131ba0 100644 --- a/lib/domain/connections_service.dart +++ b/lib/domain/connections_service.dart @@ -1,9 +1,9 @@ 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/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/search_devices.dart'; diff --git a/lib/domain/device/i_device_repository.dart b/lib/domain/device/i_device_repository.dart index db1dfaf2..54704976 100644 --- a/lib/domain/device/i_device_repository.dart +++ b/lib/domain/device/i_device_repository.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:collection'; import 'dart:io'; +import 'package:cbj_integrations_controller/domain/core/request_types.dart'; import 'package:cbj_integrations_controller/domain/room/room_entity.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'; 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 7979e269..9119d5cc 100644 --- a/lib/domain/security_bear/i_security_bear_connection_repository.dart +++ b/lib/domain/security_bear/i_security_bear_connection_repository.dart @@ -37,7 +37,7 @@ abstract interface class ISecurityBearConnectionRepository { Future> searchForSecurityBear(); Future> setSecurityBearWiFiInformation( - CBJCompEntity compEntity, + CbjCompEntity compEntity, ); Future> diff --git a/lib/infrastructure/cbj_comp_repository.dart b/lib/infrastructure/cbj_comp_repository.dart index 03a804cd..d5ca4b93 100644 --- a/lib/infrastructure/cbj_comp_repository.dart +++ b/lib/infrastructure/cbj_comp_repository.dart @@ -1,48 +1,48 @@ part of 'package:cybearjinni/domain/cbj_comp/i_cbj_comp_repository.dart'; -class _CBJCompRepository implements ICBJCompRepository { +class _CbjCompRepository implements ICbjCompRepository { @override - Future> shutdownServer() async { + Future> shutdownServer() async { await CreateTheCBJAppServer().shutdownServer(); return right(unit); } @override - Future> firstSetup( - CBJCompEntity cBJCompEntity, + Future> firstSetup( + CbjCompEntity cBJCompEntity, ) async { try { - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } catch (e) { - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } } @override - Future> create(CBJCompEntity deviceEntity) { + Future> create(CbjCompEntity deviceEntity) { // TODO: implement create throw UnimplementedError(); } @override - Future> devicesList(CBJCompEntity deviceEntity) { + Future> devicesList(CbjCompEntity deviceEntity) { // TODO: implement devicesList throw UnimplementedError(); } @override - Future> updateCompInfo( - CBJCompEntity compEntity, + Future> updateCompInfo( + CbjCompEntity compEntity, ) async { try { - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } catch (e) { - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } } @override - Stream> getConnectedComputersIP() async* { + Stream> getConnectedComputersIP() async* { try { final CreateTheCBJAppServer createTheCBJAppServer = CreateTheCBJAppServer(); @@ -56,18 +56,18 @@ class _CBJCompRepository implements ICBJCompRepository { return right(compInfoSB.compIP); }); } catch (e) { - yield left(const CBJCompFailure.unexpected()); + yield left(const CbjCompFailure.unexpected()); } - yield left(const CBJCompFailure.unexpected()); + yield left(const CbjCompFailure.unexpected()); } @override - Future> getInformationFromDeviceByIp( + Future> getInformationFromDeviceByIp( String compIp, ) async { try {} catch (e) { - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } - return left(const CBJCompFailure.unexpected()); + return left(const CbjCompFailure.unexpected()); } } diff --git a/lib/infrastructure/hub_client/hub_requests_routing.dart b/lib/infrastructure/hub_client/hub_requests_routing.dart index 3e2cbc16..ea3a52c2 100644 --- a/lib/infrastructure/hub_client/hub_requests_routing.dart +++ b/lib/infrastructure/hub_client/hub_requests_routing.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:convert'; +import 'package:cbj_integrations_controller/domain/core/request_types.dart'; import 'package:cbj_integrations_controller/domain/room/i_room_repository.dart'; import 'package:cbj_integrations_controller/domain/room/room_entity.dart'; import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart'; diff --git a/lib/infrastructure/mqtt.dart b/lib/infrastructure/mqtt.dart index bd6ce936..c2d37326 100644 --- a/lib/infrastructure/mqtt.dart +++ b/lib/infrastructure/mqtt.dart @@ -1,5 +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/domain/i_saved_devices_repo.dart'; import 'package:cbj_integrations_controller/domain/i_saved_rooms_repo.dart'; diff --git a/lib/infrastructure/security_bear_client/security_bear_connection_repository.dart b/lib/infrastructure/security_bear_client/security_bear_connection_repository.dart index 60b613bc..ad290f5d 100644 --- a/lib/infrastructure/security_bear_client/security_bear_connection_repository.dart +++ b/lib/infrastructure/security_bear_client/security_bear_connection_repository.dart @@ -244,7 +244,7 @@ class _SecurityBearConnectionRepository @override Future> setSecurityBearWiFiInformation( - CBJCompEntity compEntity, + CbjCompEntity compEntity, ) async { try { final ManageNetworkEntity firstWifiEntityOrFailure = diff --git a/lib/presentation/atoms/switch_atom.dart b/lib/presentation/atoms/switch_atom.dart index 6b1c72ee..6a5b51bd 100644 --- a/lib/presentation/atoms/switch_atom.dart +++ b/lib/presentation/atoms/switch_atom.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; +import 'package:cbj_integrations_controller/domain/core/request_types.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 72cfa17f..d243bb87 100644 --- a/lib/presentation/core/entities_utils.dart +++ b/lib/presentation/core/entities_utils.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; +import 'package:cbj_integrations_controller/domain/core/request_types.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'; @@ -6,7 +6,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart class EntitiesUtils { static IconData iconOfDeviceType(EntityTypes deviceType) { switch (deviceType) { - case EntityTypes.AirConditioner: + case EntityTypes.airConditioner: // TODO: Handle this case. break; case EntityTypes.babyMonitor: diff --git a/lib/presentation/molecules/device_by_type_molecule.dart b/lib/presentation/molecules/device_by_type_molecule.dart index 3b5d6f45..a3ed4927 100644 --- a/lib/presentation/molecules/device_by_type_molecule.dart +++ b/lib/presentation/molecules/device_by_type_molecule.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbenum.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_blinds_entity/generic_blinds_entity.dart'; diff --git a/lib/presentation/molecules/devices/blind_molecule.dart b/lib/presentation/molecules/devices/blind_molecule.dart index 7ac63061..6cb608a8 100644 --- a/lib/presentation/molecules/devices/blind_molecule.dart +++ b/lib/presentation/molecules/devices/blind_molecule.dart @@ -1,7 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_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/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:cybearjinni/domain/connections_service.dart'; diff --git a/lib/presentation/molecules/devices/blinds_card_molecule.dart b/lib/presentation/molecules/devices/blinds_card_molecule.dart index 21c26ab5..2e8a9e1e 100644 --- a/lib/presentation/molecules/devices/blinds_card_molecule.dart +++ b/lib/presentation/molecules/devices/blinds_card_molecule.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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: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 f59c75aa..184abcde 100644 --- a/lib/presentation/molecules/devices/boiler_molecule.dart +++ b/lib/presentation/molecules/devices/boiler_molecule.dart @@ -1,7 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_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/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:cybearjinni/domain/connections_service.dart'; diff --git a/lib/presentation/molecules/devices/dimmable_light_molecule.dart b/lib/presentation/molecules/devices/dimmable_light_molecule.dart index e023fd35..42601297 100644 --- a/lib/presentation/molecules/devices/dimmable_light_molecule.dart +++ b/lib/presentation/molecules/devices/dimmable_light_molecule.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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_dimmable_light_entity/generic_dimmable_light_entity.dart'; diff --git a/lib/presentation/molecules/devices/light_card_molecule.dart b/lib/presentation/molecules/devices/light_card_molecule.dart index abc6bfd7..d166a711 100644 --- a/lib/presentation/molecules/devices/light_card_molecule.dart +++ b/lib/presentation/molecules/devices/light_card_molecule.dart @@ -1,4 +1,4 @@ -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart'; +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'; diff --git a/lib/presentation/molecules/devices/light_molecule.dart b/lib/presentation/molecules/devices/light_molecule.dart index 1ccc9e54..9a39942c 100644 --- a/lib/presentation/molecules/devices/light_molecule.dart +++ b/lib/presentation/molecules/devices/light_molecule.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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_light_entity/generic_light_entity.dart'; import 'package:cybearjinni/domain/connections_service.dart'; diff --git a/lib/presentation/molecules/devices/rgb_light_molecule.dart b/lib/presentation/molecules/devices/rgb_light_molecule.dart index 68bcc93e..489627fc 100644 --- a/lib/presentation/molecules/devices/rgb_light_molecule.dart +++ b/lib/presentation/molecules/devices/rgb_light_molecule.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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_rgbw_light_entity/generic_rgbw_light_entity.dart'; diff --git a/lib/presentation/molecules/devices/smart_plug_molecule.dart b/lib/presentation/molecules/devices/smart_plug_molecule.dart index d73b43df..12b06494 100644 --- a/lib/presentation/molecules/devices/smart_plug_molecule.dart +++ b/lib/presentation/molecules/devices/smart_plug_molecule.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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_smart_plug_entity/generic_smart_plug_entity.dart'; import 'package:cybearjinni/domain/connections_service.dart'; diff --git a/lib/presentation/molecules/devices/smart_tv_molecule.dart b/lib/presentation/molecules/devices/smart_tv_molecule.dart index 9d8e6a1e..a9d0f770 100644 --- a/lib/presentation/molecules/devices/smart_tv_molecule.dart +++ b/lib/presentation/molecules/devices/smart_tv_molecule.dart @@ -1,7 +1,7 @@ import 'dart:collection'; import 'package:another_flushbar/flushbar_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/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'; diff --git a/lib/presentation/molecules/devices/switch_molecule.dart b/lib/presentation/molecules/devices/switch_molecule.dart index e75135c9..2923088f 100644 --- a/lib/presentation/molecules/devices/switch_molecule.dart +++ b/lib/presentation/molecules/devices/switch_molecule.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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_switch_entity/generic_switch_entity.dart'; import 'package:cybearjinni/domain/connections_service.dart'; diff --git a/lib/presentation/organisms/devices_list_view.dart b/lib/presentation/organisms/devices_list_view.dart index cfa7e92e..c888350a 100644 --- a/lib/presentation/organisms/devices_list_view.dart +++ b/lib/presentation/organisms/devices_list_view.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/core/entities_utils.dart'; diff --git a/lib/presentation/organisms/open_room_organism.dart b/lib/presentation/organisms/open_room_organism.dart index 87dde719..52dc2844 100644 --- a/lib/presentation/organisms/open_room_organism.dart +++ b/lib/presentation/organisms/open_room_organism.dart @@ -1,5 +1,5 @@ +import 'package:cbj_integrations_controller/domain/core/request_types.dart'; import 'package:cbj_integrations_controller/domain/room/room_entity.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:cybearjinni/presentation/atoms/atoms.dart'; import 'package:cybearjinni/presentation/molecules/molecules.dart'; diff --git a/lib/presentation/pages/add_new_automation_process/add_bindings/widgets/add_binding_widget.dart b/lib/presentation/pages/add_new_automation_process/add_bindings/widgets/add_binding_widget.dart index 879733d2..ba2a78be 100644 --- a/lib/presentation/pages/add_new_automation_process/add_bindings/widgets/add_binding_widget.dart +++ b/lib/presentation/pages/add_new_automation_process/add_bindings/widgets/add_binding_widget.dart @@ -1,8 +1,8 @@ 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/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:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; diff --git a/lib/presentation/pages/add_new_automation_process/add_routine/widgets/add_routine_widget.dart b/lib/presentation/pages/add_new_automation_process/add_routine/widgets/add_routine_widget.dart index a599d488..71e7686d 100644 --- a/lib/presentation/pages/add_new_automation_process/add_routine/widgets/add_routine_widget.dart +++ b/lib/presentation/pages/add_new_automation_process/add_routine/widgets/add_routine_widget.dart @@ -1,9 +1,9 @@ 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/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:cybearjinni/domain/device/i_device_repository.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; diff --git a/lib/presentation/pages/add_new_automation_process/add_scene/widgets/add_scene_widget.dart b/lib/presentation/pages/add_new_automation_process/add_scene/widgets/add_scene_widget.dart index 8caba3d2..63e88c24 100644 --- a/lib/presentation/pages/add_new_automation_process/add_scene/widgets/add_scene_widget.dart +++ b/lib/presentation/pages/add_new_automation_process/add_scene/widgets/add_scene_widget.dart @@ -1,5 +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'; 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 9cebb45c..12cd2dac 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,6 @@ 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/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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/computer_connection_check/computer_connection_check_page.dart b/lib/presentation/pages/add_new_devices_process/computer_connection_check/computer_connection_check_page.dart index 69528106..0d8200ba 100644 --- a/lib/presentation/pages/add_new_devices_process/computer_connection_check/computer_connection_check_page.dart +++ b/lib/presentation/pages/add_new_devices_process/computer_connection_check/computer_connection_check_page.dart @@ -11,7 +11,7 @@ class ComputerConnectionCheckPage extends StatelessWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; void leftIconFunction(BuildContext context) { context.router.pop(); 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 aa27d27b..aafa02fe 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 @@ -23,7 +23,7 @@ class ComputerConnectionCheckWidget extends StatefulWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; static String deviceNameFieldKey = 'deviceNameField'; static String devicesDefaultRoomNameField = ''; @@ -103,8 +103,8 @@ class _ComputerConnectionCheckWidgetState } /// Organize all the data from the text fields to updated CBJCompEntity - CBJCompEntity newCBJCompEntity( - CBJCompEntity cbjCompEntity, + CbjCompEntity newCBJCompEntity( + CbjCompEntity cbjCompEntity, Map textEditingController, ) { final String deviceNameFieldKey = @@ -129,18 +129,18 @@ class _ComputerConnectionCheckWidgetState icLogger.w("Can't add unsupported device"); } }); - final CBJCompEntity compUpdatedData = cbjCompEntity.copyWith( - cBJCompDevices: CBJCompDevices(deviceEntityList.toImmutableList()), + final CbjCompEntity compUpdatedData = cbjCompEntity.copyWith( + cBJCompDevices: CbjCompDevices(deviceEntityList.toImmutableList()), ); return compUpdatedData; } - Future initialNewDevice(CBJCompEntity compUpdatedData) async { + Future initialNewDevice(CbjCompEntity compUpdatedData) async { bool error = false; - final dartz.Either updateAllDevices = - await ICBJCompRepository.instance.firstSetup(compUpdatedData); + final dartz.Either updateAllDevices = + await ICbjCompRepository.instance.firstSetup(compUpdatedData); updateAllDevices.fold( (l) { diff --git a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/configure_new_cbj_comp_page.dart b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/configure_new_cbj_comp_page.dart index a3134cdd..86096e39 100644 --- a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/configure_new_cbj_comp_page.dart +++ b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/configure_new_cbj_comp_page.dart @@ -11,7 +11,7 @@ class ConfigureNewCbjCompPage extends StatelessWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; void leftIconFunction(BuildContext context) { context.router.pop(); 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 3935fe09..a5b86455 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,6 +1,6 @@ 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/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; @@ -26,7 +26,7 @@ class ConfigureNewCbjCompWidgets extends StatefulWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; static String deviceNameFieldKey = 'deviceNameField'; static String devicesDefaultRoomNameField = ''; @@ -50,13 +50,13 @@ class _ConfigureNewCbjCompWidgetsState _sendHotSpotInformation(widget.cbjCompEntity); } - Future _sendHotSpotInformation(CBJCompEntity cBJCompEntity) async { + Future _sendHotSpotInformation(CbjCompEntity cBJCompEntity) async { progressPercentage += 0.3; setState(() { state = ConfigureNewCbjCompState.actionInProgress; }); - final CBJCompEntity compUpdatedData = cBJCompEntity; + final CbjCompEntity compUpdatedData = cBJCompEntity; final dartz.Either setSecurityBearWiFi = await ISecurityBearConnectionRepository.instance .setSecurityBearWiFiInformation(compUpdatedData); @@ -92,8 +92,8 @@ class _ConfigureNewCbjCompWidgetsState } /// Organize all the data from the text fields to updated CBJCompEntity - CBJCompEntity newCBJCompEntity( - CBJCompEntity cbjCompEntity, + CbjCompEntity newCBJCompEntity( + CbjCompEntity cbjCompEntity, Map textEditingController, ) { final String deviceNameFieldKey = @@ -118,18 +118,18 @@ class _ConfigureNewCbjCompWidgetsState icLogger.w("Can't add unsupported device"); } }); - final CBJCompEntity compUpdatedData = cbjCompEntity.copyWith( - cBJCompDevices: CBJCompDevices(deviceEntityList.toImmutableList()), + final CbjCompEntity compUpdatedData = cbjCompEntity.copyWith( + cBJCompDevices: CbjCompDevices(deviceEntityList.toImmutableList()), ); return compUpdatedData; } - Future initialNewDevice(CBJCompEntity compUpdatedData) async { + Future initialNewDevice(CbjCompEntity compUpdatedData) async { bool error = false; - final dartz.Either updateAllDevices = - await ICBJCompRepository.instance.firstSetup(compUpdatedData); + final dartz.Either updateAllDevices = + await ICbjCompRepository.instance.firstSetup(compUpdatedData); updateAllDevices.fold( (l) { @@ -141,7 +141,7 @@ class _ConfigureNewCbjCompWidgetsState } Widget devicesList( - CBJCompEntity cbjCompEntityForDeviceList, + CbjCompEntity cbjCompEntityForDeviceList, Map textEditingController, BuildContext context, ) { 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 f1dd8a73..78a225d6 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,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; @@ -11,7 +11,7 @@ class CBJCompCard extends StatelessWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; @override Widget build(BuildContext context) { 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 75ab307c..fb879b16 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,5 +1,5 @@ import 'package:auto_route/auto_route.dart'; -import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.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:cybearjinni/domain/cbj_comp/cbj_comp_entity.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart'; @@ -12,7 +12,7 @@ class CBJCompCardWithDevicesControll extends StatelessWidget { required this.cbjCompEntity, }); - final CBJCompEntity cbjCompEntity; + final CbjCompEntity cbjCompEntity; Widget devicesTypes(BuildContext context) { final List typesList = []; diff --git a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/scan_for_new_cbj_comps_widget.dart b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/scan_for_new_cbj_comps_widget.dart index e41c554d..bad1069a 100644 --- a/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/scan_for_new_cbj_comps_widget.dart +++ b/lib/presentation/pages/add_new_devices_process/scan_for_new_cbj_comps/widgets/scan_for_new_cbj_comps_widget.dart @@ -19,7 +19,7 @@ class ScanForNewCBJCompsWidget extends StatefulWidget { } class _ScanForNewCBJCompsWidgetState extends State { - StreamSubscription>? + StreamSubscription>? _cbjCompStreamSubscription; @override @@ -30,7 +30,7 @@ class _ScanForNewCBJCompsWidgetState extends State { Future _watchAllStarted() async { await _cbjCompStreamSubscription?.cancel(); - _cbjCompStreamSubscription = ICBJCompRepository.instance + _cbjCompStreamSubscription = ICbjCompRepository.instance .getConnectedComputersIP() .listen((failureOrCBJCompList) { final dynamic failureOrCompListDynamic = failureOrCBJCompList.fold( @@ -38,7 +38,7 @@ class _ScanForNewCBJCompsWidgetState extends State { (ip) => ip, ); - if (failureOrCompListDynamic == CBJCompFailure) { + if (failureOrCompListDynamic == CbjCompFailure) { } else { _compDevicesReceived(failureOrCBJCompList); } @@ -46,14 +46,14 @@ class _ScanForNewCBJCompsWidgetState extends State { } Future _compDevicesReceived( - dartz.Either failureOrCBJCompList, + dartz.Either failureOrCBJCompList, ) async { final dynamic failureOrCompListDynamic = failureOrCBJCompList.fold( (f) => f, (ip) => ip, ); - if (failureOrCompListDynamic == CBJCompFailure) { + if (failureOrCompListDynamic == CbjCompFailure) { } else { final String ipAsString = failureOrCompListDynamic as String; routeToConfigure(ipAsString); @@ -61,8 +61,8 @@ class _ScanForNewCBJCompsWidgetState extends State { } void routeToConfigure(String ipAsString) { - final CBJCompEntity compEntity = CBJCompEntity.empty().copyWith( - lastKnownIp: CBJCompLastKnownIp(ipAsString), + final CbjCompEntity compEntity = CbjCompEntity.empty().copyWith( + lastKnownIp: CbjCompLastKnownIp(ipAsString), ); context.router.replace( @@ -73,7 +73,7 @@ class _ScanForNewCBJCompsWidgetState extends State { @override Future dispose() async { await _cbjCompStreamSubscription?.cancel(); - await ICBJCompRepository.instance.shutdownServer(); + await ICbjCompRepository.instance.shutdownServer(); return super.dispose(); } diff --git a/lib/presentation/pages/entities_in_room_page.dart b/lib/presentation/pages/entities_in_room_page.dart index 34a06317..ebc7f56e 100644 --- a/lib/presentation/pages/entities_in_room_page.dart +++ b/lib/presentation/pages/entities_in_room_page.dart @@ -1,6 +1,6 @@ import 'package:auto_route/auto_route.dart'; +import 'package:cbj_integrations_controller/domain/core/request_types.dart'; import 'package:cbj_integrations_controller/domain/room/room_entity.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:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/circular_progress_indicator_atom.dart'; diff --git a/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_rooms.dart b/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_rooms.dart index 1eddba30..459ed361 100644 --- a/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_rooms.dart +++ b/lib/presentation/pages/home_page/tabs/smart_devices_tab/smart_devices_by_rooms.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:collection'; +import 'package:cbj_integrations_controller/domain/core/request_types.dart'; import 'package:cbj_integrations_controller/domain/room/room_entity.dart'; import 'package:cbj_integrations_controller/domain/room/value_objects_room.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:cybearjinni/domain/connections_service.dart'; import 'package:cybearjinni/presentation/atoms/atoms.dart';