stash changes

lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart

@@ -38,8 +38,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
+    int index = updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -48,21 +47,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
-      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
+    int index = currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -73,26 +68,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
-          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
-                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -102,15 +93,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
-              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)..addAll(selectedFunction);
-            List.from(currentFunctions)..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
-            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -119,8 +107,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
-      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
 
     try {
@@ -139,8 +126,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
-      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
 
     try {
@@ -159,15 +145,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
-      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -176,8 +160,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.first['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       if (_isFirstActionDelay(state.thenItems)) {
@@ -252,8 +235,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -353,43 +335,35 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
-      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
-          ifItems: ifItems, selectedFunctions: selectedFunctions));
     }
   }
 
-  FutureOr<void> _changeOperatorOperator(
+  FutureOr<void> _changeOperatorOperator(ChangeAutomationOperator event, Emitter<RoutineState> emit) {
-      ChangeAutomationOperator event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       selectedAutomationOperator: event.operator,
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
-      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(routineName: event.name));
   }
 
@@ -414,8 +388,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     );
   }
 
-  FutureOr<void> _onResetRoutineState(
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
-      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(_resetState());
   }
 }

lib/pages/routiens/bloc/routine_bloc/routine_state.dart

@@ -67,15 +67,12 @@ class RoutineState extends Equatable {
       errorMessage: errorMessage ?? this.errorMessage,
       routineName: routineName ?? this.routineName,
       selectedIcon: selectedIcon ?? this.selectedIcon,
-      loadScenesErrorMessage:
+      loadScenesErrorMessage: loadScenesErrorMessage ?? this.loadScenesErrorMessage,
-          loadScenesErrorMessage ?? this.loadScenesErrorMessage,
+      loadAutomationErrorMessage: loadAutomationErrorMessage ?? this.loadAutomationErrorMessage,
-      loadAutomationErrorMessage:
-          loadAutomationErrorMessage ?? this.loadAutomationErrorMessage,
       searchText: searchText ?? this.searchText,
       isTabToRun: isTabToRun ?? this.isTabToRun,
       isAutomation: isAutomation ?? this.isAutomation,
-      selectedAutomationOperator:
+      selectedAutomationOperator: selectedAutomationOperator ?? this.selectedAutomationOperator,
-          selectedAutomationOperator ?? this.selectedAutomationOperator,
       effectiveTime: effectiveTime ?? this.effectiveTime,
     );
   }

lib/pages/routiens/view/routines_view.dart

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
+import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
+import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class RoutinesView extends StatelessWidget {
@@ -23,48 +26,30 @@ class RoutinesView extends StatelessWidget {
             children: [
               Text(
                 "Create New Routines",
-                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                      fontWeight: FontWeight.bold,
                       color: ColorsManager.grayColor,
+                      fontWeight: FontWeight.bold,
                     ),
               ),
-              SizedBox(
+              const SizedBox(
-                height: 200,
+                height: 10,
-                width: 150,
-                child: GestureDetector(
-                  onTap: () {
-                    BlocProvider.of<SwitchTabsBloc>(context).add(
-                      const CreateNewRoutineViewEvent(true),
-                    );
-                  },
-                  child: Card(
-                    elevation: 3,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    color: ColorsManager.whiteColors,
-                    child: Center(
-                      child: Container(
-                        decoration: BoxDecoration(
-                          color: ColorsManager.graysColor,
-                          borderRadius: BorderRadius.circular(120),
-                          border: Border.all(
-                            color: ColorsManager.greyColor,
-                            width: 2.0,
-                          ),
-                        ),
-                        height: 70,
-                        width: 70,
-                        child: Icon(
-                          Icons.add,
-                          color: ColorsManager.dialogBlueTitle,
-                          size: 40,
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
               ),
+              RoutineViewCard(
+                onTap: () {
+                  BlocProvider.of<SwitchTabsBloc>(context).add(
+                    const CreateNewRoutineViewEvent(true),
+                  );
+                  context.read<RoutineBloc>().add(
+                        (ResetRoutineState()),
+                      );
+                },
+                icon: Icons.add,
+                textString: '',
+              ),
+              const SizedBox(
+                height: 30,
+              ),
+              const FetchRoutineScenesAutomation(),
               const Spacer(),
             ],
           ),

lib/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class FetchRoutineScenesAutomation extends StatefulWidget {
+  const FetchRoutineScenesAutomation({super.key});
+
+  @override
+  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
+}
+
+class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>()
+      ..add(const LoadScenes(spaceId))
+      ..add(const LoadAutomation(spaceId));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RoutineBloc, RoutineState>(
+      builder: (context, state) {
+        debugPrint(state.scenes.toString());
+        debugPrint(state.automations.toString());
+
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              "Scenes (Tab to Run)",
+              style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                    color: ColorsManager.grayColor,
+                    fontWeight: FontWeight.bold,
+                  ),
+            ),
+            const SizedBox(
+              height: 10,
+            ),
+            state.loadScenesErrorMessage != null
+                ? Text(state.loadScenesErrorMessage ?? '')
+                : state.scenes.isNotEmpty
+                    ? SizedBox(
+                        height: 200,
+                        child: ListView.builder(
+                          shrinkWrap: true,
+                          scrollDirection: Axis.horizontal,
+                          itemCount: state.scenes.length,
+                          itemBuilder: (context, index) {
+                            return RoutineViewCard(
+                              onTap: () {},
+                              textString: state.scenes[index].name,
+                              icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                            );
+                          },
+                        ),
+                      )
+                    : const CircularProgressIndicator(),
+            const SizedBox(
+              height: 30,
+            ),
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  "Automations",
+                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        color: ColorsManager.grayColor,
+                        fontWeight: FontWeight.bold,
+                      ),
+                ),
+                const SizedBox(
+                  height: 10,
+                ),
+                state.loadAutomationErrorMessage != null
+                    ? Text(state.loadAutomationErrorMessage ?? '')
+                    : state.automations.isNotEmpty
+                        ? Expanded(
+                            child: SizedBox(
+                              height: 200,
+                              child: ListView.builder(
+                                shrinkWrap: true,
+                                scrollDirection: Axis.horizontal,
+                                itemCount: state.automations.length,
+                                itemBuilder: (context, index) {
+                                  return RoutineViewCard(
+                                    onTap: () {},
+                                    textString: state.automations[index].name,
+                                    icon: Assets.automation,
+                                  );
+                                },
+                              ),
+                            ),
+                          )
+                        : const CircularProgressIndicator(),
+              ],
+            )
+          ],
+        );
+      },
+    );
+  }
+}

lib/pages/routiens/widgets/main_routine_view/routine_view_card.dart

@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class RoutineViewCard extends StatelessWidget {
+  const RoutineViewCard({
+    super.key,
+    required this.onTap,
+    required this.icon,
+    required this.textString,
+  });
+
+  final Function() onTap;
+  final dynamic icon;
+  final String textString;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 200,
+      width: 150,
+      child: GestureDetector(
+        onTap: () {
+          onTap();
+        },
+        child: Card(
+          elevation: 3,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(10),
+          ),
+          color: ColorsManager.whiteColors,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Center(
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: ColorsManager.graysColor,
+                    borderRadius: BorderRadius.circular(120),
+                    border: Border.all(
+                      color: ColorsManager.greyColor,
+                      width: 2.0,
+                    ),
+                  ),
+                  height: 70,
+                  width: 70,
+                  child: (icon is String) && icon.contains('.svg')
+                      ? SvgPicture.asset(icon)
+                      : Icon(
+                          icon,
+                          color: ColorsManager.dialogBlueTitle,
+                          size: 40,
+                        ),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 3),
+                child: Text(
+                  textString,
+                  textAlign: TextAlign.center,
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: 2,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    color: ColorsManager.blackColor,
+                    fontSize: 12,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}