Skip to content

Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.

ui overhaul: glow-orb dashboard hero, stacked storage meter, vivid tiles, inline selection strip; bump 2.8.5

momenbasel47be19af7aa2
diff --git a/PureMac/Views/Apps/AppFilesView.swift b/PureMac/Views/Apps/AppFilesView.swift
index a922357..5f00902 100644
--- a/PureMac/Views/Apps/AppFilesView.swift
+++ b/PureMac/Views/Apps/AppFilesView.swift
@@ -84,8 +84,9 @@ struct AppFilesView: View {
var body: some View {
VStack(spacing: 0) {
header
-
- Divider()
+ .padding(.horizontal, 16)
+ .padding(.top, 14)
+ .padding(.bottom, 10)
// Content
if appState.isScanningAppFiles {
@@ -145,39 +146,41 @@ struct AppFilesView: View {
// MARK: - Header
private var header: some View {
- HStack(spacing: 12) {
- Image(nsImage: app.icon)
- .resizable()
- .frame(width: 48, height: 48)
- .scaleEffect(iconHovering && !reduceMotion ? 1.06 : 1)
- .animation(reduceMotion ? nil : MotionTokens.snappy, value: iconHovering)
- .onHover { iconHovering = $0 }
-
- VStack(alignment: .leading, spacing: 2) {
- Text(app.appName)
- .font(.title3.bold())
- Text(app.bundleIdentifier)
- .font(.caption)
- .foregroundStyle(.secondary)
- }
+ CardSurface(padding: 16, tint: Tint.purple) {
+ HStack(spacing: 14) {
+ Image(nsImage: app.icon)
+ .resizable()
+ .frame(width: 52, height: 52)
+ .shadow(color: .black.opacity(0.18), radius: 6, y: 3)
+ .scaleEffect(iconHovering && !reduceMotion ? 1.06 : 1)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: iconHovering)
+ .onHover { iconHovering = $0 }
+
+ VStack(alignment: .leading, spacing: 3) {
+ Text(app.appName)
+ .font(.system(size: 17, weight: .bold))
+ Text(app.bundleIdentifier)
+ .font(.system(size: 11.5))
+ .foregroundStyle(.secondary)
+ }
- Spacer()
+ Spacer()
- if !appState.discoveredFiles.isEmpty {
- VStack(alignment: .trailing, spacing: 2) {
- Text(filesCountText(count: appState.discoveredFiles.count))
- .font(.callout)
- .foregroundStyle(.secondary)
- .monospacedDigit()
- .contentTransition(.numericText())
- CountUpBytes(bytes: totalSelectedSize)
- .font(.callout.bold())
+ if !appState.discoveredFiles.isEmpty {
+ VStack(alignment: .trailing, spacing: 2) {
+ CountUpBytes(bytes: totalSelectedSize)
+ .font(.system(size: 18, weight: .bold))
+ Text(filesCountText(count: appState.discoveredFiles.count))
+ .font(.system(size: 11))
+ .foregroundStyle(.secondary)
+ .monospacedDigit()
+ .contentTransition(.numericText())
+ }
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.9),
+ value: appState.discoveredFiles.count)
}
- .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.9),
- value: appState.discoveredFiles.count)
}
}
- .padding()
}
// MARK: - Scanning state
@@ -297,13 +300,18 @@ struct AppFilesView: View {
// MARK: - Action bar
private var actionBar: some View {
- HStack {
+ HStack(spacing: 12) {
Button("Select All") {
appState.selectedFiles = Set(appState.discoveredFiles)
}
+ .buttonStyle(.bordered)
+ .controlSize(.small)
+
Button("Deselect All") {
appState.selectedFiles.removeAll()
}
+ .buttonStyle(.bordered)
+ .controlSize(.small)
Spacer()
@@ -323,8 +331,12 @@ struct AppFilesView: View {
}
.animation(reduceMotion ? nil : .spring(response: 0.35, dampingFraction: 0.8),
value: appState.selectedFiles.isEmpty)
- .padding()
+ .padding(.horizontal, 16)
+ .padding(.vertical, 12)
.background(.bar)
+ .overlay(alignment: .top) {
+ Divider().opacity(0.6)
+ }
}
// MARK: - Helpers
diff --git a/PureMac/Views/Apps/AppListView.swift b/PureMac/Views/Apps/AppListView.swift
index b2dad5c..b70fa81 100644
--- a/PureMac/Views/Apps/AppListView.swift
+++ b/PureMac/Views/Apps/AppListView.swift
@@ -154,7 +154,7 @@ private struct HoverScaleIcon: View {
var body: some View {
Image(nsImage: icon)
.resizable()
- .frame(width: 20, height: 20)
+ .frame(width: 22, height: 22)
.scaleEffect(hovering && !reduceMotion ? 1.12 : 1)
.animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
.onHover { hovering = $0 }
diff --git a/PureMac/Views/CategoryDetailView.swift b/PureMac/Views/CategoryDetailView.swift
index d87e62b..1c7f824 100644
--- a/PureMac/Views/CategoryDetailView.swift
+++ b/PureMac/Views/CategoryDetailView.swift
@@ -25,7 +25,12 @@ struct CategoryDetailView: View {
if result.items.isEmpty {
EmptyStateView("All Clean", systemImage: "checkmark.circle", description: "No junk files found in this category.", tint: Tint.green)
} else {
- fileList(result)
+ VStack(spacing: 0) {
+ selectionStrip(result)
+ .padding(.horizontal, 20)
+ .padding(.bottom, 10)
+ fileList(result)
+ }
}
} else {
EmptyStateView("Not Scanned", systemImage: category.icon, description: "Run a scan to analyze this category.", action: { appState.scanSingleCategory(category) }, actionLabel: "Scan Now", tint: category.color)
@@ -44,14 +49,8 @@ struct CategoryDetailView: View {
.disabled(appState.scanState.isActive)
}
- ToolbarItemGroup(placement: .automatic) {
+ ToolbarItem(placement: .automatic) {
if let result = result, !result.items.isEmpty {
- Button("Select All") {
- appState.selectAllInCategory(category)
- }
- Button("Deselect All") {
- appState.deselectAllInCategory(category)
- }
Button(action: { sortDescending.toggle() }) {
Label {
Text(LocalizedStringKey(sortDescending ? "Largest First" : "Smallest First"))
@@ -62,24 +61,6 @@ struct CategoryDetailView: View {
.help(LocalizedStringKey(sortDescending ? "Sorted: Largest First" : "Sorted: Smallest First"))
}
}
-
- ToolbarItem(placement: .automatic) {
- if let _ = result, !appState.scanState.isActive {
- let selectedSize = appState.selectedSizeInCategory(category)
- let selectedCount = appState.selectedCountInCategory(category)
- if selectedSize > 0 {
- Button {
- showConfirmation = true
- } label: {
- Label {
- Text(cleanItemsLabel(count: selectedCount))
- } icon: {
- Image(systemName: "trash")
- }
- }
- }
- }
- }
}
.confirmationDialog(cleanConfirmationTitle, isPresented: $showConfirmation, titleVisibility: .visible) {
Button("Clean", role: .destructive) {
@@ -109,23 +90,26 @@ struct CategoryDetailView: View {
let itemCount = result?.itemCount ?? 0
let isScanning = appState.scanState.isActive
- return CardSurface(padding: 18) {
+ return CardSurface(padding: 20, tint: category.color) {
HStack(alignment: .center, spacing: 16) {
- IconTile(systemName: category.icon, tint: category.color, size: 56, corner: 14)
+ IconTile(systemName: category.icon, tint: category.color, size: 60, corner: 16, vivid: true)
VStack(alignment: .leading, spacing: 4) {
Text(LocalizedStringKey(category.rawValue))
- .font(.system(size: 22, weight: .semibold))
+ .font(.system(size: 22, weight: .bold))
Text(LocalizedStringKey(category.description))
- .font(.system(size: 12))
+ .font(.system(size: 12.5))
.foregroundStyle(.secondary)
if itemCount > 0 {
Text(itemsAndSizeText(itemCount: itemCount, totalSize: totalSize))
- .font(.system(size: 11.5, weight: .medium))
+ .font(.system(size: 11.5, weight: .semibold))
.monospacedDigit()
.contentTransition(reduceMotion ? .identity : .numericText())
.foregroundStyle(category.color)
- .padding(.top, 2)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 3)
+ .background(Capsule().fill(category.color.opacity(0.12)))
+ .padding(.top, 4)
.animation(reduceMotion ? nil : MotionTokens.gentle, value: totalSize)
}
}
@@ -143,12 +127,73 @@ struct CategoryDetailView: View {
.font(.system(size: 12.5, weight: .semibold))
}
.buttonStyle(.bordered)
+ .tint(category.color)
.controlSize(.large)
.disabled(isScanning)
}
}
}
+ /// Persistent action strip above the file list: tri-state select-all,
+ /// live selection count, selected size, and the Clean CTA. Previously
+ /// these lived only in the toolbar, one extra glance away from the rows
+ /// they act on.
+ private func selectionStrip(_ result: CategoryResult) -> some View {
+ let selectedCount = appState.selectedCountInCategory(category)
+ let totalCount = result.itemCount
+ let selectedSize = appState.selectedSizeInCategory(category)
+
+ return CardSurface(padding: 10, elevation: .flat) {
+ HStack(spacing: 12) {
+ Toggle(isOn: Binding(
+ get: { selectedCount == totalCount && totalCount > 0 },
+ set: { newValue in
+ if newValue {
+ appState.selectAllInCategory(category)
+ } else {
+ appState.deselectAllInCategory(category)
+ }
+ }
+ )) {
+ Text(
+ String(
+ format: String(localized: "%lld of %lld selected"),
+ Int64(selectedCount),
+ Int64(totalCount)
+ )
+ )
+ .font(.system(size: 12, weight: .medium))
+ .monospacedDigit()
+ .contentTransition(reduceMotion ? .identity : .numericText())
+ }
+ .toggleStyle(AnimatedCheckboxStyle(tint: category.color))
+ .animation(reduceMotion ? nil : MotionTokens.gentle, value: selectedCount)
+
+ Spacer()
+
+ Text(ByteCountFormatter.string(fromByteCount: selectedSize, countStyle: .file))
+ .font(.system(size: 13, weight: .semibold))
+ .monospacedDigit()
+ .foregroundStyle(.secondary)
+
+ if selectedSize > 0 {
+ Button {
+ showConfirmation = true
+ } label: {
+ Label {
+ Text(cleanItemsLabel(count: selectedCount))
+ } icon: {
+ Image(systemName: "trash")
+ }
+ }
+ .buttonStyle(GlowProminentButtonStyle(tint: Tint.red, gradient: TintGradient.destructive))
+ .transition(reduceMotion ? .opacity : .opacity.combined(with: .scale(scale: 0.92)))
+ }
+ }
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: selectedSize > 0)
+ }
+ }
+
private func itemsAndSizeText(itemCount: Int, totalSize: Int64) -> String {
String(
format: String(localized: "%lld items · %@"),
@@ -170,28 +215,13 @@ struct CategoryDetailView: View {
searchText.isEmpty || item.name.localizedCaseInsensitiveContains(searchText) || item.path.localizedCaseInsensitiveContains(searchText)
}
return List {
- Section {
- // No .staggered() here: List is lazy, so a delayed-reveal
- // modifier would blank each row for ~0.45s as it scrolls into
- // view on large scans. The row hover/selection polish carries
- // the motion; the list-level sort/filter animation handles
- // reorders.
- ForEach(Array(items.enumerated()), id: \.element.id) { _, item in
- FileRowView(item: item)
- }
- } header: {
- let selectedCount = appState.selectedCountInCategory(category)
- let totalCount = result.itemCount
- Text(
- String(
- format: String(localized: "%lld of %lld selected"),
- Int64(selectedCount),
- Int64(totalCount)
- )
- )
- .monospacedDigit()
- .contentTransition(reduceMotion ? .identity : .numericText())
- .animation(reduceMotion ? nil : MotionTokens.gentle, value: selectedCount)
+ // No .staggered() here: List is lazy, so a delayed-reveal
+ // modifier would blank each row for ~0.45s as it scrolls into
+ // view on large scans. The row hover/selection polish carries
+ // the motion; the list-level sort/filter animation handles
+ // reorders.
+ ForEach(Array(items.enumerated()), id: \.element.id) { _, item in
+ FileRowView(item: item)
}
}
// CleanableItem ids are stable, so SwiftUI move-animates re-sorts and
@@ -225,7 +255,7 @@ private struct FileRowView: View {
)) {
HStack {
Image(systemName: fileIcon)
- .foregroundStyle(.secondary)
+ .foregroundStyle(item.category.color.opacity(0.85))
.frame(width: 20)
VStack(alignment: .leading, spacing: 2) {
@@ -244,6 +274,23 @@ private struct FileRowView: View {
Spacer()
+ // Hover-revealed Finder shortcut; stays in the layout so the
+ // trailing size never shifts sideways.
+ if !item.path.isEmpty {
+ Button {
+ NSWorkspace.shared.selectFile(item.path, inFileViewerRootedAtPath: "")
+ } label: {
+ Image(systemName: "folder")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .buttonStyle(.plain)
+ .help("Reveal in Finder")
+ .opacity(hovering ? 1 : 0)
+ .scaleEffect(reduceMotion ? 1 : (hovering ? 1 : 0.8))
+ .allowsHitTesting(hovering)
+ }
+
if let date = item.lastModified {
Text(date, style: .date)
.font(.caption)
diff --git a/PureMac/Views/Components/AppTheme.swift b/PureMac/Views/Components/AppTheme.swift
index cd1ba0a..9594bd8 100644
--- a/PureMac/Views/Components/AppTheme.swift
+++ b/PureMac/Views/Components/AppTheme.swift
@@ -83,14 +83,18 @@ enum TintGradient {
}
/// Tinted square icon container used in the sidebar and on dashboard cards.
-/// Single muted fill, thin border. When `glow` is set (selected sidebar row,
-/// emphasized card) the tile picks up a gradient fill and a soft tinted halo.
+/// Two-stop tinted fill with a hairline inner stroke. When `glow` is set
+/// (selected sidebar row, emphasized card) the tile picks up a stronger
+/// gradient and a soft tinted halo. When `vivid` is set the tile becomes a
+/// full-saturation gradient bubble with a white glyph — reserved for focal
+/// spots (category heroes, result rows) so the chrome stays matte elsewhere.
struct IconTile: View {
let systemName: String
var tint: Color = Tint.blue
var size: CGFloat = 26
var corner: CGFloat = 7
var glow: Bool = false
+ var vivid: Bool = false
@Environment(\.accessibilityReduceMotion) private var reduceMotion
@@ -99,25 +103,64 @@ struct IconTile: View {
RoundedRectangle(cornerRadius: corner, style: .continuous)
.fill(
LinearGradient(
- colors: [tint.opacity(glow ? 0.30 : 0.14), tint.opacity(0.14)],
+ colors: vivid
+ ? [tint, tint.opacity(0.72)]
+ : [tint.opacity(glow ? 0.32 : 0.16), tint.opacity(glow ? 0.16 : 0.07)],
startPoint: .topLeading, endPoint: .bottomTrailing
)
)
- .shadow(color: tint.opacity(glow ? 0.45 : 0), radius: glow ? 5 : 0)
+ .overlay(
+ RoundedRectangle(cornerRadius: corner, style: .continuous)
+ .strokeBorder(vivid ? Color.white.opacity(0.22) : tint.opacity(glow ? 0.38 : 0.20),
+ lineWidth: 0.5)
+ )
+ .shadow(color: tint.opacity(vivid ? 0.42 : (glow ? 0.45 : 0)),
+ radius: vivid ? 6 : (glow ? 5 : 0))
Image(systemName: systemName)
.font(.system(size: size * 0.52, weight: .semibold))
- .foregroundStyle(tint)
- .shadow(color: tint.opacity(glow ? 0.5 : 0), radius: glow ? 3 : 0)
+ .foregroundStyle(vivid ? Color.white : tint)
+ .shadow(color: vivid ? Color.black.opacity(0.18) : tint.opacity(glow ? 0.5 : 0),
+ radius: vivid ? 2 : (glow ? 3 : 0))
}
.frame(width: size, height: size)
.animation(reduceMotion ? nil : MotionTokens.snappy, value: glow)
}
}
-/// Card surface. Flat fill, hairline border, single soft shadow. No accent
-/// stripe by default — content hierarchy carries the meaning, not chrome.
-/// Pass `material` for a vibrancy/glass panel (used on focal hero states
-/// where a tinted backdrop sits behind the card).
+/// Shared ambient backdrop for the app's detail surfaces: layered radial
+/// washes in jewel tones, concentrated at the top where hero content lives
+/// and fading to nothing at the bottom. Static layers — no Reduce Motion
+/// concerns. Opacities halve in light mode so surfaces stay clean.
+struct AmbientBackdrop: View {
+ @Environment(\.colorScheme) private var colorScheme
+
+ private var strength: Double { colorScheme == .dark ? 1 : 0.55 }
+
+ var body: some View {
+ ZStack {
+ Color(nsColor: .windowBackgroundColor)
+ RadialGradient(
+ colors: [Tint.blue.opacity(0.10 * strength), .clear],
+ center: .topLeading, startRadius: 0, endRadius: 700
+ )
+ RadialGradient(
+ colors: [Tint.purple.opacity(0.08 * strength), .clear],
+ center: .topTrailing, startRadius: 0, endRadius: 620
+ )
+ RadialGradient(
+ colors: [Tint.pink.opacity(0.05 * strength), .clear],
+ center: UnitPoint(x: 0.5, y: -0.15), startRadius: 0, endRadius: 480
+ )
+ }
+ .ignoresSafeArea()
+ }
+}
+
+/// Card surface. Flat fill, hairline border, soft shadow. No accent stripe —
+/// content hierarchy carries the meaning, not chrome. Pass `material` for a
+/// vibrancy/glass panel (used on focal hero states where a tinted backdrop
+/// sits behind the card). Pass `tint` for a barely-there vertical color wash
+/// that gives the card an identity without adding chrome.
struct CardSurface<Content: View>: View {
var padding: CGFloat = 16
/// Retained for callsite compatibility; the accent line is intentionally
@@ -125,24 +168,38 @@ struct CardSurface<Content: View>: View {
var accent: Color? = nil
var elevation: CardElevation = .standard
var material: Material? = nil
+ /// Optional identity wash. Kept under ~7% opacity so text contrast and
+ /// light-mode cleanliness are unaffected.
+ var tint: Color? = nil
@ViewBuilder var content: Content
+ private let cornerRadius: CGFloat = 14
+
var body: some View {
content
.padding(padding)
.background(
ZStack {
if let material {
- RoundedRectangle(cornerRadius: 12, style: .continuous)
+ RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
.fill(material)
} else {
- RoundedRectangle(cornerRadius: 12, style: .continuous)
+ RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
.fill(Color(nsColor: .controlBackgroundColor))
}
+ if let tint {
+ RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
+ .fill(
+ LinearGradient(
+ colors: [tint.opacity(0.07), tint.opacity(0.015)],
+ startPoint: .top, endPoint: .bottom
+ )
+ )
+ }
}
)
.overlay(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
+ RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
.strokeBorder(
material != nil ? Color.white.opacity(0.14) : Color.primary.opacity(0.07),
lineWidth: material != nil ? 1 : 0.5
@@ -158,24 +215,24 @@ enum CardElevation {
var ambient: Double {
switch self {
case .flat: return 0.0
- case .standard: return 0.04
- case .raised: return 0.07
+ case .standard: return 0.05
+ case .raised: return 0.10
}
}
var ambientRadius: CGFloat {
switch self {
case .flat: return 0
- case .standard: return 4
- case .raised: return 10
+ case .standard: return 7
+ case .raised: return 20
}
}
var ambientY: CGFloat {
switch self {
case .flat: return 0
- case .standard: return 1
- case .raised: return 3
+ case .standard: return 2
+ case .raised: return 8
}
}
}
@@ -203,6 +260,19 @@ struct StatusChip: View {
}
}
+/// Consistent section title used on dashboard-style surfaces. Single source
+/// of truth for the "quiet bold headline" look so every section matches.
+struct SectionHeader: View {
+ let title: LocalizedStringKey
+
+ init(_ title: LocalizedStringKey) { self.title = title }
+
+ var body: some View {
+ Text(title)
+ .font(.system(size: 15, weight: .semibold))
+ }
+}
+
/// Hover/press feedback for tappable cards. Plain mode is a subtle scale;
/// `lift` mode adds the CleanMyMac-style float (rise + soft shadow). Under
/// Reduce Motion the scale/offset are dropped and only the shadow remains.
@@ -241,14 +311,18 @@ extension View {
/// Gradient capsule CTA with a soft tinted glow — the primary-action style.
/// Hover lifts the glow and scale; press squeezes. `breathes` adds a gentle
/// idle glow pulse (radius only, no scale) for the single hero CTA on an
-/// otherwise calm screen. All motion is suppressed under Reduce Motion.
+/// otherwise calm screen. `large` bumps the type and padding for the one
+/// dominant call-to-action on a surface. All motion is suppressed under
+/// Reduce Motion.
struct GlowProminentButtonStyle: ButtonStyle {
var tint: Color = Tint.blue
var gradient: LinearGradient = TintGradient.accent
var breathes: Bool = false
+ var large: Bool = false
func makeBody(configuration: Configuration) -> some View {
- GlowBody(configuration: configuration, tint: tint, gradient: gradient, breathes: breathes)
+ GlowBody(configuration: configuration, tint: tint, gradient: gradient,
+ breathes: breathes, large: large)
}
private struct GlowBody: View {
@@ -256,6 +330,7 @@ struct GlowProminentButtonStyle: ButtonStyle {
let tint: Color
let gradient: LinearGradient
let breathes: Bool
+ let large: Bool
@State private var hovering = false
@State private var breathe = false
@@ -263,10 +338,10 @@ struct GlowProminentButtonStyle: ButtonStyle {
var body: some View {
configuration.label
- .font(.system(size: 13, weight: .semibold))
+ .font(.system(size: large ? 14 : 13, weight: .semibold))
.foregroundStyle(.white)
- .padding(.horizontal, 18)
- .padding(.vertical, 9)
+ .padding(.horizontal, large ? 22 : 18)
+ .padding(.vertical, large ? 11 : 9)
.background(Capsule().fill(gradient))
.overlay(Capsule().strokeBorder(.white.opacity(0.18), lineWidth: 0.5))
.shadow(color: tint.opacity(hovering ? 0.45 : (breathe ? 0.40 : 0.22)),
diff --git a/PureMac/Views/Components/DashboardCharts.swift b/PureMac/Views/Components/DashboardCharts.swift
index c698c13..a83760b 100644
--- a/PureMac/Views/Components/DashboardCharts.swift
+++ b/PureMac/Views/Components/DashboardCharts.swift
@@ -28,16 +28,56 @@ struct HealthRing: View {
var body: some View {
ZStack {
+ // Orb body — a deep jewel fill that turns the flat ring into a
+ // glowing sphere. Inset so it never bleeds across the track.
+ Circle()
+ .fill(
+ RadialGradient(
+ colors: [arcColor.opacity(0.14), arcColor.opacity(0.05), .clear],
+ center: .center,
+ startRadius: 2,
+ endRadius: 160
+ )
+ )
+ .padding(lineWidth + 10)
+
+ // Slow conic sheen sweeping the orb interior — the "alive" cue.
+ // Removed entirely under Reduce Motion.
+ if !reduceMotion {
+ TimelineView(.animation) { timeline in
+ let t = timeline.date.timeIntervalSinceReferenceDate
+ let angle = (t.truncatingRemainder(dividingBy: 6.0) / 6.0) * 360.0
+ Circle()
+ .fill(
+ AngularGradient(
+ colors: [.clear, .clear, arcColor.opacity(0.10), .clear],
+ center: .center
+ )
+ )
+ .rotationEffect(.degrees(angle))
+ }
+ .padding(lineWidth + 10)
+ .clipShape(Circle())
+ }
+
Circle()
.stroke(Color.primary.opacity(0.06), lineWidth: lineWidth)
- // Soft glow layer underneath the crisp arc.
+ // Bloom: a wide soft halo under a tighter, brighter one. The
+ // glow comes from these blurred duplicates of the crisp arc.
Circle()
.trim(from: 0, to: sweep)
- .stroke(arcColor.opacity(0.5),
+ .stroke(arcColor.opacity(0.35),
style: StrokeStyle(lineWidth: lineWidth, lineCap: .round))
.rotationEffect(.degrees(-90))
- .blur(radius: 9)
+ .blur(radius: 16)
+
+ Circle()
+ .trim(from: 0, to: sweep)
+ .stroke(arcColor.opacity(0.55),
+ style: StrokeStyle(lineWidth: lineWidth * 0.7, lineCap: .round))
+ .rotationEffect(.degrees(-90))
+ .blur(radius: 7)
Circle()
.trim(from: 0, to: sweep)
@@ -225,24 +265,82 @@ struct LegendChip: View {
let color: Color
let label: LocalizedStringKey
let value: String
+ /// Optional share readout ("72%") rendered after the value.
+ var percent: String? = nil
var body: some View {
HStack(spacing: 7) {
- RoundedRectangle(cornerRadius: 3, style: .continuous)
+ RoundedRectangle(cornerRadius: 3.5, style: .continuous)
.fill(color)
.frame(width: 10, height: 10)
VStack(alignment: .leading, spacing: 0) {
Text(label)
.font(.system(size: 10.5))
.foregroundStyle(.secondary)
- Text(value)
- .font(.system(size: 12, weight: .semibold))
- .monospacedDigit()
+ HStack(alignment: .firstTextBaseline, spacing: 4) {
+ Text(value)
+ .font(.system(size: 12, weight: .semibold))
+ .monospacedDigit()
+ if let percent {
+ Text(percent)
+ .font(.system(size: 10, weight: .medium))
+ .monospacedDigit()
+ .foregroundStyle(.tertiary)
+ }
+ }
}
}
}
}
+// MARK: - Stacked meter
+//
+// Full-width segmented storage bar (Used / Junk / Purgeable / Free). Segments
+// sit flush inside one track with thin separators, grow in with a spring on
+// appear, and cross-dim when a legend chip reports a hover. Honors Reduce
+// Motion (instant reveal, instant cross-dim).
+
+struct StackedMeter: View {
+ struct Segment: Identifiable {
+ /// Stable id so legend hover can cross-highlight the matching segment.
+ let id: String
+ let value: Double
+ let color: Color
+ }
+
+ let segments: [Segment]
+ var height: CGFloat = 14
+ /// When set (legend hover), every other segment dims for cross-highlight.
+ var highlightedID: String? = nil
+
+ @State private var reveal: CGFloat = 0
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ private var total: Double { max(segments.reduce(0) { $0 + $1.value }, 0.0001) }
+
+ var body: some View {
+ GeometryReader { geo in
+ let separator: CGFloat = 2
+ let available = geo.size.width - separator * CGFloat(max(0, segments.count - 1))
+ HStack(spacing: separator) {
+ ForEach(segments) { seg in
+ let frac = CGFloat(seg.value / total)
+ RoundedRectangle(cornerRadius: height * 0.3, style: .continuous)
+ .fill(seg.color)
+ .frame(width: max(frac > 0 ? 4 : 0, available * frac * reveal))
+ .opacity(highlightedID == nil || highlightedID == seg.id ? 1 : 0.28)
+ }
+ }
+ }
+ .frame(height: height)
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.2), value: highlightedID)
+ .onAppear {
+ if reduceMotion { reveal = 1; return }
+ withAnimation(.spring(response: 0.9, dampingFraction: 0.85)) { reveal = 1 }
+ }
+ }
+}
+
// MARK: - Success medal
//
// Center checkmark with two concentric rings that expand and fade once on
diff --git a/PureMac/Views/Components/EmptyStateView.swift b/PureMac/Views/Components/EmptyStateView.swift
index 90c5265..4c24c36 100644
--- a/PureMac/Views/Components/EmptyStateView.swift
+++ b/PureMac/Views/Components/EmptyStateView.swift
@@ -31,8 +31,12 @@ struct EmptyStateView: View {
Circle()
.fill((tint ?? Color.secondary).opacity(0.10))
.frame(width: 96, height: 96)
+ Circle()
+ .strokeBorder((tint ?? Color.secondary).opacity(0.16), lineWidth: 1)
+ .frame(width: 96, height: 96)
Image(systemName: systemImage)
.font(.system(size: 40))
+ .symbolRenderingMode(.hierarchical)
.foregroundStyle(tint ?? Color.secondary)
}
// One-shot entrance pop, then a gentle idle float. Both skipped
diff --git a/PureMac/Views/Components/MenuBarMonitorView.swift b/PureMac/Views/Components/MenuBarMonitorView.swift
index 6dfea94..ca100a1 100644
--- a/PureMac/Views/Components/MenuBarMonitorView.swift
+++ b/PureMac/Views/Components/MenuBarMonitorView.swift
@@ -22,9 +22,16 @@ struct MenuBarMonitorView: View {
var body: some View {
VStack(alignment: .leading, spacing: 12) {
- Text("System Monitor")
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(.primary)
+ HStack(spacing: 7) {
+ if let appIcon = NSImage(named: "AppIcon") {
+ Image(nsImage: appIcon)
+ .resizable()
+ .frame(width: 18, height: 18)
+ }
+ Text("System Monitor")
+ .font(.system(size: 13, weight: .semibold))
+ .foregroundStyle(.primary)
+ }
VStack(spacing: 10) {
MeterRow(title: "CPU", tint: Tint.blue,
@@ -61,7 +68,7 @@ struct MenuBarMonitorView: View {
}
}
.padding(14)
- .frame(width: 248)
+ .frame(width: 252)
.onAppear { monitor.start() }
.onDisappear { monitor.stop() }
}
@@ -119,11 +126,16 @@ private struct MeterRow: View {
Capsule()
.fill(Color.primary.opacity(0.08))
Capsule()
- .fill(tint)
+ .fill(
+ LinearGradient(
+ colors: [tint, tint.opacity(0.65)],
+ startPoint: .leading, endPoint: .trailing
+ )
+ )
.frame(width: max(2, geo.size.width * clamped))
}
}
- .frame(height: 5)
+ .frame(height: 6)
}
}
}
diff --git a/PureMac/Views/DashboardView.swift b/PureMac/Views/DashboardView.swift
index fc24c58..c90a99c 100644
--- a/PureMac/Views/DashboardView.swift
+++ b/PureMac/Views/DashboardView.swift
@@ -34,14 +34,6 @@ struct DashboardView: View {
var body: some View {
ZStack {
- // Quiet tinted wash so the glass hero states have color to
- // refract. Static — no Reduce Motion concerns.
- LinearGradient(
- colors: [Tint.blue.opacity(0.08), Tint.purple.opacity(0.05), .clear],
- startPoint: .top, endPoint: .bottom
- )
- .ignoresSafeArea()
-
ScrollView {
VStack(alignment: .leading, spacing: 20) {
switch appState.scanState {
@@ -155,53 +147,59 @@ struct DashboardView: View {
// Below this width the side-by-side ring + storage column overflows the
// card, so the hero stacks vertically and the ring shrinks.
let compact = dashboardSize.width > 0 && dashboardSize.width < 660
- let ringSize: CGFloat = compact ? 132 : 180
-
- return CardSurface(padding: 24, accent: stress ? Tint.orange : Tint.blue, elevation: .raised) {
- AdaptiveStack(compact: compact, spacing: compact ? 18 : 28) {
- ZStack {
- // Slow atmospheric drift behind the ring — barely-there
- // ambient depth, frozen under Reduce Motion.
- HeroDrift(tint: stress ? Tint.orange : Tint.blue)
- HealthRing(percent: percentUsed)
- .frame(width: ringSize, height: ringSize)
- }
+ let ringSize: CGFloat = compact ? 132 : 176
+
+ return CardSurface(padding: compact ? 20 : 26, elevation: .raised,
+ tint: stress ? Tint.orange : Tint.blue) {
+ VStack(spacing: compact ? 18 : 24) {
+ AdaptiveStack(compact: compact, spacing: compact ? 18 : 30) {
+ ZStack {
+ // Slow atmospheric drift behind the ring — barely-there
+ // ambient depth, frozen under Reduce Motion.
+ HeroDrift(tint: stress ? Tint.orange : Tint.blue)
+ HealthRing(percent: percentUsed)
+ .frame(width: ringSize, height: ringSize)
+ // Small satellite bubbles orbiting the ring — the
+ // playful counterweight to the matte stat cards.
+ OrbSatellites(tint: stress ? Tint.orange : Tint.blue, ringSize: ringSize)
+ }
- VStack(alignment: .leading, spacing: 14) {
- HStack(alignment: .top) {
- VStack(alignment: .leading, spacing: 4) {
- HStack(spacing: 8) {
- Text("Storage")
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(.secondary)
- .textCase(.uppercase)
- .tracking(0.6)
- if stress {
- StatusChip(label: String(localized: "Low space"),
- systemImage: "exclamationmark.triangle.fill",
- tint: Tint.orange)
+ VStack(alignment: .leading, spacing: 12) {
+ HStack(alignment: .top) {
+ VStack(alignment: .leading, spacing: 5) {
+ HStack(spacing: 8) {
+ Text("Storage")
+ .font(.system(size: 12, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .textCase(.uppercase)
+ .tracking(0.8)
+ if stress {
+ StatusChip(label: String(localized: "Low space"),
+ systemImage: "exclamationmark.triangle.fill",
+ tint: Tint.orange)
+ }
}
+ CountUpBytes(bytes: free)
+ .font(.system(size: 38, weight: .bold))
+ .foregroundStyle(stress ? Tint.orange : Color.primary)
+ Text(freeOfText(total: total))
+ .font(.system(size: 12.5))
+ .foregroundStyle(.secondary)
}
- CountUpBytes(bytes: free)
- .font(.system(size: 34, weight: .semibold))
- .foregroundStyle(stress ? Tint.orange : Color.primary)
- Text(freeOfText(total: total))
- .font(.system(size: 12))
- .foregroundStyle(.secondary)
- }
- Spacer()
- Button {
- appState.startSmartScan()
- } label: {
- Label("Smart Scan", systemImage: "sparkles")
- .padding(.horizontal, 4)
+ Spacer()
+ Button {
+ appState.startSmartScan()
+ } label: {
+ Label("Smart Scan", systemImage: "sparkles")
+ .padding(.horizontal, 4)
+ }
+ .buttonStyle(GlowProminentButtonStyle(breathes: true, large: true))
}
- .buttonStyle(GlowProminentButtonStyle(breathes: true))
}
-
- storageBreakdown(used: used, total: total)
+ .frame(maxWidth: .infinity, alignment: .leading)
}
- .frame(maxWidth: .infinity, alignment: .leading)
+
+ storageMeter(used: used, total: total)
}
}
}
@@ -213,50 +211,72 @@ struct DashboardView: View {
)
}
- private func storageBreakdown(used: Int64, total: Int64) -> some View {
- let usedPct = total > 0 ? Double(used) / Double(total) : 0
- let junkPct = total > 0 ? min(0.4, Double(appState.totalJunkSize) / Double(total)) : 0
+ /// Full-width segmented meter (Used / Junk / Purgeable / Free) with a
+ /// hoverable legend. The same segment math as the composition donut, so
+ /// both surfaces always agree.
+ private func storageMeter(used: Int64, total: Int64) -> some View {
+ let purge = max(0, appState.diskInfo.purgeableSpace)
+ let junk = max(0, min(appState.totalJunkSize, used))
+ let usedCore = max(0, used - junk - purge)
+ let free = max(0, appState.diskInfo.freeSpace)
+
+ var segments: [StackedMeter.Segment] = [
+ .init(id: "used", value: Double(usedCore), color: Tint.blue)
+ ]
+ if junk > 0 {
+ segments.append(.init(id: "junk", value: Double(junk), color: Tint.orange))
+ }
+ if purge > 0 {
+ segments.append(.init(id: "purgeable", value: Double(purge), color: Tint.green))
+ }
+ segments.append(.init(id: "free", value: Double(free), color: Color.primary.opacity(0.10)))
- return VStack(alignment: .leading, spacing: 8) {
- GeometryReader { geo in
- ZStack(alignment: .leading) {
- Capsule()
- .fill(Color.primary.opacity(0.08))
- HStack(spacing: 0) {
- Capsule()
- .fill(LinearGradient(colors: [Tint.blue, Tint.purple], startPoint: .leading, endPoint: .trailing))
- .frame(width: geo.size.width * CGFloat(usedPct))
- }
- if junkPct > 0 {
- Capsule()
- .fill(Tint.orange)
- .frame(width: max(8, geo.size.width * CGFloat(junkPct)))
- .offset(x: geo.size.width * CGFloat(usedPct - junkPct))
- .opacity(0.85)
- }
- }
- }
- .frame(height: 10)
+ let usedPct = total > 0 ? Double(used) / Double(total) : 0
- HStack(spacing: 16) {
- LegendDot(color: Tint.blue, label: "Used", value: ByteCountFormatter.string(fromByteCount: used, countStyle: .file))
- if appState.totalJunkSize > 0 {
- LegendDot(color: Tint.orange, label: "Junk",
- value: ByteCountFormatter.string(fromByteCount: appState.totalJunkSize, countStyle: .file))
+ return VStack(alignment: .leading, spacing: 10) {
+ StackedMeter(segments: segments, highlightedID: hoveredSegment)
+
+ HStack(spacing: 18) {
+ HoverableLegendChip(color: Tint.blue, label: "Used",
+ value: formatted(usedCore),
+ percent: shareString(usedCore, of: total)) { hovering in
+ hoveredSegment = hovering ? "used" : nil
}
- if appState.diskInfo.purgeableSpace > 0 {
- LegendDot(color: Tint.green, label: "Purgeable",
- value: ByteCountFormatter.string(fromByteCount: appState.diskInfo.purgeableSpace, countStyle: .file))
+ if junk > 0 {
+ HoverableLegendChip(color: Tint.orange, label: "Junk",
+ value: formatted(junk),
+ percent: shareString(junk, of: total)) { hovering in
+ hoveredSegment = hovering ? "junk" : nil
+ }
+ }
+ if purge > 0 {
+ HoverableLegendChip(color: Tint.green, label: "Purgeable",
+ value: formatted(purge),
+ percent: shareString(purge, of: total)) { hovering in
+ hoveredSegment = hovering ? "purgeable" : nil
+ }
}
Spacer()
Text(percentUsedText(usedPct))
- .font(.system(size: 11, weight: .medium))
+ .font(.system(size: 11.5, weight: .semibold))
.foregroundStyle(.secondary)
.monospacedDigit()
}
}
}
+ private func formatted(_ bytes: Int64) -> String {
+ ByteCountFormatter.string(fromByteCount: bytes, countStyle: .file)
+ }
+
+ private func shareString(_ part: Int64, of total: Int64) -> String? {
+ guard total > 0, part > 0 else { return nil }
+ let share = Int((Double(part) / Double(total) * 100).rounded())
+ // A rounded 0% is noise — hide it for slivers like APFS purgeable.
+ guard share > 0 else { return nil }
+ return "\(share)%"
+ }
+
private func percentUsedText(_ usedPct: Double) -> String {
String(format: String(localized: "%lld%% used"), Int64(usedPct * 100))
}
@@ -355,14 +375,14 @@ struct DashboardView: View {
add("purgeable", purge, Tint.green, "Purgeable")
add("free", free, Color.primary.opacity(0.14), "Free")
- return CardSurface(padding: 18, elevation: .standard) {
- HStack(alignment: .center, spacing: 24) {
+ return CardSurface(padding: 20, elevation: .standard) {
+ HStack(alignment: .center, spacing: 28) {
ZStack {
StorageDonut(segments: segments, highlightedID: hoveredSegment)
- .frame(width: 132, height: 132)
+ .frame(width: 148, height: 148)
VStack(spacing: 1) {
Text(ByteCountFormatter.string(fromByteCount: total, countStyle: .file))
- .font(.system(size: 17, weight: .bold))
+ .font(.system(size: 18, weight: .bold))
.monospacedDigit()
Text("total")
.font(.system(size: 10))
@@ -373,7 +393,8 @@ struct DashboardView: View {
VStack(alignment: .leading, spacing: 12) {
ForEach(Array(segments.enumerated()), id: \.element.id) { idx, seg in
HoverableLegendChip(
- color: seg.color, label: seg.label, value: seg.display
+ color: seg.color, label: seg.label, value: seg.display,
+ percent: shareString(Int64(seg.value), of: total)
) { hovering in
hoveredSegment = hovering ? seg.id : nil
}
@@ -428,7 +449,7 @@ struct DashboardView: View {
// MARK: - Scanning state
private var scanningHero: some View {
- CardSurface(padding: 24, accent: Tint.blue, elevation: .raised, material: .ultraThinMaterial) {
+ CardSurface(padding: 26, elevation: .raised, material: .ultraThinMaterial, tint: Tint.blue) {
HStack(alignment: .center, spacing: 28) {
ScanningGauge(progress: appState.scanProgress)
.frame(width: 180, height: 180)
@@ -511,44 +532,62 @@ struct DashboardView: View {
private var completedHero: some View {
let isClean = appState.totalJunkSize <= 0
- return CardSurface(padding: 24, accent: isClean ? Tint.green : Tint.orange, elevation: .raised) {
- VStack(alignment: .leading, spacing: 14) {
- HStack(alignment: .firstTextBaseline) {
- if !isClean {
- CountUpBytes(bytes: appState.totalJunkSize)
- .font(.system(size: 40, weight: .semibold))
- Text("found")
- .font(.system(size: 16))
- .foregroundStyle(.secondary)
- } else {
- HStack(spacing: 10) {
- cleanSealIcon
- Text("Your Mac is clean")
- .font(.system(size: 22, weight: .bold))
- .foregroundStyle(Tint.green)
- }
+ return CardSurface(padding: 26, elevation: .raised,
+ tint: isClean ? Tint.green : Tint.orange) {
+ HStack(spacing: 24) {
+ if isClean {
+ HStack(spacing: 12) {
+ cleanSealIcon
+ Text("Your Mac is clean")
+ .font(.system(size: 22, weight: .bold))
+ .foregroundStyle(Tint.green)
}
Spacer()
Button("Scan Again") { appState.startSmartScan() }
.controlSize(.large)
- }
- if !isClean {
- HStack {
- if appState.totalSelectedSize > 0 {
- Button {
- showConfirmation = true
- } label: {
- Label {
- Text(cleanSelectedLabel)
- } icon: {
- Image(systemName: "sparkles")
+ } else {
+ VStack(alignment: .leading, spacing: 10) {
+ Text("Junk Found")
+ .font(.system(size: 12, weight: .semibold))
+ .foregroundStyle(Tint.orange)
+ .textCase(.uppercase)
+ .tracking(0.8)
+ HStack(alignment: .firstTextBaseline, spacing: 8) {
+ CountUpBytes(bytes: appState.totalJunkSize)
+ .font(.system(size: 40, weight: .bold))
+ .foregroundStyle(
+ LinearGradient(
+ colors: [Tint.orange, Tint.red],
+ startPoint: .topLeading, endPoint: .bottomTrailing
+ )
+ )
+ Text("found")
+ .font(.system(size: 16))
+ .foregroundStyle(.secondary)
+ }
+ Text(junkFoundDelta(count: appState.allResults.count))
+ .font(.system(size: 12.5))
+ .foregroundStyle(.secondary)
+
+ HStack(spacing: 12) {
+ if appState.totalSelectedSize > 0 {
+ Button {
+ showConfirmation = true
+ } label: {
+ Label {
+ Text(cleanSelectedLabel)
+ } icon: {
+ Image(systemName: "sparkles")
+ }
+ .padding(.horizontal, 6)
}
- .padding(.horizontal, 6)
+ .buttonStyle(GlowProminentButtonStyle(large: true))
}
- .buttonStyle(GlowProminentButtonStyle())
+ Button("Scan Again") { appState.startSmartScan() }
}
- Spacer()
+ .padding(.top, 2)
}
+ Spacer()
}
}
}
@@ -615,7 +654,7 @@ struct DashboardView: View {
}
private var cleaningHero: some View {
- CardSurface(padding: 24, accent: Tint.orange, elevation: .raised, material: .ultraThinMaterial) {
+ CardSurface(padding: 26, elevation: .raised, material: .ultraThinMaterial, tint: Tint.orange) {
HStack(alignment: .center, spacing: 28) {
ScanningGauge(progress: appState.cleanProgress, tint: Tint.orange, label: "CLEANING")
.frame(width: 180, height: 180)
@@ -650,7 +689,7 @@ struct DashboardView: View {
}
private var cleanedHero: some View {
- CardSurface(padding: 24, accent: Tint.green, elevation: .raised, material: .ultraThinMaterial) {
+ CardSurface(padding: 26, elevation: .raised, material: .ultraThinMaterial, tint: Tint.green) {
HStack(alignment: .center, spacing: 28) {
SuccessMedal()
.background(
@@ -678,8 +717,7 @@ struct DashboardView: View {
// MARK: - Helpers
private func sectionHeader(_ text: LocalizedStringKey) -> some View {
- Text(text)
- .font(.system(size: 16, weight: .bold))
+ SectionHeader(text)
.padding(.top, 4)
}
}
@@ -697,15 +735,16 @@ private struct StatCard: View {
var byteValue: Int64? = nil
var body: some View {
- CardSurface(padding: 14, accent: tint) {
- VStack(alignment: .leading, spacing: 6) {
+ CardSurface(padding: 16, tint: tint) {
+ VStack(alignment: .leading, spacing: 8) {
HStack(spacing: 8) {
IconTile(systemName: icon, tint: tint, size: 28, glow: true)
Text(label)
- .font(.system(size: 12, weight: .medium))
+ .font(.system(size: 11, weight: .semibold))
.foregroundStyle(.secondary)
.textCase(.uppercase)
- .tracking(0.4)
+ .tracking(0.5)
+ Spacer(minLength: 0)
}
Group {
if let byteValue {
@@ -716,13 +755,14 @@ private struct StatCard: View {
.contentTransition(.numericText())
}
}
- .font(.system(size: 22, weight: .bold))
+ .font(.system(size: 23, weight: .bold))
.lineLimit(1)
.minimumScaleFactor(0.6)
if let delta {
Text(delta)
.font(.system(size: 11))
.foregroundStyle(.tertiary)
+ .lineLimit(1)
}
}
}
@@ -742,7 +782,7 @@ private struct Suggestion: Identifiable {
private struct SuggestionRow: View {
let suggestion: Suggestion
var body: some View {
- CardSurface(padding: 14, accent: suggestion.tint) {
+ CardSurface(padding: 14, tint: suggestion.tint) {
HStack(spacing: 14) {
IconTile(systemName: suggestion.icon, tint: suggestion.tint,
size: 38, corner: 10, glow: true)
@@ -791,42 +831,23 @@ private struct ScanPathTicker: View {
// MARK: - Gauges
-private struct LegendDot: View {
- let color: Color
- let label: LocalizedStringKey
- let value: String
-
- var body: some View {
- HStack(spacing: 6) {
- Circle().fill(color).frame(width: 8, height: 8)
- VStack(alignment: .leading, spacing: 0) {
- Text(label)
- .font(.system(size: 10.5))
- .foregroundStyle(.secondary)
- Text(value)
- .font(.system(size: 11.5, weight: .semibold))
- .monospacedDigit()
- }
- }
- }
-}
-
// ScanningGauge now lives in Components/DashboardCharts.swift (radar sweep +
// halo rings + Reduce Motion compliance).
-/// Legend chip wrapper that reports hover for donut cross-highlighting and
-/// scales slightly while hovered.
+/// Legend chip wrapper that reports hover for donut/meter cross-highlighting
+/// and scales slightly while hovered.
private struct HoverableLegendChip: View {
let color: Color
let label: LocalizedStringKey
let value: String
+ var percent: String? = nil
let onHoverChange: (Bool) -> Void
@State private var hovering = false
@Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
- LegendChip(color: color, label: label, value: value)
+ LegendChip(color: color, label: label, value: value, percent: percent)
.scaleEffect(hovering && !reduceMotion ? 1.05 : 1, anchor: .leading)
.animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
.onHover { h in
@@ -861,6 +882,44 @@ private struct HeroDrift: View {
}
}
+/// Two small glass bubbles hovering just outside the hero ring. They bob on
+/// offset rhythms so the composition feels alive without competing with the
+/// gauge itself. Positions are static under Reduce Motion.
+private struct OrbSatellites: View {
+ let tint: Color
+ let ringSize: CGFloat
+
+ @State private var bob = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ let orbit = ringSize / 2 + 14
+ ZStack {
+ Circle()
+ .fill(tint.opacity(0.22))
+ .frame(width: 13, height: 13)
+ .blur(radius: 0.5)
+ .offset(x: -orbit - 6, y: -orbit * 0.55 + (bob ? -7 : 7))
+ .opacity(bob ? 0.9 : 0.55)
+ Circle()
+ .stroke(tint.opacity(0.30), lineWidth: 1)
+ .frame(width: 17, height: 17)
+ .offset(x: orbit + 4, y: orbit * 0.5 + (bob ? 6 : -6))
+ Circle()
+ .fill(Tint.purple.opacity(0.18))
+ .frame(width: 8, height: 8)
+ .offset(x: orbit * 0.35, y: -orbit - 8 + (bob ? -5 : 5))
+ }
+ .allowsHitTesting(false)
+ .onAppear {
+ guard !reduceMotion else { return }
+ withAnimation(.easeInOut(duration: 2.8).repeatForever(autoreverses: true)) {
+ bob = true
+ }
+ }
+ }
+}
+
/// Gradient progress capsule with a traveling shimmer band, replacing the
/// stock linear ProgressView during scans/cleans. Shimmer is masked to the
/// filled portion and removed entirely under Reduce Motion.
@@ -933,7 +992,7 @@ private struct CategoryToggleRow: View {
}
)) {
HStack(spacing: 12) {
- IconTile(systemName: result.category.icon, tint: result.category.color, size: 28)
+ IconTile(systemName: result.category.icon, tint: result.category.color, size: 28, vivid: true)
VStack(alignment: .leading, spacing: 1) {
Text(LocalizedStringKey(result.category.rawValue))
.font(.system(size: 13.5, weight: .semibold))
diff --git a/PureMac/Views/MainWindow.swift b/PureMac/Views/MainWindow.swift
index 670977a..49765e6 100644
--- a/PureMac/Views/MainWindow.swift
+++ b/PureMac/Views/MainWindow.swift
@@ -160,7 +160,8 @@ struct MainWindow: View {
appState.checkFullDiskAccess()
}
}
- .buttonStyle(.bordered)
+ .buttonStyle(.borderedProminent)
+ .tint(Tint.orange)
.controlSize(.small)
.help("Fix permission")
}
@@ -211,22 +212,7 @@ struct MainWindow: View {
.animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.8),
value: appState.hasFullDiskAccess)
.frame(maxWidth: .infinity, maxHeight: .infinity)
- .background(
- // Quiet ambient gradient under every section. Static layers,
- // opacities kept low enough to stay clean in light mode.
- ZStack {
- Color(nsColor: .windowBackgroundColor)
- LinearGradient(
- colors: [Tint.blue.opacity(0.05), .clear],
- startPoint: .topLeading, endPoint: .center
- )
- RadialGradient(
- colors: [Tint.purple.opacity(0.03), .clear],
- center: .topTrailing, startRadius: 0, endRadius: 600
- )
- }
- .ignoresSafeArea()
- )
+ .background(AmbientBackdrop())
}
@ViewBuilder
@@ -291,11 +277,11 @@ struct MainWindow: View {
.padding(.horizontal, 14)
.padding(.vertical, 10)
.background(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
.fill(Tint.orange.opacity(0.08))
)
.overlay(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
.strokeBorder(Tint.orange.opacity(0.22), lineWidth: 0.5)
)
}
diff --git a/PureMac/Views/Orphans/OrphanListView.swift b/PureMac/Views/Orphans/OrphanListView.swift
index 3da409e..652524c 100644
--- a/PureMac/Views/Orphans/OrphanListView.swift
+++ b/PureMac/Views/Orphans/OrphanListView.swift
@@ -321,6 +321,21 @@ private struct OrphanRowView: View {
Spacer()
+ // Hover-revealed Finder shortcut; stays in the layout so the
+ // trailing size never shifts sideways.
+ Button {
+ onReveal()
+ } label: {
+ Image(systemName: "folder")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .buttonStyle(.plain)
+ .help("Reveal in Finder")
+ .opacity(hovering ? 1 : 0)
+ .scaleEffect(reduceMotion ? 1 : (hovering ? 1 : 0.8))
+ .allowsHitTesting(hovering)
+
if let size = fileSize {
Text(ByteCountFormatter.string(fromByteCount: size, countStyle: .file))
.monospacedDigit()
diff --git a/project.yml b/project.yml
index 88c8108..f698d9d 100644
--- a/project.yml
+++ b/project.yml
@@ -23,8 +23,8 @@ settings:
CODE_SIGN_ENTITLEMENTS: "PureMac/PureMac.entitlements"
INFOPLIST_FILE: "PureMac/Info.plist"
PRODUCT_BUNDLE_IDENTIFIER: "com.puremac.app"
- MARKETING_VERSION: "2.8.4"
- CURRENT_PROJECT_VERSION: "19"
+ MARKETING_VERSION: "2.8.5"
+ CURRENT_PROJECT_VERSION: "20"
GENERATE_INFOPLIST_FILE: "NO"
ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"
COMBINE_HIDPI_IMAGES: "YES"