Skip to content

Added activity viewer inactive state #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tom-ludwig merged 4 commits into from
Jan 16, 2025
Merged

Added activity viewer inactive state #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
371272e
Added inactive state for activity viewer
austincondiff Jan 16, 2025
c4999e2
Added inactive states to the start and stop task buttons
austincondiff Jan 16, 2025
dbee3f4
Merge branch 'main' into activity-viewer-inactive-state
austincondiff Jan 16, 2025
06f62b5
Fixed SwiftLint error
austincondiff Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import SwiftUI

struct TaskNotificationView: View {
@Environment(\.controlActiveState)
private var activeState

@ObservedObject var taskNotificationHandler: TaskNotificationHandler
@State private var isPresented: Bool = false
@State var notification: TaskNotificationModel?
Expand Down Expand Up @@ -46,6 +49,7 @@ struct TaskNotificationView: View {
}
}
.transition(.opacity.combined(with: .move(edge: .trailing)))
.opacity(activeState == .inactive ? 0.4 : 1.0)
.padding(3)
.padding(-3)
.padding(.trailing, 3)
Expand Down
5 changes: 5 additions & 0 deletions CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ struct SchemeDropDownView: View {
@Environment(\.colorScheme)
private var colorScheme

@Environment(\.controlActiveState)
private var activeState

@State var isSchemePopOverPresented: Bool = false
@State private var isHoveringScheme: Bool = false

Expand All @@ -33,7 +36,9 @@ struct SchemeDropDownView: View {
Image(systemName: "folder.badge.gearshape")
.imageScale(.medium)
Text(workspaceDisplayName)
.frame(minWidth: 0)
}
.opacity(activeState == .inactive ? 0.4 : 1.0)
.font(.subheadline)
.padding(.trailing, 11.5)
.padding(.horizontal, 2.5)
Expand Down
5 changes: 5 additions & 0 deletions CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ struct TaskDropDownView: View {
@Environment(\.colorScheme)
private var colorScheme

@Environment(\.controlActiveState)
private var activeState

@ObservedObject var taskManager: TaskManager

@State private var isTaskPopOverPresented: Bool = false
Expand All @@ -28,8 +31,10 @@ struct TaskDropDownView: View {
}
} else {
Text("Create Tasks")
.frame(minWidth: 0)
}
}
.opacity(activeState == .inactive ? 0.4 : 1.0)
.font(.subheadline)
.padding(.trailing, 11.5)
.padding(.horizontal, 2.5)
Expand Down
1 change: 1 addition & 0 deletions CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct TaskView: View {
HStack(spacing: 5) {
Image(systemName: "gearshape")
Text(task.name)
.frame(minWidth: 0)
Spacer(minLength: 0)
}
.padding(.trailing, 7.5)
Expand Down
4 changes: 4 additions & 0 deletions CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import SwiftUI

struct StartTaskToolbarButton: View {
@Environment(\.controlActiveState)
private var activeState

@UpdatingWindowController var windowController: CodeEditWindowController?

@ObservedObject var taskManager: TaskManager
Expand All @@ -28,6 +31,7 @@ struct StartTaskToolbarButton: View {
} label: {
Label("Start", systemImage: "play.fill")
.labelStyle(.iconOnly)
.opacity(activeState == .inactive ? 0.5 : 1.0)
.font(.system(size: 18, weight: .regular))
.help("Start selected task")
.frame(width: 28)
Expand Down
4 changes: 4 additions & 0 deletions CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import SwiftUI
import Combine

struct StopTaskToolbarButton: View {
@Environment(\.controlActiveState)
private var activeState

@ObservedObject var taskManager: TaskManager

/// Tracks the current selected task's status. Updated by `updateStatusListener`
Expand All @@ -25,6 +28,7 @@ struct StopTaskToolbarButton: View {
} label: {
Label("Stop", systemImage: "stop.fill")
.labelStyle(.iconOnly)
.opacity(activeState == .inactive ? 0.5 : 1.0)
.font(.system(size: 15, weight: .regular))
.help("Stop selected task")
.frame(width: 28)
Expand Down