diff --git a/Apps/AtlasApp/Sources/AtlasApp/AtlasAppModel.swift b/Apps/AtlasApp/Sources/AtlasApp/AtlasAppModel.swift index bb201f3..f5d559c 100644 --- a/Apps/AtlasApp/Sources/AtlasApp/AtlasAppModel.swift +++ b/Apps/AtlasApp/Sources/AtlasApp/AtlasAppModel.swift @@ -480,9 +480,7 @@ final class AtlasAppModel: ObservableObject { break case .permissions: await inspectPermissions() - case .settings: - break - case .about: + case .settings, .about: break } } diff --git a/Apps/AtlasApp/Sources/AtlasApp/TaskCenterView.swift b/Apps/AtlasApp/Sources/AtlasApp/TaskCenterView.swift index 1b3027d..452c907 100644 --- a/Apps/AtlasApp/Sources/AtlasApp/TaskCenterView.swift +++ b/Apps/AtlasApp/Sources/AtlasApp/TaskCenterView.swift @@ -43,10 +43,10 @@ struct TaskCenterView: View { title: taskRun.kind.title, subtitle: taskRun.summary, footnote: timelineFootnote(for: taskRun), - systemImage: icon(for: taskRun.kind), - tone: taskRun.status.tintTone + systemImage: taskRun.kind.atlasSystemImage, + tone: taskRun.status.atlasTone ) { - AtlasStatusChip(taskRun.status.title, tone: taskRun.status.tintTone) + AtlasStatusChip(taskRun.status.title, tone: taskRun.status.atlasTone) } } } @@ -55,8 +55,7 @@ struct TaskCenterView: View { Button(action: onOpenHistory) { Label(AtlasL10n.string("taskcenter.openHistory"), systemImage: "arrow.right.circle.fill") } - .buttonStyle(.borderedProminent) - .controlSize(.large) + .buttonStyle(.atlasPrimary) .keyboardShortcut(.defaultAction) .accessibilityIdentifier("taskcenter.openHistory") .accessibilityHint(AtlasL10n.string("taskcenter.openHistory.hint")) @@ -74,33 +73,4 @@ struct TaskCenterView: View { return AtlasL10n.string("taskcenter.timeline.running", start) } - private func icon(for kind: TaskKind) -> String { - switch kind { - case .scan: - return "sparkles" - case .executePlan: - return "play.circle" - case .uninstallApp: - return "trash" - case .restore: - return "arrow.uturn.backward.circle" - case .inspectPermissions: - return "lock.shield" - } - } -} - -private extension TaskStatus { - var tintTone: AtlasTone { - switch self { - case .queued: - return .neutral - case .running: - return .warning - case .completed: - return .success - case .failed, .cancelled: - return .danger - } - } } diff --git a/Packages/AtlasFeaturesAbout/Sources/AtlasFeaturesAbout/Resources/Media.xcassets/avatar.imageset/Contents.json b/Packages/AtlasFeaturesAbout/Sources/AtlasFeaturesAbout/Resources/Media.xcassets/avatar.imageset/Contents.json index 6166535..ee712ed 100644 --- a/Packages/AtlasFeaturesAbout/Sources/AtlasFeaturesAbout/Resources/Media.xcassets/avatar.imageset/Contents.json +++ b/Packages/AtlasFeaturesAbout/Sources/AtlasFeaturesAbout/Resources/Media.xcassets/avatar.imageset/Contents.json @@ -2,8 +2,7 @@ "images" : [ { "filename" : "avatar.png", - "idiom" : "universal", - "scale" : "2x" + "idiom" : "universal" } ], "info" : { diff --git a/Packages/AtlasFeaturesSettings/Sources/AtlasFeaturesSettings/SettingsFeatureView.swift b/Packages/AtlasFeaturesSettings/Sources/AtlasFeaturesSettings/SettingsFeatureView.swift index bb8a6cb..99cce5d 100644 --- a/Packages/AtlasFeaturesSettings/Sources/AtlasFeaturesSettings/SettingsFeatureView.swift +++ b/Packages/AtlasFeaturesSettings/Sources/AtlasFeaturesSettings/SettingsFeatureView.swift @@ -129,6 +129,7 @@ public struct SettingsFeatureView: View { .font(AtlasTypography.body.weight(.medium)) } .toggleStyle(.switch) + .tint(AtlasColor.brand) .accessibilityIdentifier("settings.notifications") .accessibilityHint(AtlasL10n.string("settings.notifications.hint")) } @@ -162,6 +163,7 @@ public struct SettingsFeatureView: View { Text(AtlasL10n.string("settings.retention.adjust")) .font(AtlasTypography.body.weight(.medium)) } + .tint(AtlasColor.brand) .accessibilityIdentifier("settings.recoveryRetention") .accessibilityHint(AtlasL10n.string("settings.retention.hint")) }