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

Somewhat working

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-11-10 03:00:10 +05:30
commit 4444df4cb4
3 changed files with 164 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

110
DynamicIsland/managers/DoNotDisturbManager.swift
View file

@ -82,19 +82,34 @@ final class DoNotDisturbManager: ObservableObject {
let metadata = self.extractMetadata(from: notification)
DispatchQueue.main.async {
if let identifier = metadata.identifier, identifier != self.currentFocusModeIdentifier {
self.currentFocusModeIdentifier = identifier
let trimmedIdentifier = metadata.identifier?.trimmingCharacters(in: .whitespacesAndNewlines)
let trimmedName = metadata.name?.trimmingCharacters(in: .whitespacesAndNewlines)
let incomingIdentifier = (trimmedIdentifier?.isEmpty == false ? trimmedIdentifier! : self.currentFocusModeIdentifier)
let incomingName = (trimmedName?.isEmpty == false ? trimmedName! : self.currentFocusModeName)
let resolvedMode = FocusModeType.resolve(identifier: incomingIdentifier, name: incomingName)
debugPrint("[DoNotDisturbManager] Focus update -> identifier: \(trimmedIdentifier ?? "<nil>") (incoming: \(incomingIdentifier.isEmpty ? "<empty>" : incomingIdentifier)) | name: \(trimmedName ?? "<nil>") | resolved: \(resolvedMode.rawValue)")
let finalIdentifier = resolvedMode.rawValue
if finalIdentifier != self.currentFocusModeIdentifier {
self.currentFocusModeIdentifier = finalIdentifier
}
if let name = metadata.name {
if name != self.currentFocusModeName {
self.currentFocusModeName = name
}
} else if !self.currentFocusModeIdentifier.isEmpty {
let derivedName = FocusModeType(rawValue: self.currentFocusModeIdentifier)?.displayName ?? ""
if !derivedName.isEmpty {
self.currentFocusModeName = derivedName
}
let finalName: String
if let name = trimmedName, !name.isEmpty {
finalName = name
} else if !resolvedMode.displayName.isEmpty {
finalName = resolvedMode.displayName
} else if !incomingName.isEmpty {
finalName = incomingName
} else {
finalName = "Focus"
}
if finalName != self.currentFocusModeName {
self.currentFocusModeName = finalName
}
guard self.isDoNotDisturbActive != isActive else { return }
@ -117,6 +132,10 @@ final class DoNotDisturbManager: ObservableObject {
let identifierKeys = [
"FocusModeIdentifier",
"focusModeIdentifier",
"FocusModeUUID",
"focusModeUUID",
"UUID",
"uuid",
"identifier",
"Identifier"
]
@ -124,12 +143,21 @@ final class DoNotDisturbManager: ObservableObject {
let nameKeys = [
"FocusModeName",
"focusModeName",
"FocusMode",
"focusMode",
"name",
"Name"
]
let identifier = identifierKeys.compactMap { userInfo[$0] as? String }.first
let name = nameKeys.compactMap { userInfo[$0] as? String }.first
let identifier = identifierKeys
.compactMap { userInfo[$0] as? String }
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
.first { !$0.isEmpty }
let name = nameKeys
.compactMap { userInfo[$0] as? String }
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
.first { !$0.isEmpty }
return (name, identifier)
}
@ -143,7 +171,7 @@ private extension Notification.Name {
// MARK: - Focus Mode Types
enum FocusModeType: String {
enum FocusModeType: String, CaseIterable {
case doNotDisturb = "com.apple.donotdisturb.mode"
case work = "com.apple.focus.work"
case personal = "com.apple.focus.personal"
@ -158,7 +186,7 @@ enum FocusModeType: String {
var displayName: String {
switch self {
case .doNotDisturb: return "Do Not Disturb"
case .doNotDisturb: return "DnD"
case .work: return "Work"
case .personal: return "Personal"
case .sleep: return "Sleep"
@ -184,7 +212,7 @@ enum FocusModeType: String {
case .mindfulness: return "brain.head.profile"
case .reading: return "book.fill"
case .custom: return "app.badge"
case .unknown: return "moon.zzz.fill"
case .unknown: return "moon.fill"
}
}
@ -218,9 +246,57 @@ enum FocusModeType: String {
var inactiveSymbol: String {
switch self {
case .doNotDisturb:
return "moon.circle"
return "moon.circle.fill"
default:
return sfSymbol
}
}
}
extension FocusModeType {
init(identifier: String) {
let normalized = identifier.trimmingCharacters(in: .whitespacesAndNewlines)
let normalizedLowercased = normalized.lowercased()
guard !normalized.isEmpty else {
self = .doNotDisturb
return
}
if let direct = FocusModeType(rawValue: normalized) ?? FocusModeType(rawValue: normalizedLowercased) {
self = direct
return
}
if let resolved = FocusModeType.allCases.first(where: {
guard !$0.rawValue.isEmpty else { return false }
return normalized.hasPrefix($0.rawValue) || normalizedLowercased.hasPrefix($0.rawValue)
}) {
self = resolved
return
}
if normalizedLowercased.hasPrefix("com.apple.focus.") {
self = .custom
return
}
self = .doNotDisturb
}
static func resolve(identifier: String?, name: String?) -> FocusModeType {
let trimmedIdentifier = identifier?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
if !trimmedIdentifier.isEmpty {
return FocusModeType(identifier: trimmedIdentifier)
}
let trimmedName = name?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
if !trimmedName.isEmpty {
if let match = FocusModeType.allCases.first(where: { !$0.displayName.isEmpty && $0.displayName.compare(trimmedName, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame }) {
return match
}
}
return .doNotDisturb
}
}