From 88dd42f943ebbd0e16fd8f7fdca582b6c4696d3f Mon Sep 17 00:00:00 2001 From: Nana <ns01266@surrey.ac.uk> Date: Wed, 22 May 2024 12:30:46 +0100 Subject: [PATCH] polishing --- FocusAssistant/FocusAssistant.xcodeproj/project.pbxproj | 4 ++-- .../Screens/Tasks/Active Task/ActiveTaskView.swift | 6 +++++- .../Screens/Tasks/Task Detail View/TaskDetailView.swift | 2 ++ .../Tasks/Task Detail View/TaskDetailViewModel.swift | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/FocusAssistant/FocusAssistant.xcodeproj/project.pbxproj b/FocusAssistant/FocusAssistant.xcodeproj/project.pbxproj index e63a83d..e682f57 100644 --- a/FocusAssistant/FocusAssistant.xcodeproj/project.pbxproj +++ b/FocusAssistant/FocusAssistant.xcodeproj/project.pbxproj @@ -591,7 +591,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = FocusAssistant/FocusAssistant.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_ASSET_PATHS = "\"FocusAssistant/Preview Content\""; DEVELOPMENT_TEAM = 4TMP5JL59R; ENABLE_PREVIEWS = YES; @@ -626,7 +626,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = FocusAssistant/FocusAssistant.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_ASSET_PATHS = "\"FocusAssistant/Preview Content\""; DEVELOPMENT_TEAM = 4TMP5JL59R; ENABLE_PREVIEWS = YES; diff --git a/FocusAssistant/FocusAssistant/Screens/Tasks/Active Task/ActiveTaskView.swift b/FocusAssistant/FocusAssistant/Screens/Tasks/Active Task/ActiveTaskView.swift index a22a0ed..7ebbd94 100644 --- a/FocusAssistant/FocusAssistant/Screens/Tasks/Active Task/ActiveTaskView.swift +++ b/FocusAssistant/FocusAssistant/Screens/Tasks/Active Task/ActiveTaskView.swift @@ -94,7 +94,11 @@ struct ActiveTaskView: View { if vm.activeTask == nil { vm.setActiveTask(task) vm.startTimer() - } else { vm.addNewTimer = true } + } else { + vm.activeTask = nil + vm.isStarted = false + vm.stopTimer() + } } } label: { Image(systemName: !vm.isStarted ? "timer" : "stop.fill") diff --git a/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailView.swift b/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailView.swift index a132ff3..ef82906 100644 --- a/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailView.swift +++ b/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailView.swift @@ -84,6 +84,7 @@ struct TaskDetailView: View { case .medium: if abs(task.startTime!.timeIntervalSince(Date.now)) > 600 { withAnimation(.easeInOut(duration: 2)) { + vm.selectedTask = task vm.isDisplayingContext = true } } else { @@ -91,6 +92,7 @@ struct TaskDetailView: View { } case .high: withAnimation(.easeInOut) { + vm.selectedTask = task vm.isDisplayingContext = true } } diff --git a/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailViewModel.swift b/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailViewModel.swift index f32a686..1c4b344 100644 --- a/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailViewModel.swift +++ b/FocusAssistant/FocusAssistant/Screens/Tasks/Task Detail View/TaskDetailViewModel.swift @@ -26,7 +26,6 @@ import Foundation if task.priority == .high { return "High priority tasks start automatically at their start time" } - if task.priority == .low { return nil } -- GitLab