mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Update fix for Sneak Peek
This commit is contained in:
Hariharan Mudaliar
parent
9214c61544
commit
a4e58b9e70
3 changed files with 137 additions and 183 deletions
|
|
@ -13,6 +13,7 @@ import Foundation
|
|||
import KeyboardShortcuts
|
||||
import SwiftUI
|
||||
import SwiftUIIntrospect
|
||||
import AtollExtensionKit
|
||||
#if canImport(AppKit)
|
||||
import AppKit
|
||||
#elseif canImport(UIKit)
|
||||
|
|
@ -563,13 +564,10 @@ struct ContentView: View {
|
|||
let inlinePayload = extensionLiveActivityManager.payload(bundleIdentifier: bundleID, activityID: activityID)
|
||||
ExtensionInlineSneakPeekView(
|
||||
payload: inlinePayload,
|
||||
title: coordinator.sneakPeek.title,
|
||||
subtitle: coordinator.sneakPeek.subtitle,
|
||||
accentColor: coordinator.sneakPeek.accentColor ?? .gray,
|
||||
notchHeight: vm.effectiveClosedNotchHeight,
|
||||
closedNotchWidth: vm.closedNotchSize.width,
|
||||
isHovering: isHovering,
|
||||
gestureProgress: gestureProgress
|
||||
isHovering: isHovering
|
||||
)
|
||||
.transition(AnyTransition.move(edge: .trailing).combined(with: .opacity))
|
||||
} else if coordinator.sneakPeek.show && Defaults[.inlineHUD] && (coordinator.sneakPeek.type != .music) && (coordinator.sneakPeek.type != .battery) && (coordinator.sneakPeek.type != .timer) && (coordinator.sneakPeek.type != .reminder) && (coordinator.sneakPeek.type != .volume || vm.notchState == .closed) {
|
||||
|
|
@ -600,12 +598,10 @@ struct ContentView: View {
|
|||
} else if (!coordinator.expandingView.show || coordinator.expandingView.type == .privacy) && vm.notchState == .closed && privacyManager.hasAnyIndicator && (Defaults[.enableCameraDetection] || Defaults[.enableMicrophoneDetection]) && !vm.hideOnClosed {
|
||||
PrivacyLiveActivity()
|
||||
} else if let extensionPayload = extensionStandalonePayload {
|
||||
let suppressingCenterText = shouldSuppressExtensionCenter(for: extensionPayload)
|
||||
let layout = extensionStandaloneLayout(
|
||||
for: extensionPayload,
|
||||
notchHeight: vm.effectiveClosedNotchHeight,
|
||||
isHovering: isHovering,
|
||||
suppressingCenterText: suppressingCenterText
|
||||
isHovering: isHovering
|
||||
)
|
||||
ExtensionLiveActivityStandaloneView(
|
||||
payload: extensionPayload,
|
||||
|
|
@ -676,25 +672,31 @@ struct ContentView: View {
|
|||
}
|
||||
}
|
||||
// Extension live activity sneak peek
|
||||
else if case .extensionLiveActivity = coordinator.sneakPeek.type {
|
||||
else if case let .extensionLiveActivity(bundleID, activityID) = coordinator.sneakPeek.type {
|
||||
if !vm.hideOnClosed && activeSneakPeekStyle == .standard {
|
||||
HStack(alignment: .center, spacing: 6) {
|
||||
if !coordinator.sneakPeek.icon.isEmpty {
|
||||
Image(systemName: coordinator.sneakPeek.icon)
|
||||
}
|
||||
let payload = extensionLiveActivityManager.payload(bundleIdentifier: bundleID, activityID: activityID)
|
||||
let descriptor = payload?.descriptor
|
||||
let accent = (descriptor?.accentColor.swiftUIColor ?? coordinator.sneakPeek.accentColor ?? .gray)
|
||||
.ensureMinimumBrightness(factor: 0.7)
|
||||
GeometryReader { geo in
|
||||
let combinedText = coordinator.sneakPeek.subtitle.isEmpty ?
|
||||
coordinator.sneakPeek.title :
|
||||
"\(coordinator.sneakPeek.title) - \(coordinator.sneakPeek.subtitle)"
|
||||
HStack(spacing: 6) {
|
||||
RoundedRectangle(cornerRadius: 2)
|
||||
.fill(accent)
|
||||
.frame(width: 8, height: 12)
|
||||
MarqueeText(
|
||||
.constant(combinedText),
|
||||
textColor: coordinator.sneakPeek.accentColor ?? .gray,
|
||||
.constant(
|
||||
extensionSneakPeekText(
|
||||
preferredTitle: coordinator.sneakPeek.title,
|
||||
preferredSubtitle: coordinator.sneakPeek.subtitle,
|
||||
descriptor: descriptor
|
||||
)
|
||||
),
|
||||
textColor: accent,
|
||||
minDuration: 1,
|
||||
frameWidth: geo.size.width
|
||||
frameWidth: max(0, geo.size.width - 14)
|
||||
)
|
||||
}
|
||||
}
|
||||
.foregroundStyle(coordinator.sneakPeek.accentColor ?? .gray)
|
||||
.padding(.bottom, 10)
|
||||
}
|
||||
}
|
||||
|
|
@ -776,6 +778,19 @@ struct ContentView: View {
|
|||
}
|
||||
}
|
||||
|
||||
private func extensionSneakPeekText(preferredTitle: String, preferredSubtitle: String?, descriptor: AtollLiveActivityDescriptor?) -> String {
|
||||
let trimmedPreferredTitle = preferredTitle.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let descriptorTitle = descriptor?.title.trimmingCharacters(in: .whitespacesAndNewlines) ?? "Extension"
|
||||
let title = trimmedPreferredTitle.isEmpty ? descriptorTitle : trimmedPreferredTitle
|
||||
|
||||
let trimmedPreferredSubtitle = preferredSubtitle?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
let descriptorSubtitle = descriptor?.subtitle?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
let subtitle = !trimmedPreferredSubtitle.isEmpty ? trimmedPreferredSubtitle : descriptorSubtitle
|
||||
|
||||
guard !subtitle.isEmpty else { return title }
|
||||
return "\(title) • \(subtitle)"
|
||||
}
|
||||
|
||||
private let reminderTimeFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .none
|
||||
|
|
@ -1286,7 +1301,7 @@ struct ContentView: View {
|
|||
return payload
|
||||
}
|
||||
|
||||
private func extensionStandaloneLayout(for payload: ExtensionLiveActivityPayload, notchHeight: CGFloat, isHovering: Bool, suppressingCenterText: Bool) -> ExtensionStandaloneLayout {
|
||||
private func extensionStandaloneLayout(for payload: ExtensionLiveActivityPayload, notchHeight: CGFloat, isHovering: Bool) -> ExtensionStandaloneLayout {
|
||||
let outerHeight = notchHeight
|
||||
let contentHeight = max(0, notchHeight - (isHovering ? 0 : 12))
|
||||
let leadingWidth = max(contentHeight, 44)
|
||||
|
|
@ -1303,15 +1318,10 @@ struct ContentView: View {
|
|||
contentHeight: contentHeight,
|
||||
leadingWidth: leadingWidth,
|
||||
centerWidth: centerWidth,
|
||||
trailingWidth: trailingWidth,
|
||||
suppressingCenterText: suppressingCenterText
|
||||
trailingWidth: trailingWidth
|
||||
)
|
||||
}
|
||||
|
||||
private func shouldSuppressExtensionCenter(for payload: ExtensionLiveActivityPayload) -> Bool {
|
||||
vm.notchState == .closed
|
||||
}
|
||||
|
||||
@MainActor
|
||||
private final class ExtensionRoutingDiagnostics {
|
||||
static let shared = ExtensionRoutingDiagnostics()
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ struct ExtensionStandaloneLayout {
|
|||
let leadingWidth: CGFloat
|
||||
let centerWidth: CGFloat
|
||||
let trailingWidth: CGFloat
|
||||
let suppressingCenterText: Bool
|
||||
}
|
||||
|
||||
struct ExtensionLiveActivityStandaloneView: View {
|
||||
|
|
@ -23,17 +22,6 @@ struct ExtensionLiveActivityStandaloneView: View {
|
|||
private var resolvedLeadingContent: AtollTrailingContent {
|
||||
resolvedExtensionLeadingContent(for: descriptor)
|
||||
}
|
||||
private var resolvedCenterStyle: ExtensionCenterContentView.Style {
|
||||
switch descriptor.centerTextStyle {
|
||||
case .inline:
|
||||
return .inline
|
||||
case .standard:
|
||||
return .stacked
|
||||
case .inheritUser:
|
||||
return Defaults[.sneakPeekStyles] == .inline ? .inline : .stacked
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
ExtensionLeadingContentView(
|
||||
|
|
@ -49,20 +37,7 @@ struct ExtensionLiveActivityStandaloneView: View {
|
|||
Rectangle()
|
||||
.fill(Color.black)
|
||||
.frame(width: layout.centerWidth, height: contentHeight)
|
||||
.overlay(
|
||||
Group {
|
||||
if layout.suppressingCenterText {
|
||||
EmptyView()
|
||||
} else {
|
||||
ExtensionCenterContentView(
|
||||
descriptor: descriptor,
|
||||
accent: accentColor,
|
||||
width: layout.centerWidth,
|
||||
style: resolvedCenterStyle
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
.overlay(EmptyView())
|
||||
|
||||
ExtensionMusicWingView(
|
||||
payload: payload,
|
||||
|
|
@ -182,57 +157,6 @@ struct ExtensionLeadingContentView: View {
|
|||
}
|
||||
}
|
||||
|
||||
struct ExtensionCenterContentView: View {
|
||||
enum Style {
|
||||
case stacked
|
||||
case inline
|
||||
}
|
||||
|
||||
let descriptor: AtollLiveActivityDescriptor
|
||||
let accent: Color
|
||||
let width: CGFloat
|
||||
let style: Style
|
||||
|
||||
var body: some View {
|
||||
switch style {
|
||||
case .stacked:
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(descriptor.title)
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.foregroundStyle(.white)
|
||||
.lineLimit(1)
|
||||
if let subtitle = descriptor.subtitle, !subtitle.isEmpty {
|
||||
Text(subtitle)
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.foregroundStyle(Color.white.opacity(0.7))
|
||||
.lineLimit(1)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
case .inline:
|
||||
HStack(alignment: .center, spacing: 8) {
|
||||
MarqueeText(
|
||||
.constant(descriptor.title),
|
||||
font: .system(size: 13, weight: .semibold),
|
||||
nsFont: .body,
|
||||
textColor: .white,
|
||||
minDuration: 0.4,
|
||||
frameWidth: max(40, width * 0.55)
|
||||
)
|
||||
Spacer(minLength: 4)
|
||||
if let subtitle = descriptor.subtitle, !subtitle.isEmpty {
|
||||
Text(subtitle)
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.foregroundStyle(Color.white.opacity(0.75))
|
||||
.lineLimit(1)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func logExtensionDiagnostics(_ message: String) {
|
||||
guard Defaults[.extensionDiagnosticsLoggingEnabled] else { return }
|
||||
Logger.log(message, category: .extensions)
|
||||
|
|
@ -382,120 +306,140 @@ struct ExtensionNotchSectionView: View {
|
|||
|
||||
struct ExtensionInlineSneakPeekView: View {
|
||||
let payload: ExtensionLiveActivityPayload?
|
||||
let title: String
|
||||
let subtitle: String?
|
||||
let accentColor: Color
|
||||
let notchHeight: CGFloat
|
||||
let closedNotchWidth: CGFloat
|
||||
let isHovering: Bool
|
||||
let gestureProgress: CGFloat
|
||||
|
||||
private let wingPadding: CGFloat = 16
|
||||
|
||||
private var descriptor: AtollLiveActivityDescriptor? { payload?.descriptor }
|
||||
private var resolvedAccent: Color { descriptor?.accentColor.swiftUIColor ?? accentColor }
|
||||
private var contentHeight: CGFloat {
|
||||
max(0, notchHeight - (isHovering ? 0 : 12))
|
||||
private var trailingRenderable: ExtensionTrailingRenderable? {
|
||||
descriptor.map { resolvedExtensionTrailingRenderable(for: $0) }
|
||||
}
|
||||
|
||||
private var leadingWidth: CGFloat {
|
||||
let base = max(contentHeight, 44)
|
||||
return max(base * 0.85, base + gestureProgress / 2)
|
||||
private var contentHeight: CGFloat {
|
||||
max(0, notchHeight - (isHovering ? 0 : 12))
|
||||
}
|
||||
|
||||
private var centerWidth: CGFloat {
|
||||
max(closedNotchWidth + (isHovering ? 8 : 0), 120)
|
||||
}
|
||||
|
||||
private var trailingWidth: CGFloat {
|
||||
max(leadingWidth * 0.9, 120)
|
||||
private var iconDiameter: CGFloat {
|
||||
max(contentHeight - 8, 28)
|
||||
}
|
||||
|
||||
private var marqueeFrameWidth: CGFloat {
|
||||
max(48, centerWidth - 24)
|
||||
private var leftWingWidth: CGFloat {
|
||||
wingPadding + iconDiameter
|
||||
}
|
||||
|
||||
private var resolvedTitle: String {
|
||||
let descriptorTitle = descriptor?.title ?? "Extension"
|
||||
let preferred = title.isEmpty ? descriptorTitle : title
|
||||
return preferred.isEmpty ? "Extension" : preferred
|
||||
private var baseTrailingWidth: CGFloat {
|
||||
max(iconDiameter, 56)
|
||||
}
|
||||
|
||||
private var resolvedSubtitle: String {
|
||||
if let subtitle, !subtitle.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
return subtitle.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
private var trailingContentWidth: CGFloat {
|
||||
guard let payload else { return baseTrailingWidth }
|
||||
return ExtensionLayoutMetrics.trailingWidth(
|
||||
for: payload,
|
||||
baseWidth: baseTrailingWidth,
|
||||
maxWidth: baseTrailingWidth + centerWidth * 0.6
|
||||
)
|
||||
}
|
||||
if let descriptorSubtitle = descriptor?.subtitle, !descriptorSubtitle.isEmpty {
|
||||
return descriptorSubtitle
|
||||
|
||||
private var rightWingWidth: CGFloat {
|
||||
wingPadding + trailingContentWidth
|
||||
}
|
||||
return ""
|
||||
|
||||
private var trailingContentAvailableWidth: CGFloat {
|
||||
max(0, trailingContentWidth - wingPadding)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
leadingWing
|
||||
.frame(width: leadingWidth, height: contentHeight)
|
||||
|
||||
Rectangle()
|
||||
.fill(Color.black)
|
||||
.frame(width: centerWidth, height: contentHeight)
|
||||
.overlay(alignment: .bottomLeading) {
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
MarqueeText(
|
||||
.constant(resolvedTitle),
|
||||
font: .system(size: 12, weight: .semibold),
|
||||
nsFont: .subheadline,
|
||||
textColor: .white,
|
||||
minDuration: 0.4,
|
||||
frameWidth: marqueeFrameWidth
|
||||
)
|
||||
if !resolvedSubtitle.isEmpty {
|
||||
Text(resolvedSubtitle)
|
||||
.font(.system(size: 11, weight: .regular))
|
||||
.foregroundStyle(Color.white.opacity(0.75))
|
||||
.lineLimit(1)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.bottom, 6)
|
||||
}
|
||||
|
||||
centerSection
|
||||
trailingWing
|
||||
.frame(width: trailingWidth, height: contentHeight)
|
||||
}
|
||||
.frame(height: notchHeight + (isHovering ? 8 : 0), alignment: .center)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var leadingWing: some View {
|
||||
Color.clear
|
||||
.frame(width: leftWingWidth, height: contentHeight)
|
||||
.background(alignment: .leading) {
|
||||
Group {
|
||||
if let descriptor {
|
||||
ExtensionLeadingContentView(
|
||||
content: resolvedExtensionLeadingContent(for: descriptor),
|
||||
badge: descriptor.badgeIcon,
|
||||
accent: resolvedAccent,
|
||||
frameWidth: leadingWidth,
|
||||
frameHeight: contentHeight,
|
||||
frameWidth: iconDiameter,
|
||||
frameHeight: iconDiameter,
|
||||
defaultIcon: descriptor.leadingIcon
|
||||
)
|
||||
} else {
|
||||
RoundedRectangle(cornerRadius: contentHeight * 0.25, style: .continuous)
|
||||
RoundedRectangle(cornerRadius: iconDiameter * 0.25, style: .continuous)
|
||||
.fill(resolvedAccent.gradient)
|
||||
.frame(width: iconDiameter, height: iconDiameter)
|
||||
}
|
||||
}
|
||||
.frame(width: iconDiameter, height: iconDiameter)
|
||||
.frame(maxHeight: .infinity, alignment: .center)
|
||||
.padding(.leading, wingPadding / 2)
|
||||
}
|
||||
}
|
||||
|
||||
private var centerSection: some View {
|
||||
Rectangle()
|
||||
.fill(Color.black)
|
||||
.frame(width: centerWidth, height: contentHeight)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var trailingWing: some View {
|
||||
VStack {
|
||||
Rectangle()
|
||||
.fill(resolvedAccent.gradient)
|
||||
.mask {
|
||||
AudioSpectrumView(isPlaying: .constant(true))
|
||||
.frame(width: 18, height: 12)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
Color.clear
|
||||
.frame(width: rightWingWidth, height: contentHeight)
|
||||
.background(alignment: .trailing) {
|
||||
if let descriptor, let trailingRenderable {
|
||||
VStack(alignment: .trailing, spacing: 6) {
|
||||
switch trailingRenderable {
|
||||
case let .content(content):
|
||||
if case .none = content {
|
||||
Spacer(minLength: 0)
|
||||
} else {
|
||||
ExtensionEdgeContentView(
|
||||
content: content,
|
||||
accent: resolvedAccent,
|
||||
availableWidth: trailingContentAvailableWidth,
|
||||
alignment: .trailing
|
||||
)
|
||||
.frame(maxWidth: trailingContentAvailableWidth, alignment: .trailing)
|
||||
}
|
||||
case let .indicator(indicator):
|
||||
ExtensionProgressIndicatorView(
|
||||
indicator: indicator,
|
||||
progress: descriptor.progress,
|
||||
accent: resolvedAccent,
|
||||
estimatedDuration: descriptor.estimatedDuration,
|
||||
maxVisualHeight: contentHeight
|
||||
)
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
|
||||
.padding(.trailing, 8)
|
||||
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(.trailing, wingPadding / 2)
|
||||
.padding(.vertical, 6)
|
||||
} else {
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(resolvedAccent.opacity(0.25))
|
||||
.frame(width: max(32, trailingContentAvailableWidth * 0.6), height: max(16, contentHeight * 0.4))
|
||||
.padding(.trailing, wingPadding / 2)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .trailing)
|
||||
.padding(.vertical, 6)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -352,8 +352,8 @@ struct ExtensionProgressIndicatorView: View {
|
|||
|
||||
private func resolvedRingDiameter(requested: CGFloat) -> CGFloat {
|
||||
guard let maxVisualHeight else { return requested }
|
||||
let clamped = min(requested, max(maxVisualHeight - 6, 18))
|
||||
return max(18, clamped)
|
||||
let target = max(min(maxVisualHeight - 12, 24), 16)
|
||||
return min(requested, target)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue