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

Sneak peek is a bit issue

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-01-15 23:50:22 +05:30
commit 88692a241a
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
3 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
DynamicIsland/ContentView.swift
View file

@ -1271,13 +1271,7 @@ struct ContentView: View {
let outerHeight = notchHeight
let contentHeight = max(0, notchHeight - (isHovering ? 0 : 12))
let leadingWidth = max(contentHeight, 44)
let centerWidth: CGFloat = {
if suppressingCenterText {
let base = vm.closedNotchSize.width * 0.35
return max(64, min(base, 96))
}
return max(vm.closedNotchSize.width + (isHovering ? 8 : 0), 96)
}()
let centerWidth: CGFloat = max(vm.closedNotchSize.width + (isHovering ? 8 : 0), 96)
let trailingWidth = ExtensionLayoutMetrics.trailingWidth(
for: payload,
baseWidth: leadingWidth,
@ -1297,13 +1291,8 @@ struct ContentView: View {
private func shouldSuppressExtensionCenter(for payload: ExtensionLiveActivityPayload) -> Bool {
guard vm.notchState == .closed else { return false }
let descriptor = payload.descriptor
guard descriptor.sneakPeekConfig?.enabled ?? true else { return false }
guard coordinator.sneakPeek.show else { return false }
guard case let .extensionLiveActivity(bundleID, activityID) = coordinator.sneakPeek.type else { return false }
guard bundleID == payload.bundleIdentifier && activityID == descriptor.id else { return false }
let style = coordinator.sneakPeek.styleOverride ?? Defaults[.sneakPeekStyles]
return style == .inline
let config = payload.descriptor.sneakPeekConfig ?? .default
return config.enabled
}
@MainActor

38
DynamicIsland/components/Extensions/ExtensionLiveActivityViews.swift
View file

@ -344,12 +344,37 @@ struct ExtensionInlineSneakPeekView: View {
@ViewBuilder
private var trailingWing: some View {
if let payload {
ExtensionMusicWingView(
payload: payload,
notchHeight: contentHeight,
trailingWidth: trailingWidth
)
let descriptor = payload.descriptor
switch resolvedExtensionTrailingRenderable(for: descriptor) {
case let .content(content):
if case .none = content {
spectrumPlaceholder
} else {
VStack(alignment: .trailing, spacing: 6) {
ExtensionEdgeContentView(
content: content,
accent: resolvedAccent,
availableWidth: trailingWidth,
alignment: .trailing
)
.frame(maxWidth: .infinity, alignment: .trailing)
Spacer(minLength: 0)
}
.padding(.trailing, 8)
.padding(.vertical, 6)
}
case .indicator:
spectrumPlaceholder
}
} else {
spectrumPlaceholder
}
}
@ViewBuilder
private var spectrumPlaceholder: some View {
VStack {
Rectangle()
.fill(resolvedAccent.gradient)
.mask {
@ -358,5 +383,8 @@ struct ExtensionInlineSneakPeekView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
.padding(.trailing, 8)
.padding(.vertical, 6)
}
}

10
DynamicIsland/components/Extensions/ExtensionRenderingHelpers.swift
View file

@ -318,10 +318,13 @@ struct ExtensionProgressIndicatorView: View {
.monospacedDigit()
case let .countdown(font, color):
let textColor = color?.swiftUIColor ?? accent
Text(countdownText)
let text = countdownText
Text(text)
.font(font.swiftUIFont())
.foregroundStyle(textColor)
.monospacedDigit()
.contentTransition(.numericText())
.animation(.smooth(duration: 0.25), value: text)
case .lottie:
Image(systemName: "sparkles")
.font(.system(size: 14, weight: .medium))
@ -418,10 +421,13 @@ struct ExtensionCountdownTextView: View {
var body: some View {
TimelineView(.periodic(from: .now, by: 1)) { context in
Text(formattedRemaining(since: context.date))
let remainingText = formattedRemaining(since: context.date)
Text(remainingText)
.font(font.swiftUIFont())
.foregroundStyle(customColor ?? accent)
.monospacedDigit()
.contentTransition(.numericText())
.animation(.smooth(duration: 0.25), value: remainingText)
}
}