Add generated configuration files for Flutter integration across platforms

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->

## Jira Ticket
[SP-1796](https://syncrow.atlassian.net/browse/SP-1796)

## Description

Added day of month labels to all analytics charts
Implemented ranges for each pollutant based on the highest value of each
pollutant in the range of aqi chart.

## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [x] ✨ New feature (non-breaking change which adds functionality)
- [ ] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [x] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore 


[SP-1796]:
https://syncrow.atlassian.net/browse/SP-1796?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

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

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

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

@@ -3,6 +3,7 @@ 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';
 
@@ -149,6 +150,7 @@ class AqiDistributionChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
+      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
         showTitles: chartData.isNotEmpty,
         getTitlesWidget: (value, _) => FittedBox(

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

@@ -2,15 +2,18 @@ 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 {
@@ -45,15 +48,34 @@ 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: 301,
+        maxY: _maxYForAqiType.$1,
         clipData: const FlClipData.vertical(),
-        gridData: EnergyManagementChartsHelper.gridData(horizontalInterval: 50),
-        titlesData: RangeOfAqiChartsHelper.titlesData(context, chartData),
+        gridData: EnergyManagementChartsHelper.gridData(
+          horizontalInterval: _maxYForAqiType.$2,
+        ),
+        titlesData: RangeOfAqiChartsHelper.titlesData(
+          context,
+          chartData,
+          leftSideInterval: _maxYForAqiType.$2,
+        ),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: RangeOfAqiChartsHelper.lineTouchData(chartData),
         betweenBarsData: [

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

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

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

@@ -1,6 +1,7 @@
 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';
 
@@ -15,6 +16,7 @@ abstract final class EnergyManagementChartsHelper {
     return FlTitlesData(
       show: true,
       bottomTitles: AxisTitles(
+        axisNameWidget: const ChartsXAxisTitle(),
         drawBelowEverything: true,
         sideTitles: SideTitles(
           interval: 1,
@@ -62,17 +64,12 @@ abstract final class EnergyManagementChartsHelper {
     );
   }
 
-  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 String getToolTipLabel(double value) => value.formatNumberToKwh;
 
   static List<LineTooltipItem?> getTooltipItems(List<LineBarSpot> touchedSpots) {
     return touchedSpots.map((spot) {
       return LineTooltipItem(
-        getToolTipLabel(spot.x, spot.y),
+        getToolTipLabel(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('Energy Consumption per Device'),
+                        title: Text('Device energy consumed'),
                       ),
                     ),
                   ),

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('Total Energy Consumption')),
+                    child: ChartTitle(title: Text('Space energy consumed')),
                   ),
                 ),
                 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(
-              '$value Occupants',
+              'Occupancy detected: $value',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 10,
                 fontWeight: FontWeight.w500,

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

@@ -2,6 +2,7 @@ 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';
 
@@ -88,8 +89,8 @@ class OccupancyChart extends StatelessWidget {
   }) {
     final data = chartData;
 
-    final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
-    final percentage = '${(occupancyValue).toStringAsFixed(0)}%';
+    final occupancyValue = double.parse(data[group.x].occupancy);
+    final percentage = '${occupancyValue.toStringAsFixed(0)}%';
 
     return BarTooltipItem(
       percentage,
@@ -116,7 +117,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,
@@ -128,6 +129,7 @@ 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: 'Presnce Sensor'),
+              const AnalyticsSidebarHeader(title: 'Presence Sensor'),
               Expanded(
                 child: SizedBox(
                   // height: MediaQuery.sizeOf(context).height * 0.2,

lib/pages/analytics/widgets/charts_x_axis_title.dart

@@ -0,0 +1,23 @@
+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/device_managment/ac/bloc/ac_bloc.dart

@@ -45,7 +45,8 @@ 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;
@@ -68,12 +69,13 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  void _listenToChanges(deviceId) {
+  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+
+  void _listenToChanges(String deviceId) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
-
-      stream.listen((DatabaseEvent event) async {
+      _deviceStatusSubscription =
+          ref.onValue.listen((DatabaseEvent event) async {
         if (event.snapshot.value == null) return;
 
         Map<dynamic, dynamic> usersMap =
@@ -82,10 +84,14 @@ 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);
+        deviceStatus =
+            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        print('Device status updated: ${deviceStatus.acSwitch}');
+
         if (!isClosed) {
           add(AcStatusUpdated(deviceStatus));
         }
@@ -106,15 +112,14 @@ 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'));
       }
@@ -129,8 +134,10 @@ 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()));
@@ -293,14 +300,18 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         totalSeconds--;
         scheduledHours = totalSeconds ~/ 3600;
         scheduledMinutes = (totalSeconds % 3600) ~/ 60;
+        if (!isClosed) {
           add(UpdateTimerEvent());
+        }
       } else {
         _countdownTimer?.cancel();
         timerActive = false;
         scheduledHours = 0;
         scheduledMinutes = 0;
+        if (!isClosed) {
           add(TimerCompletedEvent());
         }
+      }
     });
   }
 
@@ -326,9 +337,11 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       _startCountdownTimer(
         emit,
       );
+      if (!isClosed) {
         add(UpdateTimerEvent());
       }
     }
+  }
 
   void _updateDeviceFunctionFromCode(String code, dynamic value) {
     switch (code) {
@@ -370,6 +383,8 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   @override
   Future<void> close() {
     add(OnClose());
+    _countdownTimer?.cancel();
+    _deviceStatusSubscription?.cancel();
     return super.close();
   }
 }

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

@@ -12,7 +12,8 @@ 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});
@@ -145,8 +146,11 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                       children: [
                         IconButton(
                           icon: const Icon(Icons.arrow_left),
-                          onPressed: () {
-                            blocProvider.add(SmartPowerArrowPressedEvent(-1));
+                          onPressed: blocProvider.currentPage <= 0
+                              ? null
+                              : () {
+                                  blocProvider
+                                      .add(SmartPowerArrowPressedEvent(-1));
                                   pageController.previousPage(
                                     duration: const Duration(milliseconds: 300),
                                     curve: Curves.easeInOut,
@@ -165,8 +169,11 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                         ),
                         IconButton(
                           icon: const Icon(Icons.arrow_right),
-                          onPressed: () {
-                            blocProvider.add(SmartPowerArrowPressedEvent(1));
+                          onPressed: blocProvider.currentPage >= 3
+                              ? null
+                              : () {
+                                  blocProvider
+                                      .add(SmartPowerArrowPressedEvent(1));
                                   pageController.nextPage(
                                     duration: const Duration(milliseconds: 300),
                                     curve: Curves.easeInOut,
@@ -195,8 +202,8 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                             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

@@ -83,6 +83,12 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       emit(currentState.copyWith(
         scheduleMode: event.scheduleMode,
         countdownRemaining: Duration.zero,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        isCountdownActive: false,
+        isInchingActive: false,
       ));
     }
   }
@@ -94,6 +100,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
     if (state is ScheduleLoaded) {
       final currentState = state as ScheduleLoaded;
       emit(currentState.copyWith(
+        countdownSeconds: event.seconds,
         countdownHours: event.hours,
         countdownMinutes: event.minutes,
         inchingHours: 0,
@@ -113,6 +120,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
         inchingHours: event.hours,
         inchingMinutes: event.minutes,
         countdownRemaining: Duration.zero,
+        inchingSeconds: 0, // Add this
       ));
     }
   }
@@ -424,6 +432,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
               countdownMinutes: countdownDuration.inMinutes % 60,
               countdownRemaining: countdownDuration,
               isCountdownActive: true,
+              countdownSeconds: countdownDuration.inSeconds,
             ),
           );
 
@@ -437,6 +446,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
                 countdownMinutes: 0,
                 countdownRemaining: Duration.zero,
                 isCountdownActive: false,
+                countdownSeconds: 0,
               ),
             );
           }
@@ -448,6 +458,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
               inchingMinutes: inchingDuration.inMinutes % 60,
               isInchingActive: true,
               countdownRemaining: inchingDuration,
+              countdownSeconds: inchingDuration.inSeconds,
             ),
           );
         }
@@ -574,8 +585,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   }
 
   String extractTime(String isoDateTime) {
-    // Example input: "2025-06-19T15:45:00.000"
-    return isoDateTime.split('T')[1].split('.')[0]; // gives "15:45:00"
+    return isoDateTime.split('T')[1].split('.')[0];
   }
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {

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

@@ -146,14 +146,16 @@ class UpdateScheduleModeEvent extends ScheduleEvent {
 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];
+  List<Object> get props => [hours, minutes, seconds];
 }
 
 class UpdateInchingTimeEvent extends ScheduleEvent {

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

@@ -26,11 +26,15 @@ class ScheduleLoaded extends ScheduleState {
   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,
@@ -61,6 +65,9 @@ class ScheduleLoaded extends ScheduleState {
     bool? isInchingActive,
     ScheduleModes? scheduleMode,
     Duration? countdownRemaining,
+    String? deviceId,
+    int? countdownSeconds,
+    int? inchingSeconds,
   }) {
     return ScheduleLoaded(
       schedules: schedules ?? this.schedules,
@@ -68,7 +75,7 @@ class ScheduleLoaded extends ScheduleState {
       selectedDays: selectedDays ?? this.selectedDays,
       functionOn: functionOn ?? this.functionOn,
       isEditing: isEditing ?? this.isEditing,
-      deviceId: deviceId,
+      deviceId: deviceId ?? this.deviceId,
       countdownHours: countdownHours ?? this.countdownHours,
       countdownMinutes: countdownMinutes ?? this.countdownMinutes,
       isCountdownActive: isCountdownActive ?? this.isCountdownActive,
@@ -77,6 +84,8 @@ class ScheduleLoaded extends ScheduleState {
       isInchingActive: isInchingActive ?? this.isInchingActive,
       scheduleMode: scheduleMode ?? this.scheduleMode,
       countdownRemaining: countdownRemaining ?? this.countdownRemaining,
+      countdownSeconds: countdownSeconds ?? this.countdownSeconds,
+      inchingSeconds: inchingSeconds ?? this.inchingSeconds,
     );
   }
 
@@ -96,6 +105,8 @@ class ScheduleLoaded extends ScheduleState {
         isInchingActive,
         scheduleMode,
         countdownRemaining,
+        countdownSeconds,
+        inchingSeconds,
       ];
 }
 

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

@@ -6,7 +6,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CountdownInchingView extends StatefulWidget {
-  const CountdownInchingView({super.key});
+  final String deviceId;
+  const CountdownInchingView({super.key, required this.deviceId});
 
   @override
   State<CountdownInchingView> createState() => _CountdownInchingViewState();
@@ -15,25 +16,30 @@ class CountdownInchingView extends StatefulWidget {
 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) {
+  void _updateControllers(
+      int displayHours, int displayMinutes, int displaySeconds) {
     if (_lastHours != displayHours) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (_hoursController.hasClients) {
@@ -50,6 +56,15 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
       });
       _lastMinutes = displayMinutes;
     }
+    // Update seconds controller
+    if (_lastSeconds != displaySeconds) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_secondsController.hasClients) {
+          _secondsController.jumpToItem(displaySeconds);
+        }
+      });
+      _lastSeconds = displaySeconds;
+    }
   }
 
   @override
@@ -57,7 +72,6 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
     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;
@@ -67,8 +81,21 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
         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,
+                ),
+              );
+        }
 
-        _updateControllers(displayHours, displayMinutes);
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -100,7 +127,10 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
                   (value) {
                     if (!isActive) {
                       context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: value, minutes: displayMinutes));
+                            hours: value,
+                            minutes: displayMinutes,
+                            seconds: displaySeconds,
+                          ));
                     }
                   },
                   isActive: isActive,
@@ -115,7 +145,31 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
                   (value) {
                     if (!isActive) {
                       context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: displayHours, minutes: value));
+                            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,

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

@@ -74,7 +74,9 @@ class BuildScheduleView extends StatelessWidget {
                           ),
                         if (state.scheduleMode == ScheduleModes.countdown ||
                             state.scheduleMode == ScheduleModes.inching)
-                          const CountdownInchingView(),
+                           CountdownInchingView(
+                            deviceId: deviceUuid,
+                          ),
                         const SizedBox(height: 20),
                         if (state.scheduleMode == ScheduleModes.countdown)
                           CountdownModeButtons(

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -79,6 +79,7 @@ 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(
@@ -107,7 +108,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
                 'Installation Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    ((device.createTime ?? 0) * 1000),
+                    (device.createTime ?? 0) * 1000,
                   ),
                 ),
               ),
@@ -126,12 +127,16 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
           ),
           TableRow(
             children: [
-              _buildInfoRow('Status:', 'Online', statusColor: Colors.green),
+              _buildInfoRow(
+                'Status:',
+                isOnlineDevice ? 'Online' : 'offline',
+                statusColor: isOnlineDevice ? Colors.green : Colors.red,
+              ),
               _buildInfoRow(
                 'Last Offline Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    ((device.updateTime ?? 0) * 1000),
+                    (device.updateTime ?? 0) * 1000,
                   ),
                 ),
               ),

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -289,7 +289,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
-      emit(state.copyWith(selectedSpaces: updatedSelectedSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -445,10 +444,12 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   List<String> _getThePathToChild(String communityId, String selectedSpaceId) {
     List<String> ids = [];
-    for (var community in state.communityList) {
+    final communityDataSource =
+        state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
+    for (final community in communityDataSource) {
       if (community.uuid == communityId) {
-        for (var space in community.spaces) {
-          List<String> list = [];
+        for (final space in community.spaces) {
+          final list = <String>[];
           list.add(space.uuid!);
           ids = _getAllParentsIds(space, selectedSpaceId, List.from(list));
           if (ids.isNotEmpty) {

lib/pages/visitor_password/view/access_type_radio_group.dart

@@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
+
+class AccessTypeRadioGroup extends StatelessWidget {
+  final String? selectedType;
+  final String? accessTypeSelected;
+  final Function(String) onTypeSelected;
+  final VisitorPasswordBloc visitorBloc;
+
+  const AccessTypeRadioGroup({
+    super.key,
+    required this.selectedType,
+    required this.accessTypeSelected,
+    required this.onTypeSelected,
+    required this.visitorBloc,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    final text = Theme.of(context)
+        .textTheme
+        .bodySmall!
+        .copyWith(color: Colors.black, fontSize: 13);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Text(
+              '* ',
+              style: Theme.of(context)
+                  .textTheme
+                  .bodyMedium!
+                  .copyWith(color: Colors.red),
+            ),
+            Text('Access Type', style: text),
+          ],
+        ),
+        const SizedBox(height: 8),
+        if (size.width < 800)
+          Column(
+            children: [
+              _buildRadioTile(
+                context,
+                'Online Password',
+                selectedType ?? accessTypeSelected,
+                onTypeSelected,
+              ),
+              const SizedBox(height: 8),
+              _buildRadioTile(
+                context,
+                'Offline Password',
+                selectedType ?? accessTypeSelected,
+                onTypeSelected,
+              ),
+            ],
+          )
+        else
+          Row(
+            children: [
+              Expanded(
+                flex: 2,
+                child: Row(
+                  children: [
+                    _buildRadioTile(
+                      context,
+                      'Online Password',
+                      selectedType ?? accessTypeSelected,
+                      onTypeSelected,
+                      width: size.width * 0.12,
+                    ),
+                    _buildRadioTile(
+                      context,
+                      'Offline Password',
+                      selectedType ?? accessTypeSelected,
+                      onTypeSelected,
+                      width: size.width * 0.12,
+                    ),
+                  ],
+                ),
+              ),
+              const Spacer(flex: 2),
+            ],
+          ),
+      ],
+    );
+  }
+
+  Widget _buildRadioTile(
+    BuildContext context,
+    String value,
+    String? groupValue,
+    Function(String) onChanged, {
+    double? width,
+  }) {
+    return SizedBox(
+      width: width,
+      child: RadioListTile<String>(
+        contentPadding: EdgeInsets.zero,
+        title: Text(value,
+            style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  color: Colors.black,
+                  fontSize: 13,
+                )),
+        value: value,
+        groupValue: groupValue,
+        onChanged: (value) {
+          if (value != null) {
+            onChanged(value);
+            if (value == 'Dynamic Password') {
+              visitorBloc.usageFrequencySelected = '';
+            }
+          }
+        },
+      ),
+    );
+  }
+}

lib/pages/visitor_password/view/responsive_fields_row.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
+
+class NameAndEmailFields extends StatelessWidget {
+  final TextEditingController nameController;
+  final TextEditingController emailController;
+  final String? Function(String?)? nameValidator;
+  final String? Function(String?)? emailValidator;
+
+  const NameAndEmailFields({
+    super.key,
+    required this.nameController,
+    required this.emailController,
+    required this.nameValidator,
+    required this.emailValidator,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+      width: size.width,
+      child: size.width < 800
+          ? Column(
+              children: [
+                CustomWebTextField(
+                  validator: nameValidator,
+                  controller: nameController,
+                  isRequired: true,
+                  textFieldName: 'Name',
+                  description: '',
+                ),
+                const SizedBox(height: 15),
+                CustomWebTextField(
+                  validator: emailValidator,
+                  controller: emailController,
+                  isRequired: true,
+                  textFieldName: 'Email Address',
+                  description:
+                      'The password will be sent to the visitor’s email address.',
+                ),
+              ],
+            )
+          : Row(
+              children: [
+                Expanded(
+                  flex: 2,
+                  child: CustomWebTextField(
+                    validator: nameValidator,
+                    controller: nameController,
+                    isRequired: true,
+                    textFieldName: 'Name',
+                    description: '',
+                  ),
+                ),
+                const Spacer(),
+                Expanded(
+                  flex: 2,
+                  child: CustomWebTextField(
+                    validator: emailValidator,
+                    controller: emailController,
+                    isRequired: true,
+                    textFieldName: 'Email Address',
+                    description:
+                        'The password will be sent to the visitor’s email address.',
+                  ),
+                ),
+                const Spacer(),
+              ],
+            ),
+    );
+  }
+}

lib/pages/visitor_password/view/usage_frequency_radio_group.dart

@@ -0,0 +1,91 @@
+import 'package:flutter/material.dart';
+
+class UsageFrequencyRadioGroup extends StatelessWidget {
+  final String? selectedFrequency;
+  final String? usageFrequencySelected;
+  final Function(String) onFrequencySelected;
+
+  const UsageFrequencyRadioGroup({
+    super.key,
+    required this.selectedFrequency,
+    required this.usageFrequencySelected,
+    required this.onFrequencySelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    final text = Theme.of(context)
+        .textTheme
+        .bodySmall!
+        .copyWith(color: Colors.black, fontSize: 13);
+
+    return size.width < 600
+        ? Column(
+            children: [
+              _buildRadioTile(
+                context,
+                'One-Time',
+                selectedFrequency ?? usageFrequencySelected,
+                onFrequencySelected,
+                text: text,
+                fullWidth: true,
+              ),
+              const SizedBox(height: 8),
+              _buildRadioTile(
+                context,
+                'Periodic',
+                selectedFrequency ?? usageFrequencySelected,
+                onFrequencySelected,
+                text: text,
+                fullWidth: true,
+              ),
+            ],
+          )
+        : Row(
+            children: [
+              _buildRadioTile(
+                context,
+                'One-Time',
+                selectedFrequency ?? usageFrequencySelected,
+                onFrequencySelected,
+                width: size.width * 0.12,
+                text: text,
+              ),
+              _buildRadioTile(
+                context,
+                'Periodic',
+                selectedFrequency ?? usageFrequencySelected,
+                onFrequencySelected,
+                width: size.width * 0.12,
+                text: text,
+              ),
+            ],
+          );
+  }
+
+  Widget _buildRadioTile(
+    BuildContext context,
+    String value,
+    String? groupValue,
+    Function(String) onChanged, {
+    double? width,
+    required TextStyle text,
+    bool fullWidth = false,
+  }) {
+    return SizedBox(
+      width: fullWidth ? double.infinity : width,
+      child: RadioListTile<String>(
+        contentPadding: EdgeInsets.zero,
+        title: Text(value, style: text),
+        value: value,
+        groupValue: groupValue,
+        onChanged: (String? value) {
+          if (value != null) {
+            onChanged(value);
+          }
+        },
+      ),
+    );
+  }
+}

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -9,8 +9,11 @@ import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_state.dart';
+import 'package:syncrow_web/pages/visitor_password/view/access_type_radio_group.dart';
 import 'package:syncrow_web/pages/visitor_password/view/add_device_dialog.dart';
 import 'package:syncrow_web/pages/visitor_password/view/repeat_widget.dart';
+import 'package:syncrow_web/pages/visitor_password/view/responsive_fields_row.dart';
+import 'package:syncrow_web/pages/visitor_password/view/usage_frequency_radio_group.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';
@@ -21,7 +24,10 @@ class VisitorPasswordDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
-    var text = Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.black, fontSize: 13);
+    var text = Theme.of(context)
+        .textTheme
+        .bodySmall!
+        .copyWith(color: Colors.black, fontSize: 13);
     return BlocProvider(
       create: (context) => VisitorPasswordBloc(),
       child: BlocListener<VisitorPasswordBloc, VisitorPasswordState>(
@@ -35,7 +41,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                     title: 'Sent Successfully',
                     widgeta: Column(
                       children: [
-                        if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty)
+                        if (visitorBloc
+                            .passwordStatus!.failedOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Failed Devices'),
@@ -45,7 +52,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                                 child: ListView.builder(
                                   scrollDirection: Axis.horizontal,
                                   shrinkWrap: true,
-                                  itemCount: visitorBloc.passwordStatus!.failedOperations.length,
+                                  itemCount: visitorBloc
+                                      .passwordStatus!.failedOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
                                       margin: EdgeInsets.all(5),
@@ -53,14 +61,17 @@ class VisitorPasswordDialog extends StatelessWidget {
                                       height: 45,
                                       child: Center(
                                           child: Text(visitorBloc
-                                              .passwordStatus!.failedOperations[index].deviceUuid)),
+                                              .passwordStatus!
+                                              .failedOperations[index]
+                                              .deviceUuid)),
                                     );
                                   },
                                 ),
                               ),
                             ],
                           ),
-                        if (visitorBloc.passwordStatus!.successOperations.isNotEmpty)
+                        if (visitorBloc
+                            .passwordStatus!.successOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Success Devices'),
@@ -70,15 +81,18 @@ class VisitorPasswordDialog extends StatelessWidget {
                                 child: ListView.builder(
                                   scrollDirection: Axis.horizontal,
                                   shrinkWrap: true,
-                                  itemCount: visitorBloc.passwordStatus!.successOperations.length,
+                                  itemCount: visitorBloc
+                                      .passwordStatus!.successOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
                                       margin: EdgeInsets.all(5),
                                       decoration: containerDecoration,
                                       height: 45,
                                       child: Center(
-                                          child: Text(visitorBloc.passwordStatus!
-                                              .successOperations[index].deviceUuid)),
+                                          child: Text(visitorBloc
+                                              .passwordStatus!
+                                              .successOperations[index]
+                                              .deviceUuid)),
                                     );
                                   },
                                 ),
@@ -88,8 +102,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                       ],
                     ))
                 .then((v) {
-              Navigator.of(context).pop(true);
-
+              Navigator.of(context).pop(v);
             });
           } else if (state is FailedState) {
             visitorBloc.stateDialog(
@@ -102,15 +115,16 @@ class VisitorPasswordDialog extends StatelessWidget {
         child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
           builder: (BuildContext context, VisitorPasswordState state) {
             final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
-            bool isRepeat = state is IsRepeatState ? state.repeat : visitorBloc.repeat;
+            bool isRepeat =
+                state is IsRepeatState ? state.repeat : visitorBloc.repeat;
             return AlertDialog(
               backgroundColor: Colors.white,
               title: Text(
                 'Create visitor password',
-                style: Theme.of(context)
-                    .textTheme
-                    .headlineLarge!
-                    .copyWith(fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
+                style: Theme.of(context).textTheme.headlineLarge!.copyWith(
+                    fontWeight: FontWeight.w400,
+                    fontSize: 24,
+                    color: Colors.black),
               ),
               content: state is LoadingInitialState
                   ? const Center(child: CircularProgressIndicator())
@@ -121,34 +135,11 @@ class VisitorPasswordDialog extends StatelessWidget {
                           padding: const EdgeInsets.all(5.0),
                           child: ListBody(
                             children: <Widget>[
-                              Container(
-                                child: Row(
-                                  children: [
-                                    Expanded(
-                                      flex: 2,
-                                      child: CustomWebTextField(
-                                        validator: visitorBloc.validate,
-                                        controller: visitorBloc.userNameController,
-                                        isRequired: true,
-                                        textFieldName: 'Name',
-                                        description: '',
-                                      ),
-                                    ),
-                                    const Spacer(),
-                                    Expanded(
-                                      flex: 2,
-                                      child: CustomWebTextField(
-                                        validator: visitorBloc.validateEmail,
-                                        controller: visitorBloc.emailController,
-                                        isRequired: true,
-                                        textFieldName: 'Email Address',
-                                        description:
-                                            'The password will be sent to the visitor’s email address.',
-                                      ),
-                                    ),
-                                    const Spacer(),
-                                  ],
-                                ),
+                              NameAndEmailFields(
+                                nameController: visitorBloc.userNameController,
+                                emailController: visitorBloc.emailController,
+                                nameValidator: visitorBloc.validate,
+                                emailValidator: visitorBloc.validateEmail,
                               ),
                               const SizedBox(
                                 height: 15,
@@ -156,104 +147,40 @@ class VisitorPasswordDialog extends StatelessWidget {
                               Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Row(
-                                    children: [
-                                      Text(
-                                        '* ',
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodyMedium!
-                                            .copyWith(color: Colors.red),
-                                      ),
-                                      Text('Access Type', style: text),
-                                    ],
-                                  ),
-                                  Row(
-                                    children: <Widget>[
-                                      Expanded(
-                                          flex: 2,
-                                          child: Row(
-                                            children: [
-                                              SizedBox(
-                                                width: size.width * 0.12,
-                                                child: RadioListTile<String>(
-                                                  contentPadding: EdgeInsets.zero,
-                                                  title: Text(
-                                                    'Online Password',
-                                                    style: text,
-                                                  ),
-                                                  value: 'Online Password',
-                                                  groupValue: (state is PasswordTypeSelected)
+                                  AccessTypeRadioGroup(
+                                    selectedType: state is PasswordTypeSelected
                                         ? state.selectedType
-                                                      : visitorBloc.accessTypeSelected,
-                                                  onChanged: (String? value) {
-                                                    if (value != null) {
+                                        : null,
+                                    accessTypeSelected:
+                                        visitorBloc.accessTypeSelected,
+                                    onTypeSelected: (value) {
                                       context
                                           .read<VisitorPasswordBloc>()
                                           .add(SelectPasswordType(value));
-                                                    }
                                     },
+                                    visitorBloc: visitorBloc,
                                   ),
-                                              ),
-                                              SizedBox(
-                                                width: size.width * 0.12,
-                                                child: RadioListTile<String>(
-                                                  contentPadding: EdgeInsets.zero,
-                                                  title: Text('Offline Password', style: text),
-                                                  value: 'Offline Password',
-                                                  groupValue: (state is PasswordTypeSelected)
-                                                      ? state.selectedType
-                                                      : visitorBloc.accessTypeSelected,
-                                                  onChanged: (String? value) {
-                                                    if (value != null) {
-                                                      context
-                                                          .read<VisitorPasswordBloc>()
-                                                          .add(SelectPasswordType(value));
-                                                    }
-                                                  },
-                                                ),
-                                              ),
-                                              // SizedBox(
-                                              //   width: size.width * 0.12,
-                                              //   child: RadioListTile<String>(
-                                              //     contentPadding: EdgeInsets.zero,
-                                              //     title: Text(
-                                              //       'Dynamic Password',
-                                              //       style: text,
-                                              //     ),
-                                              //     value: 'Dynamic Password',
-                                              //     groupValue: (state is PasswordTypeSelected)
-                                              //         ? state.selectedType
-                                              //         : visitorBloc.accessTypeSelected,
-                                              //     onChanged: (String? value) {
-                                              //       if (value != null) {
-                                              //         context
-                                              //             .read<VisitorPasswordBloc>()
-                                              //             .add(SelectPasswordType(value));
-                                              //         visitorBloc.usageFrequencySelected = '';
-                                              //       }
-                                              //     },
-                                              //   ),
-                                              // ),
-                                            ],
-                                          )),
-                                      const Spacer(
-                                        flex: 2,
-                                      ),
-                                    ],
-                                  ),
-                                  if (visitorBloc.accessTypeSelected == 'Online Password')
+
+                                  if (visitorBloc.accessTypeSelected ==
+                                      'Online Password')
                                     Text(
                                       'Only currently online devices can be selected. It is recommended to use when the device network is stable, and the system randomly generates a digital password',
-                                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .bodySmall!
+                                          .copyWith(
                                               fontWeight: FontWeight.w400,
                                               color: ColorsManager.grayColor,
                                               fontSize: 9),
                                     ),
-                                  if (visitorBloc.accessTypeSelected == 'Offline Password')
+                                  if (visitorBloc.accessTypeSelected ==
+                                      'Offline Password')
                                     Text(
                                       'Unaffected by the online status of the device, you can select online or offline device, and the system randomly generates a digital password',
-                                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .bodySmall!
+                                          .copyWith(
                                               fontWeight: FontWeight.w400,
                                               color: ColorsManager.grayColor,
                                               fontSize: 9),
@@ -271,9 +198,11 @@ class VisitorPasswordDialog extends StatelessWidget {
                                   )
                                 ],
                               ),
-                              visitorBloc.accessTypeSelected == 'Dynamic Password'
-                                  ? const SizedBox()
-                                  : Column(
+                              if (visitorBloc.accessTypeSelected ==
+                                  'Dynamic Password')
+                                const SizedBox()
+                              else
+                                Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
                                     Row(
@@ -291,123 +220,148 @@ class VisitorPasswordDialog extends StatelessWidget {
                                         ),
                                       ],
                                     ),
-                                        Row(
-                                          children: <Widget>[
-                                            SizedBox(
-                                              width: size.width * 0.12,
-                                              child: RadioListTile<String>(
-                                                contentPadding: EdgeInsets.zero,
-                                                title: Text(
-                                                  'One-Time',
-                                                  style: text,
-                                                ),
-                                                value: 'One-Time',
-                                                groupValue: (state is UsageFrequencySelected)
+                                    UsageFrequencyRadioGroup(
+                                      selectedFrequency:
+                                          state is UsageFrequencySelected
                                               ? state.selectedFrequency
-                                                    : visitorBloc.usageFrequencySelected,
-                                                onChanged: (String? value) {
-                                                  if (value != null) {
+                                              : null,
+                                      usageFrequencySelected:
+                                          visitorBloc.usageFrequencySelected,
+                                      onFrequencySelected: (value) {
                                         context
                                             .read<VisitorPasswordBloc>()
                                             .add(SelectUsageFrequency(value));
-                                                  }
                                       },
                                     ),
-                                            ),
-                                            SizedBox(
-                                              width: size.width * 0.12,
-                                              child: RadioListTile<String>(
-                                                contentPadding: EdgeInsets.zero,
-                                                title: Text('Periodic', style: text),
-                                                value: 'Periodic',
-                                                groupValue: (state is UsageFrequencySelected)
-                                                    ? state.selectedFrequency
-                                                    : visitorBloc.usageFrequencySelected,
-                                                onChanged: (String? value) {
-                                                  if (value != null) {
-                                                    context.read<VisitorPasswordBloc>()
-                                                        .add(SelectUsageFrequency(value));
-                                                  }
-                                                },
-                                              ),
-                                            ),
-                                          ],
-                                        ),
 
                                     //One-Time
-                                        if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                                            visitorBloc.accessTypeSelected == 'Online Password')
+                                    if (visitorBloc.usageFrequencySelected ==
+                                            'One-Time' &&
+                                        visitorBloc.accessTypeSelected ==
+                                            'Online Password')
                                       Text(
                                         'Within the validity period, each device can be unlocked only once.',
-                                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                color: ColorsManager.grayColor, fontSize: 9),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
+                                                color: ColorsManager.grayColor,
+                                                fontSize: 9),
                                       ),
-                                        if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                                            visitorBloc.accessTypeSelected == 'Offline Password')
+                                    if (visitorBloc.usageFrequencySelected ==
+                                            'One-Time' &&
+                                        visitorBloc.accessTypeSelected ==
+                                            'Offline Password')
                                       Text(
                                         'Within the validity period, each device can be unlocked only once, and the maximum validity period is 6 hours',
-                                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                color: ColorsManager.grayColor, fontSize: 9),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
+                                                color: ColorsManager.grayColor,
+                                                fontSize: 9),
                                       ),
 
                                     // Periodic
-                                        if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                            visitorBloc.accessTypeSelected == 'Offline Password')
+                                    if (visitorBloc.usageFrequencySelected ==
+                                            'Periodic' &&
+                                        visitorBloc.accessTypeSelected ==
+                                            'Offline Password')
                                       Text(
                                         'Within the validity period, there is no limit to the number of times each device can be unlocked, and it should be used at least once within 24 hours after the entry into force.',
-                                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                color: ColorsManager.grayColor, fontSize: 9),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
+                                                color: ColorsManager.grayColor,
+                                                fontSize: 9),
                                       ),
 
-                                        if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                            visitorBloc.accessTypeSelected == 'Online Password')
+                                    if (visitorBloc.usageFrequencySelected ==
+                                            'Periodic' &&
+                                        visitorBloc.accessTypeSelected ==
+                                            'Online Password')
                                       Text(
                                         'Within the validity period, there is no limit to the number of times each device can be unlocked.',
-                                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                color: ColorsManager.grayColor, fontSize: 9),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
+                                                color: ColorsManager.grayColor,
+                                                fontSize: 9),
                                       ),
                                   ],
                                 ),
                               const SizedBox(
                                 height: 20,
                               ),
-                              if ((visitorBloc.usageFrequencySelected != 'One-Time' ||
-                                      visitorBloc.accessTypeSelected != 'Offline Password') &&
+                              if ((visitorBloc.usageFrequencySelected !=
+                                          'One-Time' ||
+                                      visitorBloc.accessTypeSelected !=
+                                          'Offline Password') &&
                                   (visitorBloc.usageFrequencySelected != ''))
                                 DateTimeWebWidget(
                                     isRequired: true,
                                     title: 'Access Period',
                                     size: size,
                                     endTime: () {
-                                      if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                          visitorBloc.accessTypeSelected == 'Offline Password') {
-                                        visitorBloc.add(SelectTimeEvent(context: context, isEffective: false));
+                                      if (visitorBloc.usageFrequencySelected ==
+                                              'Periodic' &&
+                                          visitorBloc.accessTypeSelected ==
+                                              'Offline Password') {
+                                        visitorBloc.add(SelectTimeEvent(
+                                            context: context,
+                                            isEffective: false));
                                       } else {
-                                        visitorBloc.add(SelectTimeVisitorPassword(context: context, isStart: false, isRepeat: false));
+                                        visitorBloc.add(
+                                            SelectTimeVisitorPassword(
+                                                context: context,
+                                                isStart: false,
+                                                isRepeat: false));
                                       }
                                     },
                                     startTime: () {
-                                      if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                          visitorBloc.accessTypeSelected == 'Offline Password') {
-                                        visitorBloc.add(
-                                            SelectTimeEvent(context: context, isEffective: true));
+                                      if (visitorBloc.usageFrequencySelected ==
+                                              'Periodic' &&
+                                          visitorBloc.accessTypeSelected ==
+                                              'Offline Password') {
+                                        visitorBloc.add(SelectTimeEvent(
+                                            context: context,
+                                            isEffective: true));
                                       } else {
-                                        visitorBloc.add(SelectTimeVisitorPassword(
-                                            context: context, isStart: true, isRepeat: false));
+                                        visitorBloc.add(
+                                            SelectTimeVisitorPassword(
+                                                context: context,
+                                                isStart: true,
+                                                isRepeat: false));
                                       }
                                     },
-                                    firstString: (visitorBloc.usageFrequencySelected ==
-                                                'Periodic' && visitorBloc.accessTypeSelected == 'Offline Password')
+                                    firstString: (visitorBloc
+                                                    .usageFrequencySelected ==
+                                                'Periodic' &&
+                                            visitorBloc.accessTypeSelected ==
+                                                'Offline Password')
                                         ? visitorBloc.effectiveTime
-                                        : visitorBloc.startTimeAccess.toString(),
-                                    secondString: (visitorBloc.usageFrequencySelected ==
-                                                'Periodic' && visitorBloc.accessTypeSelected == 'Offline Password')
+                                        : visitorBloc.startTimeAccess
+                                            .toString(),
+                                    secondString: (visitorBloc
+                                                    .usageFrequencySelected ==
+                                                'Periodic' &&
+                                            visitorBloc.accessTypeSelected ==
+                                                'Offline Password')
                                         ? visitorBloc.expirationTime
                                         : visitorBloc.endTimeAccess.toString(),
                                     icon: Assets.calendarIcon),
-                              const SizedBox(height: 10,),
-                              Text(visitorBloc.accessPeriodValidate,
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: ColorsManager.red),),
+                              const SizedBox(
+                                height: 10,
+                              ),
+                              Text(
+                                visitorBloc.accessPeriodValidate,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(color: ColorsManager.red),
+                              ),
                               const SizedBox(
                                 height: 20,
                               ),
@@ -431,7 +385,10 @@ class VisitorPasswordDialog extends StatelessWidget {
                                   ),
                                   Text(
                                     'Within the validity period, each device can be unlocked only once.',
-                                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .bodySmall!
+                                        .copyWith(
                                             fontWeight: FontWeight.w400,
                                             color: ColorsManager.grayColor,
                                             fontSize: 9),
@@ -439,8 +396,10 @@ class VisitorPasswordDialog extends StatelessWidget {
                                   const SizedBox(
                                     height: 20,
                                   ),
-                                  if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                      visitorBloc.accessTypeSelected == 'Online Password')
+                                  if (visitorBloc.usageFrequencySelected ==
+                                          'Periodic' &&
+                                      visitorBloc.accessTypeSelected ==
+                                          'Online Password')
                                     SizedBox(
                                       width: 100,
                                       child: Column(
@@ -451,7 +410,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                                             child: CupertinoSwitch(
                                               value: visitorBloc.repeat,
                                               onChanged: (value) {
-                                                visitorBloc.add(ToggleRepeatEvent());
+                                                visitorBloc
+                                                    .add(ToggleRepeatEvent());
                                               },
                                               applyTheme: true,
                                             ),
@@ -459,12 +419,16 @@ class VisitorPasswordDialog extends StatelessWidget {
                                         ],
                                       ),
                                     ),
-                                  if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                                      visitorBloc.accessTypeSelected == 'Online Password')
-                                    isRepeat ? const RepeatWidget() : const SizedBox(),
+                                  if (visitorBloc.usageFrequencySelected ==
+                                          'Periodic' &&
+                                      visitorBloc.accessTypeSelected ==
+                                          'Online Password')
+                                    isRepeat
+                                        ? const RepeatWidget()
+                                        : const SizedBox(),
                                   Container(
                                     decoration: containerDecoration,
-                                    width: size.width / 9,
+                                    width: size.width / 6,
                                     child: DefaultButton(
                                       onPressed: () {
                                         showDialog(
@@ -472,21 +436,27 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           barrierDismissible: false,
                                           builder: (BuildContext context) {
                                             return AddDeviceDialog(
-                                              selectedDeviceIds: visitorBloc.selectedDevices,
+                                              selectedDeviceIds:
+                                                  visitorBloc.selectedDevices,
                                             );
                                           },
                                         ).then((listDevice) {
                                           if (listDevice != null) {
-                                            visitorBloc.selectedDevices = listDevice;
+                                            visitorBloc.selectedDevices =
+                                                listDevice;
                                           }
                                         });
                                       },
                                       borderRadius: 8,
                                       child: Text(
                                         '+ Add Device',
-                                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
                                                 fontWeight: FontWeight.w400,
-                                            color: ColorsManager.whiteColors,
+                                                color:
+                                                    ColorsManager.whiteColors,
                                                 fontSize: 12),
                                       ),
                                     ),
@@ -506,7 +476,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                   child: DefaultButton(
                     borderRadius: 8,
                     onPressed: () {
-                      Navigator.of(context).pop(true);
+                      Navigator.of(context).pop(null);
                     },
                     backgroundColor: Colors.white,
                     child: Text(
@@ -525,30 +495,37 @@ class VisitorPasswordDialog extends StatelessWidget {
                     onPressed: () {
                       if (visitorBloc.forgetFormKey.currentState!.validate()) {
                         if (visitorBloc.selectedDevices.isNotEmpty) {
-                          if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                              visitorBloc.accessTypeSelected == 'Offline Password') {
+                          if (visitorBloc.usageFrequencySelected ==
+                                  'One-Time' &&
+                              visitorBloc.accessTypeSelected ==
+                                  'Offline Password') {
                             setPasswordFunction(context, size, visitorBloc);
-                          } else if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                          visitorBloc.accessTypeSelected == 'Offline Password') {
+                          } else if (visitorBloc.usageFrequencySelected ==
+                                  'Periodic' &&
+                              visitorBloc.accessTypeSelected ==
+                                  'Offline Password') {
                             if (visitorBloc.expirationTime != 'End Time' &&
-                                visitorBloc.effectiveTime != 'Start Time' ) {
+                                visitorBloc.effectiveTime != 'Start Time') {
                               setPasswordFunction(context, size, visitorBloc);
-                            }else{
+                            } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message: 'Please select Access Period to continue',
+                                  message:
+                                      'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
-                          } else if(
-                          visitorBloc.endTimeAccess.toString()!='End Time'
-                              &&visitorBloc.startTimeAccess.toString()!='Start Time') {
+                          } else if (visitorBloc.endTimeAccess.toString() !=
+                                  'End Time' &&
+                              visitorBloc.startTimeAccess.toString() !=
+                                  'Start Time') {
                             if (visitorBloc.effectiveTimeTimeStamp != null &&
                                 visitorBloc.expirationTimeTimeStamp != null) {
                               if (isRepeat == true) {
                                 if (visitorBloc.expirationTime != 'End Time' &&
                                     visitorBloc.effectiveTime != 'Start Time' &&
                                     visitorBloc.selectedDays.isNotEmpty) {
-                                  setPasswordFunction(context, size, visitorBloc);
+                                  setPasswordFunction(
+                                      context, size, visitorBloc);
                                 } else {
                                   visitorBloc.stateDialog(
                                       context: context,
@@ -562,13 +539,15 @@ class VisitorPasswordDialog extends StatelessWidget {
                             } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message: 'Please select Access Period to continue',
+                                  message:
+                                      'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
-                          }else{
+                          } else {
                             visitorBloc.stateDialog(
                                 context: context,
-                                  message: 'Please select Access Period to continue',
+                                message:
+                                    'Please select Access Period to continue',
                                 title: 'Access Period');
                           }
                         } else {
@@ -615,7 +594,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                 content: SizedBox(
                   height: size.height * 0.25,
                   child: Center(
-                    child: CircularProgressIndicator(), // Display a loading spinner
+                    child:
+                        CircularProgressIndicator(), // Display a loading spinner
                   ),
                 ),
               );
@@ -639,7 +619,10 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ),
                           Text(
                             'Set Password',
-                            style: Theme.of(context).textTheme.headlineLarge!.copyWith(
+                            style: Theme.of(context)
+                                .textTheme
+                                .headlineLarge!
+                                .copyWith(
                                   fontSize: 30,
                                   fontWeight: FontWeight.w400,
                                   color: Colors.black,
@@ -668,7 +651,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                     child: DefaultButton(
                       borderRadius: 8,
                       onPressed: () {
-                        Navigator.of(context).pop();
+                        Navigator.of(context).pop(null);
                       },
                       backgroundColor: Colors.white,
                       child: Text(
@@ -689,37 +672,45 @@ class VisitorPasswordDialog extends StatelessWidget {
                       onPressed: () {
                         Navigator.pop(context);
                         if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                            visitorBloc.accessTypeSelected == 'Online Password') {
+                            visitorBloc.accessTypeSelected ==
+                                'Online Password') {
                           visitorBloc.add(OnlineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
                           ));
-                        }
-                        else if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                            visitorBloc.accessTypeSelected == 'Online Password') {
+                        } else if (visitorBloc.usageFrequencySelected ==
+                                'Periodic' &&
+                            visitorBloc.accessTypeSelected ==
+                                'Online Password') {
                           visitorBloc.add(OnlineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
-                            effectiveTime: visitorBloc.effectiveTimeTimeStamp.toString(),
-                            invalidTime: visitorBloc.expirationTimeTimeStamp.toString(),
+                            effectiveTime:
+                                visitorBloc.effectiveTimeTimeStamp.toString(),
+                            invalidTime:
+                                visitorBloc.expirationTimeTimeStamp.toString(),
                           ));
-                        }
-                        else if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                            visitorBloc.accessTypeSelected == 'Offline Password') {
+                        } else if (visitorBloc.usageFrequencySelected ==
+                                'One-Time' &&
+                            visitorBloc.accessTypeSelected ==
+                                'Offline Password') {
                           visitorBloc.add(OfflineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
                           ));
-                        }
-                        else if (visitorBloc.usageFrequencySelected == 'Periodic' &&
-                            visitorBloc.accessTypeSelected == 'Offline Password') {
+                        } else if (visitorBloc.usageFrequencySelected ==
+                                'Periodic' &&
+                            visitorBloc.accessTypeSelected ==
+                                'Offline Password') {
                           visitorBloc.add(OfflineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
-                            effectiveTime: visitorBloc.effectiveTimeTimeStamp.toString(),
-                            invalidTime: visitorBloc.expirationTimeTimeStamp.toString(),
+                            effectiveTime:
+                                visitorBloc.effectiveTimeTimeStamp.toString(),
+                            invalidTime:
+                                visitorBloc.expirationTimeTimeStamp.toString(),
                           ));
                         }
                       },