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

Merge branch 'pr-159' into feature/media

Browse source 
MERGE TRIAL FOR THE LYRICS THINGY
This commit is contained in:
Hariharan Mudaliar 2025-12-09 13:34:18 +05:30
commit 9910f2fb65
No known key found for this signature in database
GPG key ID: D04F1C2B9194DDFC
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DynamicIsland/components/Notch/MinimalisticMusicPlayerView.swift
View file

@ -715,7 +715,7 @@ private struct MinimalisticReminderDetailsView: View {
private var playPauseButton: some View {
MinimalisticSquircircleButton(
icon: musicManager.isPlaying ? "pause.fill" : "play.fill",
icon: musicManager.isPlaying ? (musicManager.isLiveStream ? "stop.fill" : "pause.fill") : "play.fill",
fontSize: 28,
fontWeight: .semibold,
frameSize: CGSize(width: 60, height: 60),
@ -733,6 +733,7 @@ private struct MinimalisticReminderDetailsView: View {
icon: String,
size: CGFloat = 18,
isActive: Bool = false,
activeColor: Color = .red,
pressEffect: MinimalisticSquircircleButton.PressEffect = .none,
symbolEffect: MinimalisticSquircircleButton.SymbolEffectStyle = .none,
action: @escaping () -> Void
@ -743,7 +744,7 @@ private struct MinimalisticReminderDetailsView: View {
fontWeight: .medium,
frameSize: CGSize(width: 40, height: 40),
cornerRadius: 16,
foregroundColor: isActive ? .red : .white.opacity(0.85),
foregroundColor: isActive ? activeColor : .white.opacity(0.85),
pressEffect: pressEffect,
symbolEffectStyle: symbolEffect,
action: action
@ -767,6 +768,7 @@ private struct MinimalisticReminderDetailsView: View {
controlButton(
icon: enableLyrics ? "quote.bubble.fill" : "quote.bubble",
isActive: enableLyrics,
activeColor: Color(nsColor: musicManager.avgColor),
symbolEffect: .replace
) {
enableLyrics.toggle()

4
DynamicIsland/components/Notch/NotchHomeView.swift
View file

@ -259,7 +259,7 @@ struct MusicControlsView: View {
backwardConfig.action()
}
HoverButton(icon: musicManager.isPlaying ? "pause.fill" : "play.fill", scale: .large) {
HoverButton(icon: musicManager.isPlaying ? (musicManager.isLiveStream ? "stop.fill" : "pause.fill") : "play.fill", scale: .large) {
MusicManager.shared.togglePlay()
}
@ -329,7 +329,7 @@ struct MusicControlsView: View {
case .lyrics:
HoverButton(
icon: enableLyrics ? "quote.bubble.fill" : "quote.bubble",
iconColor: enableLyrics ? .accentColor : .white,
iconColor: enableLyrics ? Color(nsColor: MusicManager.shared.avgColor) : .white,
scale: .medium
) {
enableLyrics.toggle()

6
DynamicIsland/managers/MusicManager.swift
View file

@ -370,8 +370,7 @@ class MusicManager: ObservableObject {
}
} else {
let shouldClearForKnownDuration =
!isPlaying
|| (duration > 10 && remaining > 5)
(duration > 10 && remaining > 5)
|| (liveStreamCompletionObservationCount == 0
&& liveStreamEdgeObservationCount == 0
&& liveStreamCompletionReleaseCount >= 4)
@ -394,9 +393,6 @@ class MusicManager: ObservableObject {
liveStreamEdgeObservationCount = 0
liveStreamCompletionObservationCount = 0
liveStreamCompletionReleaseCount = 0
if !hasKnownDuration && isLiveStream {
isLiveStream = false
}
}
}