bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #218 from Ebullioscopic/feature/timer

Browse source 
Fix elements colouring in Light Mode
This commit is contained in:
Hariharan Mudaliar 2025-12-29 23:00:22 +05:30 • committed by GitHub
commit 389c37ecd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
DynamicIsland/components/Live activities/InlineHUD.swift
View file

@ -154,6 +154,7 @@ struct InlineHUD: View {
.lineLimit(1) .lineLimit(1)
.allowsTightening(true) .allowsTightening(true)
.contentTransition(.numericText()) .contentTransition(.numericText())
.foregroundStyle(.white)
} }
} }
.frame(width: infoWidth, height: vm.notchSize.height - (hoverAnimation ? 0 : 12), alignment: .leading) .frame(width: infoWidth, height: vm.notchSize.height - (hoverAnimation ? 0 : 12), alignment: .leading)

14
DynamicIsland/components/Notch/NotchStatsView.swift
View file

@ -557,13 +557,13 @@ struct UnifiedStatsCard: View {
// Header - consistent across all card types // Header - consistent across all card types
HStack(spacing: 4) { HStack(spacing: 4) {
Image(systemName: graphData.icon) Image(systemName: graphData.icon)
.foregroundColor(graphData.color) .foregroundStyle(graphData.color)
.font(.caption) // Match boring.notch font size .font(.caption) // Match boring.notch font size
Text(graphData.title) Text(graphData.title)
.font(.caption) // Match boring.notch font size .font(.caption) // Match boring.notch font size
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundStyle(Color.white.opacity(0.8))
Spacer() Spacer()
@ -572,7 +572,7 @@ struct UnifiedStatsCard: View {
Text(singleData.value) Text(singleData.value)
.font(.caption) // Match boring.notch font size .font(.caption) // Match boring.notch font size
.fontWeight(.bold) .fontWeight(.bold)
.foregroundColor(.primary) .foregroundStyle(.white)
} }
} }
@ -586,7 +586,7 @@ struct UnifiedStatsCard: View {
Text("•") Text("•")
.font(.caption2) .font(.caption2)
.foregroundColor(.secondary) .foregroundStyle(Color.white.opacity(0.45))
Text(dualData.negativeValue) Text(dualData.negativeValue)
.font(.caption) .font(.caption)
@ -615,7 +615,7 @@ struct UnifiedStatsCard: View {
if ["CPU", "Memory", "GPU", "Network", "Disk"].contains(graphData.title) { if ["CPU", "Memory", "GPU", "Network", "Disk"].contains(graphData.title) {
Text("Click for details") Text("Click for details")
.font(.caption2) .font(.caption2)
.foregroundColor(.secondary) .foregroundStyle(Color.white.opacity(0.75))
.opacity(isHovered ? 1.0 : 0.0) .opacity(isHovered ? 1.0 : 0.0)
.animation(.easeInOut(duration: 0.2), value: isHovered) .animation(.easeInOut(duration: 0.2), value: isHovered)
} }
@ -623,10 +623,10 @@ struct UnifiedStatsCard: View {
.padding(8) // Match boring.notch padding - reduced from 10 .padding(8) // Match boring.notch padding - reduced from 10
.background( .background(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.fill(Color(NSColor.controlBackgroundColor).opacity(0.7)) // Match boring.notch opacity .fill(Color.white.opacity(0.08))
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(graphData.color.opacity(isHovered ? 0.5 : 0.2), lineWidth: 1) .stroke(Color.white.opacity(isHovered ? 0.45 : 0.18), lineWidth: 1)
) )
) )
.scaleEffect(isHovered ? 1.02 : 1.0) .scaleEffect(isHovered ? 1.02 : 1.0)

7
DynamicIsland/components/Notch/NotchTimerView.swift
View file

@ -615,7 +615,7 @@ private struct DurationInputRow: View {
private var colon: some View { private var colon: some View {
Text(":") Text(":")
.font(.system(size: 26, weight: .black, design: .monospaced)) .font(.system(size: 26, weight: .black, design: .monospaced))
.foregroundStyle(.secondary) .foregroundStyle(Color.white.opacity(0.65))
} }
} }
@ -643,13 +643,15 @@ private struct DurationField: View {
.font(.system(size: 28, weight: .semibold, design: .monospaced)) .font(.system(size: 28, weight: .semibold, design: .monospaced))
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.textFieldStyle(.plain) .textFieldStyle(.plain)
.foregroundColor(.white)
.tint(.white)
.frame(width: width, height: 46) .frame(width: width, height: 46)
.background(Color.white.opacity(0.08)) .background(Color.white.opacity(0.08))
.clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
Text(label) Text(label)
.font(.caption) .font(.caption)
.foregroundStyle(.secondary) .foregroundStyle(Color.white.opacity(0.65))
} }
} }
@ -689,6 +691,7 @@ private struct TimerPresetCard: View {
.font(.caption.monospaced()) .font(.caption.monospaced())
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
.foregroundStyle(preset.color)
Spacer() Spacer()