macos: blink critter when overlay dismisses empty
This commit is contained in:
@@ -106,6 +106,7 @@ final class AppState: ObservableObject {
|
|||||||
|
|
||||||
@Published var isWorking: Bool = false
|
@Published var isWorking: Bool = false
|
||||||
@Published var earBoostActive: Bool = false
|
@Published var earBoostActive: Bool = false
|
||||||
|
@Published var blinkTick: Int = 0
|
||||||
@Published var heartbeatsEnabled: Bool {
|
@Published var heartbeatsEnabled: Bool {
|
||||||
didSet {
|
didSet {
|
||||||
UserDefaults.standard.set(self.heartbeatsEnabled, forKey: heartbeatsEnabledKey)
|
UserDefaults.standard.set(self.heartbeatsEnabled, forKey: heartbeatsEnabledKey)
|
||||||
@@ -228,6 +229,10 @@ final class AppState: ObservableObject {
|
|||||||
self.earBoostActive = false
|
self.earBoostActive = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func blinkOnce() {
|
||||||
|
self.blinkTick &+= 1
|
||||||
|
}
|
||||||
|
|
||||||
func setVoiceWakeEnabled(_ enabled: Bool) async {
|
func setVoiceWakeEnabled(_ enabled: Bool) async {
|
||||||
guard voiceWakeSupported else {
|
guard voiceWakeSupported else {
|
||||||
self.swabbleEnabled = false
|
self.swabbleEnabled = false
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ struct ClawdisApp: App {
|
|||||||
isPaused: self.state.isPaused,
|
isPaused: self.state.isPaused,
|
||||||
isWorking: self.state.isWorking,
|
isWorking: self.state.isWorking,
|
||||||
earBoostActive: self.state.earBoostActive,
|
earBoostActive: self.state.earBoostActive,
|
||||||
|
blinkTick: self.state.blinkTick,
|
||||||
relayStatus: self.relayManager.status,
|
relayStatus: self.relayManager.status,
|
||||||
animationsEnabled: self.state.iconAnimationsEnabled)
|
animationsEnabled: self.state.iconAnimationsEnabled)
|
||||||
}
|
}
|
||||||
@@ -344,6 +345,7 @@ private struct CritterStatusLabel: View {
|
|||||||
var isPaused: Bool
|
var isPaused: Bool
|
||||||
var isWorking: Bool
|
var isWorking: Bool
|
||||||
var earBoostActive: Bool
|
var earBoostActive: Bool
|
||||||
|
var blinkTick: Int
|
||||||
var relayStatus: RelayProcessManager.Status
|
var relayStatus: RelayProcessManager.Status
|
||||||
var animationsEnabled: Bool
|
var animationsEnabled: Bool
|
||||||
|
|
||||||
@@ -400,16 +402,17 @@ private struct CritterStatusLabel: View {
|
|||||||
self.nextEarWiggle = now.addingTimeInterval(Double.random(in: 7.0...14.0))
|
self.nextEarWiggle = now.addingTimeInterval(Double.random(in: 7.0...14.0))
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.isWorking {
|
if self.isWorking {
|
||||||
self.scurry()
|
self.scurry()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.onChange(of: self.isPaused) { _, _ in self.resetMotion() }
|
}
|
||||||
.onChange(of: self.animationsEnabled) { _, enabled in
|
.onChange(of: self.isPaused) { _, _ in self.resetMotion() }
|
||||||
if enabled {
|
.onChange(of: self.blinkTick) { _, _ in self.blink() }
|
||||||
self.scheduleRandomTimers(from: Date())
|
.onChange(of: self.animationsEnabled) { _, enabled in
|
||||||
} else {
|
if enabled {
|
||||||
self.resetMotion()
|
self.scheduleRandomTimers(from: Date())
|
||||||
|
} else {
|
||||||
|
self.resetMotion()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,6 +139,9 @@ final class VoiceWakeOverlayController: ObservableObject {
|
|||||||
window.orderOut(nil)
|
window.orderOut(nil)
|
||||||
self.model.isVisible = false
|
self.model.isVisible = false
|
||||||
self.model.level = 0
|
self.model.level = 0
|
||||||
|
if outcome == .empty {
|
||||||
|
AppStateStore.shared.blinkOnce()
|
||||||
|
}
|
||||||
AppStateStore.shared.stopVoiceEars()
|
AppStateStore.shared.stopVoiceEars()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user