Working Focus mode - focus type not yet supported

This commit is contained in:
Hariharan Mudaliar 2025-11-10 03:15:28 +05:30
commit b643f1d905
3 changed files with 95 additions and 29 deletions

View file

@ -89,10 +89,16 @@ struct DoNotDisturbLiveActivity: View {
private var labelText: String {
let trimmed = manager.currentFocusModeName.trimmingCharacters(in: .whitespacesAndNewlines)
if !trimmed.isEmpty {
if focusMode == .doNotDisturb {
return "Focus"
}
return trimmed
}
let fallback = focusMode.displayName
if focusMode == .doNotDisturb {
return "Focus"
}
return fallback.isEmpty ? "Focus" : fallback
}

View file

@ -40,8 +40,15 @@ struct FocusIndicator: View {
private var accessibilityLabel: String {
let trimmedName = manager.currentFocusModeName.trimmingCharacters(in: .whitespacesAndNewlines)
let name = trimmedName.isEmpty ? focusMode.displayName : trimmedName
return "Focus active: \(name)"
let baseName: String
if trimmedName.isEmpty {
baseName = focusMode.displayName
} else {
baseName = trimmedName
}
let finalName = focusMode == .doNotDisturb ? "Focus" : baseName
return "Focus active: \(finalName)"
}
}