Merge pull request #735 from guyluz11/dev

Added matter support
simple-hub-organization · Mar 6, 2025 · 8827e3a · 8827e3a
2 parents eb3b91d + bfe8b40
commit 8827e3a
Show file tree

Hide file tree

Showing 98 changed files with 438 additions and 284 deletions.
diff --git a/.idea/CBJ_App.iml b/.idea/CBJ_App.iml
diff --git a/lib/domain/cbj_comp/cbj_comp_entity.dart b/lib/domain/cbj_comp/cbj_comp_entity.dart
@@ -1,3 +1,4 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';

diff --git a/lib/domain/cbj_comp/cbj_comp_validators.dart b/lib/domain/cbj_comp/cbj_comp_validators.dart
@@ -1,3 +1,4 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cybearjinni/domain/cbj_comp/cbj_comp_failures.dart';
 import 'package:dartz/dartz.dart';

diff --git a/lib/domain/cbj_comp/cbj_comp_value_objects.dart b/lib/domain/cbj_comp/cbj_comp_value_objects.dart
@@ -1,11 +1,12 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
 import 'package:kt_dart/collection.dart';
-// ignore: depend_on_referenced_packages
+// ignore: depend_on_referenced_packages a
 import 'package:uuid/uuid.dart';
 
 @immutable

diff --git a/lib/domain/cbj_comp/i_cbj_comp_repository.dart b/lib/domain/cbj_comp/i_cbj_comp_repository.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';

diff --git a/lib/domain/connections_service.dart b/lib/domain/connections_service.dart
@@ -3,6 +3,7 @@ import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cybearjinni/infrastructure/core/injection.dart';
@@ -13,14 +14,16 @@ import 'package:flutter/foundation.dart';
 import 'package:grpc/grpc.dart';
 import 'package:location/location.dart';
 import 'package:network_info_plus/network_info_plus.dart';
+// ignore: depend_on_referenced_packages a
 import 'package:network_tools_flutter/network_tools_flutter.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart'
     as permission_handler;
 import 'package:rxdart/rxdart.dart';
 
 part 'package:cybearjinni/infrastructure/connection_service/app_connection_service.dart';
-part 'package:cybearjinni/infrastructure/connection_service/hub_connection_service.dart';
 part 'package:cybearjinni/infrastructure/connection_service/demo_connection_service.dart';
+part 'package:cybearjinni/infrastructure/connection_service/hub_connection_service.dart';
 part 'package:cybearjinni/infrastructure/connection_service/none_connection_service.dart';
 part 'package:cybearjinni/infrastructure/connection_service/remote_pipes_connection_service.dart';
 
@@ -75,7 +78,7 @@ abstract interface class ConnectionsService {
 
   void setEntityState(RequestActionObject action);
 
-  Future setEtitiesToArea(String areaId, HashSet<String> entities);
+  Future setEntitiesToArea(String areaId, HashSet<String> entities);
 
   Future<HashMap<String, DeviceEntityBase>> get getEntities;
 

diff --git a/lib/domain/home_user/home_user_value_objects.dart b/lib/domain/home_user/home_user_value_objects.dart
@@ -3,7 +3,7 @@ import 'package:cybearjinni/domain/home_user/home_user_failures.dart';
 import 'package:cybearjinni/domain/home_user/home_user_validators.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
-// ignore: depend_on_referenced_packages
+// ignore: depend_on_referenced_packages a
 import 'package:uuid/uuid.dart';
 
 @immutable

diff --git a/lib/domain/manage_network/i_manage_network_repository.dart b/lib/domain/manage_network/i_manage_network_repository.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cybearjinni/domain/home_user/home_user_failures.dart';
 import 'package:cybearjinni/domain/manage_network/manage_network_entity.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
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';
@@ -16,6 +17,7 @@ import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
 import 'package:location/location.dart';
 import 'package:network_info_plus/network_info_plus.dart';
+// ignore: depend_on_referenced_packages a
 import 'package:network_tools_flutter/network_tools_flutter.dart';
 import 'package:permission_handler/permission_handler.dart'
     as permission_handler;

diff --git a/lib/domain/software_info/i_software_info_repository.dart b/lib/domain/software_info/i_software_info_repository.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.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
@@ -1,3 +1,4 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';

diff --git a/lib/infrastructure/app_commands.dart b/lib/infrastructure/app_commands.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 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
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 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
@@ -43,7 +43,7 @@ class _AppConnectionService implements ConnectionsService {
   }
 
   @override
-  Future setEtitiesToArea(String areaId, HashSet<String> entities) =>
+  Future setEntitiesToArea(String areaId, HashSet<String> entities) =>
       IcSynchronizer().setEtitiesToArea(areaId, entities);
 
   @override

diff --git a/lib/infrastructure/connection_service/demo_connection_service.dart b/lib/infrastructure/connection_service/demo_connection_service.dart
@@ -46,7 +46,7 @@ class _DemoConnectionService implements ConnectionsService {
   Future setNewArea(AreaEntity area) async {}
 
   @override
-  Future setEtitiesToArea(String areaId, HashSet entities) async {}
+  Future setEntitiesToArea(String areaId, HashSet entities) async {}
 
   @override
   Future addScene(SceneCbjEntity scene) async {}

diff --git a/lib/infrastructure/connection_service/hub_connection_service.dart b/lib/infrastructure/connection_service/hub_connection_service.dart
@@ -196,7 +196,6 @@ class _HubConnectionService implements ConnectionsService {
 
       logger.i('Hub Search subnet IP $subnet');
 
-      // TODO: Search for hub
       final Stream<ActiveHost> devicesWithPort =
           HostScannerService.instance.scanDevicesForSinglePort(
         subnet,
@@ -254,7 +253,7 @@ class _HubConnectionService implements ConnectionsService {
   Future setNewArea(AreaEntity area) async {}
 
   @override
-  Future setEtitiesToArea(String areaId, HashSet entities) async {}
+  Future setEntitiesToArea(String areaId, HashSet entities) async {}
 
   @override
   Future addScene(SceneCbjEntity scene) async {}
@@ -263,11 +262,51 @@ class _HubConnectionService implements ConnectionsService {
   Future activateScene(String id) async {}
 
   @override
-  Future loginVendor(VendorLoginEntity value) async {}
+  Future loginVendor(VendorLoginEntity value) async {
+    appMessagesToHub.sink.add(
+      ClientStatusRequests(
+        sendingType: SendingType.vendorLoginType.name,
+        allRemoteCommands: jsonEncode(value.toInfrastructure().toJson()),
+      ),
+    );
+  }
 
   @override
-  Future<List<VendorEntityInformation>> getVendors() async =>
-      IcSynchronizer().getVendors();
+  Future<List<VendorEntityInformation>> getVendors() async {
+    appMessagesToHub.sink.add(
+      ClientStatusRequests(
+        sendingType: SendingType.getAllSupportedVendors.name,
+      ),
+    );
+
+    List<VendorEntityInformation> vendorList = [];
+
+    await for (final RequestsAndStatusFromHub message
+        in hubMessagesToApp.stream) {
+      final SendingType sendingType =
+          SendingTypeExtension.fromString(message.sendingType);
+      if (sendingType != SendingType.getAllSupportedVendors) {
+        continue;
+      }
+
+      try {
+        final List<dynamic> decodedJson =
+            jsonDecode(jsonDecode(message.allRemoteCommands) as String)
+                as List<dynamic>;
+        vendorList = decodedJson
+            .map(
+              (e) =>
+                  VendorEntityInformation.fromJson(e as Map<String, dynamic>),
+            )
+            .toList();
+      } catch (e) {
+        logger.e('Error converting vendors\n$e');
+      }
+      break;
+    }
+
+    return vendorList;
+  }
 
   @override
   Future<bool> connect({String? address}) async {

diff --git a/lib/infrastructure/connection_service/none_connection_service.dart b/lib/infrastructure/connection_service/none_connection_service.dart
@@ -41,7 +41,7 @@ class _NoneConnectionService implements ConnectionsService {
   Future setNewArea(AreaEntity area) async {}
 
   @override
-  Future setEtitiesToArea(String areaId, HashSet entities) async {}
+  Future setEntitiesToArea(String areaId, HashSet entities) async {}
 
   @override
   Future<HashMap<String, SceneCbjEntity>> get getScenes async => HashMap();

diff --git a/lib/infrastructure/connection_service/remote_pipes_connection_service.dart b/lib/infrastructure/connection_service/remote_pipes_connection_service.dart
@@ -175,7 +175,7 @@ class _RemotePipesConnectionService implements ConnectionsService {
   Future setNewArea(AreaEntity area) async {}
 
   @override
-  Future setEtitiesToArea(String areaId, HashSet entities) async {}
+  Future setEntitiesToArea(String areaId, HashSet entities) async {}
 
   @override
   Future addScene(SceneCbjEntity scene) async {}

diff --git a/lib/infrastructure/core/logger.dart b/lib/infrastructure/core/logger.dart
@@ -3,5 +3,5 @@ import 'package:logger/logger.dart';
 /// Instance of logger for all the app
 final logger = Logger(
   filter: ProductionFilter(),
-  printer: PrettyPrinter(methodCount: 0, printTime: true),
+  printer: PrettyPrinter(methodCount: 0),
 );
diff --git a/lib/infrastructure/mqtt.dart b/lib/infrastructure/mqtt.dart
@@ -1,8 +1,9 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 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';
-// ignore: implementation_imports
+// ignore: implementation_imports a
 import 'package:mqtt_client/src/observable/src/records.dart';
 
 class MqttServerRepository extends IMqttServerRepository {

diff --git a/lib/infrastructure/network_utilities_flutter.dart b/lib/infrastructure/network_utilities_flutter.dart
@@ -1,8 +1,11 @@
 import 'dart:async';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.dart';
+// ignore: depend_on_referenced_packages a
 import 'package:network_tools_flutter/network_tools_flutter.dart'
     as network_flutter;
+// ignore: depend_on_referenced_packages a
 import 'package:network_tools_flutter/network_tools_flutter.dart';
 
 class NetworkUtilitiesFlutter extends NetworkUtilities {

diff --git a/lib/infrastructure/security_bear_client/security_bear_server_client.dart b/lib/infrastructure/security_bear_client/security_bear_server_client.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+// ignore: depend_on_referenced_packages because this is our pacakge
 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
@@ -2,50 +2,51 @@ import 'package:cybearjinni/infrastructure/core/injection.dart';
 import 'package:cybearjinni/presentation/core/app_widget.dart';
 import 'package:cybearjinni/presentation/core/routes/app_router.dart';
 import 'package:dartz/dartz.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
 Future<Unit> main() async {
   configureDependencies(EnvApp.dev);
 
   WidgetsFlutterBinding.ensureInitialized();
 
-  await EasyLocalization.ensureInitialized();
+  // await EasyLocalization.ensureInitialized();
   getIt.registerSingleton<AppRouter>(AppRouter());
 
   runApp(
+    AppWidget(),
+
     /// Use https://lingohub.com/developers/supported-locales/language-designators-with-regions
     /// Or https://www.contentstack.com/docs/developers/multilingual-content/list-of-supported-languages/
     /// To find your language letters, and add the file letters below
-    EasyLocalization(
-      supportedLocales: const <Locale>[
-        Locale('cs', 'CZ'),
-        Locale('de', 'DE'),
-        Locale('en', 'GB'),
-        Locale('en', 'US'),
-        Locale('es', 'CO'),
-        Locale('es', 'MX'),
-        Locale('fr', 'BE'),
-        Locale('fr', 'CA'),
-        Locale('fr', 'FR'),
-        Locale('ge', 'GE'),
-        Locale('he', 'IL'),
-        Locale('hi', 'IN'),
-        Locale('hr', 'HR'),
-        Locale('id', 'ID'),
-        Locale('it', 'IT'),
-        Locale('ka', 'GE'),
-        Locale('nb', 'NO'),
-        Locale('pt', 'BR'),
-        Locale('ru', 'RU'),
-        Locale('te', 'IN'),
-        Locale('th', 'TH'),
-        Locale('zh', 'TW'),
-      ],
-      path: 'assets/translations',
-      fallbackLocale: const Locale('en', 'US'),
-      child: AppWidget(),
-    ),
+    // EasyLocalization(
+    //   supportedLocales: const <Locale>[
+    //     Locale('cs', 'CZ'),
+    //     Locale('de', 'DE'),
+    //     Locale('en', 'GB'),
+    //     Locale('en', 'US'),
+    //     Locale('es', 'CO'),
+    //     Locale('es', 'MX'),
+    //     Locale('fr', 'BE'),
+    //     Locale('fr', 'CA'),
+    //     Locale('fr', 'FR'),
+    //     Locale('ge', 'GE'),
+    //     Locale('he', 'IL'),
+    //     Locale('hi', 'IN'),
+    //     Locale('hr', 'HR'),
+    //     Locale('id', 'ID'),
+    //     Locale('it', 'IT'),
+    //     Locale('ka', 'GE'),
+    //     Locale('nb', 'NO'),
+    //     Locale('pt', 'BR'),
+    //     Locale('ru', 'RU'),
+    //     Locale('te', 'IN'),
+    //     Locale('th', 'TH'),
+    //     Locale('zh', 'TW'),
+    //   ],
+    //   path: 'assets/translations',
+    //   fallbackLocale: const Locale('en', 'US'),
+    //   child: AppWidget(),
+    // ),
   );
   return unit;
 }
diff --git a/lib/presentation/atoms/button_atom.dart b/lib/presentation/atoms/button_atom.dart
@@ -40,7 +40,7 @@ class ButtonWidgetAtom extends StatelessWidget {
           style: FilledButton.styleFrom().copyWith(
             alignment: Alignment.center,
             backgroundColor: disabled
-                ? MaterialStateProperty.all(colorScheme.surfaceVariant)
+                ? WidgetStateProperty.all(colorScheme.surfaceContainerHighest)
                 : null,
           ),
           icon: Icon(icon),

diff --git a/lib/presentation/atoms/scene_atom.dart b/lib/presentation/atoms/scene_atom.dart
@@ -1,3 +1,4 @@
+// ignore: depend_on_referenced_packages because this is our pacakge
 import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cybearjinni/domain/connections_service.dart';
 import 'package:cybearjinni/presentation/atoms/atoms.dart';