Add countdown seconds to schedule management

<!--
  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-1711](https://syncrow.atlassian.net/browse/SP-1711)
[SP-1712](https://syncrow.atlassian.net/browse/SP-1712)

## Description

1. Shows tooltip on space cell.
2. navigates to space when a new space is selected
3. Fixed a thrown Exception because of an Expanded widget
4. Adjusted connections between spaces to select from and to nodes.
5. Created a `SpaceDetailsDialog` and a helper class to show it, because
a space can be created through different widgets, and this was done to
unify the logic and remove code duplication.

## Type of Change

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

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


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

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

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/routines/widgets/routine_dialogs/curtain_dialog.dart

@@ -58,9 +58,7 @@ class CurtainHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    DialogHeader(dialogType == 'THEN'
-                        ? 'Curtain Functions'
-                        : 'Curtain Conditions'),
+                    const DialogHeader('AC Functions'),
                     Expanded(
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.stretch,

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

@@ -7,21 +7,22 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
   final Map<String, Offset> positions;
   final double cardWidth = 150.0;
   final double cardHeight = 90.0;
-  final String? selectedSpaceUuid;
+  final Set<String> highlightedUuids;
 
   SpacesConnectionsArrowPainter({
     required this.connections,
     required this.positions,
-    this.selectedSpaceUuid,
+    required this.highlightedUuids,
   });
 
   @override
   void paint(Canvas canvas, Size size) {
     for (final connection in connections) {
-      final isSelected = connection.to == selectedSpaceUuid;
+      final isSelected = highlightedUuids.contains(connection.from) ||
+          highlightedUuids.contains(connection.to);
       final paint = Paint()
         ..color = isSelected
-            ? ColorsManager.primaryColor
+            ? ColorsManager.blackColor
             : ColorsManager.blackColor.withValues(alpha: 0.5)
         ..strokeWidth = 2.0
         ..style = PaintingStyle.stroke;
@@ -36,7 +37,7 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
 
         final path = Path()..moveTo(startPoint.dx, startPoint.dy);
 
-        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 60);
+        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 20);
         final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 60);
 
         path.cubicTo(controlPoint1.dx, controlPoint1.dy, controlPoint2.dx,
@@ -46,7 +47,7 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
 
         final circlePaint = Paint()
           ..color = isSelected
-              ? ColorsManager.primaryColor
+              ? ColorsManager.blackColor
               : ColorsManager.blackColor.withValues(alpha: 0.5)
           ..style = PaintingStyle.fill
           ..blendMode = BlendMode.srcIn;

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

@@ -1,18 +1,23 @@
 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();
@@ -25,19 +30,30 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
   final double _cardHeight = 90.0;
   final double _horizontalSpacing = 150.0;
   final double _verticalSpacing = 120.0;
-  String? _selectedSpaceUuid;
 
   late TransformationController _transformationController;
   late AnimationController _animationController;
 
   @override
   void initState() {
-    super.initState();
     _transformationController = TransformationController();
     _animationController = AnimationController(
       vsync: this,
-      duration: const Duration(milliseconds: 100),
+      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
@@ -47,6 +63,15 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     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,
@@ -63,15 +88,16 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     });
   }
 
-  void _onSpaceTapped(String spaceUuid) {
-    setState(() {
-      _selectedSpaceUuid = spaceUuid;
-    });
+  void _animateToSpace(SpaceModel? space) {
+    if (space == null) {
+      _runAnimation(Matrix4.identity());
+      return;
+    }
 
-    final position = _positions[spaceUuid];
+    final position = _positions[space.uuid];
     if (position == null) return;
 
-    const scale = 2.0;
+    const scale = 1.5;
     final viewSize = context.size;
     if (viewSize == null) return;
 
@@ -86,11 +112,19 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     _runAnimation(matrix);
   }
 
+  void _onSpaceTapped(SpaceModel? space) {
+    context.read<CommunitiesTreeSelectionBloc>().add(
+          SelectSpaceEvent(community: widget.community, space: space),
+        );
+  }
+
   void _resetSelectionAndZoom() {
-    setState(() {
-      _selectedSpaceUuid = null;
-    });
-    _runAnimation(Matrix4.identity());
+    context.read<CommunitiesTreeSelectionBloc>().add(
+          SelectSpaceEvent(
+            community: widget.community,
+            space: null,
+          ),
+        );
   }
 
   void _calculateLayout(
@@ -150,16 +184,23 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
     _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);
+    _generateWidgets(community.spaces, widgets, connections, highlightedUuids);
 
     return [
       CustomPaint(
         painter: SpacesConnectionsArrowPainter(
           connections: connections,
           positions: _positions,
-          selectedSpaceUuid: _selectedSpaceUuid,
+          highlightedUuids: highlightedUuids,
         ),
         child: Stack(alignment: AlignmentDirectional.center, children: widgets),
       ),
@@ -170,11 +211,15 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     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,
@@ -182,32 +227,31 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
           width: _cardWidth,
           height: _cardHeight,
           child: SpaceCardWidget(
-            index: spaces.indexOf(space),
-            onPositionChanged: (newPosition) {},
-            buildSpaceContainer: (index) {
+            buildSpaceContainer: () {
               return Opacity(
-                opacity: 1.0,
+                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
+                child: Tooltip(
+                  message: space.spaceName,
+                  preferBelow: false,
                   child: SpaceCell(
-                  index: index,
-                  onTap: () => _onSpaceTapped(space.uuid),
+                    onTap: () => _onSpaceTapped(space),
                     icon: space.icon,
                     name: space.spaceName,
                   ),
+                ),
               );
             },
-            screenSize: MediaQuery.sizeOf(context),
-            position: position,
-            isHovered: false,
-            onHoverChanged: (int index, bool isHovered) {},
-            onButtonTap: (int index, Offset newPosition) {},
+            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
           ),
         ),
       );
 
       for (final child in space.children) {
-        connections.add(SpaceConnectionModel(from: space.uuid, to: child.uuid));
+        connections.add(
+          SpaceConnectionModel(from: space.uuid, to: child.uuid),
+        );
       }
-      _generateWidgets(space.children, widgets, connections);
+      _generateWidgets(space.children, widgets, connections, highlightedUuids);
     }
   }
 
@@ -218,7 +262,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       transformationController: _transformationController,
       boundaryMargin: EdgeInsets.symmetric(
         horizontal: MediaQuery.sizeOf(context).width * 0.3,
-        vertical: MediaQuery.sizeOf(context).height * 0.2,
+        vertical: MediaQuery.sizeOf(context).height * 0.3,
       ),
       minScale: 0.5,
       maxScale: 3.0,
@@ -226,8 +270,8 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       child: GestureDetector(
         onTap: _resetSelectionAndZoom,
         child: SizedBox(
-          width: MediaQuery.sizeOf(context).width * 2,
-          height: MediaQuery.sizeOf(context).height * 2,
+          width: MediaQuery.sizeOf(context).width * 5,
+          height: MediaQuery.sizeOf(context).height * 5,
           child: Stack(children: treeWidgets),
         ),
       ),

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

@@ -1,4 +1,5 @@
 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 {
@@ -7,7 +8,7 @@ class CreateSpaceButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {},
+      onTap: () => SpaceDetailsDialogHelper.showCreate(context),
       child: Container(
         height: 60,
         decoration: BoxDecoration(

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

@@ -2,15 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class PlusButtonWidget extends StatelessWidget {
-  final int index;
-  final String direction;
   final Offset offset;
-  final void Function(int index, Offset newPosition) onButtonTap;
+  final void Function() onButtonTap;
 
   const PlusButtonWidget({
     super.key,
-    required this.index,
-    required this.direction,
     required this.offset,
     required this.onButtonTap,
   });
@@ -18,13 +14,7 @@ class PlusButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {
-        if (direction == 'down') {
-          onButtonTap(index, const Offset(0, 150));
-        } else {
-          onButtonTap(index, const Offset(150, 0));
-        }
-      },
+      onTap: onButtonTap,
       child: Container(
         width: 30,
         height: 30,

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

@@ -1,60 +1,39 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/plus_button_widget.dart';
 
-class SpaceCardWidget extends StatelessWidget {
-  final int index;
-  final Size screenSize;
-  final Offset position;
-  final bool isHovered;
-  final void Function(int index, bool isHovered) onHoverChanged;
-  final void Function(int index, Offset newPosition) onButtonTap;
-  final Widget Function(int index) buildSpaceContainer;
-  final ValueChanged<Offset> onPositionChanged;
+class SpaceCardWidget extends StatefulWidget {
+  final void Function() onTap;
+  final Widget Function() buildSpaceContainer;
 
   const SpaceCardWidget({
-    super.key,
-    required this.index,
-    required this.onPositionChanged,
-    required this.screenSize,
-    required this.position,
-    required this.isHovered,
-    required this.onHoverChanged,
-    required this.onButtonTap,
+    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: (_) => onHoverChanged(index, true),
-      onExit: (_) => onHoverChanged(index, false),
+      onEnter: (_) => setState(() => isHovered = true),
+      onExit: (_) => setState(() => isHovered = false),
       child: SizedBox(
-        width: 150,
-        height: 90,
         child: Stack(
           clipBehavior: Clip.none,
           alignment: Alignment.center,
           children: [
-            buildSpaceContainer(index),
-
+            widget.buildSpaceContainer(),
             if (isHovered)
               Positioned(
                 bottom: 0,
                 child: PlusButtonWidget(
-                  index: index,
-                  direction: 'down',
                   offset: Offset.zero,
-                  onButtonTap: onButtonTap,
-                ),
-              ),
-            if (isHovered)
-              Positioned(
-                right: -15,
-                child: PlusButtonWidget(
-                  index: index,
-                  direction: 'right',
-                  offset: Offset.zero,
-                  onButtonTap: onButtonTap,
+                  onButtonTap: widget.onTap,
                 ),
               ),
           ],

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

@@ -1,29 +1,23 @@
 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 int index;
   final String icon;
   final String name;
-  final VoidCallback? onDoubleTap;
   final VoidCallback? onTap;
 
   const SpaceCell({
     super.key,
-    required this.index,
     required this.icon,
     required this.name,
-    this.onTap,
-    this.onDoubleTap,
+    required this.onTap,
   });
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
     return GestureDetector(
-      onDoubleTap: onDoubleTap,
       onTap: onTap,
       child: Container(
         width: 150,
@@ -36,7 +30,7 @@ class SpaceCell extends StatelessWidget {
             Expanded(
               child: Text(
                 name,
-                style: theme.textTheme.bodyLarge?.copyWith(
+                style: context.textTheme.bodyLarge?.copyWith(
                   fontWeight: FontWeight.bold,
                   color: ColorsManager.blackColor,
                 ),
@@ -63,7 +57,10 @@ class SpaceCell extends StatelessWidget {
       child: Center(
         child: SvgPicture.asset(
           icon,
-          color: ColorsManager.whiteColors,
+          colorFilter: const ColorFilter.mode(
+            ColorsManager.whiteColors,
+            BlendMode.srcIn,
+          ),
           width: 24,
           height: 24,
         ),

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

@@ -9,14 +9,19 @@ class SpaceManagementCommunityStructure extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final selectedCommunity =
-        context.watch<CommunitiesTreeSelectionBloc>().state.selectedCommunity!;
+    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,
+      visible: selectedCommunity!.spaces.isNotEmpty,
       replacement: const Row(
-          children: [spacer, Expanded(child: CreateSpaceButton()), spacer]),
-      child: CommunityStructureCanvas(community: selectedCommunity),
+        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

@@ -7,8 +7,7 @@ class SpaceManagementTemplatesView extends StatelessWidget {
   const SpaceManagementTemplatesView({super.key});
   @override
   Widget build(BuildContext context) {
-    return Expanded(
-      child: ColoredBox(
+    return ColoredBox(
       color: ColorsManager.whiteColors,
       child: GridView.builder(
         padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
@@ -27,7 +26,6 @@ class SpaceManagementTemplatesView extends StatelessWidget {
           );
         },
       ),
-      ),
     );
   }
 

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

@@ -16,7 +16,7 @@ final class SelectCommunityEvent extends CommunitiesTreeSelectionEvent {
 }
 
 final class SelectSpaceEvent extends CommunitiesTreeSelectionEvent {
-  final SpaceModel space;
+  final SpaceModel? space;
   final CommunityModel community;
 
   const SelectSpaceEvent({required this.space, required this.community});

lib/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart';
+
+abstract final class SpaceDetailsDialogHelper {
+  static void showCreate(BuildContext context) {
+    showDialog<void>(
+      context: context,
+      builder: (context) => const SpaceDetailsDialog(),
+    );
+  }
+}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class SpaceDetailsDialog extends StatelessWidget {
+  const SpaceDetailsDialog({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Dialog(
+      child: Text('Create Space'),
+    );
+  }
+}

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)),
                                     );
                                   },
                                 ),
@@ -89,7 +103,6 @@ class VisitorPasswordDialog extends StatelessWidget {
                     ))
                 .then((v) {
               Navigator.of(context).pop(true);
-
             });
           } 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),
                                       ),
                                     ),
@@ -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') {
                               setPasswordFunction(context, size, visitorBloc);
                             } 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 {
                             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,
@@ -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(),
                           ));
                         }
                       },