now if user change end time into value before start time it prevent it with dialog information showing the error and if the init start date is null fill it with the needed value

lib/common/widgets/app_loading_indicator.dart

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

lib/pages/analytics/models/range_of_aqi.dart

@@ -38,9 +38,9 @@ class RangeOfAqiValue extends Equatable {
   factory RangeOfAqiValue.fromJson(Map<String, dynamic> json) {
     return RangeOfAqiValue(
       type: json['type'] as String,
-      min: (json['min'] as num? ?? 0).toDouble(),
-      average: (json['average'] as num? ?? 0).toDouble(),
-      max: (json['max'] as num? ?? 0).toDouble(),
+      min: (json['min'] as num).toDouble(),
+      average: (json['average'] as num).toDouble(),
+      max: (json['max'] as num).toDouble(),
     );
   }
 

lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart

@@ -24,13 +24,11 @@ abstract final class FetchAirQualityDataHelper {
   }) {
     final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
     final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
-    if (shouldFetchAnalyticsDevices) {
-      loadAnalyticsDevices(
-        context,
-        communityUuid: communityUuid,
-        spaceUuid: spaceUuid,
-      );
-    }
+    loadAnalyticsDevices(
+      context,
+      communityUuid: communityUuid,
+      spaceUuid: spaceUuid,
+    );
     loadRangeOfAqi(
       context,
       spaceUuid: spaceUuid,

lib/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart

@@ -18,16 +18,11 @@ abstract final class RangeOfAqiChartsHelper {
     (ColorsManager.hazardousPurple, 'Hazardous'),
   ];
 
-  static FlTitlesData titlesData(
-    BuildContext context,
-    List<RangeOfAqi> data, {
-    double leftSideInterval = 50,
-  }) {
+  static FlTitlesData titlesData(BuildContext context, List<RangeOfAqi> data) {
     final titlesData = EnergyManagementChartsHelper.titlesData(context);
     return titlesData.copyWith(
       bottomTitles: titlesData.bottomTitles.copyWith(
         sideTitles: titlesData.bottomTitles.sideTitles.copyWith(
-          reservedSize: 36,
           getTitlesWidget: (value, meta) => Padding(
             padding: const EdgeInsetsDirectional.only(top: 20.0),
             child: Text(
@@ -43,11 +38,10 @@ abstract final class RangeOfAqiChartsHelper {
       leftTitles: titlesData.leftTitles.copyWith(
         sideTitles: titlesData.leftTitles.sideTitles.copyWith(
           reservedSize: 70,
-          interval: leftSideInterval,
+          interval: 50,
           maxIncluded: false,
-          minIncluded: true,
           getTitlesWidget: (value, meta) {
-            final text = value.toInt().toString();
+            final text = value >= 300 ? '301+' : value.toInt().toString();
             return Padding(
               padding: const EdgeInsetsDirectional.only(end: 12),
               child: FittedBox(

lib/pages/analytics/modules/air_quality/views/air_quality_view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_box.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_legend.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart';
 
 class AirQualityView extends StatelessWidget {
@@ -21,10 +20,6 @@ class AirQualityView extends StatelessWidget {
             child: Column(
               spacing: 32,
               children: [
-                SizedBox(
-                  height: height * 0.1,
-                  child: const AqiLegend(),
-                ),
                 SizedBox(
                   height: height * 1.2,
                   child: const AirQualityEndSideWidget(),
@@ -45,7 +40,7 @@ class AirQualityView extends StatelessWidget {
         return SingleChildScrollView(
           child: Container(
             padding: _padding,
-            height: height * 1.2,
+            height: height * 1.1,
             child: const Column(
               children: [
                 Expanded(
@@ -57,9 +52,8 @@ class AirQualityView extends StatelessWidget {
                         child: Column(
                           spacing: 20,
                           children: [
-                            Expanded(flex: 2, child: AqiLegend()),
-                            Expanded(flex: 12, child: RangeOfAqiChartBox()),
-                            Expanded(flex: 12, child: AqiDistributionChartBox()),
+                            Expanded(child: RangeOfAqiChartBox()),
+                            Expanded(child: AqiDistributionChartBox()),
                           ],
                         ),
                       ),

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -33,13 +32,8 @@ class AqiDistributionChart extends StatelessWidget {
   }
 
   List<BarChartGroupData> _buildBarGroups() {
-    final groups = <BarChartGroupData>[];
-    for (var i = 0; i < chartData.length; i++) {
-      final data = chartData[i];
-      final isAllZero = data.data.every((d) => d.percentage == 0);
-      if (isAllZero) {
-        continue;
-      }
+    return List.generate(chartData.length, (index) {
+      final data = chartData[index];
       final stackItems = <BarChartRodData>[];
       double currentY = 0;
       var isFirstElement = true;
@@ -62,15 +56,13 @@ class AqiDistributionChart extends StatelessWidget {
         currentY += percentageData.percentage + _rodStackItemsSpacing;
         isFirstElement = false;
       }
-      groups.add(
-        BarChartGroupData(
-          x: i,
-          barRods: stackItems,
-          groupVertically: true,
-        ),
+
+      return BarChartGroupData(
+        x: index,
+        barRods: stackItems,
+        groupVertically: true,
       );
-    }
-    return groups;
+    });
   }
 
   BarTouchData _barTouchData(BuildContext context) {
@@ -81,7 +73,6 @@ class AqiDistributionChart extends StatelessWidget {
           color: ColorsManager.semiTransparentBlack,
         ),
         tooltipRoundedRadius: 16,
-        maxContentWidth: 500,
         tooltipPadding: const EdgeInsets.all(8),
         getTooltipItem: (group, groupIndex, rod, rodIndex) {
           final data = chartData[group.x];
@@ -90,13 +81,10 @@ class AqiDistributionChart extends StatelessWidget {
 
           final textStyle = context.textTheme.bodySmall?.copyWith(
             color: ColorsManager.blackColor,
-            fontSize: 11,
+            fontSize: 8,
           );
 
           for (final percentageData in data.data) {
-            if (percentageData.percentage == 0) {
-              continue;
-            }
             final percentage = percentageData.percentage.toStringAsFixed(1);
             final type = percentageData.type[0].toUpperCase() +
                 percentageData.type.substring(1).replaceAll('_', ' ');
@@ -110,7 +98,7 @@ class AqiDistributionChart extends StatelessWidget {
             DateFormat('dd/MM/yyyy').format(data.date),
             context.textTheme.bodyMedium!.copyWith(
               color: ColorsManager.blackColor,
-              fontSize: 12,
+              fontSize: 9,
               fontWeight: FontWeight.w600,
             ),
             textAlign: TextAlign.start,
@@ -130,6 +118,7 @@ class AqiDistributionChart extends StatelessWidget {
     final leftTitles = titlesData.leftTitles.copyWith(
       sideTitles: titlesData.leftTitles.sideTitles.copyWith(
         reservedSize: 70,
+        interval: 20,
         maxIncluded: false,
         minIncluded: true,
         getTitlesWidget: (value, meta) => Padding(
@@ -150,9 +139,8 @@ class AqiDistributionChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
-      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
-        showTitles: chartData.isNotEmpty,
+        showTitles: true,
         getTitlesWidget: (value, _) => FittedBox(
           alignment: AlignmentDirectional.bottomCenter,
           fit: BoxFit.scaleDown,
@@ -160,7 +148,7 @@ class AqiDistributionChart extends StatelessWidget {
             chartData[value.toInt()].date.day.toString(),
             style: context.textTheme.bodySmall?.copyWith(
               color: ColorsManager.lightGreyColor,
-              fontSize: 12,
+              fontSize: 8,
             ),
           ),
         ),

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart

@@ -19,7 +19,7 @@ class AqiDistributionChartTitle extends StatelessWidget {
       children: [
         ChartsLoadingWidget(isLoading: isLoading),
         const Expanded(
-          flex: 4,
+          flex: 3,
           child: FittedBox(
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerStart,
@@ -28,26 +28,23 @@ class AqiDistributionChartTitle extends StatelessWidget {
             ),
           ),
         ),
-        Expanded(
-          flex: 2,
-          child: FittedBox(
-            alignment: AlignmentDirectional.centerEnd,
-            fit: BoxFit.scaleDown,
-            child: AqiTypeDropdown(
-              onChanged: (value) {
-                if (value != null) {
-                  final bloc = context.read<AirQualityDistributionBloc>();
-                  try {
-                    final param = _makeLoadAqiDistributionParam(context, value);
-                    bloc.add(LoadAirQualityDistribution(param));
-                  } catch (_) {
-                    return;
-                  } finally {
-                    bloc.add(UpdateAqiTypeEvent(value));
-                  }
+        FittedBox(
+          alignment: AlignmentDirectional.centerEnd,
+          fit: BoxFit.scaleDown,
+          child: AqiTypeDropdown(
+            onChanged: (value) {
+              if (value != null) {
+                final bloc = context.read<AirQualityDistributionBloc>();
+                try {
+                  final param = _makeLoadAqiDistributionParam(context, value);
+                  bloc.add(LoadAirQualityDistribution(param));
+                } catch (_) {
+                  return;
+                } finally {
+                  bloc.add(UpdateAqiTypeEvent(value));
                 }
-              },
-            ),
+              }
+            },
           ),
         ),
       ],

lib/pages/analytics/modules/air_quality/widgets/aqi_legend.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class AqiLegend extends StatelessWidget {
-  const AqiLegend({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsetsDirectional.all(20),
-      decoration: subSectionContainerDecoration.copyWith(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        spacing: 16,
-        children: RangeOfAqiChartsHelper.gradientData.map((e) {
-          return Flexible(
-            flex: 4,
-            child: FittedBox(
-              fit: BoxFit.fill,
-              child: ChartInformativeCell(
-                color: e.$1,
-                title: FittedBox(
-                  fit: BoxFit.fill,
-                  child: Text(e.$2),
-                ),
-                height: null,
-              ),
-            ),
-          );
-        }).toList(),
-      ),
-    );
-  }
-}

lib/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart

@@ -47,37 +47,36 @@ class AqiLocationInfoCell extends StatelessWidget {
               ),
             ),
             Align(
-              alignment: AlignmentDirectional.bottomCenter,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Expanded(
-                    child: SvgPicture.asset(
-                      svgPath,
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.bottomStart,
-                    ),
-                  ),
-                  Expanded(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.bottomEnd,
-                      child: Padding(
-                        padding: const EdgeInsetsDirectional.all(10),
-                        child: Text(
-                          value,
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: ColorsManager.vividBlue.withValues(
-                              alpha: 0.7,
-                            ),
-                            fontWeight: FontWeight.w700,
-                            fontSize: 24,
-                          ),
-                        ),
+              alignment: AlignmentDirectional.bottomEnd,
+              child: Padding(
+                padding: const EdgeInsetsDirectional.all(10),
+                child: SizedBox(
+                  height: 40,
+                  width: 120,
+                  child: FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: AlignmentDirectional.bottomEnd,
+                    child: Text(
+                      value,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.vividBlue.withValues(alpha: 0.7),
+                        fontWeight: FontWeight.w700,
+                        fontSize: 24,
                       ),
                     ),
                   ),
-                ],
+                ),
+              ),
+            ),
+            Align(
+              alignment: AlignmentDirectional.bottomStart,
+              child: SizedBox.square(
+                dimension: MediaQuery.sizeOf(context).width * 0.45,
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: AlignmentDirectional.bottomStart,
+                  child: SvgPicture.asset(svgPath),
+                ),
               ),
             ),
           ],

lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart

@@ -2,18 +2,15 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class RangeOfAqiChart extends StatelessWidget {
   final List<RangeOfAqi> chartData;
-  final AqiType selectedAqiType;
 
   const RangeOfAqiChart({
     super.key,
     required this.chartData,
-    required this.selectedAqiType,
   });
 
   List<(List<double> values, Color color, Color? dotColor)> get _lines {
@@ -48,34 +45,15 @@ class RangeOfAqiChart extends StatelessWidget {
     ];
   }
 
-  (double maxY, double interval) get _maxYForAqiType {
-    const aqiMaxValues = <AqiType, (double maxY, double interval)>{
-      AqiType.aqi: (401, 100),
-      AqiType.pm25: (351, 50),
-      AqiType.pm10: (501, 100),
-      AqiType.hcho: (301, 50),
-      AqiType.tvoc: (501, 50),
-      AqiType.co2: (1251, 250),
-    };
-
-    return aqiMaxValues[selectedAqiType]!;
-  }
-
   @override
   Widget build(BuildContext context) {
     return LineChart(
       LineChartData(
         minY: 0,
-        maxY: _maxYForAqiType.$1,
+        maxY: 301,
         clipData: const FlClipData.vertical(),
-        gridData: EnergyManagementChartsHelper.gridData(
-          horizontalInterval: _maxYForAqiType.$2,
-        ),
-        titlesData: RangeOfAqiChartsHelper.titlesData(
-          context,
-          chartData,
-          leftSideInterval: _maxYForAqiType.$2,
-        ),
+        gridData: EnergyManagementChartsHelper.gridData(horizontalInterval: 50),
+        titlesData: RangeOfAqiChartsHelper.titlesData(context, chartData),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: RangeOfAqiChartsHelper.lineTouchData(chartData),
         betweenBarsData: [

lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart

@@ -32,12 +32,7 @@ class RangeOfAqiChartBox extends StatelessWidget {
               const SizedBox(height: 10),
               const Divider(),
               const SizedBox(height: 20),
-              Expanded(
-                child: RangeOfAqiChart(
-                  chartData: state.filteredRangeOfAqi,
-                  selectedAqiType: state.selectedAqiType,
-                ),
-              ),
+              Expanded(child: RangeOfAqiChart(chartData: state.filteredRangeOfAqi)),
             ],
           ),
         );

lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart

@@ -7,18 +7,16 @@ class ChartInformativeCell extends StatelessWidget {
     required this.title,
     required this.color,
     this.hasBorder = false,
-    this.height,
   });
 
   final Widget title;
   final Color color;
   final bool hasBorder;
-  final double? height;
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: height ?? MediaQuery.sizeOf(context).height * 0.0385,
+      height: MediaQuery.sizeOf(context).height * 0.0385,
       padding: const EdgeInsetsDirectional.symmetric(
         vertical: 8,
         horizontal: 12,

lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart

@@ -1,7 +1,6 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/helpers/format_number_to_kwh.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -16,7 +15,6 @@ abstract final class EnergyManagementChartsHelper {
     return FlTitlesData(
       show: true,
       bottomTitles: AxisTitles(
-        axisNameWidget: const ChartsXAxisTitle(),
         drawBelowEverything: true,
         sideTitles: SideTitles(
           interval: 1,
@@ -64,12 +62,17 @@ abstract final class EnergyManagementChartsHelper {
     );
   }
 
-  static String getToolTipLabel(double value) => value.formatNumberToKwh;
+  static String getToolTipLabel(num month, double value) {
+    final monthLabel = month.toString();
+    final valueLabel = value.formatNumberToKwh;
+    final labels = [monthLabel, valueLabel];
+    return labels.where((element) => element.isNotEmpty).join(', ');
+  }
 
   static List<LineTooltipItem?> getTooltipItems(List<LineBarSpot> touchedSpots) {
     return touchedSpots.map((spot) {
       return LineTooltipItem(
-        getToolTipLabel(spot.y),
+        getToolTipLabel(spot.x, spot.y),
         const TextStyle(
           color: ColorsManager.textPrimaryColor,
           fontWeight: FontWeight.w600,

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart

@@ -37,7 +37,7 @@ class EnergyConsumptionPerDeviceChartBox extends StatelessWidget {
                       fit: BoxFit.scaleDown,
                       alignment: AlignmentDirectional.centerStart,
                       child: ChartTitle(
-                        title: Text('Device energy consumed'),
+                        title: Text('Energy Consumption per Device'),
                       ),
                     ),
                   ),

lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart

@@ -32,7 +32,7 @@ class TotalEnergyConsumptionChartBox extends StatelessWidget {
                   child: FittedBox(
                     alignment: AlignmentDirectional.centerStart,
                     fit: BoxFit.scaleDown,
-                    child: ChartTitle(title: Text('Space energy consumed')),
+                    child: ChartTitle(title: Text('Total Energy Consumption')),
                   ),
                 ),
                 const Spacer(flex: 4),

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

@@ -39,7 +39,7 @@ class HeatMapTooltip extends StatelessWidget {
             ),
             const Divider(height: 2, thickness: 1),
             Text(
-              'Occupancy detected: $value',
+              '$value Occupants',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 10,
                 fontWeight: FontWeight.w500,

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

@@ -2,7 +2,6 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -89,8 +88,8 @@ class OccupancyChart extends StatelessWidget {
   }) {
     final data = chartData;
 
-    final occupancyValue = double.parse(data[group.x].occupancy);
-    final percentage = '${occupancyValue.toStringAsFixed(0)}%';
+    final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
+    final percentage = '${(occupancyValue).toStringAsFixed(0)}%';
 
     return BarTooltipItem(
       percentage,
@@ -117,7 +116,7 @@ class OccupancyChart extends StatelessWidget {
             alignment: AlignmentDirectional.centerStart,
             fit: BoxFit.scaleDown,
             child: Text(
-              '${value.toStringAsFixed(0)}%',
+              '${(value).toStringAsFixed(0)}%',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 12,
                 color: ColorsManager.greyColor,
@@ -129,7 +128,6 @@ class OccupancyChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
-      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
         showTitles: true,
         getTitlesWidget: (value, _) => FittedBox(

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

@@ -23,7 +23,7 @@ class OccupancyEndSideBar extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              const AnalyticsSidebarHeader(title: 'Presence Sensor'),
+              const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
               Expanded(
                 child: SizedBox(
                   // height: MediaQuery.sizeOf(context).height * 0.2,

lib/pages/analytics/widgets/charts_x_axis_title.dart

@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class ChartsXAxisTitle extends StatelessWidget {
-  const ChartsXAxisTitle({
-    this.label = 'Day of month',
-    super.key,
-  });
-
-  final String label;
-
-  @override
-  Widget build(BuildContext context) {
-    return Text(
-      label,
-      style: context.textTheme.bodySmall?.copyWith(
-        color: ColorsManager.lightGreyColor,
-        fontSize: 8,
-      ),
-    );
-  }
-}

lib/pages/common/custom_table.dart

@@ -179,36 +179,31 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildEmptyState() => Container(
-        height: widget.size.height,
-        color: ColorsManager.whiteColors,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Column(
-                  children: [
-                    SvgPicture.asset(Assets.emptyTable),
-                    const SizedBox(height: 15),
-                    Text(
-                      widget.tableName == 'AccessManagement'
-                          ? 'No Password '
-                          : 'No Devices',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall!
-                          .copyWith(color: ColorsManager.grayColor),
-                    )
-                  ],
-                ),
-              ],
-            ),
-            SizedBox(height: widget.size.height * 0.5),
-          ],
-        ),
+  Widget _buildEmptyState() => Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Column(
+                children: [
+                  SvgPicture.asset(Assets.emptyTable),
+                  const SizedBox(height: 15),
+                  Text(
+                    widget.tableName == 'AccessManagement'
+                        ? 'No Password '
+                        : 'No Devices',
+                    style: Theme.of(context)
+                        .textTheme
+                        .bodySmall!
+                        .copyWith(color: ColorsManager.grayColor),
+                  )
+                ],
+              ),
+            ],
+          ),
+        ],
       );
   Widget _buildSelectAllCheckbox() {
     return Container(

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

@@ -45,8 +45,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   ) async {
     emit(AcsLoadingState());
     try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
       if (deviceStatus.countdown1 != 0) {
         final totalMinutes = deviceStatus.countdown1 * 6;
@@ -69,13 +68,12 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
-
-  void _listenToChanges(String deviceId) {
+  void _listenToChanges(deviceId) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      _deviceStatusSubscription =
-          ref.onValue.listen((DatabaseEvent event) async {
+      final stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) async {
         if (event.snapshot.value == null) return;
 
         Map<dynamic, dynamic> usersMap =
@@ -84,14 +82,10 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         List<Status> statusList = [];
 
         usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
+          statusList.add(Status(code: element['code'], value: element['value']));
         });
 
-        deviceStatus =
-            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
-        print('Device status updated: ${deviceStatus.acSwitch}');
-
+        deviceStatus = AcStatusModel.fromJson(usersMap['productUuid'], statusList);
         if (!isClosed) {
           add(AcStatusUpdated(deviceStatus));
         }
@@ -112,14 +106,15 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     Emitter<AcsState> emit,
   ) async {
     emit(AcsLoadingState());
+    _updateDeviceFunctionFromCode(event.code, event.value);
+    emit(ACStatusLoaded(status: deviceStatus));
 
     try {
       final success = await controlDeviceService.controlDevice(
         deviceUuid: event.deviceId,
         status: Status(code: event.code, value: event.value),
       );
-      _updateDeviceFunctionFromCode(event.code, event.value);
-      emit(ACStatusLoaded(status: deviceStatus));
+
       if (!success) {
         emit(const AcsFailedState(error: 'Failed to control device'));
       }
@@ -134,10 +129,8 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   ) async {
     emit(AcsLoadingState());
     try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus =
-          AcStatusModel.fromJson(event.devicesIds.first, status.status);
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus = AcStatusModel.fromJson(event.devicesIds.first, status.status);
       emit(ACStatusLoaded(status: deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
@@ -300,17 +293,13 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         totalSeconds--;
         scheduledHours = totalSeconds ~/ 3600;
         scheduledMinutes = (totalSeconds % 3600) ~/ 60;
-        if (!isClosed) {
-          add(UpdateTimerEvent());
-        }
+        add(UpdateTimerEvent());
       } else {
         _countdownTimer?.cancel();
         timerActive = false;
         scheduledHours = 0;
         scheduledMinutes = 0;
-        if (!isClosed) {
-          add(TimerCompletedEvent());
-        }
+        add(TimerCompletedEvent());
       }
     });
   }
@@ -337,9 +326,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       _startCountdownTimer(
         emit,
       );
-      if (!isClosed) {
-        add(UpdateTimerEvent());
-      }
+      add(UpdateTimerEvent());
     }
   }
 
@@ -383,8 +370,6 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   @override
   Future<void> close() {
     add(OnClose());
-    _countdownTimer?.cancel();
-    _deviceStatusSubscription?.cancel();
     return super.close();
   }
 }

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -40,18 +40,17 @@ class DeviceManagementBloc
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices =
-            await DevicesManagementApi().fetchDevices('', '', projectUuid);
+        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
           for (var space in spacesList) {
-            devices.addAll(await DevicesManagementApi()
-                .fetchDevices(community, space, projectUuid));
+            devices.addAll(await DevicesManagementApi().fetchDevices(
+                community, space, projectUuid));
           }
         }
       }
@@ -101,7 +100,7 @@ class DeviceManagementBloc
       ));
 
       if (currentProductName.isNotEmpty) {
-        add(SearchDevices(deviceNameOrProductName: currentProductName));
+        add(SearchDevices(productName: currentProductName));
       }
     }
   }
@@ -270,41 +269,34 @@ class DeviceManagementBloc
         return 'All';
     }
   }
+
   void _onSearchDevices(
       SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
-        (event.deviceNameOrProductName == null ||
-            event.deviceNameOrProductName!.isEmpty)) {
+        (event.productName == null || event.productName!.isEmpty)) {
       currentProductName = '';
-      _filteredDevices = List.from(_devices);
-      emit(DeviceManagementLoaded(
-        devices: _devices,
-        selectedIndex: _selectedIndex,
-        onlineCount: _onlineCount,
-        offlineCount: _offlineCount,
-        lowBatteryCount: _lowBatteryCount,
-        selectedDevice: null,
-        isControlButtonEnabled: false,
-      ));
-      return;
+      if (state is DeviceManagementFiltered) {
+        add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
+      } else {
+        return;
+      }
     }
-    if (event.deviceNameOrProductName == currentProductName &&
+
+    if (event.productName == currentProductName &&
         event.community == currentCommunity &&
         event.unitName == currentUnitName &&
         event.searchField) {
       return;
     }
 
-    currentProductName = event.deviceNameOrProductName ?? '';
+    currentProductName = event.productName ?? '';
     currentCommunity = event.community;
     currentUnitName = event.unitName;
 
-    List<AllDevicesModel> devicesToSearch = _devices;
+    List<AllDevicesModel> devicesToSearch = _filteredDevices;
 
     if (devicesToSearch.isNotEmpty) {
-      final searchText = event.deviceNameOrProductName?.toLowerCase() ?? '';
-
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
@@ -312,25 +304,31 @@ class DeviceManagementBloc
                     ?.toLowerCase()
                     .contains(event.community!.toLowerCase()) ??
                 false);
-
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
-                device.spaces!.any((space) =>
-                    space.spaceName != null &&
-                    space.spaceName!
-                        .toLowerCase()
-                        .contains(event.unitName!.toLowerCase())));
+                device.spaces!.isNotEmpty &&
+                device.spaces![0].spaceName!
+                    .toLowerCase()
+                    .contains(event.unitName!.toLowerCase()));
+        final matchesProductName = event.productName == null ||
+            event.productName!.isEmpty ||
+            (device.name
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
+        final matchesDeviceName = event.productName == null ||
+            event.productName!.isEmpty ||
+            (device.categoryName
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
 
-        final matchesSearchText = searchText.isEmpty ||
-            (device.name?.toLowerCase().contains(searchText) ?? false) ||
-            (device.productName?.toLowerCase().contains(searchText) ?? false);
-
-        return matchesCommunity && matchesUnit && matchesSearchText;
+        return matchesCommunity &&
+            matchesUnit &&
+            (matchesProductName || matchesDeviceName);
       }).toList();
 
-      _filteredDevices = filteredDevices;
-
       emit(DeviceManagementFiltered(
         filteredDevices: filteredDevices,
         selectedIndex: _selectedIndex,

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -38,18 +38,18 @@ class SelectedFilterChanged extends DeviceManagementEvent {
 class SearchDevices extends DeviceManagementEvent {
   final String? community;
   final String? unitName;
-  final String? deviceNameOrProductName;
+  final String? productName;
   final bool searchField;
 
   const SearchDevices({
     this.community,
     this.unitName,
-    this.deviceNameOrProductName,
+    this.productName,
     this.searchField = false,
   });
 
   @override
-  List<Object?> get props => [community, unitName, deviceNameOrProductName];
+  List<Object?> get props => [community, unitName, productName];
 }
 
 class SelectDevice extends DeviceManagementEvent {

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -53,7 +53,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       controller: controller,
       onSubmitted: () {
         final searchDevicesEvent = SearchDevices(
-          deviceNameOrProductName: _productNameController.text,
+          productName: _productNameController.text,
           unitName: _unitNameController.text,
           searchField: true,
         );
@@ -68,7 +68,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       onSearch: () => context.read<DeviceManagementBloc>().add(
             SearchDevices(
               unitName: _unitNameController.text,
-              deviceNameOrProductName: _productNameController.text,
+              productName: _productNameController.text,
               searchField: true,
             ),
           ),

lib/pages/device_managment/door_lock/bloc/door_lock_bloc.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+
 import 'dart:async';
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -14,38 +16,45 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
   DoorLockBloc({required this.deviceId}) : super(DoorLockInitial()) {
     on<DoorLockFetchStatus>(_onFetchDeviceStatus);
+    //on<DoorLockControl>(_onDoorLockControl);
     on<UpdateLockEvent>(_updateLock);
     on<DoorLockFactoryReset>(_onFactoryReset);
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  void _listenToChanges(String deviceId) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      ref.onValue.listen((event) {
-        final data = event.snapshot.value;
-        if (data is Map) {
-          final statusData = data['status'] as List<dynamic>? ?? [];
-          final statusList = statusData.map((item) {
-            return Status(code: item['code'], value: item['value']);
-          }).toList();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-          final model =
-              DoorLockStatusModel.fromJson(data['productUuid'], statusList);
-          if (!isClosed) {
-            add(StatusUpdated(model));
-          }
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            DoorLockStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
         }
       });
     } catch (_) {}
   }
 
   void _onStatusUpdated(StatusUpdated event, Emitter<DoorLockState> emit) {
+    emit(DoorLockStatusLoading());
+
     deviceStatus = event.deviceStatus;
     emit(DoorLockStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onFetchDeviceStatus(
+  FutureOr<void> _onFetchDeviceStatus(
       DoorLockFetchStatus event, Emitter<DoorLockState> emit) async {
     emit(DoorLockStatusLoading());
     try {
@@ -54,13 +63,14 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
       deviceStatus =
           DoorLockStatusModel.fromJson(event.deviceId, status.status);
       _listenToChanges(event.deviceId);
+
       emit(DoorLockStatusLoaded(deviceStatus));
     } catch (e) {
       emit(DoorLockControlError(e.toString()));
     }
   }
 
-  Future<void> _updateLock(
+  FutureOr<void> _updateLock(
       UpdateLockEvent event, Emitter<DoorLockState> emit) async {
     final oldValue = deviceStatus.normalOpenSwitch;
     deviceStatus = deviceStatus.copyWith(normalOpenSwitch: !oldValue);
@@ -68,6 +78,7 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
     try {
       final response = await DevicesManagementApi.openDoorLock(deviceId);
+
       if (!response) {
         _revertValueAndEmit(deviceId, 'normal_open_switch', oldValue, emit);
       }
@@ -77,8 +88,35 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
     }
   }
 
-  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
-      Emitter<DoorLockState> emit) {
+  Future<void> _runDebounce({
+    required String deviceId,
+    required String code,
+    required dynamic value,
+    required dynamic oldValue,
+    required Emitter<DoorLockState> emit,
+  }) async {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        final response = await DevicesManagementApi()
+            .deviceControl(deviceId, Status(code: code, value: value));
+        if (!response) {
+          _revertValueAndEmit(deviceId, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(deviceId, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(
+    String deviceId,
+    String code,
+    dynamic oldValue,
+    Emitter<DoorLockState> emit,
+  ) {
     _updateLocalValue(code, oldValue);
     emit(DoorLockStatusLoaded(deviceStatus));
     emit(const DoorLockControlError('Failed to control the device.'));
@@ -86,23 +124,34 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
   void _updateLocalValue(String code, dynamic value) {
     switch (code) {
-      case 'normal_open_switch':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(normalOpenSwitch: value);
-        }
-        break;
       case 'reverse_lock':
         if (value is bool) {
           deviceStatus = deviceStatus.copyWith(reverseLock: value);
         }
         break;
+      case 'normal_open_switch':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(normalOpenSwitch: value);
+        }
+        break;
       default:
         break;
     }
     emit(DoorLockStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onFactoryReset(
+  dynamic _getValueByCode(String code) {
+    switch (code) {
+      case 'reverse_lock':
+        return deviceStatus.reverseLock;
+      case 'normal_open_switch':
+        return deviceStatus.normalOpenSwitch;
+      default:
+        return null;
+    }
+  }
+
+  FutureOr<void> _onFactoryReset(
       DoorLockFactoryReset event, Emitter<DoorLockState> emit) async {
     emit(DoorLockStatusLoading());
     try {

lib/pages/device_managment/door_lock/widget/door_button.dart

@@ -8,7 +8,7 @@ import 'package:syncrow_web/pages/device_managment/door_lock/models/door_lock_st
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class DoorLockButton extends StatelessWidget {
+class DoorLockButton extends StatefulWidget {
   const DoorLockButton({
     super.key,
     required this.doorLock,
@@ -18,28 +18,70 @@ class DoorLockButton extends StatelessWidget {
   final AllDevicesModel doorLock;
   final DoorLockStatusModel smartDoorModel;
 
-  double _calculateProgress() {
-    final value = smartDoorModel.unlockRequest;
-    if (value <= 0 || value > 30) return 0;
-    return value / 30.0;
+  @override
+  State<DoorLockButton> createState() =>
+      _DoorLockButtonState(smartDoorModel: smartDoorModel);
+}
+
+class _DoorLockButtonState extends State<DoorLockButton>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+  DoorLockStatusModel smartDoorModel;
+
+  _DoorLockButtonState({required this.smartDoorModel});
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 500),
+    );
+    _animation = Tween<double>(begin: 0, end: 1).animate(_animationController)
+      ..addListener(() {
+        setState(() {});
+      });
+
+    if (smartDoorModel.unlockRequest > 0) {
+      _animationController.reverse(from: 1);
+    }
+  }
+
+  @override
+  void didUpdateWidget(covariant DoorLockButton oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.smartDoorModel.normalOpenSwitch !=
+        widget.smartDoorModel.normalOpenSwitch) {
+      setState(() {
+        smartDoorModel = widget.smartDoorModel;
+      });
+
+      if (smartDoorModel.unlockRequest > 0) {
+        _animationController.forward(from: 0);
+      } else {
+        _animationController.reverse(from: 1);
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    final progress = _calculateProgress();
-    final isEnabled = smartDoorModel.unlockRequest > 0;
-
     return SizedBox(
       width: 255,
       height: 255,
       child: InkWell(
-        onTap: isEnabled
-            ? () {
-                BlocProvider.of<DoorLockBloc>(context).add(
-                  UpdateLockEvent(value: !smartDoorModel.normalOpenSwitch),
-                );
-              }
-            : null,
+        onTap: () {
+          _animationController.forward(from: 0);
+          BlocProvider.of<DoorLockBloc>(context)
+              .add(UpdateLockEvent(value: !smartDoorModel.normalOpenSwitch));
+        },
         child: Container(
           width: 255,
           height: 255,
@@ -73,16 +115,15 @@ class DoorLockButton extends StatelessWidget {
                   ),
                 ),
               ),
-              if (progress > 0)
-                SizedBox.expand(
-                  child: CircularProgressIndicator(
-                    value: progress,
-                    strokeWidth: 8,
-                    backgroundColor: Colors.transparent,
-                    valueColor: const AlwaysStoppedAnimation<Color>(
-                        ColorsManager.primaryColor),
-                  ),
+              SizedBox.expand(
+                child: CircularProgressIndicator(
+                  value: _animation.value,
+                  strokeWidth: 8,
+                  backgroundColor: Colors.transparent,
+                  valueColor: const AlwaysStoppedAnimation<Color>(
+                      ColorsManager.primaryColor),
                 ),
+              ),
             ],
           ),
         ),

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/schedule_view/time_out_alarm_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/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(
-                  height: 200,
-                  child: Center(child: CircularProgressIndicator()));
+              return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
             }
-            if (state is GarageDoorLoadedState &&
-                state.status.schedules!.isEmpty) {
+            if (state is GarageDoorLoadedState && state.status.schedules?.isEmpty == true) {
               return _buildEmptyState(context);
             } else if (state is GarageDoorLoadedState) {
               return Container(
                   height: 200,
                   decoration: BoxDecoration(
                     border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius: const BorderRadius.vertical(
-                        bottom: Radius.circular(20)),
+                    borderRadius:
+                        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(
-                    state.status.schedules![i], i, context, state),
+                _buildScheduleRow(state.status.schedules![i], i, context, state),
           ],
         ),
       ),
@@ -138,8 +134,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
     );
   }
 
-  TableRow _buildScheduleRow(ScheduleModel schedule, int index,
-      BuildContext context, GarageDoorLoadedState state) {
+  TableRow _buildScheduleRow(ScheduleModel schedule, int index, 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,
-                      color: ColorsManager.blueColor)
+                  ? const Icon(Icons.radio_button_checked, color: ColorsManager.blueColor)
                   : const Icon(
                       Icons.radio_button_unchecked,
                       color: ColorsManager.grayColor,
@@ -166,9 +160,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
             ),
           ),
         ),
-        Center(
-            child: Text(_getSelectedDays(
-                ScheduleModel.parseSelectedDays(schedule.days)))),
+        Center(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(
-                      context,
-                      schedule: schedule,
-                      index: index,
-                      isEdit: true);
+                  GarageDoorDialogHelper.showAddGarageDoorScheduleDialog(context,
+                      schedule: schedule, index: index, isEdit: true);
                 },
                 child: Text(
                   'Edit',
-                  style: context.textTheme.bodySmall!
-                      .copyWith(color: ColorsManager.blueColor),
+                  style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blueColor),
                 ),
               ),
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  context
-                      .read<GarageDoorBloc>()
-                      .add(DeleteGarageDoorScheduleEvent(
+                  context.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!
-                      .copyWith(color: ColorsManager.blueColor),
+                  style: context.textTheme.bodySmall!.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/schedule_view/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_header.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/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
-    with HelperResponsiveLayout {
+class OneGangGlassSwitchControlView extends StatelessWidget 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)
-            ..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
+          OneGangGlassSwitchBlocFactory.create(deviceId: 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(
-      BuildContext context, OneGangGlassStatusModel status) {
+  Widget _buildStatusControls(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(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<OneGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        category: 'switch_1',
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: '',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
+        ToggleWidget(
+          value: false,
+          code: '',
+          deviceId: deviceId,
+          label: 'Scheduling',
+          icon: Assets.scheduling,
+          onChange: (value) {},
+          showToggle: false,
         ),
       ],
     );

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(
-          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,
-        ),
+        const SizedBox(),
       ],
     );
   }

lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart

@@ -12,8 +12,7 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 //Smart Power Clamp
-class SmartPowerDeviceControl extends StatelessWidget
-    with HelperResponsiveLayout {
+class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayout {
   final String deviceId;
 
   const SmartPowerDeviceControl({super.key, required this.deviceId});
@@ -146,16 +145,13 @@ class SmartPowerDeviceControl extends StatelessWidget
                       children: [
                         IconButton(
                           icon: const Icon(Icons.arrow_left),
-                          onPressed: blocProvider.currentPage <= 0
-                              ? null
-                              : () {
-                                  blocProvider
-                                      .add(SmartPowerArrowPressedEvent(-1));
-                                  pageController.previousPage(
-                                    duration: const Duration(milliseconds: 300),
-                                    curve: Curves.easeInOut,
-                                  );
-                                },
+                          onPressed: () {
+                            blocProvider.add(SmartPowerArrowPressedEvent(-1));
+                            pageController.previousPage(
+                              duration: const Duration(milliseconds: 300),
+                              curve: Curves.easeInOut,
+                            );
+                          },
                         ),
                         Text(
                           currentPage == 0
@@ -169,16 +165,13 @@ class SmartPowerDeviceControl extends StatelessWidget
                         ),
                         IconButton(
                           icon: const Icon(Icons.arrow_right),
-                          onPressed: blocProvider.currentPage >= 3
-                              ? null
-                              : () {
-                                  blocProvider
-                                      .add(SmartPowerArrowPressedEvent(1));
-                                  pageController.nextPage(
-                                    duration: const Duration(milliseconds: 300),
-                                    curve: Curves.easeInOut,
-                                  );
-                                },
+                          onPressed: () {
+                            blocProvider.add(SmartPowerArrowPressedEvent(1));
+                            pageController.nextPage(
+                              duration: const Duration(milliseconds: 300),
+                              curve: Curves.easeInOut,
+                            );
+                          },
                         ),
                       ],
                     ),
@@ -202,8 +195,8 @@ class SmartPowerDeviceControl extends StatelessWidget
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
                                 selectedDate: blocProvider.dateTime!,
-                                viewType: blocProvider
-                                    .views[blocProvider.currentIndex]));
+                                viewType:
+                                    blocProvider.views[blocProvider.currentIndex]));
                           },
                           widget: blocProvider.dateSwitcher(),
                           chartData: blocProvider.energyDataList.isNotEmpty

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

@@ -1,597 +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,
-        countdownHours: 0,
-        countdownMinutes: 0,
-        inchingHours: 0,
-        inchingMinutes: 0,
-        isCountdownActive: false,
-        isInchingActive: false,
-      ));
-    }
-  }
-
-  void _onUpdateCountdownTime(
-    UpdateCountdownTimeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        countdownSeconds: event.seconds,
-        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,
-        inchingSeconds: 0, // Add this
-      ));
-    }
-  }
-
-  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,
-              countdownSeconds: countdownDuration.inSeconds,
-            ),
-          );
-
-          if (countdownDuration.inSeconds > 0) {
-            _startCountdownTimer(emit, countdownDuration);
-          } else {
-            _countdownTimer?.cancel();
-            emit(
-              currentState.copyWith(
-                countdownHours: 0,
-                countdownMinutes: 0,
-                countdownRemaining: Duration.zero,
-                isCountdownActive: false,
-                countdownSeconds: 0,
-              ),
-            );
-          }
-        } else if (code == 'switch_inching') {
-          final inchingDuration = Duration(seconds: totalSeconds);
-          emit(
-            currentState.copyWith(
-              inchingHours: inchingDuration.inHours,
-              inchingMinutes: inchingDuration.inMinutes % 60,
-              isInchingActive: true,
-              countdownRemaining: inchingDuration,
-              countdownSeconds: inchingDuration.inSeconds,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  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) {
-    return isoDateTime.split('T')[1].split('.')[0];
-  }
-
-  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,234 +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;
-  final int seconds;
-
-  const UpdateCountdownTimeEvent({
-    required this.hours,
-    required this.minutes,
-    required this.seconds,
-  });
-
-  @override
-  List<Object> get props => [hours, minutes, seconds];
-}
-
-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,120 +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 int inchingSeconds;
-  final bool isInchingActive;
-  final ScheduleModes scheduleMode;
-  final Duration? countdownRemaining;
-  final int? countdownSeconds;
-
-  const ScheduleLoaded({
-    this.countdownSeconds = 0,
-    this.inchingSeconds = 0,
-    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,
-    String? deviceId,
-    int? countdownSeconds,
-    int? inchingSeconds,
-  }) {
-    return ScheduleLoaded(
-      schedules: schedules ?? this.schedules,
-      selectedTime: selectedTime ?? this.selectedTime,
-      selectedDays: selectedDays ?? this.selectedDays,
-      functionOn: functionOn ?? this.functionOn,
-      isEditing: isEditing ?? this.isEditing,
-      deviceId: deviceId ?? this.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,
-      countdownSeconds: countdownSeconds ?? this.countdownSeconds,
-      inchingSeconds: inchingSeconds ?? this.inchingSeconds,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-        schedules,
-        selectedTime,
-        selectedDays,
-        functionOn,
-        isEditing,
-        deviceId,
-        countdownHours,
-        countdownMinutes,
-        isCountdownActive,
-        inchingHours,
-        inchingMinutes,
-        isInchingActive,
-        scheduleMode,
-        countdownRemaining,
-        countdownSeconds,
-        inchingSeconds,
-      ];
-}
-
-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,239 +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 {
-  final String deviceId;
-  const CountdownInchingView({super.key, required this.deviceId});
-
-  @override
-  State<CountdownInchingView> createState() => _CountdownInchingViewState();
-}
-
-class _CountdownInchingViewState extends State<CountdownInchingView> {
-  late FixedExtentScrollController _hoursController;
-  late FixedExtentScrollController _minutesController;
-  late FixedExtentScrollController _secondsController;
-
-  int _lastHours = -1;
-  int _lastMinutes = -1;
-  int _lastSeconds = -1;
-
-  @override
-  void initState() {
-    super.initState();
-    _hoursController = FixedExtentScrollController();
-    _minutesController = FixedExtentScrollController();
-    _secondsController = FixedExtentScrollController();
-  }
-
-  @override
-  void dispose() {
-    _hoursController.dispose();
-    _minutesController.dispose();
-    _secondsController.dispose();
-    super.dispose();
-  }
-
-  void _updateControllers(
-      int displayHours, int displayMinutes, int displaySeconds) {
-    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;
-    }
-    // Update seconds controller
-    if (_lastSeconds != displaySeconds) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_secondsController.hasClients) {
-          _secondsController.jumpToItem(displaySeconds);
-        }
-      });
-      _lastSeconds = displaySeconds;
-    }
-  }
-
-  @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);
-        final displaySeconds = isActive && state.countdownRemaining != null
-            ? state.countdownRemaining!.inSeconds.remainder(60)
-            : (isCountDown ? state.countdownSeconds : state.inchingSeconds);
-
-        _updateControllers(displayHours, displayMinutes, displaySeconds!);
-
-        if (displayHours == 0 && displayMinutes == 0 && displaySeconds == 0) {
-          context.read<ScheduleBloc>().add(
-                StopScheduleEvent(
-                  mode: ScheduleModes.countdown,
-                  deviceId: widget.deviceId,
-                ),
-              );
-        }
-
-        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,
-                            seconds: displaySeconds,
-                          ));
-                    }
-                  },
-                  isActive: isActive,
-                ),
-                const SizedBox(width: 10),
-                _buildPickerColumn(
-                  context,
-                  'm',
-                  displayMinutes,
-                  60,
-                  _minutesController,
-                  (value) {
-                    if (!isActive) {
-                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                            hours: displayHours,
-                            minutes: value,
-                            seconds: displaySeconds,
-                          ));
-                    }
-                  },
-                  isActive: isActive,
-                ),
-                const SizedBox(width: 10),
-                if (isActive)
-                  _buildPickerColumn(
-                    context,
-                    's',
-                    displaySeconds,
-                    60,
-                    _secondsController,
-                    (value) {
-                      if (!isActive) {
-                        context
-                            .read<ScheduleBloc>()
-                            .add(UpdateCountdownTimeEvent(
-                              hours: displayHours,
-                              minutes: displayMinutes,
-                              seconds: 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,112 +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)
-                           CountdownInchingView(
-                            deviceId: deviceUuid,
-                          ),
-                        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/shared/device_control_dialog.dart

@@ -79,7 +79,6 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
   }
 
   Widget _buildDeviceInfoSection() {
-    final isOnlineDevice = device.online != null && device.online!;
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 25, horizontal: 50),
       child: Table(
@@ -108,7 +107,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
                 'Installation Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    (device.createTime ?? 0) * 1000,
+                    ((device.createTime ?? 0) * 1000),
                   ),
                 ),
               ),
@@ -127,16 +126,12 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
           ),
           TableRow(
             children: [
-              _buildInfoRow(
-                'Status:',
-                isOnlineDevice ? 'Online' : 'offline',
-                statusColor: isOnlineDevice ? Colors.green : Colors.red,
-              ),
+              _buildInfoRow('Status:', 'Online', statusColor: Colors.green),
               _buildInfoRow(
                 'Last Offline Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    (device.updateTime ?? 0) * 1000,
+                    ((device.updateTime ?? 0) * 1000),
                   ),
                 ),
               ),

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
-    with HelperResponsiveLayout {
+class ThreeGangGlassSwitchControlView extends StatelessWidget 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)
-            ..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
+          ThreeGangGlassSwitchBlocFactory.create(deviceId: 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(
-      BuildContext context, ThreeGangGlassStatusModel status) {
+  Widget _buildStatusControls(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) =>
-            TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
-              ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
+        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: 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(
-          onTap: () {
-            showDialog<void>(
-                context: context,
-                builder: (ctx) => BlocProvider.value(
-                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(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<TwoGangGlassSwitchBloc>(context),
-                      child: BuildScheduleView(
-                        deviceUuid: deviceId,
-                        category: 'switch_2',
-                      ),
-                    ));
-          },
-          mainText: 'Ceiling Light',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
+        ToggleWidget(
+          value: false,
+          code: '',
+          deviceId: deviceId,
+          label: 'Scheduling',
+          icon: Assets.scheduling,
+          onChange: (value) {},
+          showToggle: false,
         ),
       ],
     );

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
-    with HelperResponsiveLayout {
+class TwoGangBatchControlView extends StatelessWidget 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) =>
-          TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
-            ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
+      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
+        ..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 ||
-              state is TwoGangSwitchControlError) {
+          } else if (state is TwoGangSwitchError || 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(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
+      child: Wrap(
+        alignment: WrapAlignment.center,
+        spacing: 12,
+        runSpacing: 12,
         children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              SizedBox(
-                width: 200,
-                height: 150,
-                child: ToggleWidget(
-                  value: status.switch1,
-                  code: 'switch_1',
-                  deviceId: deviceId,
-                  label: 'Wall Light',
-                  onChange: (value) {
-                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                          deviceId: deviceId,
-                          code: 'switch_1',
-                          value: value,
-                        ));
-                  },
-                ),
-              ),
-              const SizedBox(width: 10),
-              SizedBox(
-                width: 200,
-                height: 150,
-                child: ToggleWidget(
-                  value: status.switch2,
-                  code: 'switch_2',
-                  deviceId: deviceId,
-                  label: 'Ceiling Light',
-                  onChange: (value) {
-                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                          deviceId: deviceId,
-                          code: 'switch_2',
-                          value: value,
-                        ));
-                  },
-                ),
-              ),
-            ],
+          SizedBox(
+            width: 200,
+            child: ToggleWidget(
+              value: status.switch1,
+              code: 'switch_1',
+              deviceId: deviceId,
+              label: 'Wall Light',
+              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',
+              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:syncrow_web/pages/device_managment/all_devices/models/device_status.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/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 = [
-    'Sun',
-    'Mon',
-    'Tue',
-    'Wed',
-    'Thu',
-    'Fri',
-    'Sat'
-  ];
+  static void showAddScheduleDialog(BuildContext context, {ScheduleModel? schedule, int? index, bool? isEdit}) {
+    final bloc = context.read<WaterHeaterBloc>();
 
-  static Future<ScheduleEntry?> showAddScheduleDialog(
-    BuildContext context, {
-    ScheduleEntry? schedule,
-    bool isEdit = false,
-  }) {
-    final initialTime = schedule != null
-        ? _convertStringToTimeOfDay(schedule.time)
-        : TimeOfDay.now();
-    final initialDays = schedule != null
-        ? _convertDaysStringToBooleans(schedule.days)
-        : List.filled(7, false);
-    bool? functionOn = schedule?.function.value ?? true;
-    TimeOfDay selectedTime = initialTime;
-    List<bool> selectedDays = List.of(initialDays);
+    if (schedule == null) {
+      bloc.add((const UpdateSelectedTimeEvent(null)));
+      bloc.add(InitializeAddScheduleEvent(
+        selectedTime: null,
+        selectedDays: List.filled(7, false),
+        functionOn: false,
+        isEditing: false,
+      ));
+    } else {
+      final time = _convertStringToTimeOfDay(schedule.time);
+      final selectedDays = _convertDaysStringToBooleans(schedule.days);
 
-    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(
-          builder: (ctx, setState) {
-            return AlertDialog(
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(20),
-              ),
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                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(),
-                    ],
+        return BlocProvider.value(
+          value: bloc,
+          child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
+            builder: (context, state) {
+              if (state is WaterHeaterDeviceStatusLoaded) {
+                return AlertDialog(
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(20),
                   ),
-                  const SizedBox(height: 24),
-                  SizedBox(
-                    width: 150,
-                    height: 40,
-                    child: ElevatedButton(
-                      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(
+                  content: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
+                          const SizedBox(),
                           Text(
-                            selectedTime.format(context),
-                            style: Theme.of(context)
-                                .textTheme
-                                .bodySmall!
-                                .copyWith(color: Colors.grey),
+                            'Scheduling',
+                            style: context.textTheme.titleLarge!.copyWith(
+                              color: ColorsManager.dialogBlueTitle,
+                              fontWeight: FontWeight.bold,
+                            ),
                           ),
-                          const Icon(Icons.access_time,
-                              color: Colors.grey, size: 18),
+                          const SizedBox(),
                         ],
                       ),
+                      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,
+                        ),
+                      ),
                     ),
-                  ),
-                  const SizedBox(height: 16),
-                  _buildDayCheckboxes(ctx, selectedDays, (i, v) {
-                    setState(() => selectedDays[i] = v);
-                  }),
-                  const SizedBox(height: 16),
-                  _buildFunctionSwitch(ctx, functionOn!, (v) {
-                    setState(() => functionOn = v);
-                  }),
-                ],
-              ),
-              actions: [
-                SizedBox(
-                  width: 100,
-                  child: OutlinedButton(
-                    onPressed: () {
-                      Navigator.pop(ctx, null);
-                    },
-                    child: const Text('Cancel'),
-                  ),
-                ),
-                SizedBox(
-                  width: 100,
-                  child: ElevatedButton(
-                    onPressed: () {
-                      final entry = ScheduleEntry(
-                        category: schedule?.category ?? 'switch_1',
-                        time: _formatTimeOfDayToISO(selectedTime),
-                        function: Status(code: 'switch_1', value: functionOn),
-                        days: _convertSelectedDaysToStrings(selectedDays),
-                        scheduleId: schedule?.scheduleId,
-                      );
-                      Navigator.pop(ctx, entry);
-                    },
-                    child: const Text('Save'),
-                  ),
-                ),
-              ],
-            );
-          },
+                    SizedBox(
+                      width: 200,
+                      child: DefaultButton(
+                        height: 40,
+                        onPressed: () {
+                          if (state.selectedTime != null) {
+                            if (state.isEditing && index != null) {
+                              bloc.add(EditWaterHeaterScheduleEvent(
+                                scheduleId: schedule?.scheduleId ?? '',
+                                category: 'switch_1',
+                                time: state.selectedTime!,
+                                selectedDays: state.selectedDays,
+                                functionOn: state.functionOn,
+                              ));
+                            } else {
+                              bloc.add(AddScheduleEvent(
+                                category: 'switch_1',
+                                time: state.selectedTime!,
+                                selectedDays: state.selectedDays,
+                                functionOn: state.functionOn,
+                              ));
+                            }
+                            Navigator.pop(context);
+                          }
+                        },
+                        backgroundColor: ColorsManager.primaryColor,
+                        child: const Text('Save'),
+                      ),
+                    ),
+                  ],
+                );
+              }
+              return const SizedBox();
+            },
+          ),
         );
       },
     );
   }
 
-  static TimeOfDay _convertStringToTimeOfDay(String iso) {
-    final dt = DateTime.tryParse(iso);
-    if (dt != null) return TimeOfDay(hour: dt.hour, minute: dt.minute);
-    return const TimeOfDay(hour: 9, minute: 0);
+  static TimeOfDay _convertStringToTimeOfDay(String timeString) {
+    final regex = RegExp(r'^(\d{2}):(\d{2})$');
+    final match = regex.firstMatch(timeString);
+    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
-        .map((d) =>
-            selectedDays.map((e) => e.toLowerCase()).contains(d.toLowerCase()))
-        .toList();
-  }
+    List<bool> daysBoolean = List.filled(7, false);
 
-  static String _formatTimeOfDayToISO(TimeOfDay t) {
-    final now = DateTime.now();
-    final dt = DateTime(now.year, now.month, now.day, t.hour, t.minute);
-    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]);
+    for (int i = 0; i < daysOfWeek.length; i++) {
+      if (selectedDays.contains(daysOfWeek[i])) {
+        daysBoolean[i] = true;
+      }
     }
-    return result;
+
+    return daysBoolean;
   }
 
-  static Widget _buildDayCheckboxes(BuildContext ctx, List<bool> selectedDays,
-      Function(int, bool) onChanged) {
+  static Widget _buildDayCheckboxes(BuildContext context, List<bool> selectedDays, {bool? isEdit}) {
     final dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+
     return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: List.generate(
-        7,
-        (index) => Row(
+      children: List.generate(7, (index) {
+        return 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(
-      BuildContext ctx, bool isOn, Function(bool) onChanged) {
+  static Widget _buildFunctionSwitch(BuildContext context, bool isOn, bool? isEdit) {
     return Row(
       children: [
         Text(
           'Function:',
-          style:
-              Theme.of(ctx).textTheme.bodySmall!.copyWith(color: Colors.grey),
+          style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.grayColor),
         ),
         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) =>
-      ScheduleEntry.fromMap(json.decode(source));
+  factory ScheduleEntry.fromJson(String source) => ScheduleEntry.fromMap(json.decode(source));
 
   @override
   bool operator ==(Object other) {
@@ -75,23 +73,6 @@ class ScheduleEntry {
 
   @override
   int get hashCode {
-    return category.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,
-    );
+    return category.hashCode ^ time.hashCode ^ function.hashCode ^ days.hashCode;
   }
 }

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(
-                  height: 200, child: Center(child: SizedBox()));
+              return const 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(
-                        deviceUuid: device.uuid ?? '',
-                        category: 'switch_1',
-                      ),
+                      child: BuildScheduleView(status: status),
                     ));
           },
-          mainText: '',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
-        ),
+          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(
+                      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(
-                          StopScheduleEvent(
-                            mode: ScheduleModes.countdown,
+                    context
+                        .read<WaterHeaterBloc>()
+                        .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(
-                          StartScheduleEvent(
-                            mode: ScheduleModes.countdown,
-                            hours: hours,
-                            minutes: minutes,
+                    context.read<WaterHeaterBloc>().add(
+                          ToggleWaterHeaterEvent(
+                            deviceId: deviceId,
+                            code: 'countdown_1',
+                            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'
-    hide StopScheduleEvent;
+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 InchingModeButtons extends StatelessWidget {
@@ -41,9 +38,15 @@ class InchingModeButtons extends StatelessWidget {
               ? DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context.read<ScheduleBloc>().add(
-                          StopScheduleEvent(
-                              deviceId: deviceId, mode: ScheduleModes.inching),
+                    context
+                        .read<WaterHeaterBloc>()
+                        .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 VoidCallback onAddSchedule;
-  final String category;
+  final WaterHeaterDeviceStatusLoaded state;
+  final Function onAddSchedule;
 
   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/space_management_v2/main_module/models/space_connection_model.dart

@@ -1,6 +0,0 @@
-class SpaceConnectionModel {
-  final String from;
-  final String to;
-
-  const SpaceConnectionModel({required this.from, required this.to});
-}

lib/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class SpacesConnectionsArrowPainter extends CustomPainter {
-  final List<SpaceConnectionModel> connections;
-  final Map<String, Offset> positions;
-  final double cardWidth = 150.0;
-  final double cardHeight = 90.0;
-  final Set<String> highlightedUuids;
-
-  SpacesConnectionsArrowPainter({
-    required this.connections,
-    required this.positions,
-    required this.highlightedUuids,
-  });
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    for (final connection in connections) {
-      final isSelected = highlightedUuids.contains(connection.from) ||
-          highlightedUuids.contains(connection.to);
-      final paint = Paint()
-        ..color = isSelected
-            ? ColorsManager.blackColor
-            : ColorsManager.blackColor.withValues(alpha: 0.5)
-        ..strokeWidth = 2.0
-        ..style = PaintingStyle.stroke;
-
-      final from = positions[connection.from];
-      final to = positions[connection.to];
-
-      if (from != null && to != null) {
-        final startPoint =
-            Offset(from.dx + cardWidth / 2, from.dy + cardHeight - 10);
-        final endPoint = Offset(to.dx + cardWidth / 2, to.dy);
-
-        final path = Path()..moveTo(startPoint.dx, startPoint.dy);
-
-        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 20);
-        final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 60);
-
-        path.cubicTo(controlPoint1.dx, controlPoint1.dy, controlPoint2.dx,
-            controlPoint2.dy, endPoint.dx, endPoint.dy);
-
-        canvas.drawPath(path, paint);
-
-        final circlePaint = Paint()
-          ..color = isSelected
-              ? ColorsManager.blackColor
-              : ColorsManager.blackColor.withValues(alpha: 0.5)
-          ..style = PaintingStyle.fill
-          ..blendMode = BlendMode.srcIn;
-        canvas.drawCircle(endPoint, 4, circlePaint);
-      }
-    }
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
-}

lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart

@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart';
-
-abstract final class SpaceManagementCommunityDialogHelper {
-  static void showCreateDialog(BuildContext context) {
-    showDialog<void>(
-      context: context,
-      builder: (_) => CreateCommunityDialog(
-        title: const SelectableText('Community Name'),
-        onCreateCommunity: (community) {
-          context.read<CommunitiesBloc>().add(
-                InsertCommunity(community),
-              );
-          context.read<CommunitiesTreeSelectionBloc>().add(
-                SelectCommunityEvent(community: community),
-              );
-        },
-      ),
-    );
-  }
-}

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

@@ -1,43 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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/community_structure_canvas.dart

@@ -1,280 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_card_widget.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_cell.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/space_details/presentation/helpers/space_details_dialog_helper.dart';
-
-class CommunityStructureCanvas extends StatefulWidget {
-  const CommunityStructureCanvas({
-    required this.community,
-    required this.selectedSpace,
-    super.key,
-  });
-
-  final CommunityModel community;
-  final SpaceModel? selectedSpace;
-
-  @override
-  State<CommunityStructureCanvas> createState() => _CommunityStructureCanvasState();
-}
-
-class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
-    with SingleTickerProviderStateMixin {
-  final Map<String, Offset> _positions = {};
-  final double _cardWidth = 150.0;
-  final double _cardHeight = 90.0;
-  final double _horizontalSpacing = 150.0;
-  final double _verticalSpacing = 120.0;
-
-  late TransformationController _transformationController;
-  late AnimationController _animationController;
-
-  @override
-  void initState() {
-    _transformationController = TransformationController();
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 150),
-    );
-    super.initState();
-  }
-
-  @override
-  void didUpdateWidget(covariant CommunityStructureCanvas oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.selectedSpace?.uuid != oldWidget.selectedSpace?.uuid) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted) {
-          _animateToSpace(widget.selectedSpace);
-        }
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _transformationController.dispose();
-    _animationController.dispose();
-    super.dispose();
-  }
-
-  Set<String> _getAllDescendantUuids(SpaceModel space) {
-    final uuids = <String>{};
-    for (final child in space.children) {
-      uuids.add(child.uuid);
-      uuids.addAll(_getAllDescendantUuids(child));
-    }
-    return uuids;
-  }
-
-  void _runAnimation(Matrix4 target) {
-    final animation = Matrix4Tween(
-      begin: _transformationController.value,
-      end: target,
-    ).animate(_animationController);
-
-    void listener() {
-      _transformationController.value = animation.value;
-    }
-
-    animation.addListener(listener);
-    _animationController.forward(from: 0).whenCompleteOrCancel(() {
-      animation.removeListener(listener);
-    });
-  }
-
-  void _animateToSpace(SpaceModel? space) {
-    if (space == null) {
-      _runAnimation(Matrix4.identity());
-      return;
-    }
-
-    final position = _positions[space.uuid];
-    if (position == null) return;
-
-    const scale = 1.5;
-    final viewSize = context.size;
-    if (viewSize == null) return;
-
-    final x = -position.dx * scale + (viewSize.width / 2) - (_cardWidth * scale / 2);
-    final y =
-        -position.dy * scale + (viewSize.height / 2) - (_cardHeight * scale / 2);
-
-    final matrix = Matrix4.identity()
-      ..translate(x, y)
-      ..scale(scale);
-
-    _runAnimation(matrix);
-  }
-
-  void _onSpaceTapped(SpaceModel? space) {
-    context.read<CommunitiesTreeSelectionBloc>().add(
-          SelectSpaceEvent(community: widget.community, space: space),
-        );
-  }
-
-  void _resetSelectionAndZoom() {
-    context.read<CommunitiesTreeSelectionBloc>().add(
-          SelectSpaceEvent(
-            community: widget.community,
-            space: null,
-          ),
-        );
-  }
-
-  void _calculateLayout(
-    List<SpaceModel> spaces,
-    int depth,
-    Map<int, double> levelXOffset,
-  ) {
-    for (final space in spaces) {
-      double childSubtreeWidth = 0;
-      if (space.children.isNotEmpty) {
-        _calculateLayout(space.children, depth + 1, levelXOffset);
-        final firstChildPos = _positions[space.children.first.uuid];
-        final lastChildPos = _positions[space.children.last.uuid];
-        if (firstChildPos != null && lastChildPos != null) {
-          childSubtreeWidth = (lastChildPos.dx + _cardWidth) - firstChildPos.dx;
-        }
-      }
-
-      final currentX = levelXOffset.putIfAbsent(depth, () => 0.0);
-      double? x;
-
-      if (space.children.isNotEmpty) {
-        final firstChildPos = _positions[space.children.first.uuid]!;
-        x = firstChildPos.dx + (childSubtreeWidth - _cardWidth) / 2;
-      } else {
-        x = currentX;
-      }
-
-      if (x < currentX) {
-        final shiftX = currentX - x;
-        _shiftSubtree(space, shiftX);
-        final keysToShift = levelXOffset.keys.where((d) => d > depth).toList();
-        for (final key in keysToShift) {
-          levelXOffset[key] = levelXOffset[key]! + shiftX;
-        }
-        x += shiftX;
-      }
-
-      final y = depth * (_verticalSpacing + _cardHeight);
-      _positions[space.uuid] = Offset(x, y);
-      levelXOffset[depth] = x + _cardWidth + _horizontalSpacing;
-    }
-  }
-
-  void _shiftSubtree(SpaceModel space, double shiftX) {
-    if (_positions.containsKey(space.uuid)) {
-      _positions[space.uuid] = _positions[space.uuid]!.translate(shiftX, 0);
-    }
-    for (final child in space.children) {
-      _shiftSubtree(child, shiftX);
-    }
-  }
-
-  List<Widget> _buildTreeWidgets() {
-    _positions.clear();
-    final community = widget.community;
-
-    _calculateLayout(community.spaces, 0, {});
-
-    final selectedSpace = widget.selectedSpace;
-    final highlightedUuids = <String>{};
-    if (selectedSpace != null) {
-      highlightedUuids.add(selectedSpace.uuid);
-      highlightedUuids.addAll(_getAllDescendantUuids(selectedSpace));
-    }
-
-    final widgets = <Widget>[];
-    final connections = <SpaceConnectionModel>[];
-    _generateWidgets(community.spaces, widgets, connections, highlightedUuids);
-
-    return [
-      CustomPaint(
-        painter: SpacesConnectionsArrowPainter(
-          connections: connections,
-          positions: _positions,
-          highlightedUuids: highlightedUuids,
-        ),
-        child: Stack(alignment: AlignmentDirectional.center, children: widgets),
-      ),
-    ];
-  }
-
-  void _generateWidgets(
-    List<SpaceModel> spaces,
-    List<Widget> widgets,
-    List<SpaceConnectionModel> connections,
-    Set<String> highlightedUuids,
-  ) {
-    for (final space in spaces) {
-      final position = _positions[space.uuid];
-      if (position == null) continue;
-
-      final isHighlighted = highlightedUuids.contains(space.uuid);
-      final hasNoSelectedSpace = widget.selectedSpace == null;
-
-      widgets.add(
-        Positioned(
-          left: position.dx,
-          top: position.dy,
-          width: _cardWidth,
-          height: _cardHeight,
-          child: SpaceCardWidget(
-            buildSpaceContainer: () {
-              return Opacity(
-                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
-                child: Tooltip(
-                  message: space.spaceName,
-                  preferBelow: false,
-                  child: SpaceCell(
-                    onTap: () => _onSpaceTapped(space),
-                    icon: space.icon,
-                    name: space.spaceName,
-                  ),
-                ),
-              );
-            },
-            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
-          ),
-        ),
-      );
-
-      for (final child in space.children) {
-        connections.add(
-          SpaceConnectionModel(from: space.uuid, to: child.uuid),
-        );
-      }
-      _generateWidgets(space.children, widgets, connections, highlightedUuids);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final treeWidgets = _buildTreeWidgets();
-    return InteractiveViewer(
-      transformationController: _transformationController,
-      boundaryMargin: EdgeInsets.symmetric(
-        horizontal: MediaQuery.sizeOf(context).width * 0.3,
-        vertical: MediaQuery.sizeOf(context).height * 0.3,
-      ),
-      minScale: 0.5,
-      maxScale: 3.0,
-      constrained: false,
-      child: GestureDetector(
-        onTap: _resetSelectionAndZoom,
-        child: SizedBox(
-          width: MediaQuery.sizeOf(context).width * 5,
-          height: MediaQuery.sizeOf(context).height * 5,
-          child: Stack(children: treeWidgets),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CommunityTemplateCell extends StatelessWidget {
-  const CommunityTemplateCell({
-    super.key,
-    required this.onTap,
-    required this.title,
-  });
-
-  final void Function() onTap;
-  final Widget title;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Column(
-        spacing: 8,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Expanded(
-            child: AspectRatio(
-              aspectRatio: 2.0,
-              child: Container(
-                decoration: ShapeDecoration(
-                  shape: RoundedRectangleBorder(
-                    side: const BorderSide(
-                      width: 4,
-                      strokeAlign: BorderSide.strokeAlignOutside,
-                      color: ColorsManager.borderColor,
-                    ),
-                    borderRadius: BorderRadius.circular(5),
-                  ),
-                ),
-              ),
-            ),
-          ),
-          DefaultTextStyle(
-            style: context.textTheme.bodyLarge!.copyWith(
-              color: ColorsManager.blackColor,
-            ),
-            child: title,
-          ),
-        ],
-      ),
-    );
-  }
-}

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

@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CreateSpaceButton extends StatelessWidget {
-  const CreateSpaceButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => SpaceDetailsDialogHelper.showCreate(context),
-      child: Container(
-        height: 60,
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(20),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.grey.withValues(alpha: 0.5),
-              spreadRadius: 5,
-              blurRadius: 7,
-              offset: const Offset(0, 3),
-            ),
-          ],
-        ),
-        child: Center(
-          child: Container(
-            width: 40,
-            height: 40,
-            decoration: const BoxDecoration(
-              color: ColorsManager.boxColor,
-              shape: BoxShape.circle,
-            ),
-            child: const Icon(
-              Icons.add,
-              color: Colors.blue,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,33 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class PlusButtonWidget extends StatelessWidget {
-  final Offset offset;
-  final void Function() onButtonTap;
-
-  const PlusButtonWidget({
-    super.key,
-    required this.offset,
-    required this.onButtonTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onButtonTap,
-      child: Container(
-        width: 30,
-        height: 30,
-        decoration: const BoxDecoration(
-          color: ColorsManager.spaceColor,
-          shape: BoxShape.circle,
-        ),
-        child: const Icon(
-          Icons.add,
-          color: ColorsManager.whiteColors,
-          size: 20,
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,44 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/plus_button_widget.dart';
-
-class SpaceCardWidget extends StatefulWidget {
-  final void Function() onTap;
-  final Widget Function() buildSpaceContainer;
-
-  const SpaceCardWidget({
-    required this.onTap,
-    required this.buildSpaceContainer,
-    super.key,
-  });
-
-  @override
-  State<SpaceCardWidget> createState() => _SpaceCardWidgetState();
-}
-
-class _SpaceCardWidgetState extends State<SpaceCardWidget> {
-  bool isHovered = false;
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-      onEnter: (_) => setState(() => isHovered = true),
-      onExit: (_) => setState(() => isHovered = false),
-      child: SizedBox(
-        child: Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            widget.buildSpaceContainer(),
-            if (isHovered)
-              Positioned(
-                bottom: 0,
-                child: PlusButtonWidget(
-                  offset: Offset.zero,
-                  onButtonTap: widget.onTap,
-                ),
-              ),
-          ],
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SpaceCell extends StatelessWidget {
-  final String icon;
-  final String name;
-  final VoidCallback? onTap;
-
-  const SpaceCell({
-    super.key,
-    required this.icon,
-    required this.name,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        width: 150,
-        height: 70,
-        decoration: _containerDecoration(),
-        child: Row(
-          children: [
-            _buildIconContainer(),
-            const SizedBox(width: 10),
-            Expanded(
-              child: Text(
-                name,
-                style: context.textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: ColorsManager.blackColor,
-                ),
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildIconContainer() {
-    return Container(
-      width: 40,
-      height: double.infinity,
-      decoration: const BoxDecoration(
-        color: ColorsManager.spaceColor,
-        borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(15),
-          bottomLeft: Radius.circular(15),
-        ),
-      ),
-      child: Center(
-        child: SvgPicture.asset(
-          icon,
-          colorFilter: const ColorFilter.mode(
-            ColorsManager.whiteColors,
-            BlendMode.srcIn,
-          ),
-          width: 24,
-          height: 24,
-        ),
-      ),
-    );
-  }
-
-  BoxDecoration _containerDecoration() {
-    return BoxDecoration(
-      color: ColorsManager.whiteColors,
-      borderRadius: BorderRadius.circular(15),
-      boxShadow: [
-        BoxShadow(
-          color: ColorsManager.lightGrayColor.withValues(alpha: 0.5),
-          spreadRadius: 2,
-          blurRadius: 5,
-          offset: const Offset(0, 3),
-        ),
-      ],
-    );
-  }
-}

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

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_management_community_structure.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_management_templates_view.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_management_communities_tree.dart';
-
-class SpaceManagementBody extends StatelessWidget {
-  const SpaceManagementBody({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        const SpaceManagementCommunitiesTree(),
-        Expanded(
-          child: BlocBuilder<CommunitiesTreeSelectionBloc,
-              CommunitiesTreeSelectionState>(
-            buildWhen: (previous, current) =>
-                previous.selectedCommunity != current.selectedCommunity,
-            builder: (context, state) => Visibility(
-              visible: state.selectedCommunity == null,
-              replacement: const SpaceManagementCommunityStructure(),
-              child: const SpaceManagementTemplatesView(),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}

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

@@ -1,27 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/create_space_button.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-
-class SpaceManagementCommunityStructure extends StatelessWidget {
-  const SpaceManagementCommunityStructure({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final selectionBloc = context.watch<CommunitiesTreeSelectionBloc>().state;
-    final selectedCommunity = selectionBloc.selectedCommunity;
-    final selectedSpace = selectionBloc.selectedSpace;
-    const spacer = Spacer(flex: 10);
-    return Visibility(
-      visible: selectedCommunity!.spaces.isNotEmpty,
-      replacement: const Row(
-        children: [spacer, Expanded(child: CreateSpaceButton()), spacer],
-      ),
-      child: CommunityStructureCanvas(
-        community: selectedCommunity,
-        selectedSpace: selectedSpace,
-      ),
-    );
-  }
-}

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

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_template_cell.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class SpaceManagementTemplatesView extends StatelessWidget {
-  const SpaceManagementTemplatesView({super.key});
-  @override
-  Widget build(BuildContext context) {
-    return ColoredBox(
-      color: ColorsManager.whiteColors,
-      child: GridView.builder(
-        padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
-        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-          maxCrossAxisExtent: 400,
-          mainAxisSpacing: 10,
-          crossAxisSpacing: 10,
-          childAspectRatio: 2.0,
-        ),
-        itemCount: _gridItems(context).length,
-        itemBuilder: (context, index) {
-          final model = _gridItems(context)[index];
-          return CommunityTemplateCell(
-            onTap: model.onTap,
-            title: model.title,
-          );
-        },
-      ),
-    );
-  }
-
-  List<_CommunityTemplateModel> _gridItems(BuildContext context) {
-    return [
-      _CommunityTemplateModel(
-        title: const Text('Blank'),
-        onTap: () => SpaceManagementCommunityDialogHelper.showCreateDialog(context),
-      ),
-    ];
-  }
-}
-
-class _CommunityTemplateModel {
-  final Widget title;
-  final void Function() onTap;
-
-  _CommunityTemplateModel({
-    required this.title,
-    required this.onTap,
-  });
-}

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

@@ -1,42 +0,0 @@
-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,11 +1,9 @@
 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);
@@ -15,26 +13,14 @@ class RemoteCommunitiesService implements CommunitiesService {
   static const _defaultErrorMessage = 'Failed to load communities';
 
   @override
-  Future<CommunitiesPaginationModel> getCommunity(
-    LoadCommunitiesParam param,
-  ) async {
+  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param) async {
     try {
-      final response = await _httpService.get(
-        path: await _makeUrl(),
-        queryParameters: {
-          'page': param.page,
-          '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 _httpService.get(
+        path: '/api/communities/',
+        expectedResponseModel: (json) => (json as List<dynamic>)
+            .map((e) => CommunityModel.fromJson(e as Map<String, dynamic>))
+            .toList(),
       );
-
-      return response;
     } on DioException catch (e) {
       final message = e.response?.data as Map<String, dynamic>?;
       final error = message?['error'] as Map<String, dynamic>?;
@@ -45,13 +31,4 @@ 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,19 +4,11 @@ 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,
   });
 
@@ -24,20 +16,11 @@ class CommunityModel extends Equatable {
     return CommunityModel(
       uuid: json['uuid'] as String,
       name: json['name'] as String,
-      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>[])
+      spaces: (json['spaces'] as List<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,37 +2,26 @@ 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? ?? '',
-      createdAt: DateTime.tryParse(json['createdAt'] as String? ?? ''),
-      updatedAt: DateTime.tryParse(json['updatedAt'] as String? ?? ''),
-      spaceName: json['spaceName'] as String? ?? '',
-      icon: json['icon'] as String? ?? 'assets/icons/location_icon.svg',
+      uuid: json['uuid'] as String,
+      spaceName: json['spaceName'] as String,
+      icon: json['icon'] as String,
       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,32 +1,3 @@
-import 'package:equatable/equatable.dart';
-
-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];
+class LoadCommunitiesParam {
+  const LoadCommunitiesParam();
 }

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

@@ -1,9 +1,6 @@
-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<CommunitiesPaginationModel> getCommunity(LoadCommunitiesParam param);
+  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param);
 }

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

@@ -14,8 +14,6 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
   })  : _communitiesService = communitiesService,
         super(const CommunitiesState()) {
     on<LoadCommunities>(_onLoadCommunities);
-    on<LoadMoreCommunities>(_onLoadMoreCommunities);
-    on<InsertCommunity>(_onInsertCommunity);
   }
 
   final CommunitiesService _communitiesService;
@@ -25,93 +23,28 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
     Emitter<CommunitiesState> emit,
   ) async {
     try {
-      emit(
-        state.copyWith(status: CommunitiesStatus.loading),
-      );
-
-      final paginationResponse = await _communitiesService.getCommunity(
-        event.param,
-      );
-
+      emit(const CommunitiesState(status: CommunitiesStatus.loading));
+      final communities = await _communitiesService.getCommunity(event.param);
       emit(
         CommunitiesState(
           status: CommunitiesStatus.success,
-          communities: paginationResponse.data,
-          hasNext: paginationResponse.hasNext,
-          currentPage: paginationResponse.page,
-          searchQuery: event.param.search,
-          isLoadingMore: false,
+          communities: communities,
         ),
       );
     } on APIException catch (e) {
-      _onApiException(e, emit);
-    } catch (e) {
-      _onError(e, emit);
-    }
-  }
-
-  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,
+        CommunitiesState(
+          status: CommunitiesStatus.failure,
+          errorMessage: e.message,
         ),
       );
-    } on APIException catch (e) {
-      _onApiException(e, emit);
     } catch (e) {
-      _onError(e, emit);
+      emit(
+        CommunitiesState(
+          status: CommunitiesStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
     }
   }
-
-  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,19 +15,3 @@ 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,48 +7,12 @@ 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,
-        isLoadingMore,
-        hasNext,
-        currentPage,
-        searchQuery,
-      ];
+  List<Object?> get props => [status, communities, errorMessage];
 }

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

@@ -1,47 +0,0 @@
-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: event.community,
-        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

@@ -1,31 +0,0 @@
-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;
-  final CommunityModel community;
-
-  const SelectSpaceEvent({required this.space, required this.community});
-
-  @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

@@ -1,29 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,112 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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(community: community, 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

@@ -1,34 +0,0 @@
-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),
-      ),
-    );
-  }
-}