mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Update colors buttons in non minimalistic and lock screen
This commit is contained in:
parent
c846ad530b
commit
12d4a0b726
3 changed files with 58 additions and 9 deletions
|
|
@ -169,6 +169,10 @@ struct MinimalisticMusicPlayerView: View {
|
|||
coordinator.timerLiveActivityEnabled && timerManager.isExternalTimerActive
|
||||
}
|
||||
|
||||
private var brandAccentColor: Color {
|
||||
musicManager.brandAccentColor
|
||||
}
|
||||
|
||||
private var timerCountdownColor: Color {
|
||||
let baseColor: Color
|
||||
if let presetId = timerManager.activePresetId,
|
||||
|
|
@ -683,19 +687,20 @@ private struct MinimalisticReminderDetailsView: View {
|
|||
icon: String,
|
||||
size: CGFloat = 18,
|
||||
isActive: Bool = false,
|
||||
activeColor: Color = .red,
|
||||
activeColor: Color? = nil,
|
||||
pressEffect: MinimalisticSquircircleButton.PressEffect = .none,
|
||||
symbolEffect: MinimalisticSquircircleButton.SymbolEffectStyle = .none,
|
||||
trigger: SkipTrigger? = nil,
|
||||
action: @escaping () -> Void
|
||||
) -> some View {
|
||||
MinimalisticSquircircleButton(
|
||||
let resolvedActiveColor = activeColor ?? brandAccentColor
|
||||
return MinimalisticSquircircleButton(
|
||||
icon: icon,
|
||||
fontSize: size,
|
||||
fontWeight: .medium,
|
||||
frameSize: CGSize(width: 40, height: 40),
|
||||
cornerRadius: 16,
|
||||
foregroundColor: isActive ? activeColor : .white.opacity(0.85),
|
||||
foregroundColor: isActive ? resolvedActiveColor : .white.opacity(0.85),
|
||||
pressEffect: pressEffect,
|
||||
symbolEffectStyle: symbolEffect,
|
||||
externalTriggerToken: trigger?.token,
|
||||
|
|
@ -775,7 +780,7 @@ private struct MinimalisticReminderDetailsView: View {
|
|||
controlButton(
|
||||
icon: enableLyrics ? "quote.bubble.fill" : "quote.bubble",
|
||||
isActive: enableLyrics,
|
||||
activeColor: Color(nsColor: musicManager.avgColor),
|
||||
activeColor: brandAccentColor,
|
||||
symbolEffect: .replace
|
||||
) {
|
||||
enableLyrics.toggle()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue