Skip to content

Commit

Permalink
Removed db spacial class
Browse files Browse the repository at this point in the history
  • Loading branch information
guyluz11 committed Jan 1, 2024
1 parent 6505bff commit 783543d
Show file tree
Hide file tree
Showing 36 changed files with 529 additions and 974 deletions.
6 changes: 2 additions & 4 deletions lib/infrastructure/mqtt.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,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';
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';
Expand Down Expand Up @@ -83,7 +81,7 @@ class MqttServerRepository extends IMqttServerRepository {
EntityState.state(EntityStateGRPC.waitingInComp);

/// Sends directly to device connector conjecture
ISavedDevicesRepo.instance.addOrUpdateFromMqtt(deviceEntityBase);
// ISavedDevicesRepo.instance.addOrUpdateFromMqtt(deviceEntityBase);

return;
} else if (entityFromTheApp is DeviceEntityBase) {
Expand All @@ -94,7 +92,7 @@ class MqttServerRepository extends IMqttServerRepository {
// ConnectorDevicesStreamFromMqtt.fromMqttStream.add(entityFromTheApp);
} else if (entityFromTheApp is RoomEntityDtos) {
logger.i('Loop?');
ISavedRoomsRepo.instance.addOrUpdateRoom(entityFromTheApp.toDomain());
// ISavedRoomsRepo.instance.addOrUpdateRoom(entityFromTheApp.toDomain());

/// Sends directly to device connector conjecture
HubRequestsToApp.streamRequestsToApp.add(
Expand Down
60 changes: 0 additions & 60 deletions lib/presentation/core/entities_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
class EntitiesUtils {
static IconData iconOfDeviceType(EntityTypes deviceType) {
switch (deviceType) {
case EntityTypes.airConditioner:
// TODO: Handle this case.
break;
case EntityTypes.babyMonitor:
// TODO: Handle this case.
break;
case EntityTypes.bed:
return Icons.bed;
case EntityTypes.blinds:
return FontAwesomeIcons.alignJustify;
case EntityTypes.boiler:
Expand All @@ -23,48 +15,21 @@ class EntitiesUtils {
break;
case EntityTypes.button:
return Icons.smart_button;
case EntityTypes.buttonWithLight:
// TODO: Handle this case.
break;
case EntityTypes.coffeeMachine:
// TODO: Handle this case.
break;
case EntityTypes.computerApp:
return Icons.computer;
case EntityTypes.dishwasher:
// TODO: Handle this case.
break;
case EntityTypes.emptyEntity:
// TODO: Handle this case.
break;
case EntityTypes.hub:
// TODO: Handle this case.
break;
case EntityTypes.humiditySensor:
// TODO: Handle this case.
break;
case EntityTypes.kettle:
// TODO: Handle this case.
break;
case EntityTypes.lightSensor:
return Icons.sensors;
case EntityTypes.light:
case EntityTypes.dimmableLight:
case EntityTypes.rgbLights:
case EntityTypes.rgbcctLights:
case EntityTypes.rgbwLights:
case EntityTypes.cctLight:
return FontAwesomeIcons.lightbulb;
case EntityTypes.microphone:
return Icons.mic;
case EntityTypes.motionSensor:
// TODO: Handle this case.
break;
case EntityTypes.oven:
// TODO: Handle this case.
break;
case EntityTypes.oxygenSensor:
return Icons.sensors;
case EntityTypes.phoneApp:
return Icons.phone;
case EntityTypes.pingEntity:
Expand All @@ -77,9 +42,6 @@ class EntitiesUtils {
case EntityTypes.scanner:
case EntityTypes.printerWithScanner:
return Icons.print;
case EntityTypes.refrigerator:
// TODO: Handle this case.
break;
case EntityTypes.routerEntity:
return Icons.router;
case EntityTypes.securityCamera:
Expand All @@ -88,37 +50,15 @@ class EntitiesUtils {
return Icons.computer;
case EntityTypes.smartPlug:
return MdiIcons.powerSocketAu;
case EntityTypes.smartSpeakers:
return Icons.speaker;
case EntityTypes.smartTV:
return Icons.tv;
case EntityTypes.smartTypeNotSupported:
// TODO: Handle this case.
break;
case EntityTypes.smartWatch:
return Icons.watch;
case EntityTypes.smartWaterBottle:
// TODO: Handle this case.
break;
case EntityTypes.smokeDetector:
case EntityTypes.smokeSensor:
case EntityTypes.soundSensor:
return Icons.sensors;
case EntityTypes.switch_:
return MdiIcons.lightSwitch;
case EntityTypes.teapot:
// TODO: Handle this case.
break;
case EntityTypes.temperatureSensor:
return MdiIcons.temperatureCelsius;
case EntityTypes.toaster:
return MdiIcons.toaster;
case EntityTypes.vacuumCleaner:
return MdiIcons.vacuum;
case EntityTypes.voiceAssistant:
return MdiIcons.voicemail;
case EntityTypes.washingMachine:
return MdiIcons.washingMachine;
}
return Icons.question_mark;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,32 @@ import 'package:cbj_integrations_controller/infrastructure/generic_entities/abst
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';
import 'package:cybearjinni/presentation/molecules/molecules.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';

@RoutePage<List<MapEntry<DeviceEntityBase, MapEntry<String?, String?>>>>()
class AddActionPage extends StatelessWidget {
void backButtonFunction(BuildContext context) {}

@override
Widget build(BuildContext context) {
return Scaffold(
body: Column(
children: [
TopBarMolecule(
pageName: 'Add Action',
leftIcon: FontAwesomeIcons.arrowLeft,
leftIconFunction: (_) => context.router.pop(),
),
ActionChooseInformation(),
],
),
);
}
}

class ActionChooseInformation extends StatefulWidget {
@override
State<ActionChooseInformation> createState() =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:auto_route/auto_route.dart';
import 'package:cybearjinni/presentation/molecules/molecules.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_bindings/widgets/add_binding_widget.dart';
import 'package:cybearjinni/presentation/pages/add_bindings/widgets/add_binding_widget.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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';
import 'package:cybearjinni/presentation/core/snack_bar_service.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_bindings/widgets/binding_action_widget.dart';
import 'package:cybearjinni/presentation/pages/add_bindings/widgets/binding_action_widget.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
Expand Down

This file was deleted.

101 changes: 0 additions & 101 deletions lib/presentation/pages/add_new_devices/add_new_cbj_devices.dart

This file was deleted.

18 changes: 0 additions & 18 deletions lib/presentation/pages/add_new_room/add_new_room_page.dart

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:multi_select_flutter/multi_select_flutter.dart';

@RoutePage()
class AddNewRoomPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.purple,
title: const TextAtom('Add New Area'),
),
body: AddNewRoomForm(),
);
}
}

class AddNewRoomForm extends StatefulWidget {
@override
State<AddNewRoomForm> createState() => _AddNewRoomFormState();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:auto_route/auto_route.dart';
import 'package:cbj_integrations_controller/domain/routine/value_objects_routine_cbj.dart';
import 'package:cybearjinni/presentation/molecules/molecules.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_routine/widgets/add_routine_widget.dart';
import 'package:cybearjinni/presentation/pages/add_routine/widgets/add_routine_widget.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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';
import 'package:cybearjinni/presentation/core/snack_bar_service.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_routine/widgets/routine_action_widget.dart';
import 'package:cybearjinni/presentation/pages/add_routine/widgets/routine_action_widget.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:auto_route/auto_route.dart';
import 'package:cybearjinni/presentation/molecules/molecules.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_scene/widgets/add_scene_widget.dart';
import 'package:cybearjinni/presentation/pages/add_scene/widgets/add_scene_widget.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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';
import 'package:cybearjinni/presentation/core/snack_bar_service.dart';
import 'package:cybearjinni/presentation/pages/add_new_automation_process/add_scene/widgets/scene_action_widget.dart';
import 'package:cybearjinni/presentation/pages/add_scene/widgets/scene_action_widget.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
Expand Down
Loading

0 comments on commit 783543d

Please sign in to comment.