mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 23:24:32 +00:00
new version
This commit is contained in:
delli
parent
cc09f17074
commit
c8a6c2b1fa
10 changed files with 1531 additions and 187 deletions
|
|
@ -36,6 +36,7 @@ struct LockScreenMusicPanel: View {
|
|||
|
||||
@ObservedObject var musicManager = MusicManager.shared
|
||||
@ObservedObject private var routeManager = AudioRouteManager.shared
|
||||
@ObservedObject private var fullscreenArtworkManager = FullScreenArtworkWindowManager.shared
|
||||
@StateObject private var volumeModel = MediaOutputVolumeViewModel()
|
||||
@ObservedObject private var airPlayManager = AppleMusicAirPlayManager.shared
|
||||
@ObservedObject private var animator: LockScreenPanelAnimator
|
||||
|
|
@ -122,6 +123,22 @@ struct LockScreenMusicPanel: View {
|
|||
private var usesEnhancedCustomLiquidBorder: Bool {
|
||||
usesCustomLiquidGlass && useEnhancedLiquidBorder
|
||||
}
|
||||
|
||||
private var hidesInlineArtworkForSpotifyCanvasFallback: Bool {
|
||||
fullscreenArtworkManager.isShowingSpotifyCanvasFallback
|
||||
}
|
||||
|
||||
private var usesSpotifyCanvasFallbackContentPresentation: Bool {
|
||||
fullscreenArtworkManager.isShowingSpotifyCanvasFallback
|
||||
}
|
||||
|
||||
private var showsDetachedFullscreenLyrics: Bool {
|
||||
usesSpotifyCanvasFallbackContentPresentation && enableLyrics
|
||||
}
|
||||
|
||||
private var shouldShowInlineLyrics: Bool {
|
||||
enableLyrics && !showsDetachedFullscreenLyrics
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
if isActive && musicManager.hasActiveSession {
|
||||
|
|
@ -140,12 +157,17 @@ struct LockScreenMusicPanel: View {
|
|||
.frame(width: currentSize.width, height: currentSize.height, alignment: .topLeading)
|
||||
.clipShape(RoundedRectangle(cornerRadius: panelCornerRadius, style: .continuous))
|
||||
.overlay {
|
||||
if showPanelBorder {
|
||||
if showPanelBorder && !usesSpotifyCanvasFallbackContentPresentation {
|
||||
panelBorderOverlay
|
||||
}
|
||||
}
|
||||
.shadow(color: Color.black.opacity(0.3), radius: 20, x: 0, y: 10)
|
||||
.contentShape(RoundedRectangle(cornerRadius: panelCornerRadius, style: .continuous))
|
||||
.shadow(
|
||||
color: usesSpotifyCanvasFallbackContentPresentation ? .clear : Color.black.opacity(0.3),
|
||||
radius: usesSpotifyCanvasFallbackContentPresentation ? 0 : 20,
|
||||
x: 0,
|
||||
y: usesSpotifyCanvasFallbackContentPresentation ? 0 : 10
|
||||
)
|
||||
.contentShape(Rectangle())
|
||||
.animation(.easeInOut(duration: 0.28), value: isExpanded)
|
||||
.animation(.easeInOut(duration: 0.24), value: shouldShowVolumeSlider)
|
||||
.onAppear {
|
||||
|
|
@ -231,9 +253,13 @@ struct LockScreenMusicPanel: View {
|
|||
collapsedLayout
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, isExpanded ? 24 : 20)
|
||||
.padding(.vertical, isExpanded ? 22 : 16)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
|
||||
.padding(.horizontal, usesSpotifyCanvasFallbackContentPresentation ? 8 : (isExpanded ? 24 : 20))
|
||||
.padding(.vertical, usesSpotifyCanvasFallbackContentPresentation ? 0 : (isExpanded ? 22 : 16))
|
||||
.frame(
|
||||
maxWidth: .infinity,
|
||||
maxHeight: .infinity,
|
||||
alignment: usesSpotifyCanvasFallbackContentPresentation ? .center : .topLeading
|
||||
)
|
||||
}
|
||||
|
||||
private var collapsedLayout: some View {
|
||||
|
|
@ -248,25 +274,40 @@ struct LockScreenMusicPanel: View {
|
|||
}
|
||||
|
||||
private var expandedLayout: some View {
|
||||
HStack(alignment: .center, spacing: expandedContentSpacing) {
|
||||
albumArtButton(size: 230, cornerRadius: expandedAlbumArtCornerRadius)
|
||||
.frame(width: 230, height: 230)
|
||||
Group {
|
||||
if hidesInlineArtworkForSpotifyCanvasFallback {
|
||||
VStack(alignment: .leading, spacing: 20) {
|
||||
expandedHeader
|
||||
progressBar
|
||||
.padding(.top, 10)
|
||||
.frame(maxWidth: .infinity)
|
||||
playbackControls(alignment: .leading)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
} else {
|
||||
HStack(alignment: .center, spacing: expandedContentSpacing) {
|
||||
albumArtButton(size: 230, cornerRadius: expandedAlbumArtCornerRadius)
|
||||
.frame(width: 230, height: 230)
|
||||
|
||||
VStack(alignment: .leading, spacing: 20) {
|
||||
expandedHeader
|
||||
progressBar
|
||||
.padding(.top, 10)
|
||||
.frame(maxWidth: .infinity)
|
||||
playbackControls(alignment: .leading)
|
||||
VStack(alignment: .leading, spacing: 20) {
|
||||
expandedHeader
|
||||
progressBar
|
||||
.padding(.top, 10)
|
||||
.frame(maxWidth: .infinity)
|
||||
playbackControls(alignment: .leading)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
.frame(maxHeight: .infinity, alignment: .center)
|
||||
}
|
||||
|
||||
private var collapsedHeader: some View {
|
||||
HStack(alignment: .center, spacing: 16) {
|
||||
albumArtButton(size: 60, cornerRadius: collapsedAlbumArtCornerRadius)
|
||||
HStack(alignment: .center, spacing: hidesInlineArtworkForSpotifyCanvasFallback ? 10 : 16) {
|
||||
if !hidesInlineArtworkForSpotifyCanvasFallback {
|
||||
albumArtButton(size: 60, cornerRadius: collapsedAlbumArtCornerRadius)
|
||||
}
|
||||
|
||||
GeometryReader { geo in
|
||||
VStack(alignment: .leading, spacing: 1) {
|
||||
|
|
@ -338,9 +379,11 @@ struct LockScreenMusicPanel: View {
|
|||
}
|
||||
|
||||
private func albumArtButton(size: CGFloat, cornerRadius: CGFloat) -> some View {
|
||||
ZStack(alignment: .bottomTrailing) {
|
||||
let artworkCornerRadius = resolvedArtworkCornerRadius(from: cornerRadius)
|
||||
|
||||
return ZStack(alignment: .bottomTrailing) {
|
||||
if isArtworkFullscreen && !keepAlbumArtVisibleDuringFullscreenArtwork {
|
||||
RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
|
||||
RoundedRectangle(cornerRadius: artworkCornerRadius, style: .continuous)
|
||||
.fill(Color.white.opacity(0.06))
|
||||
.overlay(
|
||||
Image(systemName: "photo.fill")
|
||||
|
|
@ -366,8 +409,8 @@ struct LockScreenMusicPanel: View {
|
|||
suspended: isParallaxSuspended
|
||||
)
|
||||
.frame(width: size)
|
||||
.background(albumArtBackground(cornerRadius: cornerRadius))
|
||||
.clipShape(RoundedRectangle(cornerRadius: musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? appIconCornerRadius/3 : appIconCornerRadius, style: .continuous))
|
||||
.background(albumArtBackground(cornerRadius: artworkCornerRadius))
|
||||
.clipShape(RoundedRectangle(cornerRadius: artworkCornerRadius, style: .continuous))
|
||||
.opacity(musicManager.isPlaying ? 1 : 0.4)
|
||||
.scaleEffect(musicManager.isPlaying ? 1 : 0.85)
|
||||
.animation(.easeInOut(duration: 0.2), value: musicManager.isPlaying)
|
||||
|
|
@ -544,7 +587,7 @@ struct LockScreenMusicPanel: View {
|
|||
|
||||
private func playbackControls(alignment: Alignment) -> some View {
|
||||
let spacing: CGFloat = isExpanded ? 24 : 20
|
||||
let verticalSpacing: CGFloat = (shouldShowVolumeSlider || enableLyrics) ? 14 : 10
|
||||
let verticalSpacing: CGFloat = (shouldShowVolumeSlider || shouldShowInlineLyrics) ? 14 : 10
|
||||
|
||||
return VStack(spacing: verticalSpacing) {
|
||||
controlsRow(alignment: alignment, spacing: spacing)
|
||||
|
|
@ -565,7 +608,7 @@ struct LockScreenMusicPanel: View {
|
|||
}
|
||||
}
|
||||
|
||||
if enableLyrics {
|
||||
if shouldShowInlineLyrics {
|
||||
lyricsSection(alignment: alignment)
|
||||
.transition(.move(edge: .top).combined(with: .opacity))
|
||||
}
|
||||
|
|
@ -1009,7 +1052,7 @@ struct LockScreenMusicPanel: View {
|
|||
}
|
||||
|
||||
private var lyricsExtraHeight: CGFloat {
|
||||
lyricsHeight(forExpanded: isExpanded, enabled: enableLyrics)
|
||||
lyricsHeight(forExpanded: isExpanded, enabled: shouldShowInlineLyrics)
|
||||
}
|
||||
|
||||
private var accessorySectionExtraHeight: CGFloat {
|
||||
|
|
@ -1039,7 +1082,7 @@ struct LockScreenMusicPanel: View {
|
|||
private func panelAdditionalHeight(forExpanded expanded: Bool) -> CGFloat {
|
||||
sliderHeight(forExpanded: expanded, visible: shouldShowVolumeSlider) +
|
||||
accessorySectionExtraHeight +
|
||||
lyricsHeight(forExpanded: expanded, enabled: enableLyrics)
|
||||
lyricsHeight(forExpanded: expanded, enabled: shouldShowInlineLyrics)
|
||||
}
|
||||
|
||||
private func updatePanelSize(animated: Bool = true) {
|
||||
|
|
@ -1094,7 +1137,11 @@ struct LockScreenMusicPanel: View {
|
|||
|
||||
@ViewBuilder
|
||||
private var panelBackgroundLayer: some View {
|
||||
if usesCustomLiquidGlass {
|
||||
if usesSpotifyCanvasFallbackContentPresentation {
|
||||
Color.clear
|
||||
.allowsHitTesting(false)
|
||||
.accessibilityHidden(true)
|
||||
} else if usesCustomLiquidGlass {
|
||||
customLiquidPanelBackdrop
|
||||
} else if usesStandardLiquidGlass {
|
||||
standardLiquidPanelBackdrop
|
||||
|
|
@ -1192,7 +1239,8 @@ struct LockScreenMusicPanel: View {
|
|||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: .fit)
|
||||
.clipShape(RoundedRectangle(cornerRadius: musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? cornerRadius/3 : cornerRadius))
|
||||
.compositingGroup()
|
||||
.clipShape(RoundedRectangle(cornerRadius: resolvedArtworkCornerRadius(from: cornerRadius), style: .continuous))
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
|
|
@ -1230,6 +1278,13 @@ struct LockScreenMusicPanel: View {
|
|||
isExpanded ? 18 : 12
|
||||
}
|
||||
|
||||
private func resolvedArtworkCornerRadius(from baseCornerRadius: CGFloat) -> CGFloat {
|
||||
let aspectRatio = musicManager.albumArt.size.height > 0
|
||||
? musicManager.albumArt.size.width / musicManager.albumArt.size.height
|
||||
: 1
|
||||
return aspectRatio > 1.0 ? baseCornerRadius / 3 : baseCornerRadius
|
||||
}
|
||||
|
||||
@available(macOS 26.0, *)
|
||||
private func clearLiquidGlassSurface(cornerRadius: CGFloat) -> some View {
|
||||
RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
|
||||
|
|
@ -1480,9 +1535,48 @@ private extension View {
|
|||
|
||||
final class RightClickNSView: NSView {
|
||||
var onRightClick: (() -> Void)?
|
||||
private var eventMonitor: Any?
|
||||
|
||||
override func rightMouseDown(with event: NSEvent) {
|
||||
onRightClick?()
|
||||
deinit {
|
||||
removeEventMonitor()
|
||||
}
|
||||
|
||||
override func viewDidMoveToWindow() {
|
||||
super.viewDidMoveToWindow()
|
||||
|
||||
if window == nil {
|
||||
removeEventMonitor()
|
||||
} else {
|
||||
installEventMonitorIfNeeded()
|
||||
}
|
||||
}
|
||||
|
||||
override func hitTest(_ point: NSPoint) -> NSView? {
|
||||
nil
|
||||
}
|
||||
|
||||
private func installEventMonitorIfNeeded() {
|
||||
guard eventMonitor == nil else { return }
|
||||
|
||||
eventMonitor = NSEvent.addLocalMonitorForEvents(matching: [.rightMouseDown]) { [weak self] event in
|
||||
guard let self, let window = self.window, event.window === window else {
|
||||
return event
|
||||
}
|
||||
|
||||
let pointInView = self.convert(event.locationInWindow, from: nil)
|
||||
guard self.bounds.contains(pointInView) else {
|
||||
return event
|
||||
}
|
||||
|
||||
self.onRightClick?()
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
private func removeEventMonitor() {
|
||||
guard let eventMonitor else { return }
|
||||
NSEvent.removeMonitor(eventMonitor)
|
||||
self.eventMonitor = nil
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1113,8 +1113,17 @@ private struct MinimalisticReminderDetailsView: View {
|
|||
struct MinimalisticAlbumArtView: View {
|
||||
@ObservedObject var musicManager = MusicManager.shared
|
||||
@ObservedObject var vm: DynamicIslandViewModel
|
||||
@Default(.showLiveCanvasInDynamicIsland) private var showLiveCanvasInDynamicIsland
|
||||
let albumArtNamespace: Namespace.ID
|
||||
|
||||
private var usesLiveCanvasArtwork: Bool {
|
||||
showLiveCanvasInDynamicIsland && musicManager.videoArtworkURL != nil
|
||||
}
|
||||
|
||||
private var albumArtCornerRadius: CGFloat {
|
||||
musicManager.albumArt.size.width / musicManager.albumArt.size.height > 1.0 ? 4 : 12
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
ZStack(alignment: .bottomTrailing) {
|
||||
if Defaults[.lightingEffect] {
|
||||
|
|
@ -1128,16 +1137,27 @@ struct MinimalisticAlbumArtView: View {
|
|||
Color.clear
|
||||
.aspectRatio(1, contentMode: .fit)
|
||||
.background(
|
||||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.scaledToFill()
|
||||
DynamicIslandArtworkSourceView(
|
||||
cornerRadius: albumArtCornerRadius,
|
||||
contentMode: .fill
|
||||
)
|
||||
)
|
||||
.clipped()
|
||||
.clipShape(RoundedRectangle(cornerRadius: 12))
|
||||
.clipShape(RoundedRectangle(cornerRadius: albumArtCornerRadius))
|
||||
.scaleEffect(x: 1.3, y: 1.4)
|
||||
.rotationEffect(.degrees(92))
|
||||
.blur(radius: 35)
|
||||
.opacity(min(0.6, 1 - max(musicManager.albumArt.getBrightness(), 0.3)))
|
||||
.opacity(
|
||||
usesLiveCanvasArtwork
|
||||
? (musicManager.isPlaying ? 0.68 : 0.22)
|
||||
: min(0.6, 1 - max(musicManager.albumArt.getBrightness(), 0.3))
|
||||
)
|
||||
.shadow(
|
||||
color: Color(nsColor: musicManager.avgColor).opacity(usesLiveCanvasArtwork ? 0.28 : 0.16),
|
||||
radius: usesLiveCanvasArtwork ? 18 : 12,
|
||||
x: 0,
|
||||
y: 0
|
||||
)
|
||||
}
|
||||
|
||||
private var albumArtButton: some View {
|
||||
|
|
@ -1147,13 +1167,10 @@ struct MinimalisticAlbumArtView: View {
|
|||
Color.clear
|
||||
.aspectRatio(1, contentMode: .fit)
|
||||
.background(
|
||||
|
||||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: .fit)
|
||||
.clipShape(RoundedRectangle(cornerRadius: musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? 4 : 12))
|
||||
|
||||
|
||||
DynamicIslandArtworkSourceView(
|
||||
cornerRadius: albumArtCornerRadius,
|
||||
contentMode: .fit
|
||||
)
|
||||
)
|
||||
.clipped()
|
||||
.matchedGeometryEffect(id: "albumArt", in: albumArtNamespace)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,112 @@
|
|||
import Combine
|
||||
import Defaults
|
||||
import SwiftUI
|
||||
import AppKit
|
||||
import AVFoundation
|
||||
|
||||
private final class DynamicIslandArtworkLoopController {
|
||||
let player: AVQueuePlayer
|
||||
private var looper: AVPlayerLooper?
|
||||
|
||||
init(url: URL) {
|
||||
let item = AVPlayerItem(url: url)
|
||||
player = AVQueuePlayer()
|
||||
player.isMuted = true
|
||||
player.actionAtItemEnd = .none
|
||||
looper = AVPlayerLooper(player: player, templateItem: item)
|
||||
player.play()
|
||||
}
|
||||
|
||||
deinit {
|
||||
player.pause()
|
||||
looper = nil
|
||||
}
|
||||
}
|
||||
|
||||
private final class DynamicIslandArtworkVideoContainerView: NSView {
|
||||
let playerLayer = AVPlayerLayer()
|
||||
|
||||
override init(frame frameRect: NSRect) {
|
||||
super.init(frame: frameRect)
|
||||
wantsLayer = true
|
||||
layer?.backgroundColor = NSColor.clear.cgColor
|
||||
playerLayer.videoGravity = .resizeAspectFill
|
||||
playerLayer.backgroundColor = NSColor.clear.cgColor
|
||||
layer?.addSublayer(playerLayer)
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
nil
|
||||
}
|
||||
|
||||
override func layout() {
|
||||
super.layout()
|
||||
playerLayer.frame = bounds
|
||||
}
|
||||
}
|
||||
|
||||
private struct DynamicIslandArtworkVideoView: NSViewRepresentable {
|
||||
let url: URL
|
||||
let videoGravity: AVLayerVideoGravity
|
||||
|
||||
func makeCoordinator() -> Coordinator {
|
||||
Coordinator()
|
||||
}
|
||||
|
||||
func makeNSView(context: Context) -> DynamicIslandArtworkVideoContainerView {
|
||||
let view = DynamicIslandArtworkVideoContainerView(frame: .zero)
|
||||
context.coordinator.attach(layer: view.playerLayer, url: url, gravity: videoGravity)
|
||||
return view
|
||||
}
|
||||
|
||||
func updateNSView(_ nsView: DynamicIslandArtworkVideoContainerView, context: Context) {
|
||||
context.coordinator.attach(layer: nsView.playerLayer, url: url, gravity: videoGravity)
|
||||
}
|
||||
|
||||
final class Coordinator {
|
||||
private var controller: DynamicIslandArtworkLoopController?
|
||||
private var currentURL: URL?
|
||||
|
||||
func attach(layer: AVPlayerLayer, url: URL, gravity: AVLayerVideoGravity) {
|
||||
layer.videoGravity = gravity
|
||||
|
||||
if currentURL != url || controller == nil {
|
||||
currentURL = url
|
||||
controller = DynamicIslandArtworkLoopController(url: url)
|
||||
}
|
||||
|
||||
if layer.player !== controller?.player {
|
||||
layer.player = controller?.player
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct DynamicIslandArtworkSourceView: View {
|
||||
@ObservedObject private var musicManager = MusicManager.shared
|
||||
@Default(.showLiveCanvasInDynamicIsland) private var showLiveCanvasInDynamicIsland
|
||||
|
||||
let cornerRadius: CGFloat
|
||||
let contentMode: ContentMode
|
||||
|
||||
private var liveCanvasURL: URL? {
|
||||
guard showLiveCanvasInDynamicIsland else { return nil }
|
||||
return musicManager.videoArtworkURL
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Group {
|
||||
if let liveCanvasURL {
|
||||
DynamicIslandArtworkVideoView(url: liveCanvasURL, videoGravity: .resizeAspectFill)
|
||||
} else {
|
||||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: contentMode)
|
||||
}
|
||||
}
|
||||
.clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Music Player Components
|
||||
|
||||
|
|
@ -43,8 +149,23 @@ struct MusicPlayerView: View {
|
|||
struct AlbumArtView: View {
|
||||
@ObservedObject var musicManager = MusicManager.shared
|
||||
@ObservedObject var vm: DynamicIslandViewModel
|
||||
@Default(.showLiveCanvasInDynamicIsland) private var showLiveCanvasInDynamicIsland
|
||||
let albumArtNamespace: Namespace.ID
|
||||
|
||||
private var usesLiveCanvasArtwork: Bool {
|
||||
showLiveCanvasInDynamicIsland && musicManager.videoArtworkURL != nil
|
||||
}
|
||||
|
||||
private var albumArtCornerRadius: CGFloat {
|
||||
Defaults[.cornerRadiusScaling]
|
||||
? musicManager.albumArt.size.width / musicManager.albumArt.size.height > 1.0
|
||||
? MusicPlayerImageSizes.cornerRadiusInset.opened / 3
|
||||
: MusicPlayerImageSizes.cornerRadiusInset.opened
|
||||
: musicManager.albumArt.size.width / musicManager.albumArt.size.height > 1.0
|
||||
? MusicPlayerImageSizes.cornerRadiusInset.closed / 3
|
||||
: MusicPlayerImageSizes.cornerRadiusInset.closed
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
ZStack(alignment: .bottomTrailing) {
|
||||
if Defaults[.lightingEffect] {
|
||||
|
|
@ -58,24 +179,26 @@ struct AlbumArtView: View {
|
|||
Color.clear
|
||||
.aspectRatio(1, contentMode: .fit)
|
||||
.background(
|
||||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: .fit)
|
||||
.clipShape(
|
||||
RoundedRectangle(
|
||||
cornerRadius: Defaults[.cornerRadiusScaling]
|
||||
? musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? MusicPlayerImageSizes.cornerRadiusInset.opened/3 : MusicPlayerImageSizes.cornerRadiusInset.opened
|
||||
: musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? MusicPlayerImageSizes.cornerRadiusInset.closed/3 : MusicPlayerImageSizes.cornerRadiusInset.closed
|
||||
|
||||
|
||||
)
|
||||
)
|
||||
DynamicIslandArtworkSourceView(
|
||||
cornerRadius: albumArtCornerRadius,
|
||||
contentMode: .fill
|
||||
)
|
||||
)
|
||||
.clipped()
|
||||
.scaleEffect(x: 1.3, y: 1.4)
|
||||
.rotationEffect(.degrees(92))
|
||||
.blur(radius: 40)
|
||||
.opacity(musicManager.isPlaying ? 0.5 : 0)
|
||||
.opacity(
|
||||
usesLiveCanvasArtwork
|
||||
? (musicManager.isPlaying ? 0.62 : 0.18)
|
||||
: (musicManager.isPlaying ? 0.5 : 0)
|
||||
)
|
||||
.shadow(
|
||||
color: Color(nsColor: musicManager.avgColor).opacity(usesLiveCanvasArtwork ? 0.24 : 0.16),
|
||||
radius: usesLiveCanvasArtwork ? 22 : 14,
|
||||
x: 0,
|
||||
y: 0
|
||||
)
|
||||
}
|
||||
|
||||
private var albumArtButton: some View {
|
||||
|
|
@ -111,18 +234,10 @@ struct AlbumArtView: View {
|
|||
Color.clear
|
||||
.aspectRatio(1, contentMode: .fit)
|
||||
.overlay {
|
||||
Image(nsImage: musicManager.albumArt)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: .fit)
|
||||
.clipShape(
|
||||
RoundedRectangle(
|
||||
cornerRadius: Defaults[.cornerRadiusScaling]
|
||||
? musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? MusicPlayerImageSizes.cornerRadiusInset.opened/3 : MusicPlayerImageSizes.cornerRadiusInset.opened
|
||||
: musicManager.albumArt.size.width/musicManager.albumArt.size.height > 1.0 ? MusicPlayerImageSizes.cornerRadiusInset.closed/3 : MusicPlayerImageSizes.cornerRadiusInset.closed
|
||||
|
||||
|
||||
)
|
||||
) // ensures that even the rectagular album cover is rounded just like the MacOS media player
|
||||
DynamicIslandArtworkSourceView(
|
||||
cornerRadius: albumArtCornerRadius,
|
||||
contentMode: .fit
|
||||
)
|
||||
}
|
||||
.matchedGeometryEffect(id: "albumArt", in: albumArtNamespace)
|
||||
.clipped()
|
||||
|
|
|
|||
|
|
@ -763,6 +763,7 @@ struct SettingsView: View {
|
|||
SettingsSearchEntry(tab: .media, title: "Skip buttons", keywords: ["skip", "controls", "±10"], highlightID: SettingsTab.media.highlightID(for: "Skip buttons")),
|
||||
SettingsSearchEntry(tab: .media, title: "Sneak Peek Style", keywords: ["sneak peek", "preview"], highlightID: SettingsTab.media.highlightID(for: "Sneak Peek Style")),
|
||||
SettingsSearchEntry(tab: .media, title: "Enable lyrics", keywords: ["lyrics", "song text"], highlightID: SettingsTab.media.highlightID(for: "Enable lyrics")),
|
||||
SettingsSearchEntry(tab: .media, title: "Show live canvas in Dynamic Island", keywords: ["canvas", "live canvas", "album art", "dynamic island", "spotify canvas"], highlightID: SettingsTab.media.highlightID(for: "Show live canvas in Dynamic Island")),
|
||||
SettingsSearchEntry(tab: .media, title: "Auto-hide inactive notch media player", keywords: ["auto hide", "inactive", "placeholder", "notch media"], highlightID: SettingsTab.media.highlightID(for: "Auto-hide inactive notch media player")),
|
||||
SettingsSearchEntry(tab: .media, title: "Show Change Media Output control", keywords: ["airplay", "route picker", "media output"], highlightID: SettingsTab.media.highlightID(for: "Show Change Media Output control")),
|
||||
SettingsSearchEntry(tab: .media, title: "Enable album art parallax", keywords: ["parallax", "lock screen", "album art"], highlightID: SettingsTab.media.highlightID(for: "Enable album art parallax")),
|
||||
|
|
@ -2609,6 +2610,11 @@ struct Media: View {
|
|||
Text("Enable lyrics")
|
||||
}
|
||||
.settingsHighlight(id: highlightID("Enable lyrics"))
|
||||
Defaults.Toggle(key: .showLiveCanvasInDynamicIsland) {
|
||||
Text("Show live canvas in Dynamic Island")
|
||||
}
|
||||
.settingsHighlight(id: highlightID("Show live canvas in Dynamic Island"))
|
||||
.help("Replaces the artwork tile with the live canvas when the current app provides one, and reuses that moving canvas for the surrounding lighting effect.")
|
||||
|
||||
//Parallax Effect Intensity to control how much parallax is wanted
|
||||
Slider(value: $parallaxEffectIntensity, in: 0...12, step: 1.0) {
|
||||
|
|
@ -2703,12 +2709,17 @@ struct Media: View {
|
|||
}
|
||||
.disabled(!enableLockScreenMediaWidget)
|
||||
.settingsHighlight(id: highlightID("Fullscreen artwork on right-click"))
|
||||
Defaults.Toggle(key: .lockScreenUseArtworkLayoutOverFullscreenCanvas) {
|
||||
Text("Use album art layout over fullscreen canvas")
|
||||
}
|
||||
.disabled(!enableLockScreenMediaWidget || !lockScreenMusicFullscreenArtworkEnabled)
|
||||
.settingsHighlight(id: highlightID("Use album art layout over fullscreen canvas"))
|
||||
Defaults.Toggle(key: .lockScreenKeepAlbumArtVisibleDuringFullscreenArtwork) {
|
||||
Text("Keep album art visible during fullscreen artwork")
|
||||
}
|
||||
.disabled(!enableLockScreenMediaWidget || !lockScreenMusicFullscreenArtworkEnabled)
|
||||
.settingsHighlight(id: highlightID("Keep album art visible during fullscreen artwork"))
|
||||
Text("Right-click the album art on the lock screen to set it as the wallpaper. Right-click again or click the background to restore the original wallpaper. The swap is temporary and leaves no trace in System Settings.")
|
||||
Text("Right-click the album art on the lock screen to set it as the wallpaper. Right-click again or click the background to restore the original wallpaper. If a canvas is available, Atoll can also keep the same album art + player layout on top of the live canvas.")
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
|
@ -4833,12 +4844,17 @@ struct LockScreenSettings: View {
|
|||
}
|
||||
.disabled(!enableLockScreenMediaWidget)
|
||||
.settingsHighlight(id: highlightID("Fullscreen artwork on right-click"))
|
||||
Defaults.Toggle(key: .lockScreenUseArtworkLayoutOverFullscreenCanvas) {
|
||||
Text("Use album art layout over fullscreen canvas")
|
||||
}
|
||||
.disabled(!enableLockScreenMediaWidget || !lockScreenMusicFullscreenArtworkEnabled)
|
||||
.settingsHighlight(id: highlightID("Use album art layout over fullscreen canvas"))
|
||||
Defaults.Toggle(key: .lockScreenKeepAlbumArtVisibleDuringFullscreenArtwork) {
|
||||
Text("Keep album art visible during fullscreen artwork")
|
||||
}
|
||||
.disabled(!enableLockScreenMediaWidget || !lockScreenMusicFullscreenArtworkEnabled)
|
||||
.settingsHighlight(id: highlightID("Keep album art visible during fullscreen artwork"))
|
||||
Text("Right-click the album art on the lock screen to set it as the wallpaper. Right-click again or click the background to restore the original wallpaper. The swap is temporary and leaves no trace in System Settings.")
|
||||
Text("Right-click the album art on the lock screen to set it as the wallpaper. Right-click again or click the background to restore the original wallpaper. If a canvas is available, Atoll can also keep the same album art + player layout on top of the live canvas.")
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue