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

Merge branch 'main' into feature/configurable-media-key-steps

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-05-18 21:45:18 +05:30 • committed by GitHub
commit d6e833e724
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 7444 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

7179
DynamicIsland/Localizable.xcstrings
View file

File diff suppressed because it is too large Load diff

37
DynamicIsland/components/Notch/MinimalisticMusicPlayerView.swift
View file

@ -113,6 +113,7 @@ struct MinimalisticMusicPlayerView: View {
// Compact progress bar
progressBar
.padding(.top, 6)
.clipped()
// Compact playback controls
if shouldShowControlHUDRow {
@ -133,7 +134,7 @@ struct MinimalisticMusicPlayerView: View {
reminderList
}
.padding(.horizontal, 12)
.padding(.top, -15)
.padding(.top, 12)
.padding(.bottom, ReminderLiveActivityManager.baselineMinimalisticBottomPadding)
.frame(maxWidth: .infinity)
.frame(height: calculateDynamicHeight(), alignment: .top)
@ -254,7 +255,7 @@ struct MinimalisticMusicPlayerView: View {
height += 6 + 4 // progress bar + top padding
// Add playback controls height
height += 40 + 2 // controls + top padding
height += 54 + 2 // controls + top padding
// Add lyrics height if enabled in settings (reserve space even while loading)
if enableLyrics {
@ -706,7 +707,7 @@ private struct MinimalisticReminderDetailsView: View {
// MARK: - Playback Controls (Larger)
private var playbackControls: some View {
HStack(spacing: 16) {
HStack(spacing: 10) {
ForEach(Array(displayedSlots.enumerated()), id: \.offset) { _, slot in
slotView(for: slot)
}
@ -834,10 +835,10 @@ private struct MinimalisticReminderDetailsView: View {
private var playPauseButton: some View {
MinimalisticSquircircleButton(
icon: musicManager.isPlaying ? (musicManager.isLiveStream ? "stop.fill" : "pause.fill") : "play.fill",
fontSize: 28,
fontSize: 26,
fontWeight: .semibold,
frameSize: CGSize(width: 60, height: 60),
cornerRadius: 24,
frameSize: CGSize(width: 54, height: 54),
cornerRadius: 22,
foregroundColor: .white,
pressEffect: .none,
symbolEffectStyle: .replace,
@ -867,8 +868,8 @@ private struct MinimalisticReminderDetailsView: View {
icon: icon,
fontSize: size,
fontWeight: .medium,
frameSize: CGSize(width: 40, height: 40),
cornerRadius: 16,
frameSize: CGSize(width: 36, height: 36),
cornerRadius: 14,
foregroundColor: isActive ? resolvedActiveColor : .white.opacity(0.85),
pressEffect: pressEffect,
symbolEffectStyle: symbolEffect,
@ -991,8 +992,8 @@ private struct MinimalisticReminderDetailsView: View {
icon: routeManager.activeDevice?.iconName ?? "speaker.wave.2",
fontSize: 18,
fontWeight: .medium,
frameSize: CGSize(width: 40, height: 40),
cornerRadius: 16,
frameSize: CGSize(width: 36, height: 36),
cornerRadius: 14,
foregroundColor: .white.opacity(0.85),
symbolEffectStyle: .replace
) {
@ -1051,8 +1052,8 @@ private struct MinimalisticReminderDetailsView: View {
icon: "airplayaudio",
fontSize: 18,
fontWeight: .medium,
frameSize: CGSize(width: 40, height: 40),
cornerRadius: 16,
frameSize: CGSize(width: 36, height: 36),
cornerRadius: 14,
foregroundColor: .white.opacity(0.85),
symbolEffectStyle: .replace
) {
@ -1144,17 +1145,17 @@ struct MinimalisticAlbumArtView: View {
)
.clipped()
.clipShape(RoundedRectangle(cornerRadius: albumArtCornerRadius))
.scaleEffect(x: 1.3, y: 1.4)
.scaleEffect(x: 1.08, y: 1.1)
.rotationEffect(.degrees(92))
.blur(radius: 35)
.blur(radius: 16)
.opacity(
usesLiveCanvasArtwork
? (musicManager.isPlaying ? 0.68 : 0.22)
: min(0.6, 1 - max(musicManager.albumArt.getBrightness(), 0.3))
? (musicManager.isPlaying ? 0.55 : 0.18)
: min(0.45, 1 - max(musicManager.albumArt.getBrightness(), 0.3))
)
.shadow(
color: Color(nsColor: musicManager.avgColor).opacity(usesLiveCanvasArtwork ? 0.28 : 0.16),
radius: usesLiveCanvasArtwork ? 18 : 12,
color: Color(nsColor: musicManager.avgColor).opacity(usesLiveCanvasArtwork ? 0.22 : 0.12),
radius: usesLiveCanvasArtwork ? 10 : 7,
x: 0,
y: 0
)

94
DynamicIsland/components/Settings/SettingsView.swift
View file

@ -632,10 +632,10 @@ struct SettingsView: View {
}
VStack(alignment: .leading, spacing: 2) {
Text(suggestion.title)
Text(LocalizedStringKey(suggestion.title))
.font(.system(size: 13, weight: .semibold))
.foregroundStyle(Color.primary)
Text(suggestion.tab.title)
Text(LocalizedStringKey(suggestion.tab.title))
.font(.system(size: 11))
.foregroundStyle(Color.secondary)
}
@ -2239,12 +2239,12 @@ private struct SystemControlsView: View {
case .betterDisplay:
if betterDisplayManager.isRunning { return "Running" }
if betterDisplayManager.isDetected { return "Not running" }
return "Not detected"
return String(localized: "Not detected")
case .lunar:
if lunarManager.isConnected { return "Connected" }
if lunarManager.isRunning { return "Running" }
if lunarManager.isDetected { return "Not running" }
return "Not detected"
return String(localized: "Not detected")
}
}
@ -2266,23 +2266,23 @@ private struct SystemControlsView: View {
switch thirdPartyDDCProvider {
case .betterDisplay:
if !betterDisplayManager.isDetected {
return "Install [BetterDisplay](https://betterdisplay.pro) to control external display brightness (and optional volume) through Atoll's HUD."
return String(localized: "Install [BetterDisplay](https://betterdisplay.pro) to control external display brightness (and optional volume) through Atoll's HUD.")
}
if !betterDisplayManager.isRunning {
return "BetterDisplay is installed but not currently running. Launch BetterDisplay to enable integration."
return String(localized: "BetterDisplay is installed but not currently running. Launch BetterDisplay to enable integration.")
}
return "BetterDisplay OSD events will be routed through Atoll's active HUD style. Brightness is always routed; volume is routed when external volume control listener is enabled below. Make sure BetterDisplay's OSD integration is enabled in Settings › Application › Integration."
return String(localized: "BetterDisplay OSD events will be routed through Atoll's active HUD style. Brightness is always routed; volume is routed when external volume control listener is enabled below. Make sure BetterDisplay's OSD integration is enabled in Settings › Application › Integration.")
case .lunar:
if !lunarManager.isDetected {
return "Install [Lunar](https://lunar.fyi) to control external display brightness, contrast, and optional volume through Atoll's HUD via DDC."
return String(localized: "Install [Lunar](https://lunar.fyi) to control external display brightness, contrast, and optional volume through Atoll's HUD via DDC.")
}
if !lunarManager.isRunning {
return "Lunar is installed but not currently running. Launch Lunar to enable integration."
return String(localized: "Lunar is installed but not currently running. Launch Lunar to enable integration.")
}
if lunarManager.isConnected {
return "Connected to Lunar's DDC socket. Brightness and contrast adjustments are shown through Atoll's HUD; volume follows when external volume control listener is enabled below."
return String(localized: "Connected to Lunar's DDC socket. Brightness and contrast adjustments are shown through Atoll's HUD; volume follows when external volume control listener is enabled below.")
}
return "Lunar is running but the socket connection is not yet established. It will connect automatically."
return String(localized: "Lunar is running but the socket connection is not yet established. It will connect automatically.")
}
}
@ -3125,14 +3125,14 @@ struct CalendarSettings: View {
var title: String {
switch self {
case .mins15: return "15 mins"
case .mins30: return "30 mins"
case .hour1: return "1 hour"
case .hours3: return "3 hours"
case .hours6: return "6 hours"
case .hours12: return "12 hours"
case .restOfDay: return "Rest of the day"
case .allTime: return "All time"
case .mins15: return String(localized: "15 mins")
case .mins30: return String(localized: "30 mins")
case .hour1: return String(localized: "1 hour")
case .hours3: return String(localized: "3 hours")
case .hours6: return String(localized: "6 hours")
case .hours12: return String(localized: "12 hours")
case .restOfDay: return String(localized: "Rest of the day")
case .allTime: return String(localized: "All time")
}
}
}
@ -3623,9 +3623,9 @@ private extension DevicesSettingsView {
var title: String {
switch self {
case .symbol:
return "Symbol"
return String(localized: "Symbol")
case .threeD:
return "3D"
return String(localized: "3D")
}
}
}
@ -4961,14 +4961,14 @@ struct LockScreenSettings: View {
var title: String {
switch self {
case .mins15: return "15 mins"
case .mins30: return "30 mins"
case .hour1: return "1 hour"
case .hours3: return "3 hours"
case .hours6: return "6 hours"
case .hours12: return "12 hours"
case .restOfDay: return "Rest of the day"
case .allTime: return "All time"
case .mins15: return String(localized: "15 mins")
case .mins30: return String(localized: "30 mins")
case .hour1: return String(localized: "1 hour")
case .hours3: return String(localized: "3 hours")
case .hours6: return String(localized: "6 hours")
case .hours12: return String(localized: "12 hours")
case .restOfDay: return String(localized: "Rest of the day")
case .allTime: return String(localized: "All time")
}
}
}
@ -4982,9 +4982,9 @@ struct LockScreenSettings: View {
var title: String {
switch self {
case .leading: return "Left"
case .center: return "Center"
case .trailing: return "Right"
case .leading: return String(localized: "Left")
case .center: return String(localized: "Center")
case .trailing: return String(localized: "Right")
}
}
}
@ -7057,11 +7057,11 @@ struct StatsSettings: View {
private var formattedUpdateInterval: String {
let seconds = Int(statsUpdateInterval.rounded())
if seconds >= 60 {
return "60 s (1 min)"
return String(localized: "60 s (1 min)")
} else if seconds == 1 {
return "1 s"
return String(localized: "1 s")
} else {
return "\(seconds) s"
return String(localized: "\(seconds) s")
}
}
@ -7453,16 +7453,16 @@ struct ClipboardSettings: View {
let interval = Date().timeIntervalSince(date)
if interval < 60 {
return "Just now"
return String(localized: "Just now")
} else if interval < 3600 {
let minutes = Int(interval / 60)
return "\(minutes)m ago"
return String(localized: "\(minutes)m ago")
} else if interval < 86400 {
let hours = Int(interval / 3600)
return "\(hours)h ago"
return String(localized: "\(hours)h ago")
} else {
let days = Int(interval / 86400)
return "\(days)d ago"
return String(localized: "\(days)d ago")
}
}
}
@ -7631,16 +7631,16 @@ struct ScreenAssistantSettings: View {
let interval = Date().timeIntervalSince(date)
if interval < 60 {
return "Just now"
return String(localized: "Just now")
} else if interval < 3600 {
let minutes = Int(interval / 60)
return "\(minutes)m ago"
return String(localized: "\(minutes)m ago")
} else if interval < 86400 {
let hours = Int(interval / 3600)
return "\(hours)h ago"
return String(localized: "\(hours)h ago")
} else {
let days = Int(interval / 86400)
return "\(days)d ago"
return String(localized: "\(days)d ago")
}
}
}
@ -8004,21 +8004,21 @@ struct SettingsPermissionCallout: View {
var body: some View {
VStack(alignment: .leading, spacing: 8) {
Label(title, systemImage: icon)
Label(LocalizedStringKey(title), systemImage: icon)
.font(.subheadline.weight(.semibold))
.foregroundStyle(iconColor)
Text(message)
Text(LocalizedStringKey(message))
.font(.caption)
.foregroundStyle(.secondary)
HStack(spacing: 8) {
Button(requestButtonTitle) {
Button(LocalizedStringKey(requestButtonTitle)) {
requestAction()
}
.buttonStyle(.borderedProminent)
Button(openSettingsButtonTitle) {
Button(LocalizedStringKey(openSettingsButtonTitle)) {
openSettingsAction()
}
.buttonStyle(.bordered)

63
DynamicIsland/managers/LockScreenManager.swift
View file

@ -48,6 +48,7 @@ class LockScreenManager: ObservableObject {
private var debounceIdleTask: Task<Void, Never>?
private var collapseTask: Task<Void, Never>?
private var postUnlockMusicHUDTask: Task<Void, Never>?
private var lockStatePollTask: Task<Void, Never>?
// MARK: - Helpers
@ -65,9 +66,11 @@ class LockScreenManager: ObservableObject {
deinit {
DistributedNotificationCenter.default().removeObserver(self)
NSWorkspace.shared.notificationCenter.removeObserver(self)
debounceIdleTask?.cancel()
collapseTask?.cancel()
postUnlockMusicHUDTask?.cancel()
lockStatePollTask?.cancel()
}
// MARK: - Setup
@ -80,7 +83,7 @@ class LockScreenManager: ObservableObject {
name: .init("com.apple.screenIsLocked"),
object: nil
)
// Observe screen unlocked event
DistributedNotificationCenter.default().addObserver(
self,
@ -88,7 +91,18 @@ class LockScreenManager: ObservableObject {
name: .init("com.apple.screenIsUnlocked"),
object: nil
)
// Fallback: macOS sometimes delays `com.apple.screenIsUnlocked`, leaving
// lock-screen widgets visible after the user-perceived unlock.
// The workspace session-active notification typically fires earlier; the
// guard at the top of `screenUnlocked` makes the call idempotent.
NSWorkspace.shared.notificationCenter.addObserver(
self,
selector: #selector(screenUnlocked),
name: NSWorkspace.sessionDidBecomeActiveNotification,
object: nil
)
print("LockScreenManager: ✅ Observers registered for lock/unlock events")
}
@ -141,9 +155,11 @@ class LockScreenManager: ObservableObject {
print("[\(timestamp())] LockScreenManager: ⏭️ Lock icon disabled in settings")
}
startLockStatePolling()
print("[\(timestamp())] LockScreenManager: ✅ Lock screen activated")
}
@objc private func screenUnlocked() {
guard isLocked else {
print("[\(timestamp())] LockScreenManager: 🔁 Unlock event ignored (already unlocked)")
@ -156,6 +172,7 @@ class LockScreenManager: ObservableObject {
lastUpdated = Date()
updateIdleState(locked: false)
isLocked = false
stopLockStatePolling()
postUnlockMusicHUDTask?.cancel()
shouldDelayPostUnlockMusicHUD = Defaults[.enableLockScreenLiveActivity]
@ -207,8 +224,46 @@ class LockScreenManager: ObservableObject {
print("[\(self.timestamp())] LockScreenManager: ✅ Lock screen deactivated")
}
// MARK: - Lock State Polling
// Defensive fallback against late/missed `com.apple.screenIsUnlocked` and
// `NSWorkspace.sessionDidBecomeActiveNotification` notifications, which
// macOS sometimes delivers well after the user-perceived unlock — leaving
// lock-screen widgets visible for an extra moment. While we believe we are
// locked, poll the canonical session-lock state and fire `screenUnlocked()`
// the moment the OS flips. The handler's duplicate-event guard makes this
// safe to call alongside any later-arriving notification.
private static func isSessionScreenLocked() -> Bool {
guard let session = CGSessionCopyCurrentDictionary() as? [String: Any] else {
return false
}
return session["CGSSessionScreenIsLocked"] as? Bool ?? false
}
private func startLockStatePolling() {
lockStatePollTask?.cancel()
lockStatePollTask = Task { [weak self] in
while !Task.isCancelled {
try? await Task.sleep(for: .milliseconds(500))
if Task.isCancelled { return }
await MainActor.run {
guard let self, self.isLocked else { return }
if !Self.isSessionScreenLocked() {
print("[\(self.timestamp())] LockScreenManager: 🔓 Polling detected unlock ahead of notification")
self.screenUnlocked()
}
}
}
}
}
private func stopLockStatePolling() {
lockStatePollTask?.cancel()
lockStatePollTask = nil
}
// MARK: - Idle State Management
/// Copy EXACT logic from ScreenRecordingManager
private func updateIdleState(locked: Bool) {
if locked {

2
DynamicIsland/managers/LockScreenWeatherPanelManager.swift
View file

@ -49,8 +49,10 @@ final class LockScreenWeatherPanelManager {
func hide() {
guard let window else { return }
window.alphaValue = 0
window.orderOut(nil)
window.contentView = nil
window.alphaValue = 1
latestFrame = nil
lastSnapshot = nil
lastContentSize = nil

14
DynamicIsland/tr.lproj/InfoPlist.strings Normal file
View file

@ -0,0 +1,14 @@
"CFBundleDisplayName" = "Atoll";
"NSAppleEventsUsageDescription" = "Atoll, Spotify ve Apple Music'i kontrol etmek için AppleScript kullanır.";
"NSBluetoothAlwaysUsageDescription" = "Atoll, ses aygıtları bağlandığında bunları algılamak ve HUD'da pil durumlarını göstermek için Bluetooth erişimine ihtiyaç duyar.";
"NSCalendarsFullAccessUsageDescription" = "Takvim etkinliklerini çentik içinde gösterir.";
"NSCalendarsUsageDescription" = "Takvim modu için gereklidir.";
"NSCameraUsageDescription" = "Ayna modu için kameranıza ihtiyaç duyuyoruz.";
"NSDesktopFolderUsageDescription" = "Atoll, ekran görüntülerini masaüstünüze kaydetmek için erişime ihtiyaç duyar.";
"NSDocumentsFolderUsageDescription" = "Atoll, rafa sürüklenen dosyaları kaydetmek ve okumak için erişime ihtiyaç duyar.";
"NSDownloadsFolderUsageDescription" = "Atoll, İndirilenler klasöründeki dosyaları okumak için erişime ihtiyaç duyar.";
"NSLocationUsageDescription" = "Atoll, doğru kilit ekranı hava durumunu göstermek için konumunuzu kullanır.";
"NSLocationWhenInUseUsageDescription" = "Atoll, doğru kilit ekranı hava durumunu göstermek için konumunuzu kullanır.";
"NSRemindersUsageDescription" = "Atoll, anımsatıcılarınızı göstermek için Anımsatıcılar erişimine ihtiyaç duyar.";
"NSAudioCaptureUsageDescription" = "Atoll, gerçek zamanlı müzik dalga biçimi görselleştiricisini göstermek için ses yakalama iznine ihtiyaç duyar.";
"NSScreenCaptureUsageDescription" = "Atoll, yapay zeka asistanı özelliği için ekran görüntüleri yakalamak üzere ekran kaydı iznine ihtiyaç duyar.";