fix curtain name in curtain if then containers dialogs

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

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

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

@@ -7,22 +7,21 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
   final Map<String, Offset> positions;
   final double cardWidth = 150.0;
   final double cardHeight = 90.0;
-  final Set<String> highlightedUuids;
+  final String? selectedSpaceUuid;
 
   SpacesConnectionsArrowPainter({
     required this.connections,
     required this.positions,
-    required this.highlightedUuids,
+    this.selectedSpaceUuid,
   });
 
   @override
   void paint(Canvas canvas, Size size) {
     for (final connection in connections) {
-      final isSelected = highlightedUuids.contains(connection.from) ||
-          highlightedUuids.contains(connection.to);
+      final isSelected = connection.to == selectedSpaceUuid;
       final paint = Paint()
         ..color = isSelected
-            ? ColorsManager.blackColor
+            ? ColorsManager.primaryColor
             : ColorsManager.blackColor.withValues(alpha: 0.5)
         ..strokeWidth = 2.0
         ..style = PaintingStyle.stroke;
@@ -37,7 +36,7 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
 
         final path = Path()..moveTo(startPoint.dx, startPoint.dy);
 
-        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 20);
+        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 60);
         final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 60);
 
         path.cubicTo(controlPoint1.dx, controlPoint1.dy, controlPoint2.dx,
@@ -47,7 +46,7 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
 
         final circlePaint = Paint()
           ..color = isSelected
-              ? ColorsManager.blackColor
+              ? ColorsManager.primaryColor
               : 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,26 +1,21 @@
 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();
+  State<CommunityStructureCanvas> createState() =>_CommunityStructureCanvasState();  
 }
 
 class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
@@ -30,30 +25,19 @@ 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: 150),
+      duration: const Duration(milliseconds: 100),
     );
-    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
@@ -63,15 +47,6 @@ 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,
@@ -88,16 +63,15 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     });
   }
 
-  void _animateToSpace(SpaceModel? space) {
-    if (space == null) {
-      _runAnimation(Matrix4.identity());
-      return;
-    }
+  void _onSpaceTapped(String spaceUuid) {
+    setState(() {
+      _selectedSpaceUuid = spaceUuid;
+    });
 
-    final position = _positions[space.uuid];
+    final position = _positions[spaceUuid];
     if (position == null) return;
 
-    const scale = 1.5;
+    const scale = 2.0;
     final viewSize = context.size;
     if (viewSize == null) return;
 
@@ -112,19 +86,11 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     _runAnimation(matrix);
   }
 
-  void _onSpaceTapped(SpaceModel? space) {
-    context.read<CommunitiesTreeSelectionBloc>().add(
-          SelectSpaceEvent(community: widget.community, space: space),
-        );
-  }
-
   void _resetSelectionAndZoom() {
-    context.read<CommunitiesTreeSelectionBloc>().add(
-          SelectSpaceEvent(
-            community: widget.community,
-            space: null,
-          ),
-        );
+    setState(() {
+      _selectedSpaceUuid = null;
+    });
+    _runAnimation(Matrix4.identity());
   }
 
   void _calculateLayout(
@@ -184,23 +150,16 @@ 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, highlightedUuids);
+    _generateWidgets(community.spaces, widgets, connections);
 
     return [
       CustomPaint(
         painter: SpacesConnectionsArrowPainter(
           connections: connections,
           positions: _positions,
-          highlightedUuids: highlightedUuids,
+          selectedSpaceUuid: _selectedSpaceUuid,
         ),
         child: Stack(alignment: AlignmentDirectional.center, children: widgets),
       ),
@@ -211,15 +170,11 @@ 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,
@@ -227,31 +182,32 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
           width: _cardWidth,
           height: _cardHeight,
           child: SpaceCardWidget(
-            buildSpaceContainer: () {
+            index: spaces.indexOf(space),
+            onPositionChanged: (newPosition) {},
+            buildSpaceContainer: (index) {
               return Opacity(
-                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
-                child: Tooltip(
-                  message: space.spaceName,
-                  preferBelow: false,
-                  child: SpaceCell(
-                    onTap: () => _onSpaceTapped(space),
-                    icon: space.icon,
-                    name: space.spaceName,
-                  ),
+                opacity: 1.0,
+                child: SpaceCell(
+                  index: index,
+                  onTap: () => _onSpaceTapped(space.uuid),
+                  icon: space.icon,
+                  name: space.spaceName,
                 ),
               );
             },
-            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
+            screenSize: MediaQuery.sizeOf(context),
+            position: position,
+            isHovered: false,
+            onHoverChanged: (int index, bool isHovered) {},
+            onButtonTap: (int index, Offset newPosition) {},
           ),
         ),
       );
 
       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, highlightedUuids);
+      _generateWidgets(space.children, widgets, connections);
     }
   }
 
@@ -262,7 +218,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       transformationController: _transformationController,
       boundaryMargin: EdgeInsets.symmetric(
         horizontal: MediaQuery.sizeOf(context).width * 0.3,
-        vertical: MediaQuery.sizeOf(context).height * 0.3,
+        vertical: MediaQuery.sizeOf(context).height * 0.2,
       ),
       minScale: 0.5,
       maxScale: 3.0,
@@ -270,8 +226,8 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       child: GestureDetector(
         onTap: _resetSelectionAndZoom,
         child: SizedBox(
-          width: MediaQuery.sizeOf(context).width * 5,
-          height: MediaQuery.sizeOf(context).height * 5,
+          width: MediaQuery.sizeOf(context).width * 2,
+          height: MediaQuery.sizeOf(context).height * 2,
           child: Stack(children: treeWidgets),
         ),
       ),

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

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

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

@@ -2,11 +2,15 @@ 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() onButtonTap;
+  final void Function(int index, Offset newPosition) onButtonTap;
 
   const PlusButtonWidget({
     super.key,
+    required this.index,
+    required this.direction,
     required this.offset,
     required this.onButtonTap,
   });
@@ -14,7 +18,13 @@ class PlusButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: onButtonTap,
+      onTap: () {
+        if (direction == 'down') {
+          onButtonTap(index, const Offset(0, 150));
+        } else {
+          onButtonTap(index, const Offset(150, 0));
+        }
+      },
       child: Container(
         width: 30,
         height: 30,

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

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

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

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

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

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

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

@@ -7,24 +7,26 @@ class SpaceManagementTemplatesView extends StatelessWidget {
   const SpaceManagementTemplatesView({super.key});
   @override
   Widget build(BuildContext context) {
-    return ColoredBox(
-      color: ColorsManager.whiteColors,
-      child: GridView.builder(
-        padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
-        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-          maxCrossAxisExtent: 400,
-          mainAxisSpacing: 10,
-          crossAxisSpacing: 10,
-          childAspectRatio: 2.0,
+    return Expanded(
+      child: ColoredBox(
+        color: ColorsManager.whiteColors,
+        child: GridView.builder(
+          padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
+          gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+            maxCrossAxisExtent: 400,
+            mainAxisSpacing: 10,
+            crossAxisSpacing: 10,
+            childAspectRatio: 2.0,
+          ),
+          itemCount: _gridItems(context).length,
+          itemBuilder: (context, index) {
+            final model = _gridItems(context)[index];
+            return CommunityTemplateCell(
+              onTap: model.onTap,
+              title: model.title,
+            );
+          },
         ),
-        itemCount: _gridItems(context).length,
-        itemBuilder: (context, index) {
-          final model = _gridItems(context)[index];
-          return CommunityTemplateCell(
-            onTap: model.onTap,
-            title: model.title,
-          );
-        },
       ),
     );
   }

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

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

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