finished AC

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -1,31 +1,21 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
 import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class AcBloc extends Bloc<AcsEvent, AcsState> {
-  AcStatusModel deviceStatus = AcStatusModel(
+  late AcStatusModel deviceStatus;
-    uuid: '',
+  final String deviceId;
-    acSwitch: true,
+  Timer? _timer;
-    modeString: 'hot',
-    tempSet: 300,
-    currentTemp: 315,
-    fanSpeedsString: 'low',
-    childLock: false,
-  );
 
-  AcBloc() : super(AcsInitialState()) {
+  AcBloc({required this.deviceId}) : super(AcsInitialState()) {
     on<AcFetchDeviceStatus>(_onFetchAcStatus);
     on<AcControl>(_onAcControl);
-    on<AcSwitch>(_changeAcSwitch);
-    on<IncreaseCoolToTemp>(_increaseCoolTo);
-    on<DecreaseCoolToTemp>(_decreaseCoolTo);
-    on<ChangeLock>(_changeLockValue);
-    on<ChangeAcMode>(_changeAcMode);
-    on<ChangeFanSpeed>(_changeFanSpeed);
   }
 
   FutureOr<void> _onFetchAcStatus(
@@ -34,7 +24,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = AcStatusModel.fromJson(status.productUuid, status.status);
+      deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
       emit(ACStatusLoaded(deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
@@ -45,47 +35,86 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
+
     emit(ACStatusLoaded(deviceStatus));
 
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+    );
+  }
+
+  Future<void> _runDebounce({
+    required String deviceId,
+    required String code,
+    required dynamic value,
+    required dynamic oldValue,
+    required Emitter<AcsState> emit,
+  }) async {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
       try {
-      final status = Status(code: event.code, value: event.value);
+        final response = await DevicesManagementApi()
-      final response =
+            .deviceControl(deviceId, Status(code: code, value: value));
-          await DevicesManagementApi().deviceControl(event.deviceId, status);
-
         if (!response) {
-        _updateLocalValue(event.code, oldValue);
+          _revertValueAndEmit(deviceId, code, oldValue, emit);
-        emit(ACStatusLoaded(deviceStatus));
-        emit(AcsFailedState(error: 'Failed to control the device.'));
         }
       } catch (e) {
-      _updateLocalValue(event.code, oldValue);
+        if (e is DioException && e.response != null) {
-      emit(ACStatusLoaded(deviceStatus));
+          debugPrint('Error response: ${e.response?.data}');
-      emit(AcsFailedState(error: 'Error controlling the device: $e'));
         }
+        _revertValueAndEmit(deviceId, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(
+      String deviceId, String code, dynamic oldValue, Emitter<AcsState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(ACStatusLoaded(deviceStatus));
+    emit(const AcsFailedState(error: 'Failed to control the device.'));
   }
 
   void _updateLocalValue(String code, dynamic value) {
     switch (code) {
       case 'switch':
-        deviceStatus.acSwitch = value;
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(acSwitch: value);
+        }
         break;
       case 'temp_set':
-        deviceStatus.tempSet = value;
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(tempSet: value);
+        }
         break;
       case 'mode':
-        deviceStatus.modeString = value;
+        if (value is String) {
-        deviceStatus.acMode = AcStatusModel.getACMode(value);
+          deviceStatus = deviceStatus.copyWith(
+            modeString: value,
+          );
+        }
         break;
       case 'level':
-        deviceStatus.fanSpeedsString = value;
+        if (value is String) {
-        deviceStatus.acFanSpeed = AcStatusModel.getFanSpeed(value);
+          deviceStatus = deviceStatus.copyWith(
+            fanSpeedsString: value,
+          );
+        }
         break;
       case 'child_lock':
-        deviceStatus.childLock = value;
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(childLock: value);
+        }
         break;
       default:
         break;
     }
+    emit(ACStatusLoaded(deviceStatus));
   }
 
   dynamic _getValueByCode(String code) {
@@ -104,50 +133,4 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         return null;
     }
   }
-
-  FutureOr<void> _changeAcSwitch(AcSwitch event, Emitter<AcsState> emit) async {
-    final newValue = !event.acSwitch;
-    add(AcControl(deviceId: event.deviceId, code: 'switch', value: newValue));
-  }
-
-  FutureOr<void> _increaseCoolTo(
-      IncreaseCoolToTemp event, Emitter<AcsState> emit) async {
-    final newValue = (event.value * 10).toInt() + 5;
-    if (_isValidTemperature(newValue)) {
-      add(AcControl(
-          deviceId: event.deviceId, code: 'temp_set', value: newValue));
-    }
-  }
-
-  FutureOr<void> _decreaseCoolTo(
-      DecreaseCoolToTemp event, Emitter<AcsState> emit) async {
-    final newValue = (event.value * 10).toInt() - 5;
-    if (_isValidTemperature(newValue)) {
-      add(AcControl(
-          deviceId: event.deviceId, code: 'temp_set', value: newValue));
-    }
-  }
-
-  FutureOr<void> _changeLockValue(
-      ChangeLock event, Emitter<AcsState> emit) async {
-    final newValue = !event.lockBool;
-    add(AcControl(
-        deviceId: event.deviceId, code: 'child_lock', value: newValue));
-  }
-
-  FutureOr<void> _changeAcMode(
-      ChangeAcMode event, Emitter<AcsState> emit) async {
-    final newValue = AcStatusModel.getACMode(event.tempModes.name);
-    add(AcControl(deviceId: event.deviceId, code: 'mode', value: newValue));
-  }
-
-  FutureOr<void> _changeFanSpeed(
-      ChangeFanSpeed event, Emitter<AcsState> emit) async {
-    final newValue = AcStatusModel.getFanSpeed(event.fanSpeeds.name);
-    add(AcControl(deviceId: event.deviceId, code: 'level', value: newValue));
-  }
-
-  bool _isValidTemperature(int value) {
-    return value >= 200 && value <= 300;
-  }
 }

lib/pages/device_managment/ac/bloc/ac_event.dart

@@ -1,5 +1,4 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
 
 sealed class AcsEvent extends Equatable {
   const AcsEvent();
@@ -31,63 +30,3 @@ class AcControl extends AcsEvent {
   @override
   List<Object> get props => [deviceId, code, value];
 }
-
-class AcSwitch extends AcsEvent {
-  final bool acSwitch;
-  final String deviceId;
-
-  const AcSwitch({required this.acSwitch, required this.deviceId});
-
-  @override
-  List<Object> get props => [acSwitch, deviceId];
-}
-
-class IncreaseCoolToTemp extends AcsEvent {
-  final double value;
-  final String deviceId;
-
-  const IncreaseCoolToTemp({required this.value, required this.deviceId});
-
-  @override
-  List<Object> get props => [value, deviceId];
-}
-
-class DecreaseCoolToTemp extends AcsEvent {
-  final double value;
-  final String deviceId;
-
-  const DecreaseCoolToTemp({required this.value, required this.deviceId});
-
-  @override
-  List<Object> get props => [value, deviceId];
-}
-
-class ChangeLock extends AcsEvent {
-  final bool lockBool;
-  final String deviceId;
-
-  const ChangeLock({required this.lockBool, required this.deviceId});
-
-  @override
-  List<Object> get props => [lockBool, deviceId];
-}
-
-class ChangeAcMode extends AcsEvent {
-  final TempModes tempModes;
-  final String deviceId;
-
-  const ChangeAcMode({required this.tempModes, required this.deviceId});
-
-  @override
-  List<Object> get props => [tempModes, deviceId];
-}
-
-class ChangeFanSpeed extends AcsEvent {
-  final FanSpeeds fanSpeeds;
-  final String deviceId;
-
-  const ChangeFanSpeed({required this.fanSpeeds, required this.deviceId});
-
-  @override
-  List<Object> get props => [fanSpeeds, deviceId];
-}

lib/pages/device_managment/ac/bloc/ac_state.dart

@@ -14,56 +14,12 @@ class AcsLoadingState extends AcsState {}
 
 class ACStatusLoaded extends AcsState {
   final AcStatusModel status;
+  final DateTime timestamp;
 
-  const ACStatusLoaded(this.status);
+  ACStatusLoaded(this.status) : timestamp = DateTime.now();
 
   @override
-  List<Object> get props => [status];
+  List<Object> get props => [status, timestamp];
-}
-
-class AcSwitchChanged extends AcsState {
-  final bool acSwitch;
-
-  const AcSwitchChanged(this.acSwitch);
-
-  @override
-  List<Object> get props => [acSwitch];
-}
-
-class AcTempChanged extends AcsState {
-  final double tempSet;
-
-  const AcTempChanged(this.tempSet);
-
-  @override
-  List<Object> get props => [tempSet];
-}
-
-class AcModeChanged extends AcsState {
-  final TempModes mode;
-
-  const AcModeChanged(this.mode);
-
-  @override
-  List<Object> get props => [mode];
-}
-
-class AcFanSpeedChanged extends AcsState {
-  final FanSpeeds fanSpeed;
-
-  const AcFanSpeedChanged(this.fanSpeed);
-
-  @override
-  List<Object> get props => [fanSpeed];
-}
-
-class AcLockChanged extends AcsState {
-  final bool lock;
-
-  const AcLockChanged(this.lock);
-
-  @override
-  List<Object> get props => [lock];
 }
 
 class AcsFailedState extends AcsState {

lib/pages/device_managment/ac/model/ac_model.dart

@@ -5,82 +5,113 @@ enum TempModes { hot, cold, wind }
 enum FanSpeeds { auto, low, middle, high }
 
 class AcStatusModel {
-  String uuid;
+  final String uuid;
-  bool acSwitch;
+  final bool acSwitch;
-  String modeString;
+  final String modeString;
-  int tempSet;
+  final int tempSet;
-  int currentTemp;
+  final int currentTemp;
-  String fanSpeedsString;
+  final String fanSpeedsString;
-  bool childLock;
+  final bool childLock;
-  late TempModes acMode;
+  final TempModes acMode;
-  late FanSpeeds acFanSpeed;
+  final FanSpeeds acFanSpeed;
 
-  AcStatusModel(
+  AcStatusModel({
-      {required this.uuid,
+    required this.uuid,
     required this.acSwitch,
     required this.modeString,
     required this.tempSet,
     required this.currentTemp,
     required this.fanSpeedsString,
-      required this.childLock}) {
+    required this.childLock,
-    acMode = getACMode(modeString);
+  })  : acMode = getACMode(modeString),
         acFanSpeed = getFanSpeed(fanSpeedsString);
-  }
 
   factory AcStatusModel.fromJson(String id, List<Status> jsonList) {
-    late bool _acSwitch;
+    late bool acSwitch;
-    late String _mode;
+    late String mode;
-    late int _tempSet;
+    late int tempSet;
-    late int _currentTemp;
+    late int currentTemp;
-    late String _fanSpeeds;
+    late String fanSpeeds;
-    late bool _childLock;
+    late bool childLock;
-    for (int i = 0; i < jsonList.length; i++) {
+
-      if (jsonList[i].code == 'switch') {
+    for (var status in jsonList) {
-        _acSwitch = jsonList[i].value ?? false;
+      switch (status.code) {
-      } else if (jsonList[i].code == 'mode') {
+        case 'switch':
-        _mode = jsonList[i].value ?? TempModes.cold;
+          acSwitch = status.value ?? false;
-      } else if (jsonList[i].code == 'temp_set') {
+          break;
-        _tempSet = jsonList[i].value ?? 210;
+        case 'mode':
-      } else if (jsonList[i].code == 'temp_current') {
+          mode = status.value ?? 'cold'; // default to 'cold' if null
-        _currentTemp = jsonList[i].value ?? 210;
+          break;
-      } else if (jsonList[i].code == 'level') {
+        case 'temp_set':
-        _fanSpeeds = jsonList[i].value ?? 210;
+          tempSet = status.value ?? 210; // default value if null
-      } else if (jsonList[i].code == 'child_lock') {
+          break;
-        _childLock = jsonList[i].value ?? false;
+        case 'temp_current':
+          currentTemp = status.value ?? 210; // default value if null
+          break;
+        case 'level':
+          fanSpeeds = status.value ?? 'low'; // default value if null
+          break;
+        case 'child_lock':
+          childLock = status.value ?? false;
+          break;
       }
     }
+
     return AcStatusModel(
       uuid: id,
-        acSwitch: _acSwitch,
+      acSwitch: acSwitch,
-        modeString: _mode,
+      modeString: mode,
-        tempSet: _tempSet,
+      tempSet: tempSet,
-        currentTemp: _currentTemp,
+      currentTemp: currentTemp,
-        fanSpeedsString: _fanSpeeds,
+      fanSpeedsString: fanSpeeds,
-        childLock: _childLock);
+      childLock: childLock,
+    );
+  }
+
+  AcStatusModel copyWith({
+    String? uuid,
+    bool? acSwitch,
+    String? modeString,
+    int? tempSet,
+    int? currentTemp,
+    String? fanSpeedsString,
+    bool? childLock,
+  }) {
+    return AcStatusModel(
+      uuid: uuid ?? this.uuid,
+      acSwitch: acSwitch ?? this.acSwitch,
+      modeString: modeString ?? this.modeString,
+      tempSet: tempSet ?? this.tempSet,
+      currentTemp: currentTemp ?? this.currentTemp,
+      fanSpeedsString: fanSpeedsString ?? this.fanSpeedsString,
+      childLock: childLock ?? this.childLock,
+    );
   }
 
   static TempModes getACMode(String value) {
-    if (value == 'cold') {
+    switch (value) {
+      case 'cold':
         return TempModes.cold;
-    } else if (value == 'hot') {
+      case 'hot':
         return TempModes.hot;
-    } else if (value == 'wind') {
+      case 'wind':
         return TempModes.wind;
-    } else {
+      default:
         return TempModes.cold;
     }
   }
 
   static FanSpeeds getFanSpeed(String value) {
-    if (value == 'low') {
+    switch (value) {
+      case 'low':
         return FanSpeeds.low;
-    } else if (value == 'middle') {
+      case 'middle':
         return FanSpeeds.middle;
-    } else if (value == 'high') {
+      case 'high':
         return FanSpeeds.high;
-    } else if (value == 'auto') {
+      case 'auto':
         return FanSpeeds.auto;
-    } else {
+      default:
         return FanSpeeds.auto;
     }
   }

lib/pages/device_managment/ac/view/ac_device_control.dart

@@ -6,8 +6,9 @@ import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/ac_mode.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/ac_toggle.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/current_temp.dart';
-import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
+import 'package:syncrow_web/pages/device_managment/ac/view/control_list/fan_speed.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
@@ -20,22 +21,11 @@ class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => AcBloc()..add(AcFetchDeviceStatus(device.uuid!)),
+      create: (context) => AcBloc(deviceId: device.uuid!)
+        ..add(AcFetchDeviceStatus(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
-          if (state is AcsLoadingState) {
+          if (state is ACStatusLoaded) {
-            return const Center(child: CircularProgressIndicator());
-          } else if (state is ACStatusLoaded) {
-            return _buildStatusControls(state.status, isLarge, isMedium);
-          } else {
-            return const Center(child: Text('Error fetching status'));
-          }
-        },
-      ),
-    );
-  }
-
-  Widget _buildStatusControls(AcStatusModel statuses, bool isLarge, bool isMedium) {
             return GridView(
               padding: const EdgeInsets.symmetric(horizontal: 50),
               shrinkWrap: true,
@@ -52,22 +42,42 @@ class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
               ),
               children: [
                 AcToggle(
-          value: statuses.acSwitch,
+                  value: state.status.acSwitch,
                   code: 'switch',
-          deviceId: statuses.uuid,
+                  deviceId: device.uuid!,
-        ),
-        AcMode(
-          value: statuses.acMode,
-          code: 'mode',
-          deviceId: statuses.uuid,
                 ),
                 CurrentTemp(
-          currentTemp: statuses.currentTemp,
+                  currentTemp: state.status.currentTemp,
-          tempSet: statuses.tempSet,
+                  tempSet: state.status.tempSet,
                   code: 'temp_set',
-          deviceId: statuses.uuid,
+                  deviceId: device.uuid!,
+                ),
+                AcMode(
+                  value: state.status.acMode,
+                  code: 'mode',
+                  deviceId: device.uuid!,
+                ),
+                FanSpeedControl(
+                  value: state.status.acFanSpeed,
+                  code: 'level',
+                  deviceId: device.uuid!,
+                ),
+                AcToggle(
+                  value: state.status.childLock,
+                  code: 'child_lock',
+                  deviceId: device.uuid!,
+                  description: 'Child Lock',
+                  icon: Assets.childLock,
                 ),
               ],
             );
+          } else if (state is AcsLoadingState) {
+            return const Center(child: CircularProgressIndicator());
+          } else {
+            return const Center(child: Text('Error fetching status'));
+          }
+        },
+      ),
+    );
   }
 }

lib/pages/device_managment/ac/view/control_list/ac_mode.dart

@@ -19,12 +19,6 @@ class AcMode extends StatelessWidget {
   final String code;
   final String deviceId;
 
-  void _onModeSelected(BuildContext context, TempModes mode) {
-    context.read<AcBloc>().add(
-          ChangeAcMode(tempModes: mode, deviceId: deviceId),
-        );
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -54,7 +48,13 @@ class AcMode extends StatelessWidget {
     return Flexible(
       child: GestureDetector(
         onTap: () {
-          _onModeSelected(context, mode);
+          context.read<AcBloc>().add(
+                AcControl(
+                  deviceId: deviceId,
+                  code: code,
+                  value: mode.name,
+                ),
+              );
         },
         child: Container(
           width: 50,

lib/pages/device_managment/ac/view/control_list/current_temp.dart

@@ -53,7 +53,7 @@ class _CurrentTempState extends State<CurrentTemp> {
             AcControl(
               deviceId: widget.deviceId,
               code: widget.code,
-              value: newValue * 10,
+              value: (newValue * 10).toInt(),
             ),
           );
     });

lib/pages/device_managment/ac/view/control_list/fan_speed.dart

@@ -0,0 +1,91 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
+
+class FanSpeedControl extends StatelessWidget {
+  const FanSpeedControl({
+    super.key,
+    required this.value,
+    required this.code,
+    required this.deviceId,
+  });
+
+  final FanSpeeds value;
+  final String code;
+  final String deviceId;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(20),
+        color: ColorsManager.greyColor.withOpacity(0.2),
+        border: Border.all(color: ColorsManager.boxDivider),
+      ),
+      padding: const EdgeInsets.all(8),
+      child: Column(
+        children: [
+          Wrap(
+            runSpacing: 8,
+            spacing: 8,
+            children: [
+              _buildIconContainer(context, FanSpeeds.auto, Assets.acFanAuto,
+                  value == FanSpeeds.auto),
+              _buildIconContainer(context, FanSpeeds.low, Assets.acFanLow,
+                  value == FanSpeeds.low),
+            ],
+          ),
+          Wrap(
+            runSpacing: 8,
+            spacing: 8,
+            children: [
+              _buildIconContainer(context, FanSpeeds.middle, Assets.acFanMiddle,
+                  value == FanSpeeds.middle),
+              _buildIconContainer(context, FanSpeeds.high, Assets.acFanHigh,
+                  value == FanSpeeds.high),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget _buildIconContainer(BuildContext context, FanSpeeds speed,
+      String assetPath, bool isSelected) {
+    return GestureDetector(
+      onTap: () {
+        context.read<AcBloc>().add(
+              AcControl(
+                deviceId: deviceId,
+                code: code,
+                value: speed.name,
+              ),
+            );
+      },
+      child: Container(
+        width: 50,
+        height: 50,
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: ColorsManager.whiteColors,
+          border: Border.all(
+            color: isSelected ? Colors.blue : Colors.transparent,
+            width: 2.0,
+          ),
+        ),
+        padding: const EdgeInsets.all(8),
+        child: ClipOval(
+          child: SvgPicture.asset(
+            assetPath,
+            fit: BoxFit.contain,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/device_managment/shared/increament_decreament.dart

@@ -24,7 +24,6 @@ class IncrementDecrementWidget extends StatelessWidget {
       children: [
         Material(
           type: MaterialType.transparency,
-          child: Flexible(
           child: ClipRRect(
             borderRadius: BorderRadius.circular(100),
             child: InkWell(
@@ -42,7 +41,6 @@ class IncrementDecrementWidget extends StatelessWidget {
             ),
           ),
         ),
-        ),
         Expanded(
           child: FittedBox(
             fit: BoxFit.scaleDown,
@@ -73,7 +71,6 @@ class IncrementDecrementWidget extends StatelessWidget {
         ),
         Material(
           type: MaterialType.transparency,
-          child: Flexible(
           child: ClipRRect(
             borderRadius: BorderRadius.circular(100),
             child: InkWell(
@@ -91,7 +88,6 @@ class IncrementDecrementWidget extends StatelessWidget {
             ),
           ),
         ),
-        ),
       ],
     );
   }

lib/pages/device_managment/shared/sensors_widgets/presence_display_data.dart

@@ -13,7 +13,6 @@ class PresenceDisplayValue extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(
-      child: Expanded(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -45,7 +44,6 @@ class PresenceDisplayValue extends StatelessWidget {
           ),
         ],
       ),
-      ),
     );
   }
 }

lib/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart

@@ -11,7 +11,6 @@ class PresenceStaticWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(
-      child: Expanded(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -28,7 +27,6 @@ class PresenceStaticWidget extends StatelessWidget {
           ),
         ],
       ),
-      ),
     );
   }
 }

lib/pages/device_managment/shared/sensors_widgets/presence_status.dart

@@ -15,7 +15,6 @@ class PresenceState extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(
-      child: Expanded(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -46,7 +45,6 @@ class PresenceState extends StatelessWidget {
           ),
         ],
       ),
-      ),
     );
   }
 }

lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart

@@ -56,7 +56,6 @@ class _CurrentTempState extends State<PresenceUpdateData> {
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(
-      child: Expanded(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -88,7 +87,6 @@ class _CurrentTempState extends State<PresenceUpdateData> {
               }),
         ],
       ),
-      ),
     );
   }
 }

lib/utils/constants/api_const.dart

@@ -29,7 +29,8 @@ abstract class ApiEndpoints {
   ////// Devices Management ////////////////
 
   static const String getAllDevices = '$baseUrl/device';
-  static const String getDeviceStatus = '$baseUrl/device/{uuid}/functions/status';
+  static const String getDeviceStatus =
+      '$baseUrl/device/{uuid}/functions/status';
 
   static const String deviceControl = '$baseUrl/device/{uuid}/control';
 }