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

HotFix: Inline Volume HUD

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-03-08 16:36:56 +05:30
commit 98dfa7a7e5
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
3 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DynamicIsland/ContentView.swift
View file

@ -735,7 +735,7 @@ struct ContentView: View {
} }
if coordinator.sneakPeek.show { if coordinator.sneakPeek.show {
if (coordinator.sneakPeek.type != .music) && (coordinator.sneakPeek.type != .battery) && (coordinator.sneakPeek.type != .timer) && !Defaults[.inlineHUD] && ((coordinator.sneakPeek.type != .volume && coordinator.sneakPeek.type != .brightness && coordinator.sneakPeek.type != .backlight) || vm.notchState == .closed) { if (coordinator.sneakPeek.type != .music) && (coordinator.sneakPeek.type != .battery) && (coordinator.sneakPeek.type != .timer) && (coordinator.sneakPeek.type != .reminder) && (coordinator.sneakPeek.type != .capsLock) && !coordinator.sneakPeek.type.isExtensionPayload && !Defaults[.inlineHUD] && ((coordinator.sneakPeek.type != .volume && coordinator.sneakPeek.type != .brightness && coordinator.sneakPeek.type != .backlight) || vm.notchState == .closed) {
SystemEventIndicatorModifier(eventType: $coordinator.sneakPeek.type, value: $coordinator.sneakPeek.value, icon: $coordinator.sneakPeek.icon, sendEventBack: { _ in SystemEventIndicatorModifier(eventType: $coordinator.sneakPeek.type, value: $coordinator.sneakPeek.value, icon: $coordinator.sneakPeek.icon, sendEventBack: { _ in
// //
}) })

26
DynamicIsland/components/LockScreen/LockScreenLiveActivityOverlay.swift
View file

@ -27,13 +27,14 @@ struct LockScreenLiveActivityOverlay: View {
@ObservedObject var model: LockScreenLiveActivityOverlayModel @ObservedObject var model: LockScreenLiveActivityOverlayModel
@ObservedObject var animator: LockIconAnimator @ObservedObject var animator: LockIconAnimator
let notchSize: CGSize let notchSize: CGSize
var isDynamicIslandMode: Bool = false
private var indicatorSize: CGFloat { private var indicatorSize: CGFloat {
max(0, notchSize.height - 12) max(0, notchSize.height - 12)
} }
private var horizontalPadding: CGFloat { private var horizontalPadding: CGFloat {
cornerRadiusInsets.closed.bottom isDynamicIslandMode ? 8 : cornerRadiusInsets.closed.bottom
} }
private var totalWidth: CGFloat { private var totalWidth: CGFloat {
@ -44,6 +45,10 @@ struct LockScreenLiveActivityOverlay: View {
Self.collapsedScale(for: notchSize) Self.collapsedScale(for: notchSize)
} }
private var topOffset: CGFloat {
isDynamicIslandMode ? dynamicIslandTopOffset : 0
}
@State private var isHovering: Bool = false @State private var isHovering: Bool = false
var body: some View { var body: some View {
@ -66,12 +71,17 @@ struct LockScreenLiveActivityOverlay: View {
.padding(.horizontal, horizontalPadding) .padding(.horizontal, horizontalPadding)
.background(Color.black) .background(Color.black)
.clipShape( .clipShape(
NotchShape( isDynamicIslandMode
topCornerRadius: cornerRadiusInsets.closed.top, ? AnyShape(DynamicIslandPillShape(
bottomCornerRadius: cornerRadiusInsets.closed.bottom cornerRadius: max(notchSize.height / 2, dynamicIslandPillCornerRadiusInsets.closed.standard)
) ))
: AnyShape(NotchShape(
topCornerRadius: cornerRadiusInsets.closed.top,
bottomCornerRadius: cornerRadiusInsets.closed.bottom
))
) )
.frame(width: totalWidth, height: notchSize.height) .padding(.top, topOffset)
.frame(width: totalWidth, height: notchSize.height + topOffset)
.scaleEffect(x: max(model.scale, collapsedScale) * (isHovering ? 1.03 : 1.0), .scaleEffect(x: max(model.scale, collapsedScale) * (isHovering ? 1.03 : 1.0),
y: 1 * (isHovering ? 1.03 : 1.0), y: 1 * (isHovering ? 1.03 : 1.0),
anchor: .center) anchor: .center)
@ -88,9 +98,9 @@ struct LockScreenLiveActivityOverlay: View {
} }
extension LockScreenLiveActivityOverlay { extension LockScreenLiveActivityOverlay {
static func collapsedScale(for notchSize: CGSize) -> CGFloat { static func collapsedScale(for notchSize: CGSize, isDynamicIslandMode: Bool = false) -> CGFloat {
let indicatorSize = max(0, notchSize.height - 12) let indicatorSize = max(0, notchSize.height - 12)
let horizontalPadding = cornerRadiusInsets.closed.bottom let horizontalPadding = isDynamicIslandMode ? 8.0 : cornerRadiusInsets.closed.bottom
let totalWidth = notchSize.width + (indicatorSize * 2) + (horizontalPadding * 2) let totalWidth = notchSize.width + (indicatorSize * 2) + (horizontalPadding * 2)
guard totalWidth > 0 else { return 1 } guard totalWidth > 0 else { return 1 }
return notchSize.width / totalWidth return notchSize.width / totalWidth

23
DynamicIsland/managers/LockScreenLiveActivityWindowManager.swift
View file

@ -37,6 +37,16 @@ class LockScreenLiveActivityWindowManager {
private var workspaceObservers: [NSObjectProtocol] = [] private var workspaceObservers: [NSObjectProtocol] = []
private var currentNotchSize: CGSize? private var currentNotchSize: CGSize?
/// Whether the target screen uses Dynamic Island (pill) mode.
private var isDynamicIslandMode: Bool {
isDynamicIslandModeForScreen(lockContext()?.screen)
}
private func isDynamicIslandModeForScreen(_ screen: NSScreen?) -> Bool {
guard let screen else { return false }
return shouldUseDynamicIslandMode(for: screen.localizedName)
}
private init() { private init() {
registerScreenChangeObservers() registerScreenChangeObservers()
} }
@ -49,11 +59,12 @@ class LockScreenLiveActivityWindowManager {
private func windowSize(for notchSize: CGSize) -> CGSize { private func windowSize(for notchSize: CGSize) -> CGSize {
let indicatorWidth = max(0, notchSize.height - 12) let indicatorWidth = max(0, notchSize.height - 12)
let horizontalPadding = cornerRadiusInsets.closed.bottom let horizontalPadding = isDynamicIslandMode ? 8 : cornerRadiusInsets.closed.bottom
let topOffset: CGFloat = isDynamicIslandMode ? dynamicIslandTopOffset : 0
let totalWidth = notchSize.width + (indicatorWidth * 2) + (horizontalPadding * 2) let totalWidth = notchSize.width + (indicatorWidth * 2) + (horizontalPadding * 2)
return CGSize(width: totalWidth, height: notchSize.height) return CGSize(width: totalWidth, height: notchSize.height + topOffset)
} }
private func frame(for windowSize: CGSize, on screen: NSScreen) -> NSRect { private func frame(for windowSize: CGSize, on screen: NSScreen) -> NSRect {
@ -145,7 +156,7 @@ class LockScreenLiveActivityWindowManager {
if let hostingView { if let hostingView {
hostingView.frame = CGRect(origin: .zero, size: targetFrame.size) hostingView.frame = CGRect(origin: .zero, size: targetFrame.size)
hostingView.rootView = LockScreenLiveActivityOverlay(model: overlayModel, animator: overlayAnimator, notchSize: context.notchSize) hostingView.rootView = LockScreenLiveActivityOverlay(model: overlayModel, animator: overlayAnimator, notchSize: context.notchSize, isDynamicIslandMode: isDynamicIslandMode)
} }
currentNotchSize = context.notchSize currentNotchSize = context.notchSize
@ -164,7 +175,7 @@ class LockScreenLiveActivityWindowManager {
let targetFrame = frame(for: windowSize, on: screen) let targetFrame = frame(for: windowSize, on: screen)
window.setFrame(targetFrame, display: true) window.setFrame(targetFrame, display: true)
let overlayView = LockScreenLiveActivityOverlay(model: overlayModel, animator: overlayAnimator, notchSize: notchSize) let overlayView = LockScreenLiveActivityOverlay(model: overlayModel, animator: overlayAnimator, notchSize: notchSize, isDynamicIslandMode: isDynamicIslandMode)
if let hostingView { if let hostingView {
hostingView.rootView = overlayView hostingView.rootView = overlayView
@ -197,7 +208,7 @@ class LockScreenLiveActivityWindowManager {
hideTask?.cancel() hideTask?.cancel()
guard let context = lockContext() else { return } guard let context = lockContext() else { return }
let collapsedScale = LockScreenLiveActivityOverlay.collapsedScale(for: context.notchSize) let collapsedScale = LockScreenLiveActivityOverlay.collapsedScale(for: context.notchSize, isDynamicIslandMode: isDynamicIslandMode)
overlayAnimator.update(isLocked: true) overlayAnimator.update(isLocked: true)
overlayModel.scale = collapsedScale overlayModel.scale = collapsedScale
@ -249,7 +260,7 @@ class LockScreenLiveActivityWindowManager {
let targetScale: CGFloat let targetScale: CGFloat
if let notchSize = currentNotchSize { if let notchSize = currentNotchSize {
targetScale = LockScreenLiveActivityOverlay.collapsedScale(for: notchSize) targetScale = LockScreenLiveActivityOverlay.collapsedScale(for: notchSize, isDynamicIslandMode: isDynamicIslandMode)
} else { } else {
targetScale = 0.7 targetScale = 0.7
} }