Solved conflicts and added latest update from routines design branch

This commit is contained in:
Abdullah Alassaf
2024-07-01 12:38:52 +03:00
8 changed files with 451 additions and 339 deletions

View File

@ -15,8 +15,7 @@ import 'package:syncrow_app/utils/context_extension.dart';
mixin SceneLogicHelper {
bool isOnlyDelayOrDelayLast(List<SceneStaticFunction> tasks) {
final lastTask = tasks.last;
return tasks.every((task) => task.code == 'delay') ||
lastTask.code == 'delay';
return tasks.every((task) => task.code == 'delay') || lastTask.code == 'delay';
}
void handleSaveButtonPress(
@ -122,8 +121,7 @@ mixin SceneLogicHelper {
);
} else {
return AlertDialogCountdown(
durationValue: listOfSceneStaticFunction[index].functionValue ??
taskItem.functionValue,
durationValue: listOfSceneStaticFunction[index].functionValue ?? taskItem.functionValue,
functionValue: taskItem.functionValue,
function: listOfSceneStaticFunction[index],
);