Implemented PR notes by extracting widgets into their own classes.

lib/common/widgets/app_loading_indicator.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class AppLoadingIndicator extends StatelessWidget {
+  const AppLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(child: CircularProgressIndicator());
+  }
+}

lib/main.dart

@@ -7,10 +7,10 @@ import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -59,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -67,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
           ),
         ],
         child: MaterialApp.router(

lib/main_dev.dart

@@ -7,10 +7,10 @@ import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options_dev.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -59,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -67,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
           ),
         ],
         child: MaterialApp.router(

lib/main_staging.dart

@@ -7,10 +7,10 @@ import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -56,7 +56,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -64,7 +64,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
           ),
         ],
         child: MaterialApp.router(

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -31,8 +31,6 @@ import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_o
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
@@ -132,19 +130,9 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
   }
 }
 
-class AnalyticsPageForm extends StatefulWidget {
+class AnalyticsPageForm extends StatelessWidget {
   const AnalyticsPageForm({super.key});
 
-  @override
-  State<AnalyticsPageForm> createState() => _AnalyticsPageFormState();
-}
-
-class _AnalyticsPageFormState extends State<AnalyticsPageForm> {
-  @override
-  void initState() {
-    context.read<SpaceTreeBloc>().add(InitialEvent());
-    super.initState();
-  }
   @override
   Widget build(BuildContext context) {
     return WebScaffold(

lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart

@@ -46,7 +46,7 @@ class AnalyticsEnergyManagementView extends StatelessWidget {
                     spacing: 32,
                     children: [
                       Expanded(
-                        flex: 7,
+                        flex: 2,
                         child: Column(
                           spacing: 20,
                           children: [
@@ -55,7 +55,7 @@ class AnalyticsEnergyManagementView extends StatelessWidget {
                           ],
                         ),
                       ),
-                      Expanded(flex: 4, child: PowerClampEnergyDataWidget()),
+                      Expanded(child: PowerClampEnergyDataWidget()),
                     ],
                   ),
                 ),

lib/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart

@@ -31,12 +31,12 @@ class AnalyticsOccupancyView extends StatelessWidget {
         return SingleChildScrollView(
           child: Container(
             padding: _padding,
-            height: height * 1,
+            height: height * 0.9,
             child: const Row(
               spacing: 32,
               children: [
                 Expanded(
-                  flex: 7,
+                  flex: 5,
                   child: Column(
                     spacing: 20,
                     children: [
@@ -45,7 +45,7 @@ class AnalyticsOccupancyView extends StatelessWidget {
                     ],
                   ),
                 ),
-                Expanded(flex: 4, child: OccupancyEndSideBar()),
+                Expanded(flex: 2, child: OccupancyEndSideBar()),
               ],
             ),
           ),

lib/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart

@@ -24,45 +24,37 @@ class OccupancyEndSideBar extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
-              Expanded(
+              SizedBox(
-                child: SizedBox(
+                height: MediaQuery.sizeOf(context).height * 0.2,
-                  // height: MediaQuery.sizeOf(context).height * 0.2,
+                child: PowerClampEnergyStatusWidget(
-                  child: PowerClampEnergyStatusWidget(
+                  status: [
-                    status: [
+                    PowerClampEnergyStatus(
-                      PowerClampEnergyStatus(
+                      iconPath: Assets.presenceState,
-                        iconPath: Assets.presenceState,
+                      title: 'Presence Status',
-                        title: 'Presence Status',
+                      value: _valueFromCode(
-                        value: _valueFromCode(
+                        'presence_state',
-                          'presence_state',
+                        state.deviceStatusList,
-                          state.deviceStatusList,
-                        ),
-                        unit: '',
                       ),
-                      PowerClampEnergyStatus(
+                      unit: '',
-                        iconPath: Assets.presenceTimeIcon,
+                    ),
-                        title: 'Presence Time',
+                    PowerClampEnergyStatus(
-                        value:
+                      iconPath: Assets.presenceTimeIcon,
-                            '${_valueFromCode('none_body_time', state.deviceStatusList)} Min',
+                      title: 'Presence Time',
-                        unit: '',
+                      value:
-                      ),
+                          '${_valueFromCode('none_body_time', state.deviceStatusList)} Min',
-                      PowerClampEnergyStatus(
+                      unit: '',
-                        iconPath: Assets.currentDistanceIcon,
+                    ),
-                        title: 'Detection Distance',
+                    PowerClampEnergyStatus(
-                        value:
+                      iconPath: Assets.currentDistanceIcon,
-                            '${_valueFromCode('space_move_val', state.deviceStatusList)} M',
+                      title: 'Detection Distance',
-                        unit: '',
+                      value:
-                      ),
+                          '${_valueFromCode('space_move_val', state.deviceStatusList)} M',
-                    ],
+                      unit: '',
-                  ),
+                    ),
+                  ],
                 ),
               ),
               const SizedBox(height: 20),
-              Expanded(
-                flex: 2,
-                child: FittedBox(
-                  child: Image.asset(Assets.autocadOccupancyImage),
-                ),
-              ),
             ],
           ),
         );

lib/pages/common/custom_table.dart

@@ -50,11 +50,20 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
-
+  late ScrollController _horizontalHeaderScrollController;
+  late ScrollController _horizontalBodyScrollController;
   @override
   void initState() {
     super.initState();
     _initializeSelection();
+    _horizontalHeaderScrollController = ScrollController();
+    _horizontalBodyScrollController = ScrollController();
+
+    // Synchronize horizontal scrolling
+    _horizontalBodyScrollController.addListener(() {
+      _horizontalHeaderScrollController
+          .jumpTo(_horizontalBodyScrollController.offset);
+    });
   }
 
   @override
@@ -104,78 +113,108 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
+  @override
+  void dispose() {
+    _horizontalHeaderScrollController.dispose();
+    _horizontalBodyScrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: widget.cellDecoration,
-      child: Scrollbar(
+      child: Column(
-        controller: _verticalScrollController,
+        children: [
-        thumbVisibility: true,
+          Container(
-        trackVisibility: true,
+            decoration: widget.headerDecoration ??
-        child: Scrollbar(
+                const BoxDecoration(color: ColorsManager.boxColor),
-          //fixed the horizontal scrollbar issue
-          controller: _horizontalScrollController,
-          thumbVisibility: true,
-          trackVisibility: true,
-          notificationPredicate: (notif) => notif.depth == 1,
-          child: SingleChildScrollView(
-            controller: _verticalScrollController,
             child: SingleChildScrollView(
-              controller: _horizontalScrollController,
               scrollDirection: Axis.horizontal,
+              physics: const NeverScrollableScrollPhysics(),
+              controller: _horizontalHeaderScrollController,
               child: SizedBox(
                 width: widget.size.width,
-                child: Column(
+                child: Row(
                   children: [
-                    Container(
+                    if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                      decoration: widget.headerDecoration ??
+                    ...List.generate(widget.headers.length, (index) {
-                          const BoxDecoration(
+                      return _buildTableHeaderCell(
-                            color: ColorsManager.boxColor,
+                          widget.headers[index], index);
-                          ),
+                    }),
-                      child: Row(
-                        children: [
-                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                          ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(
-                                widget.headers[index], index);
-                          })
-                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
-                        ],
-                      ),
-                    ),
-                    SizedBox(
-                      width: widget.size.width,
-                      child: widget.isEmpty
-                          ? _buildEmptyState()
-                          : Column(
-                              children:
-                                  List.generate(widget.data.length, (rowIndex) {
-                                final row = widget.data[rowIndex];
-                                return Row(
-                                  children: [
-                                    if (widget.withCheckBox)
-                                      _buildRowCheckbox(
-                                          rowIndex, widget.size.height * 0.08),
-                                    ...row.asMap().entries.map((entry) {
-                                      return _buildTableCell(
-                                        entry.value.toString(),
-                                        widget.size.height * 0.08,
-                                        rowIndex: rowIndex,
-                                        columnIndex: entry.key,
-                                      );
-                                    }).toList(),
-                                  ],
-                                );
-                              }),
-                            ),
-                    ),
                   ],
                 ),
               ),
             ),
           ),
+          Expanded(
+            child: Scrollbar(
+              controller: _verticalScrollController,
+              thumbVisibility: true,
+              trackVisibility: true,
+              child: SingleChildScrollView(
+                controller: _verticalScrollController,
+                child: Scrollbar(
+                  controller: _horizontalBodyScrollController,
+                  thumbVisibility: false,
+                  trackVisibility: false,
+                  notificationPredicate: (notif) => notif.depth == 1,
+                  child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    controller: _horizontalBodyScrollController,
+                    child: Container(
+                      color: ColorsManager.whiteColors,
+                      child: SizedBox(
+                        width: widget.size.width,
+                        child: widget.isEmpty
+                            ? _buildEmptyState()
+                            : Column(
+                                children: List.generate(widget.data.length,
+                                    (rowIndex) {
+                                  final row = widget.data[rowIndex];
+                                  return Row(
+                                    children: [
+                                      if (widget.withCheckBox)
+                                        _buildRowCheckbox(rowIndex,
+                                            widget.size.height * 0.08),
+                                      ...row.asMap().entries.map((entry) {
+                                        return _buildTableCell(
+                                          entry.value.toString(),
+                                          widget.size.height * 0.08,
+                                          rowIndex: rowIndex,
+                                          columnIndex: entry.key,
+                                        );
+                                      }).toList(),
+                                    ],
+                                  );
+                                }),
+                              ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSelectAllCheckbox() {
+    return Container(
+      width: 50,
+      decoration: const BoxDecoration(
+        border: Border.symmetric(
+          vertical: BorderSide(color: ColorsManager.boxDivider),
         ),
       ),
+      child: Checkbox(
+        value: _selectAll,
+        onChanged: widget.withSelectAll && widget.data.isNotEmpty
+            ? _toggleSelectAll
+            : null,
+      ),
     );
   }
 
@@ -205,23 +244,6 @@ class _DynamicTableState extends State<DynamicTable> {
           ),
         ],
       );
-  Widget _buildSelectAllCheckbox() {
-    return Container(
-      width: 50,
-      decoration: const BoxDecoration(
-        border: Border.symmetric(
-          vertical: BorderSide(color: ColorsManager.boxDivider),
-        ),
-      ),
-      child: Checkbox(
-        value: _selectAll,
-        onChanged: widget.withSelectAll && widget.data.isNotEmpty
-            ? _toggleSelectAll
-            : null,
-      ),
-    );
-  }
-
   Widget _buildRowCheckbox(int index, double size) {
     return Container(
       width: 50,
@@ -276,8 +298,12 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableCell(String content, double size,
+  Widget _buildTableCell(
-      {required int rowIndex, required int columnIndex}) {
+    String content,
+    double size, {
+    required int rowIndex,
+    required int columnIndex,
+  }) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
@@ -285,6 +311,7 @@ class _DynamicTableState extends State<DynamicTable> {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
+
     if (isSettingsColumn) {
       return buildSettingsIcon(
         width: 120,
@@ -389,10 +416,11 @@ class _DynamicTableState extends State<DynamicTable> {
                   padding: const EdgeInsets.all(8.0),
                   child: Center(
                     child: SvgPicture.asset(
-                      Assets.settings,
+                      Assets.settings, // ضع المسار الصحيح هنا
                       width: 40,
                       height: 22,
-                      color: ColorsManager.primaryColor,
+                      color: ColorsManager
+                          .primaryColor, // نفس لون الأيقونة في الصورة
                     ),
                   ),
                 ),

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -6,7 +6,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_tag
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
-import 'package:syncrow_web/pages/routines/models/curtain/curtain_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/flush/flush_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
@@ -360,14 +359,6 @@ SOS
           uuid: uuid ?? '',
           name: name ?? '',
         );
-      case 'CUR':
-        return [
-          ControlCurtainFunction(
-            deviceId: uuid ?? '',
-            deviceName: name ?? '',
-            type: 'BOTH',
-          )
-        ];
       case 'NCPS':
         return [
           FlushPresenceDelayFunction(
@@ -450,10 +441,15 @@ SOS
           VoltageCStatusFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           CurrentCStatusFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
           PowerFactorCStatusFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
         ];
+
       default:
         return [];
     }

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -8,28 +8,15 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/view/routines_view.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class DeviceManagementPage extends StatefulWidget with HelperResponsiveLayout {
+class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
   const DeviceManagementPage({super.key});
 
-  @override
-  State<DeviceManagementPage> createState() => _DeviceManagementPageState();
-}
-
-class _DeviceManagementPageState extends State<DeviceManagementPage> {
-
-@override
-  void initState() {
-    context.read<SpaceTreeBloc>().add(InitialEvent());
-    super.initState();
-  }
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(

lib/pages/device_managment/garage_door/helper/garage_door_helper.dart

@@ -4,8 +4,8 @@ import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_event.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/opening_clsoing_time_dialog_body.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/opening_clsoing_time_dialog_body.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/time_out_alarm_dialog_body.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/time_out_alarm_dialog_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';

lib/pages/device_managment/garage_door/view/garage_door_control_view.dart

@@ -5,7 +5,7 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/helper/garage_door_helper.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_view.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/icon_name_status_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';

lib/pages/device_managment/garage_door/widgets/opening_clsoing_time_dialog_body.dart

@@ -1,13 +1,14 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/seconds_picker.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/seconds_picker.dart';
 
 class OpeningAndClosingTimeDialogBody extends StatefulWidget {
   final ValueChanged<int> onDurationChanged;
   final GarageDoorBloc bloc;
 
-  const OpeningAndClosingTimeDialogBody({
+  OpeningAndClosingTimeDialogBody({
     required this.onDurationChanged,
     required this.bloc,
   });

lib/pages/device_managment/garage_door/widgets/schedule__garage_table.dart

@@ -26,7 +26,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
         Table(
           border: TableBorder.all(
             color: ColorsManager.graysColor,
-            borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+            borderRadius: const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
           ),
           children: [
             TableRow(
@@ -50,20 +50,17 @@ class ScheduleGarageTableWidget extends StatelessWidget {
         BlocBuilder<GarageDoorBloc, GarageDoorState>(
           builder: (context, state) {
             if (state is ScheduleGarageLoadingState) {
-              return const SizedBox(
+              return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
-                  height: 200,
-                  child: Center(child: CircularProgressIndicator()));
             }
-            if (state is GarageDoorLoadedState &&
+            if (state is GarageDoorLoadedState && state.status.schedules?.isEmpty == true) {
-                state.status.schedules!.isEmpty) {
               return _buildEmptyState(context);
             } else if (state is GarageDoorLoadedState) {
               return Container(
                   height: 200,
                   decoration: BoxDecoration(
                     border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius: const BorderRadius.vertical(
+                    borderRadius:
-                        bottom: Radius.circular(20)),
+                        const BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
                   ),
                   child: _buildTableBody(state, context));
             }
@@ -81,7 +78,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
       height: 200,
       decoration: BoxDecoration(
         border: Border.all(color: ColorsManager.graysColor),
-        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        borderRadius: const BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
       ),
       child: Center(
         child: Column(
@@ -115,8 +112,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
           children: [
             if (state.status.schedules != null)
               for (int i = 0; i < state.status.schedules!.length; i++)
-                _buildScheduleRow(
+                _buildScheduleRow(state.status.schedules![i], i, context, state),
-                    state.status.schedules![i], i, context, state),
           ],
         ),
       ),
@@ -138,8 +134,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
     );
   }
 
-  TableRow _buildScheduleRow(ScheduleModel schedule, int index,
+  TableRow _buildScheduleRow(ScheduleModel schedule, int index, BuildContext context, GarageDoorLoadedState state) {
-      BuildContext context, GarageDoorLoadedState state) {
     return TableRow(
       children: [
         Center(
@@ -157,8 +152,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
               width: 24,
               height: 24,
               child: schedule.enable
-                  ? const Icon(Icons.radio_button_checked,
+                  ? const Icon(Icons.radio_button_checked, color: ColorsManager.blueColor)
-                      color: ColorsManager.blueColor)
                   : const Icon(
                       Icons.radio_button_unchecked,
                       color: ColorsManager.grayColor,
@@ -166,9 +160,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
             ),
           ),
         ),
-        Center(
+        Center(child: Text(_getSelectedDays(ScheduleModel.parseSelectedDays(schedule.days)))),
-            child: Text(_getSelectedDays(
-                ScheduleModel.parseSelectedDays(schedule.days)))),
         Center(child: Text(formatIsoStringToTime(schedule.time, context))),
         Center(child: Text(schedule.function.value ? 'On' : 'Off')),
         Center(
@@ -178,24 +170,18 @@ class ScheduleGarageTableWidget extends StatelessWidget {
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  GarageDoorDialogHelper.showAddGarageDoorScheduleDialog(
+                  GarageDoorDialogHelper.showAddGarageDoorScheduleDialog(context,
-                      context,
+                      schedule: schedule, index: index, isEdit: true);
-                      schedule: schedule,
-                      index: index,
-                      isEdit: true);
                 },
                 child: Text(
                   'Edit',
-                  style: context.textTheme.bodySmall!
+                  style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blueColor),
-                      .copyWith(color: ColorsManager.blueColor),
                 ),
               ),
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  context
+                  context.read<GarageDoorBloc>().add(DeleteGarageDoorScheduleEvent(
-                      .read<GarageDoorBloc>()
-                      .add(DeleteGarageDoorScheduleEvent(
                         index: index,
                         scheduleId: schedule.scheduleId,
                         deviceId: state.status.uuid,
@@ -203,8 +189,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
                 },
                 child: Text(
                   'Delete',
-                  style: context.textTheme.bodySmall!
+                  style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blueColor),
-                      .copyWith(color: ColorsManager.blueColor),
                 ),
               ),
             ],

lib/pages/device_managment/garage_door/widgets/schedule_garage_managment_ui.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule__garage_table.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 

lib/pages/device_managment/garage_door/widgets/schedule_garage_view.dart

@@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/helper/garage_door_helper.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_header.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_header.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_managment_ui.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_managment_ui.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_mode_buttons.dart';
 
 class BuildGarageDoorScheduleView extends StatefulWidget {
   const BuildGarageDoorScheduleView({super.key, required this.status});

lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_switch_control_view.dart

@@ -3,14 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class OneGangGlassSwitchControlView extends StatelessWidget
+class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const OneGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -19,8 +16,7 @@ class OneGangGlassSwitchControlView extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
-            ..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
         builder: (context, state) {
           if (state is OneGangGlassSwitchLoading) {
@@ -37,8 +33,7 @@ class OneGangGlassSwitchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, OneGangGlassStatusModel status) {
-      BuildContext context, OneGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -81,21 +76,14 @@ class OneGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
-        ScheduleControlButton(
+        ToggleWidget(
-          onTap: () {
+          value: false,
-            showDialog<void>(
+          code: '',
-                context: context,
+          deviceId: deviceId,
-                builder: (ctx) => BlocProvider.value(
+          label: 'Scheduling',
-                      value: BlocProvider.of<OneGangGlassSwitchBloc>(context),
+          icon: Assets.scheduling,
-                      child: BuildScheduleView(
+          onChange: (value) {},
-                        category: 'switch_1',
+          showToggle: false,
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: '',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
         ),
       ],
     );

lib/pages/device_managment/one_gang_switch/view/wall_light_device_control.dart

@@ -5,10 +5,7 @@ import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_lig
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class WallLightDeviceControl extends StatelessWidget
@@ -58,6 +55,7 @@ class WallLightDeviceControl extends StatelessWidget
         mainAxisSpacing: 12,
       ),
       children: [
+        const SizedBox(),
         ToggleWidget(
           value: status.switch1,
           code: 'switch_1',
@@ -71,22 +69,7 @@ class WallLightDeviceControl extends StatelessWidget
                 ));
           },
         ),
-        ScheduleControlButton(
+        const SizedBox(),
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<WallLightSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        category: 'switch_1',
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: '',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
       ],
     );
   }

lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart

@@ -1,587 +0,0 @@
-import 'dart:async';
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
-import 'package:syncrow_web/services/devices_mang_api.dart';
-part 'schedule_event.dart';
-part 'schedule_state.dart';
-
-class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
-  final String deviceId;
-
-  ScheduleBloc({
-    required this.deviceId,
-  }) : super(ScheduleInitial()) {
-    on<ScheduleInitializeAddEvent>(_initializeAddSchedule);
-    on<ScheduleUpdateSelectedTimeEvent>(_updateSelectedTime);
-    on<ScheduleUpdateSelectedDayEvent>(_updateSelectedDay);
-    on<ScheduleUpdateFunctionOnEvent>(_updateFunctionOn);
-    on<ScheduleGetEvent>(_getSchedule);
-    on<ScheduleAddEvent>(_onAddSchedule);
-    on<ScheduleEditEvent>(_onEditSchedule);
-    on<ScheduleUpdateEntryEvent>(_onUpdateSchedule);
-    on<UpdateScheduleModeEvent>(_onUpdateScheduleMode);
-    on<UpdateCountdownTimeEvent>(_onUpdateCountdownTime);
-    on<UpdateInchingTimeEvent>(_onUpdateInchingTime);
-    on<StartScheduleEvent>(_onStartScheduleEvent);
-    on<StopScheduleEvent>(_onStopScheduleEvent);
-    on<ScheduleDecrementCountdownEvent>(_onDecrementCountdown);
-    on<ScheduleFetchStatusEvent>(_fetchStatus);
-    on<ScheduleDeleteEvent>(_onDeleteSchedule);
-  }
-  Timer? _countdownTimer;
-  Duration countdownRemaining = Duration.zero;
-
-  Future<void> _onStopScheduleEvent(
-    StopScheduleEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-
-      final success = await RemoteControlDeviceService().controlDevice(
-        deviceUuid: deviceId,
-        status: Status(
-          code: 'countdown_1',
-          value: 0,
-        ),
-      );
-      if (success) {
-        _countdownTimer?.cancel();
-        if (event.mode == ScheduleModes.countdown) {
-          emit(currentState.copyWith(
-            countdownHours: 0,
-            countdownMinutes: 0,
-            isCountdownActive: false,
-            countdownRemaining: Duration.zero,
-          ));
-        } else if (event.mode == ScheduleModes.inching) {
-          emit(currentState.copyWith(
-            inchingHours: 0,
-            inchingMinutes: 0,
-            isInchingActive: false,
-            countdownRemaining: Duration.zero,
-          ));
-        }
-      } else {
-        emit(const ScheduleError('Failed to stop schedule'));
-      }
-    }
-  }
-
-  void _onUpdateScheduleMode(
-    UpdateScheduleModeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        scheduleMode: event.scheduleMode,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  void _onUpdateCountdownTime(
-    UpdateCountdownTimeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        countdownHours: event.hours,
-        countdownMinutes: event.minutes,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  void _onUpdateInchingTime(
-    UpdateInchingTimeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        inchingHours: event.hours,
-        inchingMinutes: event.minutes,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  void _initializeAddSchedule(
-    ScheduleInitializeAddEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        selectedTime: event.selectedTime,
-        selectedDays: event.selectedDays ?? List.filled(7, false),
-        functionOn: event.functionOn ?? false,
-        isEditing: event.isEditing,
-        scheduleMode: event.scheduleMode,
-        countdownRemaining: Duration.zero,
-      ));
-    } else {
-      emit(ScheduleLoaded(
-        schedules: const [],
-        selectedTime: event.selectedTime,
-        selectedDays: event.selectedDays ?? List.filled(7, false),
-        functionOn: event.functionOn ?? false,
-        isEditing: event.isEditing,
-        deviceId: deviceId,
-        scheduleMode: event.scheduleMode,
-        countdownHours: 0,
-        countdownMinutes: 0,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        isCountdownActive: false,
-        isInchingActive: false,
-      ));
-    }
-  }
-
-  void _updateSelectedTime(
-    ScheduleUpdateSelectedTimeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        selectedTime: event.selectedTime,
-        countdownHours: 0,
-        countdownMinutes: 0,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  void _updateSelectedDay(
-    ScheduleUpdateSelectedDayEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      final updatedDays = List<bool>.from(currentState.selectedDays);
-      updatedDays[event.index] = event.value;
-      emit(currentState.copyWith(
-        selectedDays: updatedDays,
-        countdownHours: 0,
-        countdownMinutes: 0,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  void _updateFunctionOn(
-    ScheduleUpdateFunctionOnEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        functionOn: event.isOn,
-        countdownHours: 0,
-        countdownMinutes: 0,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        countdownRemaining: Duration.zero,
-      ));
-    }
-  }
-
-  Future<void> _getSchedule(
-    ScheduleGetEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    try {
-      emit(ScheduleLoading());
-      final schedules = await DevicesManagementApi().getDeviceSchedules(
-        deviceId,
-        event.category,
-      );
-
-      if (state is ScheduleLoaded) {
-        final currentState = state as ScheduleLoaded;
-        emit(currentState.copyWith(
-          schedules: schedules,
-          selectedTime: null,
-          selectedDays: List.filled(7, false),
-          functionOn: false,
-          isEditing: false,
-          countdownRemaining: Duration.zero,
-        ));
-      } else {
-        emit(ScheduleLoaded(
-          schedules: schedules,
-          selectedTime: null,
-          selectedDays: List.filled(7, false),
-          functionOn: false,
-          isEditing: false,
-          deviceId: deviceId,
-          scheduleMode: ScheduleModes.schedule,
-          countdownHours: 0,
-          countdownMinutes: 0,
-          inchingHours: 0,
-          inchingMinutes: 0,
-          isCountdownActive: false,
-          isInchingActive: false,
-        ));
-      }
-    } catch (e) {
-      emit(ScheduleError('Failed to load schedules: $e'));
-    }
-  }
-
-  Future<void> _onAddSchedule(
-    ScheduleAddEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    try {
-      if (state is ScheduleLoaded) {
-        final dateTime = DateTime.parse(event.time);
-        final success = await DevicesManagementApi().postSchedule(
-            category: event.category,
-            deviceId: deviceId,
-            time: getTimeStampWithoutSeconds(dateTime).toString(),
-            code: event.category,
-            value: event.functionOn,
-            days: event.selectedDays);
-        if (success) {
-          add(ScheduleGetEvent(category: event.category));
-        } else {
-          emit(const ScheduleError('Failed to add schedule'));
-        }
-      }
-    } catch (e) {
-      emit(ScheduleError('Failed to add schedule: $e'));
-    }
-  }
-
-  Future<void> _onEditSchedule(
-    ScheduleEditEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    try {
-      if (state is ScheduleLoaded) {
-        final dateTime = DateTime.parse(event.time);
-        final updatedSchedule = ScheduleEntry(
-          scheduleId: event.scheduleId,
-          category: event.category,
-          time: getTimeStampWithoutSeconds(dateTime).toString(),
-          function: Status(code: event.category, value: event.functionOn),
-          days: event.selectedDays,
-        );
-        final success = await DevicesManagementApi().editScheduleRecord(
-          deviceId,
-          updatedSchedule,
-        );
-
-        if (success) {
-          add(ScheduleGetEvent(
-            category: event.category,
-          ));
-        } else {
-          emit(const ScheduleError('Failed to update schedule'));
-        }
-      }
-    } catch (e) {
-      emit(ScheduleError('Failed to update schedule: $e'));
-    }
-  }
-
-  Future<void> _onUpdateSchedule(
-    ScheduleUpdateEntryEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    try {
-      if (state is ScheduleLoaded) {
-        final currentState = state as ScheduleLoaded;
-
-        final updatedSchedules = currentState.schedules.map((schedule) {
-          if (schedule.scheduleId == event.scheduleId) {
-            return schedule.copyWith(
-              function: Status(code: event.category, value: event.functionOn),
-              enable: event.enable,
-            );
-          }
-          return schedule;
-        }).toList();
-
-        final success = await DevicesManagementApi().updateScheduleRecord(
-          enable: event.enable,
-          uuid: deviceId,
-          scheduleId: event.scheduleId,
-        );
-
-        if (success) {
-          emit(currentState.copyWith(
-            schedules: updatedSchedules,
-            countdownHours: 0,
-            countdownMinutes: 0,
-            inchingHours: 0,
-            inchingMinutes: 0,
-            countdownRemaining: Duration.zero,
-          ));
-        } else {
-          emit(const ScheduleError('Failed to update schedule status'));
-        }
-      }
-    } catch (e) {
-      emit(ScheduleError('Failed to update schedule: $e'));
-    }
-  }
-
-  Future<void> _onDeleteSchedule(
-    ScheduleDeleteEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    try {
-      if (state is ScheduleLoaded) {
-        final currentState = state as ScheduleLoaded;
-        final success = await DevicesManagementApi().deleteScheduleRecord(
-          deviceId,
-          event.scheduleId,
-        );
-
-        if (success) {
-          final updatedSchedules = currentState.schedules
-              .where((s) => s.scheduleId != event.scheduleId)
-              .toList();
-          emit(currentState.copyWith(
-            schedules: updatedSchedules,
-            countdownHours: 0,
-            countdownMinutes: 0,
-            inchingHours: 0,
-            inchingMinutes: 0,
-            countdownRemaining: Duration.zero,
-          ));
-        } else {
-          emit(const ScheduleError('Failed to delete schedule'));
-        }
-      }
-    } catch (e) {
-      emit(ScheduleError('Failed to delete schedule: $e'));
-    }
-  }
-
-  Duration? _currentCountdown;
-
-  Future<void> _onStartScheduleEvent(
-    StartScheduleEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    if (state is ScheduleLoaded) {
-      final totalSeconds =
-          Duration(hours: event.hours, minutes: event.minutes).inSeconds;
-      final code = event.mode == ScheduleModes.countdown
-          ? 'countdown_1'
-          : 'switch_inching';
-      final currentState = state as ScheduleLoaded;
-      final duration = Duration(seconds: totalSeconds);
-      _currentCountdown = duration;
-      emit(currentState.copyWith(
-        countdownRemaining: duration,
-        schedules: currentState.schedules.map((schedule) {
-          if (schedule.function.code == code) {
-            return schedule.copyWith(
-              function: Status(code: code, value: totalSeconds),
-            );
-          }
-          return schedule;
-        }).toList(),
-        countdownHours: event.mode == ScheduleModes.countdown ? event.hours : 0,
-      ));
-
-      final success = await RemoteControlDeviceService().controlDevice(
-        deviceUuid: deviceId,
-        status: Status(
-          code: code,
-          value: totalSeconds,
-        ),
-      );
-
-      if (success) {
-        if (code == 'countdown_1') {
-          final countdownDuration = Duration(seconds: totalSeconds);
-
-          emit(
-            currentState.copyWith(
-              countdownHours: countdownDuration.inHours,
-              countdownMinutes: countdownDuration.inMinutes % 60,
-              countdownRemaining: countdownDuration,
-              isCountdownActive: true,
-            ),
-          );
-
-          if (countdownDuration.inSeconds > 0) {
-            _startCountdownTimer(emit, countdownDuration);
-          } else {
-            _countdownTimer?.cancel();
-            emit(
-              currentState.copyWith(
-                countdownHours: 0,
-                countdownMinutes: 0,
-                countdownRemaining: Duration.zero,
-                isCountdownActive: false,
-              ),
-            );
-          }
-        } else if (code == 'switch_inching') {
-          final inchingDuration = Duration(seconds: totalSeconds);
-          emit(
-            currentState.copyWith(
-              inchingHours: inchingDuration.inHours,
-              inchingMinutes: inchingDuration.inMinutes % 60,
-              isInchingActive: true,
-              countdownRemaining: inchingDuration,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  void _startCountdownTimer(
-    Emitter<ScheduleState> emit,
-    Duration duration,
-  ) {
-    _countdownTimer?.cancel();
-    _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      if (_currentCountdown != null && _currentCountdown! > Duration.zero) {
-        _currentCountdown = _currentCountdown! - const Duration(seconds: 1);
-        countdownRemaining = _currentCountdown!;
-        add(const ScheduleDecrementCountdownEvent());
-      } else {
-        timer.cancel();
-        add(StopScheduleEvent(
-          mode: _currentCountdown == null
-              ? ScheduleModes.countdown
-              : ScheduleModes.inching,
-          deviceId: deviceId,
-        ));
-      }
-    });
-  }
-
-  void _onDecrementCountdown(
-    ScheduleDecrementCountdownEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        countdownRemaining: countdownRemaining,
-      ));
-    }
-  }
-
-  @override
-  Future<void> close() {
-    _countdownTimer?.cancel();
-    return super.close();
-  }
-
-  Future<void> _fetchStatus(
-    ScheduleFetchStatusEvent event,
-    Emitter<ScheduleState> emit,
-  ) async {
-    emit(ScheduleLoading());
-
-    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      print(status.status);
-      final deviceStatus =
-          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
-
-      final scheduleMode =
-          deviceStatus.countdownHours > 0 || deviceStatus.countdownMinutes > 0
-              ? ScheduleModes.countdown
-              : deviceStatus.inchingHours > 0 || deviceStatus.inchingMinutes > 0
-                  ? ScheduleModes.inching
-                  : ScheduleModes.schedule;
-      final isCountdown = scheduleMode == ScheduleModes.countdown;
-      final isInching = scheduleMode == ScheduleModes.inching;
-
-      Duration? countdownRemaining;
-      var isCountdownActive = false;
-      var isInchingActive = false;
-
-      if (isCountdown) {
-        countdownRemaining = Duration(
-          hours: deviceStatus.countdownHours,
-          minutes: deviceStatus.countdownMinutes,
-        );
-        isCountdownActive = countdownRemaining > Duration.zero;
-      } else if (isInching) {
-        isInchingActive = Duration(
-              hours: deviceStatus.inchingHours,
-              minutes: deviceStatus.inchingMinutes,
-            ) >
-            Duration.zero;
-      }
-      if (state is ScheduleLoaded) {
-        final currentState = state as ScheduleLoaded;
-        emit(currentState.copyWith(
-          scheduleMode: scheduleMode,
-          countdownHours: deviceStatus.countdownHours,
-          countdownMinutes: deviceStatus.countdownMinutes,
-          inchingHours: deviceStatus.inchingHours,
-          inchingMinutes: deviceStatus.inchingMinutes,
-          isCountdownActive: isCountdownActive,
-          isInchingActive: isInchingActive,
-          countdownRemaining: countdownRemaining ?? Duration.zero,
-        ));
-      } else {
-        emit(ScheduleLoaded(
-          schedules: const [],
-          selectedTime: null,
-          selectedDays: List.filled(7, false),
-          functionOn: false,
-          isEditing: false,
-          deviceId: deviceId,
-          scheduleMode: scheduleMode,
-          countdownHours: deviceStatus.countdownHours,
-          countdownMinutes: deviceStatus.countdownMinutes,
-          inchingHours: deviceStatus.inchingHours,
-          inchingMinutes: deviceStatus.inchingMinutes,
-          isCountdownActive: isCountdownActive,
-          isInchingActive: isInchingActive,
-          countdownRemaining: countdownRemaining ?? Duration.zero,
-        ));
-      }
-
-      // if (isCountdownActive && countdownRemaining != null) {
-      //   _startCountdownTimer(emit, countdownRemaining);
-      // }
-    } catch (e) {
-      emit(ScheduleError('Failed to fetch device status: $e'));
-    }
-  }
-
-  String extractTime(String isoDateTime) {
-    // Example input: "2025-06-19T15:45:00.000"
-    return isoDateTime.split('T')[1].split('.')[0]; // gives "15:45:00"
-  }
-
-  int? getTimeStampWithoutSeconds(DateTime? dateTime) {
-    if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
-        dateTime.day, dateTime.hour, dateTime.minute);
-    return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
-  }
-}

lib/pages/device_managment/schedule_device/bloc/schedule_event.dart

@@ -1,232 +0,0 @@
-part of 'schedule_bloc.dart';
-
-abstract class ScheduleEvent extends Equatable {
-  const ScheduleEvent();
-}
-
-class ScheduleInitializeAddEvent extends ScheduleEvent {
-  final bool isEditing;
-  final ScheduleModes scheduleMode;
-  final TimeOfDay? selectedTime;
-  final List<bool>? selectedDays;
-  final bool? functionOn;
-
-  const ScheduleInitializeAddEvent({
-    required this.isEditing,
-    required this.scheduleMode,
-    this.selectedTime,
-    this.selectedDays,
-    this.functionOn,
-  });
-
-  @override
-  List<Object?> get props => [
-        isEditing,
-        scheduleMode,
-        selectedTime,
-        selectedDays,
-        functionOn,
-      ];
-}
-
-class ScheduleUpdateSelectedTimeEvent extends ScheduleEvent {
-  final TimeOfDay selectedTime;
-
-  const ScheduleUpdateSelectedTimeEvent(this.selectedTime);
-
-  @override
-  List<Object> get props => [selectedTime];
-}
-
-class ScheduleUpdateSelectedDayEvent extends ScheduleEvent {
-  final int index;
-  final bool value;
-
-  const ScheduleUpdateSelectedDayEvent(this.index, this.value);
-
-  @override
-  List<Object> get props => [index, value];
-}
-
-class ScheduleUpdateFunctionOnEvent extends ScheduleEvent {
-  final bool isOn;
-
-  const ScheduleUpdateFunctionOnEvent(this.isOn);
-
-  @override
-  List<Object> get props => [isOn];
-}
-
-class ScheduleGetEvent extends ScheduleEvent {
-  final String category;
-
-  const ScheduleGetEvent({required this.category});
-
-  @override
-  List<Object> get props => [category];
-}
-
-class ScheduleAddEvent extends ScheduleEvent {
-  final String category;
-  final String time;
-  final List<String> selectedDays;
-  final bool functionOn;
-
-  const ScheduleAddEvent({
-    required this.category,
-    required this.time,
-    required this.selectedDays,
-    required this.functionOn,
-  });
-
-  @override
-  List<Object> get props => [category, time, selectedDays, functionOn];
-}
-
-class ScheduleEditEvent extends ScheduleEvent {
-  final String scheduleId;
-  final String category;
-  final String time;
-  final List<String> selectedDays;
-  final bool functionOn;
-
-  const ScheduleEditEvent({
-    required this.scheduleId,
-    required this.category,
-    required this.time,
-    required this.selectedDays,
-    required this.functionOn,
-  });
-
-  @override
-  List<Object> get props => [
-        scheduleId,
-        category,
-        time,
-        selectedDays,
-        functionOn,
-      ];
-}
-
-class ScheduleDeleteEvent extends ScheduleEvent {
-  final String scheduleId;
-
-  const ScheduleDeleteEvent(this.scheduleId);
-
-  @override
-  List<Object> get props => [scheduleId];
-}
-
-class ScheduleUpdateEntryEvent extends ScheduleEvent {
-  final String scheduleId;
-  final bool functionOn;
-  final bool enable;
-  final String category;
-
-  const ScheduleUpdateEntryEvent({
-    required this.scheduleId,
-    required this.functionOn,
-    required this.enable,
-    required this.category,
-  });
-
-  @override
-  List<Object> get props => [scheduleId, functionOn, enable, category];
-}
-
-class UpdateScheduleModeEvent extends ScheduleEvent {
-  final ScheduleModes scheduleMode;
-
-  const UpdateScheduleModeEvent({required this.scheduleMode});
-
-  @override
-  List<Object> get props => [scheduleMode];
-}
-
-class UpdateCountdownTimeEvent extends ScheduleEvent {
-  final int hours;
-  final int minutes;
-
-  const UpdateCountdownTimeEvent({
-    required this.hours,
-    required this.minutes,
-  });
-
-  @override
-  List<Object> get props => [hours, minutes];
-}
-
-class UpdateInchingTimeEvent extends ScheduleEvent {
-  final int hours;
-  final int minutes;
-
-  const UpdateInchingTimeEvent({
-    required this.hours,
-    required this.minutes,
-  });
-
-  @override
-  List<Object> get props => [hours, minutes];
-}
-
-class StartScheduleEvent extends ScheduleEvent {
-  final ScheduleModes mode;
-  final int hours;
-  final int minutes;
-
-  const StartScheduleEvent({
-    required this.mode,
-    required this.hours,
-    required this.minutes,
-  });
-
-  @override
-  List<Object?> get props => [mode, hours, minutes];
-}
-
-class StopScheduleEvent extends ScheduleEvent {
-  final ScheduleModes mode;
-  final String deviceId;
-
-  const StopScheduleEvent({
-    required this.mode,
-    required this.deviceId,
-  });
-
-  @override
-  List<Object?> get props => [mode, deviceId];
-}
-
-class ScheduleDecrementCountdownEvent extends ScheduleEvent {
-  const ScheduleDecrementCountdownEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class ScheduleFetchStatusEvent extends ScheduleEvent {
-  final String deviceId;
-
-  const ScheduleFetchStatusEvent(this.deviceId);
-
-  @override
-  List<Object> get props => [deviceId];
-}
-
-class DeleteScheduleEvent extends ScheduleEvent {
-  final String scheduleId;
-
-  const DeleteScheduleEvent(this.scheduleId);
-
-  @override
-  List<Object> get props => [scheduleId];
-}
-
-class StatusUpdatedScheduleEvent extends ScheduleEvent {
-  final String id;
-
-  const StatusUpdatedScheduleEvent(this.id);
-
-  @override
-  List<Object> get props => [id];
-}

lib/pages/device_managment/schedule_device/bloc/schedule_state.dart

@@ -1,109 +0,0 @@
-part of 'schedule_bloc.dart';
-
-abstract class ScheduleState extends Equatable {
-  const ScheduleState();
-}
-
-class ScheduleInitial extends ScheduleState {
-  @override
-  List<Object> get props => [];
-}
-
-class ScheduleLoading extends ScheduleState {
-  @override
-  List<Object> get props => [];
-}
-
-class ScheduleLoaded extends ScheduleState {
-  final List<ScheduleModel> schedules;
-  final TimeOfDay? selectedTime;
-  final List<bool> selectedDays;
-  final bool functionOn;
-  final bool isEditing;
-  final String deviceId;
-  final int countdownHours;
-  final int countdownMinutes;
-  final bool isCountdownActive;
-  final int inchingHours;
-  final int inchingMinutes;
-  final bool isInchingActive;
-  final ScheduleModes scheduleMode;
-  final Duration? countdownRemaining;
-
-  const ScheduleLoaded({
-    required this.schedules,
-    this.selectedTime,
-    required this.selectedDays,
-    required this.functionOn,
-    required this.isEditing,
-    required this.deviceId,
-    this.countdownHours = 0,
-    this.countdownMinutes = 0,
-    this.isCountdownActive = false,
-    this.inchingHours = 0,
-    this.inchingMinutes = 0,
-    this.isInchingActive = false,
-    this.scheduleMode = ScheduleModes.countdown,
-    this.countdownRemaining,
-  });
-
-  ScheduleLoaded copyWith({
-    List<ScheduleModel>? schedules,
-    TimeOfDay? selectedTime,
-    List<bool>? selectedDays,
-    bool? functionOn,
-    bool? isEditing,
-    int? countdownHours,
-    int? countdownMinutes,
-    bool? isCountdownActive,
-    int? inchingHours,
-    int? inchingMinutes,
-    bool? isInchingActive,
-    ScheduleModes? scheduleMode,
-    Duration? countdownRemaining,
-  }) {
-    return ScheduleLoaded(
-      schedules: schedules ?? this.schedules,
-      selectedTime: selectedTime ?? this.selectedTime,
-      selectedDays: selectedDays ?? this.selectedDays,
-      functionOn: functionOn ?? this.functionOn,
-      isEditing: isEditing ?? this.isEditing,
-      deviceId: deviceId,
-      countdownHours: countdownHours ?? this.countdownHours,
-      countdownMinutes: countdownMinutes ?? this.countdownMinutes,
-      isCountdownActive: isCountdownActive ?? this.isCountdownActive,
-      inchingHours: inchingHours ?? this.inchingHours,
-      inchingMinutes: inchingMinutes ?? this.inchingMinutes,
-      isInchingActive: isInchingActive ?? this.isInchingActive,
-      scheduleMode: scheduleMode ?? this.scheduleMode,
-      countdownRemaining: countdownRemaining ?? this.countdownRemaining,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-        schedules,
-        selectedTime,
-        selectedDays,
-        functionOn,
-        isEditing,
-        deviceId,
-        countdownHours,
-        countdownMinutes,
-        isCountdownActive,
-        inchingHours,
-        inchingMinutes,
-        isInchingActive,
-        scheduleMode,
-        countdownRemaining,
-      ];
-}
-
-class ScheduleError extends ScheduleState {
-  final String error;
-
-  const ScheduleError(this.error);
-
-  @override
-  List<Object> get props => [error];
-}

lib/pages/device_managment/schedule_device/schedule_widgets/count_down_inching_view.dart

@@ -1,185 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CountdownInchingView extends StatefulWidget {
-  const CountdownInchingView({super.key});
-
-  @override
-  State<CountdownInchingView> createState() => _CountdownInchingViewState();
-}
-
-class _CountdownInchingViewState extends State<CountdownInchingView> {
-  late FixedExtentScrollController _hoursController;
-  late FixedExtentScrollController _minutesController;
-
-  int _lastHours = -1;
-  int _lastMinutes = -1;
-
-  @override
-  void initState() {
-    super.initState();
-    _hoursController = FixedExtentScrollController();
-    _minutesController = FixedExtentScrollController();
-  }
-
-  @override
-  void dispose() {
-    _hoursController.dispose();
-    _minutesController.dispose();
-    super.dispose();
-  }
-
-  void _updateControllers(int displayHours, int displayMinutes) {
-    if (_lastHours != displayHours) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_hoursController.hasClients) {
-          _hoursController.jumpToItem(displayHours);
-        }
-      });
-      _lastHours = displayHours;
-    }
-    if (_lastMinutes != displayMinutes) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_minutesController.hasClients) {
-          _minutesController.jumpToItem(displayMinutes);
-        }
-      });
-      _lastMinutes = displayMinutes;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ScheduleBloc, ScheduleState>(
-      builder: (context, state) {
-        if (state is! ScheduleLoaded) return const SizedBox.shrink();
-
-        final isCountDown = state.scheduleMode == ScheduleModes.countdown;
-        final isActive =
-            isCountDown ? state.isCountdownActive : state.isInchingActive;
-        final displayHours = isActive && state.countdownRemaining != null
-            ? state.countdownRemaining!.inHours
-            : (isCountDown ? state.countdownHours : state.inchingHours);
-        final displayMinutes = isActive && state.countdownRemaining != null
-            ? state.countdownRemaining!.inMinutes.remainder(60)
-            : (isCountDown ? state.countdownMinutes : state.inchingMinutes);
-
-        _updateControllers(displayHours, displayMinutes);
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              isCountDown ? 'Countdown:' : 'Inching:',
-              style: context.textTheme.bodySmall!.copyWith(
-                fontSize: 13,
-                color: ColorsManager.grayColor,
-              ),
-            ),
-            const SizedBox(height: 8),
-            Visibility(
-              visible: !isCountDown,
-              child: const Text(
-                'Once enabled this feature, each time the device is turned on, '
-                'it will automatically turn off after a preset time.',
-              ),
-            ),
-            const SizedBox(height: 8),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                _buildPickerColumn(
-                  context,
-                  'h',
-                  displayHours,
-                  100,
-                  _hoursController,
-                  (value) {
-                    if (!isActive) {
-                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: value, minutes: displayMinutes));
-                    }
-                  },
-                  isActive: isActive,
-                ),
-                const SizedBox(width: 10),
-                _buildPickerColumn(
-                  context,
-                  'm',
-                  displayMinutes,
-                  60,
-                  _minutesController,
-                  (value) {
-                    if (!isActive) {
-                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: displayHours, minutes: value));
-                    }
-                  },
-                  isActive: isActive,
-                ),
-              ],
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildPickerColumn(
-    BuildContext context,
-    String label,
-    int initialValue,
-    int itemCount,
-    FixedExtentScrollController controller,
-    ValueChanged<int> onSelected, {
-    required bool isActive,
-  }) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Container(
-          height: 40,
-          width: 80,
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          decoration: BoxDecoration(
-            color: ColorsManager.boxColor,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: ListWheelScrollView.useDelegate(
-            controller: controller,
-            itemExtent: 40.0,
-            physics: isActive
-                ? const NeverScrollableScrollPhysics()
-                : const FixedExtentScrollPhysics(),
-            onSelectedItemChanged: isActive ? null : onSelected,
-            childDelegate: ListWheelChildBuilderDelegate(
-              builder: (context, index) {
-                return Center(
-                  child: Text(
-                    index.toString().padLeft(2, '0'),
-                    style: TextStyle(
-                      fontSize: 24,
-                      color: isActive ? ColorsManager.grayColor : Colors.black,
-                    ),
-                  ),
-                );
-              },
-              childCount: itemCount,
-            ),
-          ),
-        ),
-        const SizedBox(width: 8),
-        Text(
-          label,
-          style: const TextStyle(
-            color: ColorsManager.grayColor,
-            fontSize: 18,
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart

@@ -1,110 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/count_down_inching_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/inching_mode_buttons.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_header.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_selector.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-
-class BuildScheduleView extends StatelessWidget {
-  const BuildScheduleView(
-      {super.key, required this.deviceUuid, required this.category});
-  final String deviceUuid;
-  final String category;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => ScheduleBloc(
-        deviceId: deviceUuid,
-      )
-        ..add(ScheduleGetEvent(category: category))
-        ..add(ScheduleFetchStatusEvent(deviceUuid)),
-      child: Dialog(
-        backgroundColor: Colors.white,
-        insetPadding: const EdgeInsets.all(20),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: SizedBox(
-          width: 700,
-          child: SingleChildScrollView(
-            child: Padding(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 40.0, vertical: 20),
-              child: BlocBuilder<ScheduleBloc, ScheduleState>(
-                builder: (context, state) {
-                  if (state is ScheduleLoaded) {
-                    return Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        const ScheduleHeader(),
-                        const SizedBox(height: 20),
-                        ScheduleModeSelector(
-                          currentMode: state.scheduleMode,
-                        ),
-                        const SizedBox(height: 20),
-                        if (state.scheduleMode == ScheduleModes.schedule)
-                          ScheduleManagementUI(
-                            category: category,
-                            deviceUuid: deviceUuid,
-                            onAddSchedule: () async {
-                              final entry = await ScheduleDialogHelper
-                                  .showAddScheduleDialog(
-                                context,
-                                schedule: null,
-                                isEdit: false,
-                              );
-                              if (entry != null) {
-                                context.read<ScheduleBloc>().add(
-                                      ScheduleAddEvent(
-                                        category: entry.category,
-                                        time: entry.time,
-                                        functionOn: entry.function.value,
-                                        selectedDays: entry.days,
-                                      ),
-                                    );
-                              }
-                            },
-                          ),
-                        if (state.scheduleMode == ScheduleModes.countdown ||
-                            state.scheduleMode == ScheduleModes.inching)
-                          const CountdownInchingView(),
-                        const SizedBox(height: 20),
-                        if (state.scheduleMode == ScheduleModes.countdown)
-                          CountdownModeButtons(
-                            isActive: state.isCountdownActive,
-                            deviceId: deviceUuid,
-                            hours: state.countdownHours,
-                            minutes: state.countdownMinutes,
-                          ),
-                        if (state.scheduleMode == ScheduleModes.inching)
-                          InchingModeButtons(
-                            isActive: state.isInchingActive,
-                            deviceId: deviceUuid,
-                            hours: state.inchingHours,
-                            minutes: state.inchingMinutes,
-                          ),
-                        if (state.scheduleMode != ScheduleModes.countdown &&
-                            state.scheduleMode != ScheduleModes.inching)
-                          ScheduleModeButtons(
-                            onSave: () => Navigator.pop(context),
-                          ),
-                      ],
-                    );
-                  }
-                  return const Center(child: CircularProgressIndicator());
-                },
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart

@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class ScheduleControlButton extends StatelessWidget {
-  final VoidCallback onTap;
-  final String mainText;
-  final String subtitle;
-  final String iconPath;
-
-  const ScheduleControlButton({
-    super.key,
-    required this.onTap,
-    required this.mainText,
-    required this.subtitle,
-    required this.iconPath,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: DeviceControlsContainer(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Container(
-              width: 60,
-              height: 60,
-              decoration: const BoxDecoration(
-                shape: BoxShape.circle,
-                color: ColorsManager.whiteColors,
-              ),
-              margin: const EdgeInsets.symmetric(horizontal: 4),
-              padding: const EdgeInsets.all(12),
-              child: ClipOval(
-                child: SvgPicture.asset(
-                  iconPath,
-                  fit: BoxFit.fill,
-                ),
-              ),
-            ),
-            const Spacer(),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  mainText,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                        fontWeight: FontWeight.w200,
-                        fontSize: 12,
-                        color: ColorsManager.blackColor,
-                      ),
-                ),
-                Text(
-                  subtitle,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                        fontWeight: FontWeight.w400,
-                        color: ColorsManager.blackColor,
-                      ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_selector.dart

@@ -1,87 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class ScheduleModeSelector extends StatelessWidget {
-  final ScheduleModes currentMode;
-
-  const ScheduleModeSelector({
-    super.key,
-    required this.currentMode,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final currentMode = context.select<ScheduleBloc, ScheduleModes>(
-      (bloc) => bloc.state is ScheduleLoaded &&
-              (bloc.state as ScheduleLoaded).scheduleMode != null
-          ? (bloc.state as ScheduleLoaded).scheduleMode
-          : ScheduleModes.schedule,
-    );
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Type:',
-          style: context.textTheme.bodySmall!.copyWith(
-            fontSize: 13,
-            color: ColorsManager.grayColor,
-          ),
-        ),
-        const SizedBox(height: 4),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            _buildRadioTile(
-                context, 'Countdown', ScheduleModes.countdown, currentMode),
-            _buildRadioTile(
-                context, 'Schedule', ScheduleModes.schedule, currentMode),
-            // _buildRadioTile(
-            //     context, 'Circulate', ScheduleModes.circulate, currentMode),
-            // _buildRadioTile(
-            //     context, 'Inching', ScheduleModes.inching, currentMode),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildRadioTile(
-    BuildContext context,
-    String label,
-    ScheduleModes mode,
-    ScheduleModes currentMode,
-  ) {
-    return Flexible(
-      child: ListTile(
-        contentPadding: EdgeInsets.zero,
-        title: Text(
-          label,
-          style: context.textTheme.bodySmall!.copyWith(
-            fontSize: 13,
-            color: ColorsManager.blackColor,
-          ),
-        ),
-        leading: Radio<ScheduleModes>(
-          value: mode,
-          groupValue: currentMode,
-          onChanged: (ScheduleModes? value) {
-            if (value != null) {
-              context.read<ScheduleBloc>().add(
-                    UpdateScheduleModeEvent(scheduleMode: value),
-                  );
-              if (value == ScheduleModes.schedule) {
-                context.read<ScheduleBloc>().add(
-                      const ScheduleGetEvent(category: 'switch_1'),
-                    );
-              }
-            }
-          },
-        ),
-      ),
-    );
-  }
-}

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart

@@ -1,283 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/format_date_time.dart';
-
-class ScheduleTableWidget extends StatelessWidget {
-  final String deviceUuid;
-  final String category;
-
-  const ScheduleTableWidget({
-    super.key,
-    required this.deviceUuid,
-    this.category = 'switch_1',
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => ScheduleBloc(
-        deviceId: deviceUuid,
-      )..add(ScheduleGetEvent(category: category)),
-      child: _ScheduleTableView(),
-    );
-  }
-}
-
-class _ScheduleTableView extends StatelessWidget {
-  const _ScheduleTableView();
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Table(
-          border: TableBorder.all(
-            color: ColorsManager.graysColor,
-            borderRadius: const BorderRadius.only(
-                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
-          ),
-          children: [
-            TableRow(
-              decoration: const BoxDecoration(
-                color: ColorsManager.boxColor,
-                borderRadius: BorderRadius.only(
-                  topLeft: Radius.circular(20),
-                  topRight: Radius.circular(20),
-                ),
-              ),
-              children: [
-                _buildTableHeader('Active'),
-                _buildTableHeader('Days'),
-                _buildTableHeader('Time'),
-                _buildTableHeader('Function'),
-                _buildTableHeader('Action'),
-              ],
-            ),
-          ],
-        ),
-        BlocBuilder<ScheduleBloc, ScheduleState>(
-          builder: (context, state) {
-            if (state is ScheduleLoading) {
-              return const SizedBox(
-                  height: 200,
-                  child: Center(child: CircularProgressIndicator()));
-            }
-            if (state is ScheduleLoaded && state.schedules.isEmpty) {
-              return _buildEmptyState(context);
-            }
-            if (state is ScheduleLoaded) {
-              return Container(
-                  height: 200,
-                  decoration: BoxDecoration(
-                    border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius: const BorderRadius.only(
-                        bottomLeft: Radius.circular(20),
-                        bottomRight: Radius.circular(20)),
-                  ),
-                  child: _buildTableBody(state.schedules, context));
-            }
-            if (state is ScheduleError) {
-              return Center(child: Text(state.error));
-            }
-            return const SizedBox(height: 200);
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget _buildEmptyState(BuildContext context) {
-    return Container(
-      height: 200,
-      decoration: BoxDecoration(
-        border: Border.all(color: ColorsManager.graysColor),
-        borderRadius: const BorderRadius.only(
-            bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
-      ),
-      child: Center(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            SvgPicture.asset(Assets.emptyRecords, width: 40, height: 40),
-            const SizedBox(height: 8),
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Text(
-                'No schedules added yet',
-                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      fontSize: 13,
-                      color: ColorsManager.grayColor,
-                    ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTableBody(List<ScheduleModel> schedules, BuildContext context) {
-    return SizedBox(
-      height: 200,
-      child: SingleChildScrollView(
-        child: Table(
-          border: TableBorder.all(color: ColorsManager.graysColor),
-          defaultVerticalAlignment: TableCellVerticalAlignment.middle,
-          children: [
-            for (int i = 0; i < schedules.length; i++)
-              _buildScheduleRow(schedules[i], i, context),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTableHeader(String label) {
-    return TableCell(
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: Text(
-          label,
-          style: const TextStyle(
-            fontSize: 13,
-            color: ColorsManager.grayColor,
-          ),
-        ),
-      ),
-    );
-  }
-
-  TableRow _buildScheduleRow(
-      ScheduleModel schedule, int index, BuildContext context) {
-    return TableRow(
-      children: [
-        Center(
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTap: () {
-              context.read<ScheduleBloc>().add(
-                    ScheduleUpdateEntryEvent(
-                      category: schedule.category,
-                      scheduleId: schedule.scheduleId,
-                      functionOn: schedule.function.value,
-                      enable: !schedule.enable,
-                    ),
-                  );
-            },
-            child: Center(
-              child: SizedBox(
-                width: 24,
-                height: 24,
-                child: schedule.enable
-                    ? const Icon(Icons.radio_button_checked,
-                        color: ColorsManager.blueColor)
-                    : const Icon(Icons.radio_button_unchecked,
-                        color: ColorsManager.grayColor),
-              ),
-            ),
-          ),
-        ),
-        Center(
-            child: Text(_getSelectedDays(
-                ScheduleModel.parseSelectedDays(schedule.days)))),
-        Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        Center(child: Text(schedule.function.value ? 'On' : 'Off')),
-        Center(
-          child: Wrap(
-            runAlignment: WrapAlignment.center,
-            children: [
-              TextButton(
-                style: TextButton.styleFrom(padding: EdgeInsets.zero),
-                onPressed: () {
-                  ScheduleDialogHelper.showAddScheduleDialog(
-                    context,
-                    schedule: ScheduleEntry.fromScheduleModel(schedule),
-                    isEdit: true,
-                  ).then((updatedSchedule) {
-                    if (updatedSchedule != null) {
-                      context.read<ScheduleBloc>().add(
-                            ScheduleEditEvent(
-                                scheduleId: schedule.scheduleId,
-                                category: schedule.category,
-                                time: updatedSchedule.time,
-                                functionOn: updatedSchedule.function.value,
-                                selectedDays: updatedSchedule.days),
-                          );
-                    }
-                  });
-                },
-                child: Text(
-                  'Edit',
-                  style: Theme.of(context)
-                      .textTheme
-                      .bodySmall!
-                      .copyWith(color: ColorsManager.blueColor),
-                ),
-              ),
-              TextButton(
-                style: TextButton.styleFrom(padding: EdgeInsets.zero),
-                onPressed: () async {
-                  final confirmed = await showDialog<bool>(
-                    context: context,
-                    builder: (BuildContext dialogContext) {
-                      return AlertDialog(
-                        title: const Text('Confirm Delete'),
-                        content: const Text(
-                            'Are you sure you want to delete this schedule?'),
-                        actions: [
-                          TextButton(
-                            onPressed: () =>
-                                Navigator.of(dialogContext).pop(false),
-                            child: Text('Cancel'),
-                          ),
-                          TextButton(
-                            onPressed: () =>
-                                Navigator.of(dialogContext).pop(true),
-                            child: const Text(
-                              'Delete',
-                              style: TextStyle(color: Colors.red),
-                            ),
-                          ),
-                        ],
-                      );
-                    },
-                  );
-
-                  if (confirmed == true) {
-                    context.read<ScheduleBloc>().add(
-                          ScheduleDeleteEvent(schedule.scheduleId),
-                        );
-                  }
-                },
-                child: Text(
-                  'Delete',
-                  style: Theme.of(context)
-                      .textTheme
-                      .bodySmall!
-                      .copyWith(color: ColorsManager.blueColor),
-                ),
-              )
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  String _getSelectedDays(List<bool> selectedDays) {
-    const days = ScheduleDialogHelper.allDays;
-    return selectedDays
-        .asMap()
-        .entries
-        .where((entry) => entry.value)
-        .map((entry) => days[entry.key])
-        .join(', ');
-  }
-}

lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

@@ -1,16 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+
 import '../models/three_gang_glass_switch.dart';
 
-class ThreeGangGlassSwitchControlView extends StatelessWidget
+class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const ThreeGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -19,8 +17,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
-            ..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
         builder: (context, state) {
           if (state is ThreeGangGlassSwitchLoading) {
@@ -37,8 +34,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, ThreeGangGlassStatusModel status) {
-      BuildContext context, ThreeGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -102,54 +98,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
                 );
           },
         ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        category: 'switch_1',
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: 'Wall Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        category: 'switch_2',
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: 'Ceiling Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        category: 'switch_3',
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: 'SpotLight',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
         ToggleWidget(
           value: false,
           code: '',
@@ -159,6 +107,15 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
+        ToggleWidget(
+          value: false,
+          code: '',
+          deviceId: deviceId,
+          label: 'Scheduling',
+          icon: Assets.scheduling,
+          onChange: (value) {},
+          showToggle: false,
+        ),
       ],
     );
   }

lib/pages/device_managment/three_gang_switch/view/living_room_device_control.dart

@@ -1,12 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class LivingRoomDeviceControlsView extends StatelessWidget
@@ -93,54 +90,6 @@ class LivingRoomDeviceControlsView extends StatelessWidget
                 );
           },
         ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<LivingRoomBloc>(context),
-                      child: BuildScheduleView(
-                        deviceUuid: deviceId,
-                        category: 'switch_1',
-                      ),
-                    ));
-          },
-          mainText: 'Wall Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<LivingRoomBloc>(context),
-                      child: BuildScheduleView(
-                        deviceUuid: deviceId,
-                        category: 'switch_2',
-                      ),
-                    ));
-          },
-          mainText: 'Ceiling Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<LivingRoomBloc>(context),
-                      child: BuildScheduleView(
-                        deviceUuid: deviceId,
-                        category: 'switch_3',
-                      ),
-                    ));
-          },
-          mainText: 'Spotlight',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
       ],
     );
   }

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
@@ -18,9 +16,8 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) =>
+        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
-            TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
-              ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
         child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
           builder: (context, state) {
             if (state is TwoGangGlassSwitchLoading) {
@@ -95,37 +92,14 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
-        ScheduleControlButton(
+        ToggleWidget(
-          onTap: () {
+          value: false,
-            showDialog<void>(
+          code: '',
-                context: context,
+          deviceId: deviceId,
-                builder: (ctx) => BlocProvider.value(
+          label: 'Scheduling',
-                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
+          icon: Assets.scheduling,
-                      child: BuildScheduleView(
+          onChange: (value) {},
-                        deviceUuid: deviceId,
+          showToggle: false,
-                        category: 'switch_1',
-                      ),
-                    ));
-          },
-          mainText: 'Wall Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
-        ScheduleControlButton(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        deviceUuid: deviceId,
-                        category: 'switch_2',
-                      ),
-                    ));
-          },
-          mainText: 'Ceiling Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
         ),
       ],
     );

lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
@@ -10,11 +8,9 @@ import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class TwoGangBatchControlView extends StatelessWidget
+class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const TwoGangBatchControlView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -22,17 +18,15 @@ class TwoGangBatchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) =>
+      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
-          TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
+        ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
-            ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
       child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
         builder: (context, state) {
           if (state is TwoGangSwitchLoading) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is TwoGangSwitchStatusLoaded) {
             return _buildStatusControls(context, state.status);
-          } else if (state is TwoGangSwitchError ||
+          } else if (state is TwoGangSwitchError || state is TwoGangSwitchControlError) {
-              state is TwoGangSwitchControlError) {
             return const Center(child: Text('Error fetching status'));
           } else {
             return const Center(child: CircularProgressIndicator());
@@ -88,39 +82,6 @@ class TwoGangBatchControlView extends StatelessWidget
                   ));
             },
           ),
-          ScheduleControlButton(
-            onTap: () {
-              showDialog<void>(
-                  context: context,
-                  builder: (ctx) => BlocProvider.value(
-                        value: BlocProvider.of<TwoGangSwitchBloc>(context),
-                        child: BuildScheduleView(
-                          category: 'switch_1',
-                          deviceUuid: deviceIds.first,
-                        ),
-                      ));
-            },
-            mainText: 'Wall Light',
-            subtitle: 'Scheduling',
-            iconPath: Assets.scheduling,
-          ),
-
-          ScheduleControlButton(
-            onTap: () {
-              showDialog<void>(
-                  context: context,
-                  builder: (ctx) => BlocProvider.value(
-                        value: BlocProvider.of<TwoGangSwitchBloc>(context),
-                        child: BuildScheduleView(
-                          category: 'switch_2',
-                          deviceUuid: deviceIds.first,
-                        ),
-                      ));
-            },
-            mainText: 'Ceiling Light',
-            subtitle: 'Scheduling',
-            iconPath: Assets.scheduling,
-          ),
           // FirmwareUpdateWidget(
           //   deviceId: deviceIds.first,
           //   version: 12,

lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart

@@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class TwoGangDeviceControlView extends StatelessWidget
@@ -40,101 +37,43 @@ class TwoGangDeviceControlView extends StatelessWidget
 
   Widget _buildStatusControls(BuildContext context, TwoGangStatusModel status) {
     return Center(
-      child: Column(
+      child: Wrap(
-        crossAxisAlignment: CrossAxisAlignment.center,
+        alignment: WrapAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
+        spacing: 12,
+        runSpacing: 12,
         children: [
-          Row(
+          SizedBox(
-            crossAxisAlignment: CrossAxisAlignment.center,
+            width: 200,
-            mainAxisAlignment: MainAxisAlignment.center,
+            child: ToggleWidget(
-            children: [
+              value: status.switch1,
-              SizedBox(
+              code: 'switch_1',
-                width: 200,
+              deviceId: deviceId,
-                height: 150,
+              label: 'Wall Light',
-                child: ToggleWidget(
+              onChange: (value) {
-                  value: status.switch1,
+                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                  code: 'switch_1',
+                      deviceId: deviceId,
-                  deviceId: deviceId,
+                      code: 'switch_1',
-                  label: 'Wall Light',
+                      value: value,
-                  onChange: (value) {
+                    ));
-                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
+              },
-                          deviceId: deviceId,
+            ),
-                          code: 'switch_1',
+          ),
-                          value: value,
+          SizedBox(
-                        ));
+            width: 200,
-                  },
+            child: ToggleWidget(
-                ),
+              value: status.switch2,
-              ),
+              code: 'switch_2',
-              const SizedBox(width: 10),
+              deviceId: deviceId,
-              SizedBox(
+              label: 'Ceiling Light',
-                width: 200,
+              onChange: (value) {
-                height: 150,
+                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                child: ToggleWidget(
+                      deviceId: deviceId,
-                  value: status.switch2,
+                      code: 'switch_2',
-                  code: 'switch_2',
+                      value: value,
-                  deviceId: deviceId,
+                    ));
-                  label: 'Ceiling Light',
+              },
-                  onChange: (value) {
+            ),
-                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                          deviceId: deviceId,
-                          code: 'switch_2',
-                          value: value,
-                        ));
-                  },
-                ),
-              ),
-            ],
           ),
-          const SizedBox(height: 20),
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              SizedBox(
-                width: 200,
-                height: 150,
-                child: ScheduleControlButton(
-                  onTap: () {
-                    showDialog<void>(
-                        context: context,
-                        builder: (ctx) => BlocProvider.value(
-                              value:
-                                  BlocProvider.of<TwoGangSwitchBloc>(context),
-                              child: BuildScheduleView(
-                                deviceUuid: deviceId,
-                                category: 'switch_1',
-                              ),
-                            ));
-                  },
-                  mainText: 'Wall Light',
-                  subtitle: 'Scheduling',
-                  iconPath: Assets.scheduling,
-                ),
-              ),
-              const SizedBox(width: 10),
-              SizedBox(
-                width: 200,
-                height: 150,
-                child: ScheduleControlButton(
-                  onTap: () {
-                    showDialog<void>(
-                        context: context,
-                        builder: (ctx) => BlocProvider.value(
-                              value:
-                                  BlocProvider.of<TwoGangSwitchBloc>(context),
-                              child: BuildScheduleView(
-                                deviceUuid: deviceId,
-                                category: 'switch_2',
-                              ),
-                            ));
-                  },
-                  mainText: 'Ceiling Light',
-                  subtitle: 'Scheduling',
-                  iconPath: Assets.scheduling,
-                ),
-              ),
-            ],
-          )
         ],
       ),
     );

lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart

@@ -1,210 +1,240 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.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/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleDialogHelper {
-  static const List<String> allDays = [
+  static void showAddScheduleDialog(BuildContext context, {ScheduleModel? schedule, int? index, bool? isEdit}) {
-    'Sun',
+    final bloc = context.read<WaterHeaterBloc>();
-    'Mon',
-    'Tue',
-    'Wed',
-    'Thu',
-    'Fri',
-    'Sat'
-  ];
 
-  static Future<ScheduleEntry?> showAddScheduleDialog(
+    if (schedule == null) {
-    BuildContext context, {
+      bloc.add((const UpdateSelectedTimeEvent(null)));
-    ScheduleEntry? schedule,
+      bloc.add(InitializeAddScheduleEvent(
-    bool isEdit = false,
+        selectedTime: null,
-  }) {
+        selectedDays: List.filled(7, false),
-    final initialTime = schedule != null
+        functionOn: false,
-        ? _convertStringToTimeOfDay(schedule.time)
+        isEditing: false,
-        : TimeOfDay.now();
+      ));
-    final initialDays = schedule != null
+    } else {
-        ? _convertDaysStringToBooleans(schedule.days)
+      final time = _convertStringToTimeOfDay(schedule.time);
-        : List.filled(7, false);
+      final selectedDays = _convertDaysStringToBooleans(schedule.days);
-    bool? functionOn = schedule?.function.value ?? true;
-    TimeOfDay selectedTime = initialTime;
-    List<bool> selectedDays = List.of(initialDays);
 
-    return showDialog<ScheduleEntry>(
+      bloc.add(InitializeAddScheduleEvent(
+        selectedTime: time,
+        selectedDays: selectedDays,
+        functionOn: schedule.function.value,
+        isEditing: true,
+        index: index,
+      ));
+    }
+
+    showDialog(
       context: context,
       builder: (ctx) {
-        return StatefulBuilder(
+        return BlocProvider.value(
-          builder: (ctx, setState) {
+          value: bloc,
-            return AlertDialog(
+          child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
-              shape: RoundedRectangleBorder(
+            builder: (context, state) {
-                borderRadius: BorderRadius.circular(20),
+              if (state is WaterHeaterDeviceStatusLoaded) {
-              ),
+                return AlertDialog(
-              content: Column(
+                  shape: RoundedRectangleBorder(
-                mainAxisSize: MainAxisSize.min,
+                    borderRadius: BorderRadius.circular(20),
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      const SizedBox(),
-                      Text(
-                        isEdit ? 'Edit Schedule' : 'Add Schedule',
-                        style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                              color: Colors.blue,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      const SizedBox(),
-                    ],
                   ),
-                  const SizedBox(height: 24),
+                  content: Column(
-                  SizedBox(
+                    mainAxisSize: MainAxisSize.min,
-                    width: 150,
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                    height: 40,
+                    children: [
-                    child: ElevatedButton(
+                      Row(
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.grey[200],
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(15),
-                        ),
-                      ),
-                      onPressed: () async {
-                        TimeOfDay? time = await showTimePicker(
-                          context: ctx,
-                          initialTime: selectedTime,
-                        );
-                        if (time != null) {
-                          setState(() => selectedTime = time);
-                        }
-                      },
-                      child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
+                          const SizedBox(),
                           Text(
-                            selectedTime.format(context),
+                            'Scheduling',
-                            style: Theme.of(context)
+                            style: context.textTheme.titleLarge!.copyWith(
-                                .textTheme
+                              color: ColorsManager.dialogBlueTitle,
-                                .bodySmall!
+                              fontWeight: FontWeight.bold,
-                                .copyWith(color: Colors.grey),
+                            ),
                           ),
-                          const Icon(Icons.access_time,
+                          const SizedBox(),
-                              color: Colors.grey, size: 18),
                         ],
                       ),
+                      const SizedBox(height: 24),
+                      SizedBox(
+                        width: 150,
+                        height: 40,
+                        child: DefaultButton(
+                          padding: 8,
+                          backgroundColor: ColorsManager.boxColor,
+                          borderRadius: 15,
+                          onPressed: () async {
+                            TimeOfDay? time = await showTimePicker(
+                              context: context,
+                              initialTime: state.selectedTime ?? TimeOfDay.now(),
+                              builder: (context, child) {
+                                return Theme(
+                                  data: Theme.of(context).copyWith(
+                                    colorScheme: const ColorScheme.light(
+                                      primary: ColorsManager.primaryColor,
+                                    ),
+                                  ),
+                                  child: child!,
+                                );
+                              },
+                            );
+                            if (time != null) {
+                              bloc.add(UpdateSelectedTimeEvent(time));
+                            }
+                          },
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Text(
+                                state.selectedTime == null ? 'Time' : state.selectedTime!.format(context),
+                                style: context.textTheme.bodySmall!.copyWith(
+                                  color: ColorsManager.grayColor,
+                                ),
+                              ),
+                              const Icon(
+                                Icons.access_time,
+                                color: ColorsManager.grayColor,
+                                size: 18,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                      _buildDayCheckboxes(context, state.selectedDays, isEdit: isEdit),
+                      const SizedBox(height: 16),
+                      _buildFunctionSwitch(context, state.functionOn, isEdit),
+                    ],
+                  ),
+                  actions: [
+                    SizedBox(
+                      width: 200,
+                      child: DefaultButton(
+                        height: 40,
+                        onPressed: () {
+                          Navigator.pop(context);
+                        },
+                        backgroundColor: ColorsManager.boxColor,
+                        child: Text(
+                          'Cancel',
+                          style: context.textTheme.bodyMedium,
+                        ),
+                      ),
                     ),
-                  ),
+                    SizedBox(
-                  const SizedBox(height: 16),
+                      width: 200,
-                  _buildDayCheckboxes(ctx, selectedDays, (i, v) {
+                      child: DefaultButton(
-                    setState(() => selectedDays[i] = v);
+                        height: 40,
-                  }),
+                        onPressed: () {
-                  const SizedBox(height: 16),
+                          if (state.selectedTime != null) {
-                  _buildFunctionSwitch(ctx, functionOn!, (v) {
+                            if (state.isEditing && index != null) {
-                    setState(() => functionOn = v);
+                              bloc.add(EditWaterHeaterScheduleEvent(
-                  }),
+                                scheduleId: schedule?.scheduleId ?? '',
-                ],
+                                category: 'switch_1',
-              ),
+                                time: state.selectedTime!,
-              actions: [
+                                selectedDays: state.selectedDays,
-                SizedBox(
+                                functionOn: state.functionOn,
-                  width: 100,
+                              ));
-                  child: OutlinedButton(
+                            } else {
-                    onPressed: () {
+                              bloc.add(AddScheduleEvent(
-                      Navigator.pop(ctx, null);
+                                category: 'switch_1',
-                    },
+                                time: state.selectedTime!,
-                    child: const Text('Cancel'),
+                                selectedDays: state.selectedDays,
-                  ),
+                                functionOn: state.functionOn,
-                ),
+                              ));
-                SizedBox(
+                            }
-                  width: 100,
+                            Navigator.pop(context);
-                  child: ElevatedButton(
+                          }
-                    onPressed: () {
+                        },
-                      final entry = ScheduleEntry(
+                        backgroundColor: ColorsManager.primaryColor,
-                        category: schedule?.category ?? 'switch_1',
+                        child: const Text('Save'),
-                        time: _formatTimeOfDayToISO(selectedTime),
+                      ),
-                        function: Status(code: 'switch_1', value: functionOn),
+                    ),
-                        days: _convertSelectedDaysToStrings(selectedDays),
+                  ],
-                        scheduleId: schedule?.scheduleId,
+                );
-                      );
+              }
-                      Navigator.pop(ctx, entry);
+              return const SizedBox();
-                    },
+            },
-                    child: const Text('Save'),
+          ),
-                  ),
-                ),
-              ],
-            );
-          },
         );
       },
     );
   }
 
-  static TimeOfDay _convertStringToTimeOfDay(String iso) {
+  static TimeOfDay _convertStringToTimeOfDay(String timeString) {
-    final dt = DateTime.tryParse(iso);
+    final regex = RegExp(r'^(\d{2}):(\d{2})$');
-    if (dt != null) return TimeOfDay(hour: dt.hour, minute: dt.minute);
+    final match = regex.firstMatch(timeString);
-    return const TimeOfDay(hour: 9, minute: 0);
+    if (match != null) {
+      final hour = int.parse(match.group(1)!);
+      final minute = int.parse(match.group(2)!);
+      return TimeOfDay(hour: hour, minute: minute);
+    } else {
+      throw const FormatException('Invalid time format');
+    }
   }
 
   static List<bool> _convertDaysStringToBooleans(List<String> selectedDays) {
     final daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    return daysOfWeek
+    List<bool> daysBoolean = List.filled(7, false);
-        .map((d) =>
-            selectedDays.map((e) => e.toLowerCase()).contains(d.toLowerCase()))
-        .toList();
-  }
 
-  static String _formatTimeOfDayToISO(TimeOfDay t) {
+    for (int i = 0; i < daysOfWeek.length; i++) {
-    final now = DateTime.now();
+      if (selectedDays.contains(daysOfWeek[i])) {
-    final dt = DateTime(now.year, now.month, now.day, t.hour, t.minute);
+        daysBoolean[i] = true;
-    return dt.toIso8601String();
+      }
-  }
-
-  static List<String> _convertSelectedDaysToStrings(List<bool> selectedDays) {
-    const allDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    List<String> result = [];
-    for (int i = 0; i < selectedDays.length; i++) {
-      if (selectedDays[i]) result.add(allDays[i]);
     }
-    return result;
+
+    return daysBoolean;
   }
 
-  static Widget _buildDayCheckboxes(BuildContext ctx, List<bool> selectedDays,
+  static Widget _buildDayCheckboxes(BuildContext context, List<bool> selectedDays, {bool? isEdit}) {
-      Function(int, bool) onChanged) {
     final dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+
     return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
+      children: List.generate(7, (index) {
-      children: List.generate(
+        return Row(
-        7,
-        (index) => Row(
           children: [
             Checkbox(
               value: selectedDays[index],
-              onChanged: (val) => onChanged(index, val!),
+              onChanged: (bool? value) {
+                context.read<WaterHeaterBloc>().add(UpdateSelectedDayEvent(index, value!));
+              },
             ),
             Text(dayLabels[index]),
           ],
-        ),
+        );
-      ),
+      }),
     );
   }
 
-  static Widget _buildFunctionSwitch(
+  static Widget _buildFunctionSwitch(BuildContext context, bool isOn, bool? isEdit) {
-      BuildContext ctx, bool isOn, Function(bool) onChanged) {
     return Row(
       children: [
         Text(
           'Function:',
-          style:
+          style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.grayColor),
-              Theme.of(ctx).textTheme.bodySmall!.copyWith(color: Colors.grey),
         ),
         const SizedBox(width: 10),
         Radio<bool>(
           value: true,
           groupValue: isOn,
-          onChanged: (val) => onChanged(true),
+          onChanged: (bool? value) {
+            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(true));
+          },
         ),
         const Text('On'),
         const SizedBox(width: 10),
         Radio<bool>(
           value: false,
           groupValue: isOn,
-          onChanged: (val) => onChanged(false),
+          onChanged: (bool? value) {
+            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(false));
+          },
         ),
         const Text('Off'),
       ],

lib/pages/device_managment/water_heater/models/schedule_entry.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
 
 class ScheduleEntry {
   final String category;
@@ -59,8 +58,7 @@ class ScheduleEntry {
 
   String toJson() => json.encode(toMap());
 
-  factory ScheduleEntry.fromJson(String source) =>
+  factory ScheduleEntry.fromJson(String source) => ScheduleEntry.fromMap(json.decode(source));
-      ScheduleEntry.fromMap(json.decode(source));
 
   @override
   bool operator ==(Object other) {
@@ -75,23 +73,6 @@ class ScheduleEntry {
 
   @override
   int get hashCode {
-    return category.hashCode ^
+    return category.hashCode ^ time.hashCode ^ function.hashCode ^ days.hashCode;
-        time.hashCode ^
-        function.hashCode ^
-        days.hashCode;
-  }
-
-  // Existing properties and methods
-
-  // Add the fromScheduleModel method
-
-  static ScheduleEntry fromScheduleModel(ScheduleModel scheduleModel) {
-    return ScheduleEntry(
-      days: scheduleModel.days,
-      time: scheduleModel.time,
-      function: scheduleModel.function,
-      category: scheduleModel.category,
-      scheduleId: scheduleModel.scheduleId,
-    );
   }
 }

lib/pages/device_managment/water_heater/models/water_heater_status_model.dart

@@ -16,7 +16,7 @@ class WaterHeaterStatusModel extends Equatable {
   final String cycleTiming;
   final List<ScheduleModel> schedules;
 
-  const WaterHeaterStatusModel({
+ const WaterHeaterStatusModel({
     required this.uuid,
     required this.heaterSwitch,
     required this.countdownHours,

lib/pages/device_managment/water_heater/view/water_heater_device_control.dart

@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/factories/water_heater_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedual_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -36,8 +35,7 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 state is WaterHeaterBatchFailedState) {
               return const Center(child: Text('Error fetching status'));
             } else {
-              return const SizedBox(
+              return const SizedBox(height: 200, child: Center(child: SizedBox()));
-                  height: 200, child: Center(child: SizedBox()));
             }
           },
         ));
@@ -75,22 +73,48 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 ));
           },
         ),
-        ScheduleControlButton(
+        GestureDetector(
           onTap: () {
-            showDialog<void>(
+            showDialog(
                 context: context,
                 builder: (ctx) => BlocProvider.value(
                       value: BlocProvider.of<WaterHeaterBloc>(context),
-                      child: BuildScheduleView(
+                      child: BuildScheduleView(status: status),
-                        deviceUuid: device.uuid ?? '',
-                        category: 'switch_1',
-                      ),
                     ));
           },
-          mainText: '',
+          child: DeviceControlsContainer(
-          subtitle: 'Scheduling',
+            child: Column(
-          iconPath: Assets.scheduling,
+              crossAxisAlignment: CrossAxisAlignment.start,
-        ),
+              children: [
+                Container(
+                  width: 60,
+                  height: 60,
+                  decoration: const BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: ColorsManager.whiteColors,
+                  ),
+                  margin: const EdgeInsets.symmetric(horizontal: 4),
+                  padding: const EdgeInsets.all(12),
+                  child: ClipOval(
+                    child: SvgPicture.asset(
+                      Assets.scheduling,
+                      fit: BoxFit.fill,
+                    ),
+                  ),
+                ),
+                const Spacer(),
+                Text(
+                  'Scheduling',
+                  textAlign: TextAlign.center,
+                  style: context.textTheme.titleMedium!.copyWith(
+                    fontWeight: FontWeight.w400,
+                    color: ColorsManager.blackColor,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        )
       ],
     );
   }

lib/pages/device_managment/water_heater/widgets/count_down_button.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CountdownModeButtons extends StatelessWidget {
@@ -39,10 +38,14 @@ class CountdownModeButtons extends StatelessWidget {
               ? DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context.read<ScheduleBloc>().add(
+                    context
-                          StopScheduleEvent(
+                        .read<WaterHeaterBloc>()
-                            mode: ScheduleModes.countdown,
+                        .add(StopScheduleEvent(deviceId));
+                    context.read<WaterHeaterBloc>().add(
+                          ToggleWaterHeaterEvent(
                             deviceId: deviceId,
+                            code: 'countdown_1',
+                            value: 0,
                           ),
                         );
                   },
@@ -52,11 +55,12 @@ class CountdownModeButtons extends StatelessWidget {
               : DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context.read<ScheduleBloc>().add(
+                    context.read<WaterHeaterBloc>().add(
-                          StartScheduleEvent(
+                          ToggleWaterHeaterEvent(
-                            mode: ScheduleModes.countdown,
+                            deviceId: deviceId,
-                            hours: hours,
+                            code: 'countdown_1',
-                            minutes: minutes,
+                            value: Duration(hours: hours, minutes: minutes)
+                                .inSeconds,
                           ),
                         );
                   },

lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart

@@ -0,0 +1,223 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class CountdownInchingView extends StatelessWidget {
+  final WaterHeaterDeviceStatusLoaded state;
+
+  const CountdownInchingView({
+    super.key,
+    required this.state,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final isCountDown =
+        state.scheduleMode?.name == ScheduleModes.countdown.name;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          isCountDown ? 'Countdown:' : 'Inching:',
+          style: context.textTheme.bodySmall!.copyWith(
+            fontSize: 13,
+            color: ColorsManager.grayColor,
+          ),
+        ),
+        const SizedBox(height: 8),
+        Visibility(
+          visible: !isCountDown,
+          child: const Text(
+              'Once enabled this feature, each time the device is turned on, it will automatically turn off after a preset time.'),
+        ),
+        const SizedBox(height: 8),
+        _hourMinutesWheel(context, state),
+      ],
+    );
+  }
+
+  Row _hourMinutesWheel(
+      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
+    final isCountDown =
+        state.scheduleMode?.name == ScheduleModes.countdown.name;
+    late bool isActive;
+    if (isCountDown &&
+        state.countdownRemaining != null &&
+        state.isCountdownActive == true) {
+      isActive = true;
+    } else if (!isCountDown &&
+        state.countdownRemaining != null &&
+        state.isInchingActive == true) {
+      isActive = true;
+    } else {
+      isActive = false;
+    }
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        _buildPickerColumn(
+            context,
+            'h',
+            isCountDown
+                ? (state.countdownHours ?? 0)
+                : (state.inchingHours ?? 0),
+            24, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: value,
+                minutes: isCountDown
+                    ? (state.countdownMinutes ?? 0)
+                    : (state.inchingMinutes ?? 0),
+              ));
+        }, isActive: isActive),
+        const SizedBox(width: 10),
+        _buildPickerColumn(
+            context,
+            'm',
+            isCountDown
+                ? (state.countdownMinutes ?? 0)
+                : (state.inchingMinutes ?? 0),
+            60, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: isCountDown
+                    ? (state.countdownHours ?? 0)
+                    : (state.inchingHours ?? 0),
+                minutes: value,
+              ));
+        }, isActive: isActive),
+      ],
+    );
+  }
+
+  Row _hourMinutesSecondWheel(
+      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
+    final isCountDown =
+        state.scheduleMode?.name == ScheduleModes.countdown.name;
+    late bool isActive;
+    if (isCountDown &&
+        state.countdownRemaining != null &&
+        state.isCountdownActive == true) {
+      isActive = true;
+    } else if (!isCountDown &&
+        state.countdownRemaining != null &&
+        state.isInchingActive == true) {
+      isActive = true;
+    } else {
+      isActive = false;
+    }
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        _buildPickerColumn(
+            context,
+            'h',
+            isCountDown
+                ? (state.countdownHours ?? 0)
+                : (state.inchingHours ?? 0),
+            24, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: value,
+                minutes: isCountDown
+                    ? (state.countdownMinutes ?? 0)
+                    : (state.inchingMinutes ?? 0),
+              ));
+        }, isActive: isActive),
+        const SizedBox(width: 10),
+        _buildPickerColumn(
+            context,
+            'm',
+            isCountDown
+                ? (state.countdownMinutes ?? 0)
+                : (state.inchingMinutes ?? 0),
+            60, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: isCountDown
+                    ? (state.countdownHours ?? 0)
+                    : (state.inchingHours ?? 0),
+                minutes: value,
+              ));
+        }, isActive: isActive),
+        const SizedBox(width: 10),
+        _buildPickerColumn(
+            context,
+            'S',
+            isCountDown
+                ? (state.countdownMinutes ?? 0)
+                : (state.inchingMinutes ?? 0),
+            60, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: isCountDown
+                    ? (state.countdownHours ?? 0)
+                    : (state.inchingHours ?? 0),
+                minutes: value,
+              ));
+        }, isActive: isActive),
+      ],
+    );
+  }
+
+  Widget _buildPickerColumn(
+    BuildContext context,
+    String label,
+    int initialValue,
+    int itemCount,
+    ValueChanged<int> onSelected, {
+    required bool isActive,
+  }) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          height: 40,
+          width: 80,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          decoration: BoxDecoration(
+            color: ColorsManager.boxColor,
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListWheelScrollView.useDelegate(
+            key: ValueKey('$label-$initialValue'),
+            controller: FixedExtentScrollController(
+              initialItem: initialValue,
+            ),
+            itemExtent: 40.0,
+            physics: const FixedExtentScrollPhysics(),
+            onSelectedItemChanged: onSelected,
+            childDelegate: ListWheelChildBuilderDelegate(
+              builder: (context, index) {
+                return Center(
+                  child: Text(
+                    index.toString().padLeft(2, '0'),
+                    style: TextStyle(
+                      fontSize: 24,
+                      color: isActive ? ColorsManager.grayColor : Colors.black,
+                    ),
+                  ),
+                );
+              },
+              childCount: itemCount,
+            ),
+          ),
+        ),
+        const SizedBox(width: 8),
+        Text(
+          label,
+          style: const TextStyle(
+            color: ColorsManager.grayColor,
+            fontSize: 18,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/pages/device_managment/water_heater/widgets/inching_mode_buttons.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart'
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-    hide StopScheduleEvent;
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class InchingModeButtons extends StatelessWidget {
@@ -41,9 +38,15 @@ class InchingModeButtons extends StatelessWidget {
               ? DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context.read<ScheduleBloc>().add(
+                    context
-                          StopScheduleEvent(
+                        .read<WaterHeaterBloc>()
-                              deviceId: deviceId, mode: ScheduleModes.inching),
+                        .add(StopScheduleEvent(deviceId));
+                    context.read<WaterHeaterBloc>().add(
+                          ToggleWaterHeaterEvent(
+                            deviceId: deviceId,
+                            code: 'switch_inching',
+                            value: 0,
+                          ),
                         );
                   },
                   backgroundColor: Colors.red,

lib/pages/device_managment/water_heater/widgets/schedual_view.dart

@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/count_down_button.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/count_down_inching_view.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/inching_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_header.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_managment_ui.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_mode_selector.dart';
+
+class BuildScheduleView extends StatefulWidget {
+  const BuildScheduleView({super.key, required this.status});
+
+  final WaterHeaterStatusModel status;
+
+  @override
+  State<BuildScheduleView> createState() => _BuildScheduleViewState();
+}
+
+class _BuildScheduleViewState extends State<BuildScheduleView> {
+  @override
+  Widget build(BuildContext context) {
+    final bloc = BlocProvider.of<WaterHeaterBloc>(context);
+
+    return BlocProvider.value(
+      value: bloc,
+      child: Dialog(
+        backgroundColor: Colors.white,
+        insetPadding: const EdgeInsets.all(20),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        child: SizedBox(
+          width: 700,
+          child: SingleChildScrollView(
+            child: Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 40.0, vertical: 20),
+              child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
+                builder: (context, state) {
+                  if (state is WaterHeaterDeviceStatusLoaded) {
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const ScheduleHeader(),
+                        const SizedBox(height: 20),
+                        ScheduleModeSelector(state: state),
+                        const SizedBox(height: 20),
+                        if (state.scheduleMode == ScheduleModes.schedule)
+                          ScheduleManagementUI(
+                            state: state,
+                            onAddSchedule: () {
+                              ScheduleDialogHelper.showAddScheduleDialog(
+                                  context,
+                                  schedule: null,
+                                  index: null,
+                                  isEdit: false);
+                            },
+                          ),
+                        if (state.scheduleMode == ScheduleModes.countdown ||
+                            state.scheduleMode == ScheduleModes.inching)
+                          CountdownInchingView(state: state),
+                        const SizedBox(height: 20),
+                        if (state.scheduleMode == ScheduleModes.countdown)
+                          CountdownModeButtons(
+                            isActive: state.isCountdownActive ?? false,
+                            deviceId: widget.status.uuid,
+                            hours: state.countdownHours ?? 0,
+                            minutes: state.countdownMinutes ?? 0,
+                          ),
+                        if (state.scheduleMode == ScheduleModes.inching)
+                          InchingModeButtons(
+                            isActive: state.isInchingActive ?? false,
+                            deviceId: widget.status.uuid,
+                            hours: state.inchingHours ?? 0,
+                            minutes: state.inchingMinutes ?? 0,
+                          ),
+                        if (state.scheduleMode != ScheduleModes.countdown &&
+                            state.scheduleMode != ScheduleModes.inching)
+                          ScheduleModeButtons(
+                            onSave: () {
+                              Navigator.pop(context);
+                            },
+                          ),
+                      ],
+                    );
+                  }
+                  if (state is WaterHeaterLoadingState) {
+                    return const SizedBox(
+                        height: 200,
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            ScheduleHeader(),
+                            SizedBox(
+                              height: 20,
+                            ),
+                            Center(child: CircularProgressIndicator()),
+                          ],
+                        ));
+                  }
+                  return const SizedBox(
+                    height: 200,
+                    child: ScheduleHeader(),
+                  );
+                },
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/device_managment/water_heater/widgets/schedule_managment_ui.dart

@@ -1,19 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_table.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleManagementUI extends StatelessWidget {
-  final String deviceUuid; 
+  final WaterHeaterDeviceStatusLoaded state;
-  final VoidCallback onAddSchedule;
+  final Function onAddSchedule;
-  final String category;
 
   const ScheduleManagementUI({
     super.key,
-    required this.deviceUuid,
+    required this.state,
     required this.onAddSchedule,
-    this.category = 'switch_1',
   });
 
   @override
@@ -29,7 +28,7 @@ class ScheduleManagementUI extends StatelessWidget {
             padding: 2,
             backgroundColor: ColorsManager.graysColor,
             borderRadius: 15,
-            onPressed: onAddSchedule,
+            onPressed: () => onAddSchedule(),
             child: Row(
               children: [
                 const Icon(Icons.add, color: ColorsManager.primaryColor),
@@ -44,7 +43,7 @@ class ScheduleManagementUI extends StatelessWidget {
           ),
         ),
         const SizedBox(height: 20),
-        ScheduleTableWidget(deviceUuid: deviceUuid, category: category),
+        ScheduleTableWidget(state: state),
       ],
     );
   }

lib/pages/device_managment/water_heater/widgets/schedule_mode_selector.dart

@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+
+class ScheduleModeSelector extends StatelessWidget {
+  final WaterHeaterDeviceStatusLoaded state;
+
+  const ScheduleModeSelector({super.key, required this.state});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Type:',
+          style: context.textTheme.bodySmall!.copyWith(
+            fontSize: 13,
+            color: ColorsManager.grayColor,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            _buildRadioTile(
+                context, 'Countdown', ScheduleModes.countdown, state),
+            _buildRadioTile(context, 'Schedule', ScheduleModes.schedule, state),
+            _buildRadioTile(
+                context, 'Circulate', ScheduleModes.circulate, state),
+            _buildRadioTile(context, 'Inching', ScheduleModes.inching, state),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildRadioTile(BuildContext context, String label, ScheduleModes mode,
+      WaterHeaterDeviceStatusLoaded state) {
+    return Flexible(
+      child: ListTile(
+        contentPadding: EdgeInsets.zero,
+        title: Text(
+          label,
+          style: context.textTheme.bodySmall!.copyWith(
+            fontSize: 13,
+            color: ColorsManager.blackColor,
+          ),
+        ),
+        leading: Radio<ScheduleModes>(
+          value: mode,
+          groupValue: state.scheduleMode,
+          onChanged: (ScheduleModes? value) {
+            if (value != null) {
+              if (value == ScheduleModes.countdown) {
+                context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                      scheduleMode: value,
+                      hours: state.countdownHours ?? 0,
+                      minutes: state.countdownMinutes ?? 0,
+                    ));
+              } else if (value == ScheduleModes.inching) {
+                context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                      scheduleMode: value,
+                      hours: state.inchingHours ?? 0,
+                      minutes: state.inchingMinutes ?? 0,
+                    ));
+              }
+
+              if (value == ScheduleModes.schedule) {
+                context.read<WaterHeaterBloc>().add(
+                      GetSchedulesEvent(
+                        category: 'switch_1',
+                        uuid: state.status.uuid,
+                      ),
+                    );
+              }
+            }
+          },
+        ),
+      ),
+    );
+  }
+}

lib/pages/device_managment/water_heater/widgets/schedule_table.dart

@@ -0,0 +1,222 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/format_date_time.dart';
+
+import '../helper/add_schedule_dialog_helper.dart';
+
+class ScheduleTableWidget extends StatelessWidget {
+  final WaterHeaterDeviceStatusLoaded state;
+
+  const ScheduleTableWidget({
+    super.key,
+    required this.state,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Table(
+          border: TableBorder.all(
+            color: ColorsManager.graysColor,
+            borderRadius: const BorderRadius.only(
+                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+          ),
+          children: [
+            TableRow(
+              decoration: const BoxDecoration(
+                color: ColorsManager.boxColor,
+                borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(20),
+                  topRight: Radius.circular(20),
+                ),
+              ),
+              children: [
+                _buildTableHeader('Active'),
+                _buildTableHeader('Days'),
+                _buildTableHeader('Time'),
+                _buildTableHeader('Function'),
+                _buildTableHeader('Action'),
+              ],
+            ),
+          ],
+        ),
+        BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
+          builder: (context, state) {
+            if (state is ScheduleLoadingState) {
+              return const SizedBox(
+                  height: 200,
+                  child: Center(child: CircularProgressIndicator()));
+            }
+            if (state is WaterHeaterDeviceStatusLoaded &&
+                state.schedules.isEmpty) {
+              return _buildEmptyState(context);
+            } else if (state is WaterHeaterDeviceStatusLoaded) {
+              return Container(
+                  height: 200,
+                  decoration: BoxDecoration(
+                    border: Border.all(color: ColorsManager.graysColor),
+                    borderRadius: const BorderRadius.only(
+                        bottomLeft: Radius.circular(20),
+                        bottomRight: Radius.circular(20)),
+                  ),
+                  child: _buildTableBody(state, context));
+            }
+            return const SizedBox(
+              height: 200,
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildEmptyState(BuildContext context) {
+    return Container(
+      height: 200,
+      decoration: BoxDecoration(
+        border: Border.all(color: ColorsManager.graysColor),
+        borderRadius: const BorderRadius.only(
+            bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
+      ),
+      child: Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SvgPicture.asset(Assets.emptyRecords, width: 40, height: 40),
+            const SizedBox(height: 8),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Text(
+                'No schedules added yet',
+                style: context.textTheme.bodySmall!.copyWith(
+                  fontSize: 13,
+                  color: ColorsManager.grayColor,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTableBody(
+      WaterHeaterDeviceStatusLoaded state, BuildContext context) {
+    return SizedBox(
+      height: 200,
+      child: SingleChildScrollView(
+        child: Table(
+          border: TableBorder.all(color: ColorsManager.graysColor),
+          defaultVerticalAlignment: TableCellVerticalAlignment.middle,
+          children: [
+            for (int i = 0; i < state.schedules.length; i++)
+              _buildScheduleRow(state.schedules[i], i, context, state),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTableHeader(String label) {
+    return TableCell(
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Text(
+          label,
+          style: const TextStyle(
+            fontSize: 13,
+            color: ColorsManager.grayColor,
+          ),
+        ),
+      ),
+    );
+  }
+
+  TableRow _buildScheduleRow(ScheduleModel schedule, int index,
+      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
+    return TableRow(
+      children: [
+        Center(
+          child: GestureDetector(
+            onTap: () {
+              context.read<WaterHeaterBloc>().add(UpdateScheduleEntryEvent(
+                    index: index,
+                    enable: !schedule.enable,
+                    scheduleId: schedule.scheduleId,
+                    deviceId: state.status.uuid,
+                    functionOn: schedule.function.value,
+                  ));
+            },
+            child: SizedBox(
+              width: 24,
+              height: 24,
+              child: schedule.enable
+                  ? const Icon(Icons.radio_button_checked,
+                      color: ColorsManager.blueColor)
+                  : const Icon(
+                      Icons.radio_button_unchecked,
+                      color: ColorsManager.grayColor,
+                    ),
+            ),
+          ),
+        ),
+        Center(
+            child: Text(_getSelectedDays(
+                ScheduleModel.parseSelectedDays(schedule.days)))),
+        Center(child: Text(formatIsoStringToTime(schedule.time, context))),
+        Center(child: Text(schedule.function.value ? 'On' : 'Off')),
+        Center(
+          child: Wrap(
+            runAlignment: WrapAlignment.center,
+            children: [
+              TextButton(
+                style: TextButton.styleFrom(padding: EdgeInsets.zero),
+                onPressed: () {
+                  ScheduleDialogHelper.showAddScheduleDialog(context,
+                      schedule: schedule, index: index, isEdit: true);
+                },
+                child: Text(
+                  'Edit',
+                  style: context.textTheme.bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
+                ),
+              ),
+              TextButton(
+                style: TextButton.styleFrom(padding: EdgeInsets.zero),
+                onPressed: () {
+                  context.read<WaterHeaterBloc>().add(DeleteScheduleEvent(
+                        index: index,
+                        scheduleId: schedule.scheduleId,
+                      ));
+                },
+                child: Text(
+                  'Delete',
+                  style: context.textTheme.bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _getSelectedDays(List<bool> selectedDays) {
+    final days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    List<String> selectedDaysStr = [];
+    for (int i = 0; i < selectedDays.length; i++) {
+      if (selectedDays[i]) {
+        selectedDaysStr.add(days[i]);
+      }
+    }
+    return selectedDaysStr.join(', ');
+  }
+}

lib/pages/home/view/home_card.dart

@@ -34,9 +34,17 @@ class HomeCard extends StatelessWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: [
-                  Expanded(
+                  Flexible(
-                    child: SpliteNameHelperWidget(
+                    child: FittedBox(
-                      name: name,
+                      fit: BoxFit.scaleDown,
+                      child: Text(
+                        name,
+                        style: const TextStyle(
+                          fontSize: 30,
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
                     ),
                   ),
                 ],
@@ -55,72 +63,3 @@ class HomeCard extends StatelessWidget {
     );
   }
 }
-
-class SpliteNameHelperWidget extends StatelessWidget {
-  final String name;
-  const SpliteNameHelperWidget({
-    super.key,
-    required this.name,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    List<String> parts = name.split(' ');
-
-    if (parts.length == 2) {
-      // Two-word string
-      return Padding(
-        padding: const EdgeInsetsGeometry.only(top: 10, left: 10),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Expanded(
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                child: Text(
-                  parts[0],
-                  style: const TextStyle(
-                    fontSize: 30,
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ),
-            Expanded(
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                child: Text(
-                  parts[1],
-                  style: const TextStyle(
-                    fontSize: 30,
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    } else {
-      // One-word string
-      return Text(
-        name,
-        style: const TextStyle(
-          fontSize: 30,
-          color: Colors.white,
-          fontWeight: FontWeight.bold,
-        ),
-      );
-    }
-  }
-}
-// Text(
-//                       name,
-//                       style: const TextStyle(
-//                         fontSize: 32,
-//                         color: Colors.white,
-//                         fontWeight: FontWeight.bold,
-//                       ),
-//                     )

lib/pages/home/view/home_page.dart

@@ -13,25 +13,19 @@ class HomePage extends StatefulWidget {
   State<HomePage> createState() => _HomePageState();
 }
 
-class _HomePageState extends State<HomePage> with HelperResponsiveLayout {
+class _HomePageState extends State<HomePage>  with HelperResponsiveLayout{
+
   @override
   void initState() {
-    _fetchUserInfo();
+    context.read<HomeBloc>().add(const FetchUserInfo());
-
     super.initState();
   }
-
   @override
   Widget build(BuildContext context) {
-    if (isSmallScreenSize(context) || isMediumScreenSize(context)) {
+    final isSmallScreen = isSmallScreenSize(context);
-      return HomeMobilePage();
+    final isMediumScreen = isMediumScreenSize(context);
-    }
+    return isSmallScreen || isMediumScreen
-
+        ? HomeMobilePage()
-    return const HomeWebPage();
+        : const HomeWebPage();
-  }
-
-  void _fetchUserInfo() {
-    final bloc = context.read<HomeBloc>();
-    if (bloc.user == null) bloc.add(const FetchUserInfo());
   }
 }

lib/pages/home/view/home_page_web.dart

@@ -92,7 +92,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                         flex: 4,
                         child: SizedBox(
                           height: size.height * 0.6,
-                          width: size.width * 0.8,
+                          width: size.width * 0.68,
                           child: GridView.builder(
                             itemCount: homeBloc.homeItems.length,
                             gridDelegate:

lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart

@@ -13,35 +13,6 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     on<AddFunction>(_onAddFunction);
     on<SelectFunction>(_onSelectFunction);
   }
-  // void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
-  //   final functions = List<DeviceFunctionData>.from(state.addedFunctions);
-  //   final existingIndex = functions.indexWhere(
-  //     (f) => f.functionCode == event.functionData.functionCode,
-  //   );
-
-  //   if (existingIndex != -1) {
-  //     final existingData = functions[existingIndex];
-  //     functions[existingIndex] = DeviceFunctionData(
-  //       entityId: event.functionData.entityId,
-  //       functionCode: event.functionData.functionCode,
-  //       operationName: event.functionData.operationName,
-  //       value: event.functionData.value ?? existingData.value,
-  //       valueDescription: event.functionData.valueDescription ??
-  //           existingData.valueDescription,
-  //       condition: event.functionData.condition ?? existingData.condition,
-  //       step: event.functionData.step ?? existingData.step,
-  //     );
-  //   } else {
-  //     functions.clear();
-  //     functions.add(event.functionData);
-  //   }
-
-  //   emit(state.copyWith(
-  //     addedFunctions: functions,
-  //     selectedFunction: event.functionData.functionCode,
-  //   ));
-  // }
-
   void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
     final functions = List<DeviceFunctionData>.from(state.addedFunctions);
     final existingIndex = functions.indexWhere(
@@ -49,10 +20,19 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     );
 
     if (existingIndex != -1) {
-      // Update the function value
+      final existingData = functions[existingIndex];
-      functions[existingIndex] = event.functionData;
+      functions[existingIndex] = DeviceFunctionData(
+        entityId: event.functionData.entityId,
+        functionCode: event.functionData.functionCode,
+        operationName: event.functionData.operationName,
+        value: event.functionData.value ?? existingData.value,
+        valueDescription: event.functionData.valueDescription ??
+            existingData.valueDescription,
+        condition: event.functionData.condition ?? existingData.condition,
+        step: event.functionData.step ?? existingData.step,
+      );
     } else {
-      // Add new function value
+      functions.clear();
       functions.add(event.functionData);
     }
 

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -1419,17 +1419,15 @@ Future<void> _onLoadScenes(
           event.automationId, event.automationStatusUpdate, projectId);
 
       if (success) {
-        // await SceneApi.getAutomationByUnitId(
+        final updatedAutomations = await SceneApi.getAutomationByUnitId(
-        //     event.automationStatusUpdate.spaceUuid,
+            event.automationStatusUpdate.spaceUuid,
-        //     event.communityId,
+            event.communityId,
-        //     projectId);
+            projectId);
 
         // Remove from loading set safely
-
         final updatedLoadingIds = {...state.loadingAutomationIds!}
           ..remove(event.automationId);
-        final updatedAutomations = changeItemStateOnToggelingSceen(
+
-            state.automations, event.automationId);
         emit(state.copyWith(
           automations: updatedAutomations,
           loadingAutomationIds: updatedLoadingIds,
@@ -1451,24 +1449,4 @@ Future<void> _onLoadScenes(
       ));
     }
   }
-
-  List<ScenesModel> changeItemStateOnToggelingSceen(
-      List<ScenesModel> oldSceen, String automationId) {
-    return oldSceen.map((scene) {
-      if (scene.id == automationId) {
-        return ScenesModel(
-          id: scene.id,
-          sceneTuyaId: scene.sceneTuyaId,
-          name: scene.name,
-          status: scene.status == 'enable' ? 'disable' : 'enable',
-          type: scene.type,
-          spaceName: scene.spaceName,
-          spaceId: scene.spaceId,
-          communityId: scene.communityId,
-          icon: scene.icon,
-        );
-      }
-      return scene;
-    }).toList();
-  }
 }

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -117,7 +117,7 @@ class _DropdownContentState extends State<_DropdownContent> {
     final selectedCommunity = _findCommunity(state, state.selectedSpaceId);
 
     return Container(
-      height: 40,
+      height: 46,
       decoration: BoxDecoration(
         border: Border.all(color: Colors.grey.shade300),
         borderRadius: BorderRadius.circular(12),
@@ -149,7 +149,7 @@ class _DropdownContentState extends State<_DropdownContent> {
               ),
             ),
             height: 45,
-            width: 44,
+            width: 33,
             child: const Icon(
               Icons.keyboard_arrow_down,
               color: ColorsManager.textGray,

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -44,156 +44,144 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
               _selectedSpace = null;
               _selectedCommunity = _selectedId;
             }
-            return Dialog(
+            return AlertDialog(
               backgroundColor: Colors.white,
-              insetPadding: const EdgeInsets.symmetric(
+              insetPadding: EdgeInsets.zero,
-                horizontal: 20,
+              contentPadding: EdgeInsets.zero,
-              ),
               shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(12)),
-              child: Container(
+              title: Text(
-                width: 450,
+                'Create New Routines',
-                child: Stack(
+                textAlign: TextAlign.center,
-                  children: [
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    Column(
+                      color: ColorsManager.spaceColor,
-                      mainAxisSize: MainAxisSize.min,
+                      fontSize: 20,
-                      children: [
+                      fontWeight: FontWeight.w700,
-                        const SizedBox(height: 20),
+                    ),
-                        Text(
+              ),
-                          'Create New Routines',
+              content: Stack(
-                          textAlign: TextAlign.center,
+                children: [
-                          style:
+                  Column(
-                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    mainAxisSize: MainAxisSize.min,
-                                    color: ColorsManager.spaceColor,
+                    children: [
-                                    fontSize: 20,
+                      const Divider(),
-                                    fontWeight: FontWeight.w700,
+                      const SizedBox(height: 20),
-                                  ),
+                      Column(
-                        ),
+                        children: [
-                        const Divider(),
+                          Padding(
-                        const SizedBox(height: 20),
+                              padding:
-                        Column(
+                                  const EdgeInsets.only(left: 13, right: 8),
-                          children: [
+                              child: Column(
-                            Column(
+                                children: [
-                              children: [
+                                  SpaceTreeDropdown(
-                                Padding(
+                                    selectedSpaceId: _selectedId,
-                                    padding: const EdgeInsets.only(
-                                        left: 13, right: 10),
-                                    child: Column(
-                                      children: [
-                                        SpaceTreeDropdown(
-                                          selectedSpaceId: _selectedId,
-                                          onChanged: (String? newValue) {
-                                            setState(
-                                                () => _selectedId = newValue!);
-                                            if (_selectedId != null) {
-                                              _bloc.add(
-                                                  SpaceOnlyWithDevicesEvent(
-                                                      _selectedId!));
-                                            }
-                                          },
-                                        ),
-                                      ],
-                                    )),
-                                const SizedBox(height: 21),
-                                Padding(
-                                  padding: const EdgeInsets.only(
-                                      left: 15, right: 20),
-                                  child: SpaceDropdown(
-                                    hintMessage: spaceHint,
-                                    spaces: spaces,
-                                    selectedValue: _selectedSpace,
                                     onChanged: (String? newValue) {
-                                      setState(() {
+                                      setState(() => _selectedId = newValue!);
-                                        _selectedSpace = newValue;
+                                      if (_selectedId != null) {
-                                      });
+                                        _bloc.add(SpaceOnlyWithDevicesEvent(
+                                            _selectedId!));
+                                      }
                                     },
                                   ),
-                                ),
+                                ],
-                              ],
+                              )),
+                          const SizedBox(height: 5),
+                          const SizedBox(height: 8),
+                          Padding(
+                            padding: const EdgeInsets.only(left: 15, right: 15),
+                            child: SpaceDropdown(
+                              hintMessage: spaceHint,
+                              spaces: spaces,
+                              selectedValue: _selectedSpace,
+                              onChanged: (String? newValue) {
+                                setState(() {
+                                  _selectedSpace = newValue;
+                                });
+                              },
                             ),
-                          ],
+                          ),
-                        ),
+                        ],
-                        const SizedBox(height: 20),
-                        const Divider(),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          children: [
-                            Padding(
-                              padding: const EdgeInsets.only(
-                                left: 20,
-                                right: 20,
-                              ),
-                              child: TextButton(
-                                onPressed: () {
-                                  Navigator.of(context).pop();
-                                },
-                                child: Text(
-                                  'Cancel',
-                                  style: Theme.of(context)
-                                      .textTheme
-                                      .bodyMedium!
-                                      .copyWith(
-                                        fontWeight: FontWeight.w400,
-                                        fontSize: 14,
-                                        color: ColorsManager.blackColor,
-                                      ),
-                                ),
-                              ),
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.only(
-                                left: 20,
-                                right: 20,
-                              ),
-                              child: TextButton(
-                                onPressed: _selectedCommunity != null &&
-                                        _selectedSpace != null
-                                    ? () {
-                                        Navigator.of(context).pop({
-                                          'community': _selectedCommunity,
-                                          'space': _selectedSpace,
-                                        });
-                                      }
-                                    : null,
-                                child: Text(
-                                  'Next',
-                                  style: Theme.of(context)
-                                      .textTheme
-                                      .bodyMedium!
-                                      .copyWith(
-                                        fontWeight: FontWeight.w400,
-                                        fontSize: 14,
-                                        color: _selectedCommunity != null &&
-                                                _selectedSpace != null
-                                            ? ColorsManager.blueColor
-                                            : Colors.blue.shade100,
-                                      ),
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 10),
-                      ],
-                    ),
-                    if (isLoadingCommunities)
-                      const SizedBox(
-                        height: 200,
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            Center(
-                              child: CircularProgressIndicator(
-                                color: ColorsManager.primaryColor,
-                              ),
-                            ),
-                          ],
-                        ),
                       ),
-                  ],
+                      const SizedBox(height: 20),
-                ),
+                      const Divider(),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: () {
+                                Navigator.of(context).pop();
+                              },
+                              child: Text(
+                                'Cancel',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: ColorsManager.blackColor,
+                                    ),
+                              ),
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: _selectedCommunity != null &&
+                                      _selectedSpace != null
+                                  ? () {
+                                      Navigator.of(context).pop({
+                                        'community': _selectedCommunity,
+                                        'space': _selectedSpace,
+                                      });
+                                    }
+                                  : null,
+                              child: Text(
+                                'Next',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: _selectedCommunity != null &&
+                                              _selectedSpace != null
+                                          ? ColorsManager.blueColor
+                                          : Colors.blue.shade100,
+                                    ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                    ],
+                  ),
+                  if (isLoadingCommunities)
+                    const SizedBox(
+                      height: 200,
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Center(
+                            child: CircularProgressIndicator(
+                              color: ColorsManager.primaryColor,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                ],
               ),
             );
           },

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -34,9 +34,7 @@ class SpaceDropdown extends StatelessWidget {
           ),
           SizedBox(
             child: Container(
-              height: 40,
               decoration: BoxDecoration(
-                color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(10),
               ),
               child: DropdownButton2<String>(
@@ -47,7 +45,7 @@ class SpaceDropdown extends StatelessWidget {
                     value: space.uuid,
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.start,
                       children: [
                         Text(
                           '   ${space.name}',
@@ -90,7 +88,7 @@ class SpaceDropdown extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Expanded(
-                        flex: 8,
+                        flex: 6,
                         child: Padding(
                           padding: const EdgeInsets.only(left: 10),
                           child: Text(
@@ -131,7 +129,6 @@ class SpaceDropdown extends StatelessWidget {
                 dropdownStyleData: DropdownStyleData(
                   maxHeight: MediaQuery.of(context).size.height * 0.4,
                   decoration: BoxDecoration(
-                    color: ColorsManager.whiteColors,
                     borderRadius: BorderRadius.circular(10),
                   ),
                 ),

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/curtain_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
@@ -27,7 +26,7 @@ class DeviceDialogHelper {
       final result = await _getDialogForDeviceType(
         dialogType: dialogType,
         context: context,
-        productType: data['productType'] as String,
+        productType: data['productType'],
         data: data,
         functions: functions,
         removeComparetors: removeComparetors,
@@ -66,14 +65,7 @@ class DeviceDialogHelper {
           removeComparetors: removeComparetors,
           dialogType: dialogType,
         );
-      case 'CUR':
+
-        return CurtainHelper.showControlDialog(
-          dialogType: dialogType,
-          context: context,
-          functions: functions,
-          uniqueCustomId: data['uniqueCustomId'],
-          device: data['device'],
-        );
       case '1G':
         return OneGangSwitchHelper.showSwitchFunctionsDialog(
             dialogType: dialogType,

lib/pages/routines/helper/save_routine_helper.dart

@@ -17,10 +17,9 @@ class SaveRoutineHelper {
       builder: (context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
-            final selectedConditionLabel =
+            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
-                state.selectedAutomationOperator == 'and'
+                ? 'All Conditions are met'
-                    ? 'All Conditions are met'
+                : 'Any Condition is met';
-                    : 'Any Condition is met';
 
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
@@ -38,11 +37,10 @@ class SaveRoutineHelper {
                     Text(
                       'Create a scene: ${state.routineName ?? ""}',
                       textAlign: TextAlign.center,
-                      style:
+                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
-                          Theme.of(context).textTheme.headlineMedium!.copyWith(
+                            color: ColorsManager.primaryColorWithOpacity,
-                                color: ColorsManager.primaryColorWithOpacity,
+                            fontWeight: FontWeight.bold,
-                                fontWeight: FontWeight.bold,
+                          ),
-                              ),
                     ),
                     const SizedBox(height: 18),
                     _buildDivider(),
@@ -60,8 +58,7 @@ class SaveRoutineHelper {
                             _buildIfConditions(state, context),
                             Container(
                               width: 1,
-                              color: ColorsManager.greyColor
+                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
-                                  .withValues(alpha: 0.8),
                             ),
                             _buildThenActions(state, context),
                           ],
@@ -100,8 +97,7 @@ class SaveRoutineHelper {
       child: Row(
         spacing: 16,
         children: [
-          Expanded(
+          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
-              child: Text('IF: $selectedConditionLabel', style: textStyle)),
           const Expanded(child: Text('THEN:', style: textStyle)),
         ],
       ),
@@ -113,7 +109,7 @@ class SaveRoutineHelper {
       spacing: 16,
       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
       children: [
-        DialogFooterButton(
+ DialogFooterButton(
           text: 'Back',
           onTap: () => Navigator.pop(context),
         ),
@@ -147,8 +143,7 @@ class SaveRoutineHelper {
       child: ListView(
         // shrinkWrap: true,
         children: state.thenItems.map((item) {
-          final functions =
+          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
-              state.selectedFunctions[item['uniqueCustomId']] ?? [];
           return functionRow(item, context, functions);
         }).toList(),
       ),
@@ -208,20 +203,19 @@ class SaveRoutineHelper {
                     ),
                   ),
                   child: Center(
-                    child:
+                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                        item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                        ? Image.memory(
-                            ? Image.memory(
+                            base64Decode(item['icon']),
-                                base64Decode(item['icon']),
+                            width: 12,
-                                width: 12,
+                            height: 22,
-                                height: 22,
+                            fit: BoxFit.scaleDown,
-                                fit: BoxFit.scaleDown,
+                          )
-                              )
+                        : SvgPicture.asset(
-                            : SvgPicture.asset(
+                            item['imagePath'],
-                                item['imagePath'],
+                            width: 12,
-                                width: 12,
+                            height: 12,
-                                height: 12,
+                            fit: BoxFit.scaleDown,
-                                fit: BoxFit.scaleDown,
+                          ),
-                              ),
                   ),
                 ),
                 Flexible(

lib/pages/routines/models/curtain/curtain_function.dart

@@ -1,49 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/curtain/model/curtain_model.dart';
-import 'package:syncrow_web/pages/routines/models/curtain/curtain_opertion_value.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart'
-    show DeviceFunction;
-import 'package:syncrow_web/utils/constants/app_enum.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-abstract class CurtainFunction extends DeviceFunction<CurtainModel> {
-  final String type;
-  CurtainFunction({
-    required super.deviceId,
-    required super.deviceName,
-    required this.type,
-    required super.code,
-    required super.operationName,
-    required super.icon,
-  });
-  List<CurtainOperationalValue> getOperationalValues();
-}
-
-class ControlCurtainFunction extends CurtainFunction {
-  ControlCurtainFunction({
-    required super.deviceId,
-    required super.deviceName,
-    required super.type,
-    super.code = 'control',
-    super.operationName = 'Control',
-    super.icon = Assets.curtain,
-  });
-
-  @override
-  List<CurtainOperationalValue> getOperationalValues() => [
-        CurtainOperationalValue(
-          icon: Assets.curtain,
-          description: 'OPEN',
-          value: 'open',
-        ),
-        CurtainOperationalValue(
-          icon: Assets.curtain,
-          description: 'STOP',
-          value: 'stop',
-        ),
-        CurtainOperationalValue(
-          icon: Assets.curtain,
-          description: 'CLOSE',
-          value: 'close',
-        )
-      ];
-}

lib/pages/routines/models/curtain/curtain_opertion_value.dart

@@ -1,11 +0,0 @@
-class CurtainOperationalValue {
-  final String icon;
-  final String description;
-  final String value;
-
-  CurtainOperationalValue({
-    required this.icon,
-    required this.description,
-    required this.value,
-  });
-}

lib/pages/routines/models/pc/energy_clamp_functions.dart

@@ -405,8 +405,8 @@ class PowerFactorCStatusFunction extends EnergyClampFunctions {
           code: 'PowerFactorC',
           operationName: 'Power Factor C',
           icon: Assets.speedoMeter,
-          min: 0.0,
+          min: 0.00,
-          max: 1.0,
+          max: 1.00,
           step: 0.1,
           unit: "",
         );

lib/pages/routines/widgets/if_container.dart

@@ -148,7 +148,6 @@ class IfContainer extends StatelessWidget {
                   'NCPS',
                   'WH',
                   'PC',
-                  'CUR',
                 ].contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()

lib/pages/routines/widgets/routine_devices.dart

@@ -28,7 +28,6 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     'NCPS',
     'WH',
     'PC',
-    'CUR',
   };
 
   @override

lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart

@@ -117,22 +117,10 @@ class ACHelper {
                         },
                         onConfirm: state.addedFunctions.isNotEmpty
                             ? () {
-                                final selectedFunctionData =
-                                    state.addedFunctions.firstWhere(
-                                  (f) =>
-                                      f.functionCode == state.selectedFunction,
-                                  orElse: () => DeviceFunctionData(
-                                    entityId: '',
-                                    functionCode: state.selectedFunction ?? '',
-                                    operationName: '',
-                                    value: null,
-                                  ),
-                                );
-
                                 /// add the functions to the routine bloc
                                 context.read<RoutineBloc>().add(
                                       AddFunctionToRoutine(
-                                        [selectedFunctionData],
+                                        state.addedFunctions,
                                         uniqueCustomId,
                                       ),
                                     );

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart

@@ -78,22 +78,12 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
                   onCancel: () => Navigator.pop(context),
                   onConfirm: state.addedFunctions.isNotEmpty
                       ? () {
-                          final selectedFunctionData =
-                              state.addedFunctions.firstWhere(
-                            (f) => f.functionCode == state.selectedFunction,
-                            orElse: () => DeviceFunctionData(
-                              entityId: '',
-                              functionCode: state.selectedFunction ?? '',
-                              operationName: '',
-                              value: null,
-                            ),
-                          );
                           final functions = _updateValuesForAddedFunctions(
                             state.addedFunctions,
                           );
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                  [selectedFunctionData],
+                                  functions,
                                   '${widget.uniqueCustomId}',
                                 ),
                               );

lib/pages/routines/widgets/routine_dialogs/curtain_dialog.dart

@@ -1,270 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/curtain/curtain_function.dart';
-import 'package:syncrow_web/pages/routines/models/curtain/curtain_opertion_value.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CurtainHelper {
-  static Future<Map<String, dynamic>?> showControlDialog({
-    required String dialogType,
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required String uniqueCustomId,
-    required AllDevicesModel? device,
-  }) async {
-    List<ControlCurtainFunction> curtainFunctions =
-        functions.whereType<ControlCurtainFunction>().where((function) {
-      if (dialogType == 'THEN') {
-        return function.type == 'THEN' || function.type == 'BOTH';
-      }
-      return function.type == 'IF' || function.type == 'BOTH';
-    }).toList();
-    return showDialog<Map<String, dynamic>?>(
-      context: context,
-      builder: (context) => BlocProvider(
-        create: (_) => FunctionBloc()..add(const InitializeFunctions([])),
-        child: AlertDialog(
-          contentPadding: EdgeInsets.zero,
-          content: BlocBuilder<FunctionBloc, FunctionBlocState>(
-            builder: (context, state) {
-              final selectedFunction = state.selectedFunction;
-              final selectedOperationName = state.selectedOperationName;
-              final selectedFunctionData = state.addedFunctions
-                  .firstWhere((f) => f.functionCode == selectedFunction,
-                      orElse: () => DeviceFunctionData(
-                            entityId: '',
-                            functionCode: selectedFunction ?? '',
-                            operationName: '',
-                            value: null,
-                          ));
-
-              return Container(
-                width: selectedFunction != null ? 600 : 360,
-                height: 450,
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(20),
-                ),
-                padding: const EdgeInsets.only(top: 20),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    const DialogHeader('AC Functions'),
-                    Expanded(
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: [
-                          // Function list
-                          SizedBox(
-                            width: selectedFunction != null ? 320 : 360,
-                            child: _buildFunctionsList(
-                                context: context,
-                                curtainFunctions: curtainFunctions,
-                                onFunctionSelected:
-                                    (functionCode, operationName) {
-                                  RoutineTapFunctionHelper.onTapFunction(
-                                      context,
-                                      functionCode: functionCode,
-                                      functionOperationName: operationName,
-                                      functionValueDescription:
-                                          selectedFunctionData.valueDescription,
-                                      deviceUuid: device?.uuid,
-                                      codesToAddIntoFunctionsWithDefaultValue: [
-                                        'temp_set',
-                                        'temp_current',
-                                      ],
-                                      defaultValue: 0);
-                                }),
-                          ),
-                          // Value selector
-                          if (selectedFunction != null)
-                            Expanded(
-                              child: _buildValueSelector(
-                                context: context,
-                                selectedFunction: selectedFunction,
-                                selectedFunctionData: selectedFunctionData,
-                                controlFunctions: curtainFunctions,
-                                device: device,
-                                operationName: selectedOperationName ?? '',
-                              ),
-                            ),
-                        ],
-                      ),
-                    ),
-                    DialogFooter(
-                      onCancel: () {
-                        Navigator.pop(context);
-                      },
-                      onConfirm: state.addedFunctions.isNotEmpty
-                          ? () {
-                              /// add the functions to the routine bloc
-                              context.read<RoutineBloc>().add(
-                                    AddFunctionToRoutine(
-                                      state.addedFunctions,
-                                      uniqueCustomId,
-                                    ),
-                                  );
-
-                              // Return the device data to be added to the container
-                              Navigator.pop(context, {
-                                'deviceId': functions.first.deviceId,
-                              });
-                            }
-                          : null,
-                      isConfirmEnabled: selectedFunction != null,
-                    ),
-                  ],
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    ).then((value) {
-      return value;
-    });
-  }
-
-  static Widget _buildFunctionsList({
-    required BuildContext context,
-    required List<ControlCurtainFunction> curtainFunctions,
-    required Function(String, String) onFunctionSelected,
-  }) {
-    return ListView.separated(
-      shrinkWrap: false,
-      physics: const AlwaysScrollableScrollPhysics(),
-      itemCount: curtainFunctions.length,
-      separatorBuilder: (context, index) => const Padding(
-        padding: EdgeInsets.symmetric(horizontal: 40.0),
-        child: Divider(
-          color: ColorsManager.dividerColor,
-        ),
-      ),
-      itemBuilder: (context, index) {
-        final function = curtainFunctions[index];
-        return ListTile(
-          leading: SvgPicture.asset(
-            function.icon,
-            width: 24,
-            height: 24,
-            placeholderBuilder: (BuildContext context) => Container(
-              width: 24,
-              height: 24,
-              color: Colors.transparent,
-            ),
-          ),
-          title: Text(
-            function.operationName,
-            style: context.textTheme.bodyMedium,
-          ),
-          trailing: const Icon(
-            Icons.arrow_forward_ios,
-            size: 16,
-            color: ColorsManager.textGray,
-          ),
-          onTap: () => onFunctionSelected(
-            function.code,
-            function.operationName,
-          ),
-        );
-      },
-    );
-  }
-
-  static Widget _buildValueSelector({
-    required BuildContext context,
-    required String selectedFunction,
-    required DeviceFunctionData? selectedFunctionData,
-    required List<ControlCurtainFunction> controlFunctions,
-    AllDevicesModel? device,
-    required String operationName,
-  }) {
-    final selectedFn =
-        controlFunctions.firstWhere((f) => f.code == selectedFunction);
-
-    // Rest of your existing code for other value selectors
-    final values = selectedFn.getOperationalValues();
-    return _buildOperationalValuesList(
-      context: context,
-      values: values,
-      selectedValue: selectedFunctionData?.value,
-      device: device,
-      operationName: operationName,
-      selectCode: selectedFunction,
-      selectedFunctionData: selectedFunctionData,
-    );
-  }
-
-  static Widget _buildOperationalValuesList({
-    required BuildContext context,
-    required List<CurtainOperationalValue> values,
-    required dynamic selectedValue,
-    AllDevicesModel? device,
-    required String operationName,
-    required String selectCode,
-    DeviceFunctionData? selectedFunctionData,
-
-    // required Function(dynamic) onValueChanged,
-  }) {
-    return ListView.builder(
-      shrinkWrap: false,
-      physics: const AlwaysScrollableScrollPhysics(),
-      itemCount: values.length,
-      itemBuilder: (context, index) {
-        final value = values[index];
-        final isSelected = selectedValue == value.value;
-        return ListTile(
-          leading: SvgPicture.asset(
-            value.icon,
-            width: 24,
-            height: 24,
-            placeholderBuilder: (BuildContext context) => Container(
-              width: 24,
-              height: 24,
-              color: Colors.transparent,
-            ),
-          ),
-          title: Text(
-            value.description,
-            style: context.textTheme.bodyMedium,
-          ),
-          trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
-            size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
-          ),
-          onTap: () {
-            if (!isSelected) {
-              context.read<FunctionBloc>().add(
-                    AddFunction(
-                      functionData: DeviceFunctionData(
-                        entityId: device?.uuid ?? '',
-                        functionCode: selectCode,
-                        operationName: operationName,
-                        value: value.value,
-                        condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
-                      ),
-                    ),
-                  );
-            }
-          },
-        );
-      },
-    );
-  }
-}

lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart

@@ -192,18 +192,9 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
-              final selectedFunctionData = state.addedFunctions.firstWhere(
-                (f) => f.functionCode == state.selectedFunction,
-                orElse: () => DeviceFunctionData(
-                  entityId: '',
-                  functionCode: state.selectedFunction ?? '',
-                  operationName: '',
-                  value: null,
-                ),
-              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      [selectedFunctionData],
+                      state.addedFunctions,
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart

@@ -115,18 +115,9 @@ class _GatewayDialogState extends State<GatewayDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
-              final selectedFunctionData = state.addedFunctions.firstWhere(
-                (f) => f.functionCode == state.selectedFunction,
-                orElse: () => DeviceFunctionData(
-                  entityId: '',
-                  functionCode: state.selectedFunction ?? '',
-                  operationName: '',
-                  value: null,
-                ),
-              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      [selectedFunctionData],
+                      state.addedFunctions,
                       widget.uniqueCustomId ?? '-1',
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart

@@ -147,7 +147,7 @@ class OneGangSwitchHelper {
                                   // }
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          [selectedFunctionData],
+                                          state.addedFunctions,
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart

@@ -250,18 +250,9 @@ class _EnergyClampDialogState extends State<EnergyClampDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
-              final selectedFunctionData = state.addedFunctions.firstWhere(
-                (f) => f.functionCode == state.selectedFunction,
-                orElse: () => DeviceFunctionData(
-                  entityId: '',
-                  functionCode: state.selectedFunction ?? '',
-                  operationName: '',
-                  value: null,
-                ),
-              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      [selectedFunctionData],
+                      state.addedFunctions,
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_value_selector_widget.dart

@@ -27,16 +27,17 @@ class EnergyValueSelectorWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final selectedFn = functions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        functions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
-    final step = selectedFn.step;
+    final step = selectedFn.step ?? 1.0; 
     final _unit = selectedFn.unit ?? '';
     final (double, double) sliderRange =
         (selectedFn.min ?? 0.0, selectedFn.max ?? 100.0);
 
     if (_isSliderFunction(selectedFunction)) {
       return CustomRoutinesTextbox(
-        withSpecialChar: true,
+        withSpecialChar: false,
         currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
@@ -59,14 +60,14 @@ class EnergyValueSelectorWidget extends StatelessWidget {
                   entityId: device?.uuid ?? '',
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
-                  value: value,
+                  value: value.toInt(),
                   condition: functionData.condition,
                 ),
               ),
             ),
         unit: _unit,
         dividendOfRange: 1,
-        stepIncreaseAmount: step!,
+        stepIncreaseAmount: step,
       );
     }
 

lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart

@@ -145,22 +145,9 @@ class TwoGangSwitchHelper {
                                   //         ),
                                   //       );
                                   // }
-                                  final selectedFunctionData =
-                                      state.addedFunctions.firstWhere(
-                                    (f) =>
-                                        f.functionCode ==
-                                        state.selectedFunction,
-                                    orElse: () => DeviceFunctionData(
-                                      entityId: '',
-                                      functionCode:
-                                          state.selectedFunction ?? '',
-                                      operationName: '',
-                                      value: null,
-                                    ),
-                                  );
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          [selectedFunctionData],
+                                          state.addedFunctions,
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -210,18 +210,9 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
-              final selectedFunctionData = state.addedFunctions.firstWhere(
-                (f) => f.functionCode == state.selectedFunction,
-                orElse: () => DeviceFunctionData(
-                  entityId: '',
-                  functionCode: state.selectedFunction ?? '',
-                  operationName: '',
-                  value: null,
-                ),
-              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      [selectedFunctionData],
+                      state.addedFunctions,
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart

@@ -188,18 +188,9 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
-              final selectedFunctionData = state.addedFunctions.firstWhere(
-                (f) => f.functionCode == state.selectedFunction,
-                orElse: () => DeviceFunctionData(
-                  entityId: '',
-                  functionCode: state.selectedFunction ?? '',
-                  operationName: '',
-                  value: null,
-                ),
-              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      [selectedFunctionData],
+                      state.addedFunctions,
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/then_container.dart

@@ -30,121 +30,123 @@ class ThenContainer extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
-                    if (state.isLoading && state.isUpdate == true)
+                    state.isLoading && state.isUpdate == true
-                      const Center(
+                        ? const Center(
-                        child: CircularProgressIndicator(),
+                            child: CircularProgressIndicator(),
-                      )
+                          )
-                    else
+                        : Wrap(
-                      Wrap(
+                            spacing: 8,
-                          spacing: 8,
+                            runSpacing: 8,
-                          runSpacing: 8,
+                            children: List.generate(
-                          children: List.generate(
+                                state.thenItems.length,
-                              state.thenItems.length,
+                                (index) => GestureDetector(
-                              (index) => GestureDetector(
+                                      onTap: () async {
-                                    onTap: () async {
+                                        if (state.thenItems[index]
-                                      if (state.thenItems[index]['deviceId'] ==
+                                                ['deviceId'] ==
-                                          'delay') {
+                                            'delay') {
-                                        final result = await DelayHelper
+                                          final result = await DelayHelper
-                                            .showDelayPickerDialog(context,
+                                              .showDelayPickerDialog(context,
-                                                state.thenItems[index]);
+                                                  state.thenItems[index]);
+
+                                          if (result != null) {
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
+                                                  ...state.thenItems[index],
+                                                  'imagePath': Assets.delay,
+                                                  'title': 'Delay',
+                                                }));
+                                          }
+                                          return;
+                                        }
+
+                                        if (state.thenItems[index]['type'] ==
+                                            'automation') {
+                                          final result = await showDialog<bool>(
+                                            context: context,
+                                            builder: (BuildContext context) =>
+                                                AutomationDialog(
+                                              automationName:
+                                                  state.thenItems[index]
+                                                          ['name'] ??
+                                                      'Automation',
+                                              automationId:
+                                                  state.thenItems[index]
+                                                          ['deviceId'] ??
+                                                      '',
+                                              uniqueCustomId:
+                                                  state.thenItems[index]
+                                                      ['uniqueCustomId'],
+                                            ),
+                                          );
+
+                                          if (result != null) {
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
+                                                  ...state.thenItems[index],
+                                                  'imagePath':
+                                                      Assets.automation,
+                                                  'title':
+                                                      state.thenItems[index]
+                                                              ['name'] ??
+                                                          state.thenItems[index]
+                                                              ['title'],
+                                                }));
+                                          }
+                                          return;
+                                        }
+
+                                        final result = await DeviceDialogHelper
+                                            .showDeviceDialog(
+                                                context: context,
+                                                data: state.thenItems[index],
+                                                removeComparetors: true,
+                                                dialogType: "THEN");
 
                                         if (result != null) {
-                                          context
+                                          context.read<RoutineBloc>().add(
-                                              .read<RoutineBloc>()
+                                              AddToThenContainer(
-                                              .add(AddToThenContainer({
+                                                  state.thenItems[index]));
-                                                ...state.thenItems[index],
+                                        } else if (![
-                                                'imagePath': Assets.delay,
+                                          'AC',
-                                                'title': 'Delay',
+                                          '1G',
-                                              }));
+                                          '2G',
+                                          '3G',
+                                          'WPS',
+                                          'CPS',
+                                          "GW",
+                                          "NCPS",
+                                          'WH',
+                                        ].contains(state.thenItems[index]
+                                            ['productType'])) {
+                                          context.read<RoutineBloc>().add(
+                                              AddToThenContainer(
+                                                  state.thenItems[index]));
                                         }
-                                        return;
-                                      }
-
-                                      if (state.thenItems[index]['type'] ==
-                                          'automation') {
-                                        final result = await showDialog<bool>(
-                                          context: context,
-                                          builder: (BuildContext context) =>
-                                              AutomationDialog(
-                                            automationName:
-                                                state.thenItems[index]['name']
-                                                        as String? ??
-                                                    'Automation',
-                                            automationId: state.thenItems[index]
-                                                    ['deviceId'] as String? ??
-                                                '',
-                                            uniqueCustomId: state
-                                                    .thenItems[index]
-                                                ['uniqueCustomId'] as String,
-                                          ),
-                                        );
-
-                                        if (result != null) {
-                                          context
-                                              .read<RoutineBloc>()
-                                              .add(AddToThenContainer({
-                                                ...state.thenItems[index],
-                                                'imagePath': Assets.automation,
-                                                'title': state.thenItems[index]
-                                                        ['name'] ??
-                                                    state.thenItems[index]
-                                                        ['title'],
-                                              }));
-                                        }
-                                        return;
-                                      }
-
-                                      final result = await DeviceDialogHelper
-                                          .showDeviceDialog(
-                                              context: context,
-                                              data: state.thenItems[index],
-                                              removeComparetors: true,
-                                              dialogType: 'THEN');
-                                      if (result != null) {
-                                        context.read<RoutineBloc>().add(
-                                            AddToThenContainer(
-                                                state.thenItems[index]));
-                                      } else if (![
-                                        'AC',
-                                        '1G',
-                                        '2G',
-                                        '3G',
-                                        'WPS',
-                                        'CPS',
-                                        'GW',
-                                        'NCPS',
-                                        'WH',
-                                        'CUR',
-                                      ].contains(state.thenItems[index]
-                                          ['productType'])) {
-                                        context.read<RoutineBloc>().add(
-                                            AddToThenContainer(
-                                                state.thenItems[index]));
-                                      }
-                                    },
-                                    child: DraggableCard(
-                                      imagePath: state.thenItems[index]
-                                              ['imagePath'] as String? ??
-                                          '',
-                                      title: state.thenItems[index]['title']
-                                              as String? ??
-                                          '',
-                                      deviceData: state.thenItems[index],
-                                      padding: const EdgeInsets.symmetric(
-                                          horizontal: 4, vertical: 8),
-                                      isFromThen: true,
-                                      isFromIf: false,
-                                      onRemove: () {
-                                        context.read<RoutineBloc>().add(
-                                            RemoveDragCard(
-                                                index: index,
-                                                isFromThen: true,
-                                                key: state.thenItems[index]
-                                                        ['uniqueCustomId']
-                                                    as String));
                                       },
-                                    ),
+                                      child: DraggableCard(
-                                  ))),
+                                        imagePath: state.thenItems[index]
+                                                ['imagePath'] ??
+                                            '',
+                                        title: state.thenItems[index]
+                                                ['title'] ??
+                                            '',
+                                        deviceData: state.thenItems[index],
+                                        padding: const EdgeInsets.symmetric(
+                                            horizontal: 4, vertical: 8),
+                                        isFromThen: true,
+                                        isFromIf: false,
+                                        onRemove: () {
+                                          context.read<RoutineBloc>().add(
+                                              RemoveDragCard(
+                                                  index: index,
+                                                  isFromThen: true,
+                                                  key: state.thenItems[index]
+                                                      ['uniqueCustomId']));
+                                        },
+                                      ),
+                                    ))),
                   ],
                 ),
               ),
@@ -228,7 +230,7 @@ class ThenContainer extends StatelessWidget {
                 context: context,
                 data: mutableData,
                 removeComparetors: true,
-                dialogType: 'THEN');
+                dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             } else if (![
@@ -239,10 +241,9 @@ class ThenContainer extends StatelessWidget {
               'WPS',
               'GW',
               'CPS',
-              'NCPS',
+              "NCPS",
-              'WH',
+              "WH",
               'PC',
-              'CUR',
             ].contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }

lib/pages/space_management_v2/main_module/shared/models/paginated_data_model.dart

@@ -0,0 +1,43 @@
+import 'package:equatable/equatable.dart';
+
+class PaginatedDataModel<T> extends Equatable {
+  const PaginatedDataModel({
+    required this.data,
+    required this.page,
+    required this.size,
+    required this.hasNext,
+    required this.totalItems,
+    required this.totalPages,
+  });
+
+  final List<T> data;
+  final int page;
+  final int size;
+  final bool hasNext;
+  final int totalItems;
+  final int totalPages;
+
+  factory PaginatedDataModel.fromJson(
+    Map<String, dynamic> json,
+    List<T> Function(List<dynamic>) fromJsonList,
+  ) {
+    return PaginatedDataModel<T>(
+      data: fromJsonList(json['data'] as List<dynamic>),
+      page: json['page'] as int? ?? 1,
+      size: json['size'] as int? ?? 25,
+      hasNext: json['hasNext'] as bool? ?? false,
+      totalItems: json['totalItem'] as int? ?? 0,
+      totalPages: json['totalPage'] as int? ?? 0,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+        data,
+        page,
+        size,
+        hasNext,
+        totalItems,
+        totalPages,
+      ];
+}

lib/pages/space_management_v2/main_module/views/space_management_page.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_management_body.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/services/debounced_communities_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/services/remote_communities_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
+import 'package:syncrow_web/web_layout/web_scaffold.dart';
+
+class SpaceManagementPage extends StatelessWidget {
+  const SpaceManagementPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider(
+          create: (context) => CommunitiesBloc(
+            communitiesService: DebouncedCommunitiesService(
+              RemoteCommunitiesService(HTTPService()),
+            ),
+          )..add(const LoadCommunities(LoadCommunitiesParam())),
+        ),
+        BlocProvider(create: (context) => CommunitiesTreeSelectionBloc()),
+      ],
+      child: WebScaffold(
+        appBarTitle: Text(
+          'Space Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+        ),
+        enableMenuSidebar: false,
+        centerBody: Text(
+          'Community Structure',
+          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
+                fontWeight: FontWeight.bold,
+              ),
+        ),
+        rightBody: const NavigateHomeGridView(),
+        scaffoldBody: const SpaceManagementBody(),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/space_management_body.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree.dart';
+
+class SpaceManagementBody extends StatelessWidget {
+  const SpaceManagementBody({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Row(
+      children: [
+        SpaceManagementCommunitiesTree(),
+      ],
+    );
+  }
+}

lib/pages/space_management_v2/modules/communities/data/services/debounced_communities_service.dart

@@ -0,0 +1,42 @@
+import 'dart:async';
+
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/services/communities_service.dart';
+
+final class DebouncedCommunitiesService implements CommunitiesService {
+  DebouncedCommunitiesService(
+    this._decoratee, {
+    this.debounceDuration = const Duration(milliseconds: 500),
+  });
+
+  final CommunitiesService _decoratee;
+  final Duration debounceDuration;
+
+  Timer? _debounceTimer;
+  late Completer<CommunitiesPaginationModel>? _completer;
+
+  @override
+  Future<CommunitiesPaginationModel> getCommunity(
+    LoadCommunitiesParam param,
+  ) async {
+    _debounceTimer?.cancel();
+
+    _completer = Completer<CommunitiesPaginationModel>();
+    final currentCompleter = _completer!;
+
+    _debounceTimer = Timer(debounceDuration, () async {
+      try {
+        final result = await _decoratee.getCommunity(param);
+        if (!currentCompleter.isCompleted) {
+          currentCompleter.complete(result);
+        }
+      } catch (error) {
+        if (!currentCompleter.isCompleted) {
+          currentCompleter.completeError(error);
+        }
+      }
+    });
+
+    return currentCompleter.future;
+  }
+}

lib/pages/space_management_v2/modules/communities/data/services/remote_communities_service.dart

@@ -1,9 +1,11 @@
 import 'package:dio/dio.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/services/communities_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class RemoteCommunitiesService implements CommunitiesService {
   const RemoteCommunitiesService(this._httpService);
@@ -13,14 +15,26 @@ class RemoteCommunitiesService implements CommunitiesService {
   static const _defaultErrorMessage = 'Failed to load communities';
 
   @override
-  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param) async {
+  Future<CommunitiesPaginationModel> getCommunity(
+    LoadCommunitiesParam param,
+  ) async {
     try {
-      return _httpService.get(
+      final response = await _httpService.get(
-        path: '/api/communities/',
+        path: await _makeUrl(),
-        expectedResponseModel: (json) => (json as List<dynamic>)
+        queryParameters: {
-            .map((e) => CommunityModel.fromJson(e as Map<String, dynamic>))
+          'page': param.page,
-            .toList(),
+          'size': param.size,
+          'includeSpaces': param.includeSpaces,
+          if (param.search.isNotEmpty && param.search != 'null')
+            'search': param.search,
+        },
+        expectedResponseModel: (json) => CommunitiesPaginationModel.fromJson(
+          json as Map<String, dynamic>,
+          CommunityModel.fromJsonList,
+        ),
       );
+
+      return response;
     } on DioException catch (e) {
       final message = e.response?.data as Map<String, dynamic>?;
       final error = message?['error'] as Map<String, dynamic>?;
@@ -31,4 +45,13 @@ class RemoteCommunitiesService implements CommunitiesService {
       throw APIException(formattedErrorMessage);
     }
   }
+
+  Future<String> _makeUrl() async {
+    final projectUuid = await ProjectManager.getProjectUUID();
+    if (projectUuid == null) throw APIException('Project UUID is required');
+    return ApiEndpoints.getCommunityListv2.replaceAll(
+      '{projectId}',
+      projectUuid,
+    );
+  }
 }

lib/pages/space_management_v2/modules/communities/domain/models/community_model.dart

@@ -4,11 +4,19 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain
 class CommunityModel extends Equatable {
   final String uuid;
   final String name;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String description;
+  final String externalId;
   final List<SpaceModel> spaces;
 
   const CommunityModel({
     required this.uuid,
     required this.name,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.description,
+    required this.externalId,
     required this.spaces,
   });
 
@@ -16,11 +24,20 @@ class CommunityModel extends Equatable {
     return CommunityModel(
       uuid: json['uuid'] as String,
       name: json['name'] as String,
-      spaces: (json['spaces'] as List<dynamic>)
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      updatedAt: DateTime.parse(json['updatedAt'] as String),
+      description: json['description'] as String,
+      externalId: json['externalId']?.toString() ?? '',
+      spaces: (json['spaces'] as List<dynamic>? ?? <dynamic>[])
           .map((e) => SpaceModel.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
   }
+  static List<CommunityModel> fromJsonList(List<dynamic> json) {
+    return json
+        .map((e) => CommunityModel.fromJson(e as Map<String, dynamic>))
+        .toList();
+  }
 
   @override
   List<Object?> get props => [uuid, name, spaces];

lib/pages/space_management_v2/modules/communities/domain/models/space_model.dart

@@ -2,26 +2,37 @@ import 'package:equatable/equatable.dart';
 
 class SpaceModel extends Equatable {
   final String uuid;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;
   final String spaceName;
   final String icon;
   final List<SpaceModel> children;
+  final SpaceModel? parent;
 
   const SpaceModel({
     required this.uuid,
+    required this.createdAt,
+    required this.updatedAt,
     required this.spaceName,
     required this.icon,
     required this.children,
+    required this.parent,
   });
 
   factory SpaceModel.fromJson(Map<String, dynamic> json) {
     return SpaceModel(
-      uuid: json['uuid'] as String,
+      uuid: json['uuid'] as String? ?? '',
-      spaceName: json['spaceName'] as String,
+      createdAt: DateTime.tryParse(json['createdAt'] as String? ?? ''),
-      icon: json['icon'] as String,
+      updatedAt: DateTime.tryParse(json['updatedAt'] as String? ?? ''),
+      spaceName: json['spaceName'] as String? ?? '',
+      icon: json['icon'] as String? ?? 'assets/icons/location_icon.svg',
       children: (json['children'] as List<dynamic>?)
               ?.map((e) => SpaceModel.fromJson(e as Map<String, dynamic>))
               .toList() ??
           [],
+      parent: json['parent'] != null
+          ? SpaceModel.fromJson(json['parent'] as Map<String, dynamic>)
+          : null,
     );
   }
 

lib/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart

@@ -1,3 +1,32 @@
-class LoadCommunitiesParam {
+import 'package:equatable/equatable.dart';
-  const LoadCommunitiesParam();
+
+class LoadCommunitiesParam extends Equatable {
+  const LoadCommunitiesParam({
+    this.page = 1,
+    this.size = 25,
+    this.search = '',
+    this.includeSpaces = true,
+  });
+
+  final int page;
+  final int size;
+  final String search;
+  final bool includeSpaces;
+
+  LoadCommunitiesParam copyWith({
+    int? page,
+    int? size,
+    String? search,
+    bool? includeSpaces,
+  }) {
+    return LoadCommunitiesParam(
+      page: page ?? this.page,
+      size: size ?? this.size,
+      search: search ?? this.search,
+      includeSpaces: includeSpaces ?? this.includeSpaces,
+    );
+  }
+
+  @override
+  List<Object?> get props => [page, size, search, includeSpaces];
 }

lib/pages/space_management_v2/modules/communities/domain/services/communities_service.dart

@@ -1,6 +1,9 @@
+import 'package:syncrow_web/pages/space_management_v2/main_module/shared/models/paginated_data_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
 
+typedef CommunitiesPaginationModel = PaginatedDataModel<CommunityModel>;
+
 abstract class CommunitiesService {
-  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param);
+  Future<CommunitiesPaginationModel> getCommunity(LoadCommunitiesParam param);
 }

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart

@@ -14,6 +14,8 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
   })  : _communitiesService = communitiesService,
         super(const CommunitiesState()) {
     on<LoadCommunities>(_onLoadCommunities);
+    on<LoadMoreCommunities>(_onLoadMoreCommunities);
+    on<InsertCommunity>(_onInsertCommunity);
   }
 
   final CommunitiesService _communitiesService;
@@ -23,28 +25,93 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
     Emitter<CommunitiesState> emit,
   ) async {
     try {
-      emit(const CommunitiesState(status: CommunitiesStatus.loading));
+      emit(
-      final communities = await _communitiesService.getCommunity(event.param);
+        state.copyWith(status: CommunitiesStatus.loading),
+      );
+
+      final paginationResponse = await _communitiesService.getCommunity(
+        event.param,
+      );
+
       emit(
         CommunitiesState(
           status: CommunitiesStatus.success,
-          communities: communities,
+          communities: paginationResponse.data,
+          hasNext: paginationResponse.hasNext,
+          currentPage: paginationResponse.page,
+          searchQuery: event.param.search,
+          isLoadingMore: false,
         ),
       );
     } on APIException catch (e) {
-      emit(
+      _onApiException(e, emit);
-        CommunitiesState(
-          status: CommunitiesStatus.failure,
-          errorMessage: e.message,
-        ),
-      );
     } catch (e) {
-      emit(
+      _onError(e, emit);
-        CommunitiesState(
-          status: CommunitiesStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
     }
   }
+
+  Future<void> _onLoadMoreCommunities(
+    LoadMoreCommunities event,
+    Emitter<CommunitiesState> emit,
+  ) async {
+    if (!state.hasNext || state.isLoadingMore) return;
+
+    try {
+      emit(state.copyWith(isLoadingMore: true));
+
+      final param = LoadCommunitiesParam(
+        page: state.currentPage + 1,
+        search: state.searchQuery,
+      );
+
+      final paginationResponse = await _communitiesService.getCommunity(param);
+
+      final updatedCommunities = List<CommunityModel>.from(state.communities)
+        ..addAll(paginationResponse.data);
+
+      emit(
+        state.copyWith(
+          status: CommunitiesStatus.success,
+          communities: updatedCommunities,
+          hasNext: paginationResponse.hasNext,
+          currentPage: paginationResponse.page,
+          isLoadingMore: false,
+        ),
+      );
+    } on APIException catch (e) {
+      _onApiException(e, emit);
+    } catch (e) {
+      _onError(e, emit);
+    }
+  }
+
+  void _onApiException(
+    APIException e,
+    Emitter<CommunitiesState> emit,
+  ) {
+    emit(
+      state.copyWith(
+        status: CommunitiesStatus.failure,
+        isLoadingMore: false,
+        errorMessage: e.message,
+      ),
+    );
+  }
+
+  void _onError(Object e, Emitter<CommunitiesState> emit) {
+    emit(
+      state.copyWith(
+        status: CommunitiesStatus.failure,
+        isLoadingMore: false,
+        errorMessage: e.toString(),
+      ),
+    );
+  }
+
+  void _onInsertCommunity(
+    InsertCommunity event,
+    Emitter<CommunitiesState> emit,
+  ) {
+    emit(state.copyWith(communities: [event.community, ...state.communities]));
+  }
 }

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart

@@ -15,3 +15,19 @@ class LoadCommunities extends CommunitiesEvent {
   @override
   List<Object?> get props => [param];
 }
+
+class LoadMoreCommunities extends CommunitiesEvent {
+  const LoadMoreCommunities();
+
+  @override
+  List<Object?> get props => [];
+}
+
+final class InsertCommunity extends CommunitiesEvent {
+  const InsertCommunity(this.community);
+
+  final CommunityModel community;
+
+  @override
+  List<Object?> get props => [community];
+}

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_state.dart

@@ -7,12 +7,48 @@ final class CommunitiesState extends Equatable {
     this.status = CommunitiesStatus.initial,
     this.communities = const [],
     this.errorMessage,
+    this.isLoadingMore = false,
+    this.hasNext = false,
+    this.currentPage = 1,
+    this.searchQuery = '',
   });
 
   final CommunitiesStatus status;
   final List<CommunityModel> communities;
   final String? errorMessage;
+  final bool isLoadingMore;
+  final bool hasNext;
+  final int currentPage;
+  final String searchQuery;
+
+  CommunitiesState copyWith({
+    CommunitiesStatus? status,
+    List<CommunityModel>? communities,
+    String? errorMessage,
+    bool? isLoadingMore,
+    bool? hasNext,
+    int? currentPage,
+    String? searchQuery,
+  }) {
+    return CommunitiesState(
+      status: status ?? this.status,
+      communities: communities ?? this.communities,
+      errorMessage: errorMessage ?? this.errorMessage,
+      isLoadingMore: isLoadingMore ?? this.isLoadingMore,
+      hasNext: hasNext ?? this.hasNext,
+      currentPage: currentPage ?? this.currentPage,
+      searchQuery: searchQuery ?? this.searchQuery,
+    );
+  }
 
   @override
-  List<Object?> get props => [status, communities, errorMessage];
+  List<Object?> get props => [
+        status,
+        communities,
+        errorMessage,
+        isLoadingMore,
+        hasNext,
+        currentPage,
+        searchQuery,
+      ];
 }

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart

@@ -0,0 +1,47 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+
+part 'communities_tree_selection_event.dart';
+part 'communities_tree_selection_state.dart';
+
+class CommunitiesTreeSelectionBloc
+    extends Bloc<CommunitiesTreeSelectionEvent, CommunitiesTreeSelectionState> {
+  CommunitiesTreeSelectionBloc() : super(const CommunitiesTreeSelectionState()) {
+    on<SelectCommunityEvent>(_onSelectCommunity);
+    on<SelectSpaceEvent>(_onSelectSpace);
+    on<ClearCommunitiesTreeSelectionEvent>(_onClearSelection);
+  }
+
+  void _onSelectCommunity(
+    SelectCommunityEvent event,
+    Emitter<CommunitiesTreeSelectionState> emit,
+  ) {
+    emit(
+      CommunitiesTreeSelectionState(
+        selectedCommunity: event.community,
+        selectedSpace: null,
+      ),
+    );
+  }
+
+  void _onSelectSpace(
+    SelectSpaceEvent event,
+    Emitter<CommunitiesTreeSelectionState> emit,
+  ) {
+    emit(
+      CommunitiesTreeSelectionState(
+        selectedCommunity: null,
+        selectedSpace: event.space,
+      ),
+    );
+  }
+
+  void _onClearSelection(
+    ClearCommunitiesTreeSelectionEvent event,
+    Emitter<CommunitiesTreeSelectionState> emit,
+  ) {
+    emit(const CommunitiesTreeSelectionState());
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_event.dart

@@ -0,0 +1,30 @@
+part of 'communities_tree_selection_bloc.dart';
+
+sealed class CommunitiesTreeSelectionEvent extends Equatable {
+  const CommunitiesTreeSelectionEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+final class SelectCommunityEvent extends CommunitiesTreeSelectionEvent {
+  final CommunityModel? community;
+
+  const SelectCommunityEvent({required this.community});
+  @override
+  List<Object?> get props => [community];
+}
+
+final class SelectSpaceEvent extends CommunitiesTreeSelectionEvent {
+  final SpaceModel? space;
+
+  const SelectSpaceEvent({required this.space});
+
+  @override
+  List<Object?> get props => [space];
+}
+
+final class ClearCommunitiesTreeSelectionEvent
+    extends CommunitiesTreeSelectionEvent {
+  const ClearCommunitiesTreeSelectionEvent();
+}

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_state.dart

@@ -0,0 +1,29 @@
+part of 'communities_tree_selection_bloc.dart';
+
+final class CommunitiesTreeSelectionState extends Equatable {
+  const CommunitiesTreeSelectionState({
+    this.selectedCommunity,
+    this.selectedSpace,
+  });
+
+  final CommunityModel? selectedCommunity;
+  final SpaceModel? selectedSpace;
+
+  CommunitiesTreeSelectionState copyWith({
+    CommunityModel? selectedCommunity,
+    SpaceModel? selectedSpace,
+    List<CommunityModel>? expandedCommunities,
+    List<SpaceModel>? expandedSpaces,
+  }) {
+    return CommunitiesTreeSelectionState(
+      selectedCommunity: selectedCommunity ?? this.selectedCommunity,
+      selectedSpace: selectedSpace ?? this.selectedSpace,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+        selectedCommunity,
+        selectedSpace,
+      ];
+  }

lib/pages/space_management_v2/modules/communities/presentation/widgets/communities_tree_failure_widget.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+
+class CommunitiesTreeFailureWidget extends StatelessWidget {
+  const CommunitiesTreeFailureWidget({super.key, this.errorMessage});
+
+  final String? errorMessage;
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              errorMessage ?? 'Something went wrong',
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => context.read<CommunitiesBloc>().add(
+                    LoadCommunities(
+                      LoadCommunitiesParam(
+                        search: context.read<CommunitiesBloc>().state.searchQuery,
+                      ),
+                    ),
+                  ),
+              child: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/community_tile.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/common/widgets/custom_expansion_tile.dart';
+
+class CommunityTile extends StatelessWidget {
+  final String title;
+  final List<Widget>? children;
+  final bool isExpanded;
+  final bool isSelected;
+  final void Function(String, bool isExpanded) onExpansionChanged;
+  final void Function() onItemSelected;
+
+  const CommunityTile({
+    super.key,
+    required this.title,
+    required this.isExpanded,
+    required this.onExpansionChanged,
+    required this.onItemSelected,
+    required this.isSelected,
+    this.children,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: CustomExpansionTile(
+          title: title,
+          initiallyExpanded: isExpanded,
+          isSelected: isSelected,
+          onExpansionChanged: (bool expanded) {
+            onExpansionChanged(title, expanded);
+          },
+          onItemSelected: onItemSelected,
+          children: children ?? [],
+        ));
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/empty_communities_tree_search_result_widget.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+class EmptyCommunitiesTreeSearchResultWidget extends StatelessWidget {
+  const EmptyCommunitiesTreeSearchResultWidget({
+    required this.searchQuery,
+    super.key,
+  });
+
+  final String searchQuery;
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Text(
+        searchQuery.isEmpty
+            ? 'No communities found'
+            : 'No communities found for "$searchQuery"',
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree.dart

@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/common/widgets/app_loading_indicator.dart';
+import 'package:syncrow_web/common/widgets/search_bar.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/communities_tree_failure_widget.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/empty_communities_tree_search_result_widget.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree_community_tile.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_management_sidebar_communities_list.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_management_sidebar_header.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class SpaceManagementCommunitiesTree extends StatefulWidget {
+  const SpaceManagementCommunitiesTree({super.key});
+
+  @override
+  State<SpaceManagementCommunitiesTree> createState() =>
+      _SpaceManagementCommunitiesTreeState();
+}
+
+class _SpaceManagementCommunitiesTreeState
+    extends State<SpaceManagementCommunitiesTree> {
+  @override
+  void initState() {
+    context.read<CommunitiesBloc>().add(
+          const LoadCommunities(LoadCommunitiesParam()),
+        );
+    super.initState();
+  }
+
+  void _onSearchChanged(String searchQuery) {
+    context
+        .read<CommunitiesBloc>()
+        .add(LoadCommunities(LoadCommunitiesParam(search: searchQuery.trim())));
+  }
+
+  void _onLoadMore() {
+    context.read<CommunitiesBloc>().add(const LoadMoreCommunities());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<CommunitiesBloc, CommunitiesState>(
+      builder: (context, state) => Container(
+        width: 320,
+        decoration: subSectionContainerDecoration,
+        child: Column(
+          children: [
+            const SpaceManagementSidebarHeader(),
+            CustomSearchBar(
+              onSearchChanged: _onSearchChanged,
+            ),
+            const SizedBox(height: 16),
+            switch (state.status) {
+              CommunitiesStatus.initial => const AppLoadingIndicator(),
+              CommunitiesStatus.loading => state.communities.isEmpty
+                  ? const AppLoadingIndicator()
+                  : _buildCommunitiesTree(context, state),
+              CommunitiesStatus.success => _buildCommunitiesTree(context, state),
+              CommunitiesStatus.failure => CommunitiesTreeFailureWidget(
+                  errorMessage: state.errorMessage,
+                ),
+            },
+            Visibility(
+              visible: state.isLoadingMore,
+              child: const AppLoadingIndicator(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCommunitiesTree(
+    BuildContext context,
+    CommunitiesState state,
+  ) {
+    final communitiesIsEmpty = state.communities.isEmpty;
+    final statusIsSuccess = state.status == CommunitiesStatus.success;
+
+    return Expanded(
+      child: Visibility(
+        visible: statusIsSuccess && communitiesIsEmpty,
+        replacement: Stack(
+          children: [
+            SpaceManagementSidebarCommunitiesList(
+              communities: state.communities,
+              onLoadMore: state.hasNext ? _onLoadMore : null,
+              isLoadingMore: state.isLoadingMore,
+              hasNext: state.hasNext,
+              itemBuilder: (context, index) {
+                return SpaceManagementCommunitiesTreeCommunityTile(
+                  community: state.communities[index],
+                );
+              },
+            ),
+            if (state.status == CommunitiesStatus.loading &&
+                state.communities.isNotEmpty)
+              ColoredBox(
+                color: Colors.white.withValues(alpha: 0.7),
+                child: const AppLoadingIndicator(),
+              ),
+          ],
+        ),
+        child: EmptyCommunitiesTreeSearchResultWidget(
+          searchQuery: state.searchQuery,
+        ),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree_community_tile.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree_space_tile.dart';
+
+class SpaceManagementCommunitiesTreeCommunityTile extends StatelessWidget {
+  const SpaceManagementCommunitiesTreeCommunityTile({
+    required this.community,
+    super.key,
+  });
+
+  final CommunityModel community;
+
+  @override
+  Widget build(BuildContext context) {
+    final spaces = community.spaces
+        .map(
+          (space) => SpaceManagementCommunitiesTreeSpaceTile(
+            space: space,
+            community: community,
+          ),
+        )
+        .toList();
+    return CommunityTile(
+      title: community.name,
+      key: ValueKey(community.uuid),
+      isSelected: context
+              .watch<CommunitiesTreeSelectionBloc>()
+              .state
+              .selectedCommunity
+              ?.uuid ==
+          community.uuid,
+      isExpanded: false,
+      onItemSelected: () {
+        context.read<CommunitiesTreeSelectionBloc>().add(
+              SelectCommunityEvent(community: community),
+            );
+      },
+      onExpansionChanged: (title, expanded) {},
+      children: spaces,
+    );
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/space_management_communities_tree_space_tile.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/widgets/space_tile.dart';
+
+class SpaceManagementCommunitiesTreeSpaceTile extends StatelessWidget {
+  const SpaceManagementCommunitiesTreeSpaceTile({
+    required this.space,
+    required this.community,
+    super.key,
+  });
+
+  final SpaceModel space;
+  final CommunityModel community;
+
+  @override
+  Widget build(BuildContext context) {
+    final spaceIsExpanded = _isSpaceOrChildSelected(context, space);
+    final isSelected =
+        context.watch<CommunitiesTreeSelectionBloc>().state.selectedSpace?.uuid ==
+            space.uuid;
+    return Padding(
+      padding: const EdgeInsetsDirectional.only(start: 16.0),
+      child: SpaceTile(
+        title: space.spaceName,
+        key: ValueKey(space.uuid),
+        isSelected: isSelected,
+        initiallyExpanded: spaceIsExpanded,
+        onExpansionChanged: (expanded) {},
+        onItemSelected: () => context.read<CommunitiesTreeSelectionBloc>().add(
+              SelectSpaceEvent(space: space),
+            ),
+        children: space.children
+            .map(
+              (childSpace) => SpaceManagementCommunitiesTreeSpaceTile(
+                space: childSpace,
+                community: community,
+              ),
+            )
+            .toList(),
+      ),
+    );
+  }
+
+  bool _isSpaceOrChildSelected(BuildContext context, SpaceModel space) {
+    final selectedSpace =
+        context.read<CommunitiesTreeSelectionBloc>().state.selectedSpace;
+    final isSpaceSelected = selectedSpace?.uuid == space.uuid;
+    final anySubSpaceIsSelected = space.children.any(
+      (child) => _isSpaceOrChildSelected(context, child),
+    );
+    return isSpaceSelected || anySubSpaceIsSelected;
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/widgets/space_management_sidebar_add_community_button.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class SpaceManagementSidebarAddCommunityButton extends StatelessWidget {
+  const SpaceManagementSidebarAddCommunityButton({
+    required this.onTap,
+    super.key,
+  });
+
+  final void Function() onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: 30,
+      child: IconButton(
+        style: IconButton.styleFrom(
+          iconSize: 20,
+          backgroundColor: ColorsManager.circleImageBackground,
+          shape: const CircleBorder(
+            side: BorderSide(
+              color: ColorsManager.lightGrayBorderColor,
+              width: 3,
+            ),
+          ),
+        ),
+        onPressed: onTap,
+        icon: SvgPicture.asset(Assets.addIcon),
+      ),
+    );
+  }
+}