mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Update Cool Face Animation
This commit is contained in:
parent
6a2d74777f
commit
018050081d
1 changed files with 1 additions and 18 deletions
|
|
@ -495,7 +495,7 @@ struct ContentView: View {
|
||||||
return coordinator.expandingView.type == .recording
|
return coordinator.expandingView.type == .recording
|
||||||
case .focus:
|
case .focus:
|
||||||
return coordinator.expandingView.type == .doNotDisturb
|
return coordinator.expandingView.type == .doNotDisturb
|
||||||
case .capsLock, .coolFace:
|
case .capsLock:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
@ -823,10 +823,6 @@ struct ContentView: View {
|
||||||
return .capsLock(showLabel: showCapsLockLabel)
|
return .capsLock(showLabel: showCapsLockLabel)
|
||||||
}
|
}
|
||||||
|
|
||||||
if showNotHumanFace {
|
|
||||||
return .coolFace
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -840,8 +836,6 @@ struct ContentView: View {
|
||||||
return reminderRightWingWidth(for: entry, baseWidth: baseWidth, notchHeight: notchHeight, now: reminderManager.currentDate)
|
return reminderRightWingWidth(for: entry, baseWidth: baseWidth, notchHeight: notchHeight, now: reminderManager.currentDate)
|
||||||
case .capsLock(let showLabel):
|
case .capsLock(let showLabel):
|
||||||
return showLabel ? scaledWingWidth(baseWidth: baseWidth, centerBaseWidth: centerBaseWidth, factor: 0.4, extra: 12) : baseWidth
|
return showLabel ? scaledWingWidth(baseWidth: baseWidth, centerBaseWidth: centerBaseWidth, factor: 0.4, extra: 12) : baseWidth
|
||||||
case .coolFace:
|
|
||||||
return scaledWingWidth(baseWidth: baseWidth, centerBaseWidth: centerBaseWidth, factor: 0.36, extra: 8)
|
|
||||||
case .focus:
|
case .focus:
|
||||||
return focusRightWingWidth(baseWidth: baseWidth)
|
return focusRightWingWidth(baseWidth: baseWidth)
|
||||||
case .recording:
|
case .recording:
|
||||||
|
|
@ -942,10 +936,6 @@ struct ContentView: View {
|
||||||
Image(systemName: "capslock.fill")
|
Image(systemName: "capslock.fill")
|
||||||
.font(.system(size: badgeSize * 0.5, weight: .semibold))
|
.font(.system(size: badgeSize * 0.5, weight: .semibold))
|
||||||
.foregroundStyle(capsLockTintMode.color)
|
.foregroundStyle(capsLockTintMode.color)
|
||||||
case .coolFace:
|
|
||||||
Image(systemName: "face.smiling")
|
|
||||||
.font(.system(size: badgeSize * 0.5, weight: .semibold))
|
|
||||||
.foregroundStyle(.mint)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.frame(width: badgeSize, height: badgeSize)
|
.frame(width: badgeSize, height: badgeSize)
|
||||||
|
|
@ -982,10 +972,6 @@ struct ContentView: View {
|
||||||
} else {
|
} else {
|
||||||
spectrumView(forceSpectrum: true)
|
spectrumView(forceSpectrum: true)
|
||||||
}
|
}
|
||||||
case .coolFace:
|
|
||||||
IdleAnimationView()
|
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
||||||
.padding(.horizontal, 4)
|
|
||||||
case .focus(let mode):
|
case .focus(let mode):
|
||||||
spectrumView(forceSpectrum: true)
|
spectrumView(forceSpectrum: true)
|
||||||
case .recording:
|
case .recording:
|
||||||
|
|
@ -1532,7 +1518,6 @@ private enum MusicSecondaryLiveActivity: Equatable {
|
||||||
case recording
|
case recording
|
||||||
case focus(FocusModeType)
|
case focus(FocusModeType)
|
||||||
case capsLock(showLabel: Bool)
|
case capsLock(showLabel: Bool)
|
||||||
case coolFace
|
|
||||||
|
|
||||||
var id: String {
|
var id: String {
|
||||||
switch self {
|
switch self {
|
||||||
|
|
@ -1546,8 +1531,6 @@ private enum MusicSecondaryLiveActivity: Equatable {
|
||||||
return "focus-\(mode.rawValue)"
|
return "focus-\(mode.rawValue)"
|
||||||
case .capsLock(let showLabel):
|
case .capsLock(let showLabel):
|
||||||
return showLabel ? "caps-lock-label" : "caps-lock-icon"
|
return showLabel ? "caps-lock-label" : "caps-lock-icon"
|
||||||
case .coolFace:
|
|
||||||
return "cool-face"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue