Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IchenDEV merged 1 commit into from
Jul 29, 2026
Merged

Refine recording overlay controls #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/App/OpenTypeApp.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
}

private func stopRecording() {
Expand Down
19 changes: 17 additions & 2 deletions Sources/App/VoicePipeline+Status.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
func showOverlay() {
overlay.show(
appState: appState,
onCancel: { [weak self] in
self?.cancel()
},
onConfirm: { [weak self] in
Task { @MainActor in
await self?.stop()
}
}
)
}

func showNoSpeechDetected(reason: String) {
Log.info("[VoicePipeline] no speech detected: \(reason)")
cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
}

func resetToIdle() {
recordingTargetApp = nil
appState.phase = .idle
appState.statusMessage = L("status.ready")
overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
let saved = appState.statusMessage
appState.statusMessage = L("pipeline.busy")
soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
Task { @MainActor in
try? await Task.sleep(nanoseconds: 2_000_000_000)
if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
appState.statusMessage = message
appState.resetDownloadProgress()
soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
hideOverlayAfterDelay()
}

Expand Down
32 changes: 29 additions & 3 deletions Sources/App/VoicePipeline.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
var hideOverlayTask: Task<Void, Never>?
var recordingTargetApp: NSRunningApplication?

var currentEngine: (any SpeechEngine)? {
switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

// MARK: - Recording

func start(mode: VoiceInputMode = .dictation) async {
func start(
mode: VoiceInputMode = .dictation,
targetApp: NSRunningApplication? = nil
) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")
recordingTargetApp = targetApp

if mode.isTranslation {
cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
}

soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
)
guard micStarted else {
currentEngine?.cancelListening()
cancelScreenContextCapture()
recordingTargetApp = nil
appState.phase = .error(L("pipeline.mic_failed_permissions"))
appState.statusMessage = L("pipeline.mic_unavailable")
overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
return
}

let resolvedTargetApp = targetApp ?? recordingTargetApp
recordingTargetApp = nil
soundPlayer.playStop()
audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
targetApp: resolvedTargetApp
)
}
}

func cancel() {
guard appState.isRecording else {
Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
return
}

Log.info("[VoicePipeline] recording cancelled by user")
clearInFlightWork()
currentEngine?.cancelListening()
audioCapture.stop()
audioCapture.cleanupLastRecording()
recordingTargetApp = nil
soundPlayer.playStop()
appState.reset()
overlay.hide()
}

private func clearInFlightWork() {
processingTask?.cancel()
processingTask = nil
Expand Down
2 changes: 2 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down
2 changes: 2 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down
99 changes: 99 additions & 0 deletions Sources/UI/OverlayActionButton.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
static let actionButtonSize: CGFloat = 26
static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
case cancel
case confirm

var symbolName: String {
switch self {
case .cancel: return "xmark"
case .confirm: return "checkmark"
}
}

var accessibilityLabel: String {
switch self {
case .cancel: return L("overlay.cancel_recording")
case .confirm: return L("overlay.finish_recording")
}
}

var keyboardShortcut: KeyboardShortcut {
switch self {
case .cancel: return .cancelAction
case .confirm: return .defaultAction
}
}
}

struct OverlayActionButton: View {
let kind: OverlayActionKind
let action: () -> Void

@Environment(\.accessibilityReduceMotion) private var reduceMotion
@State private var isHovering = false

var body: some View {
Button(action: action) {
Image(systemName: kind.symbolName)
}
.buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
.keyboardShortcut(kind.keyboardShortcut)
.accessibilityLabel(kind.accessibilityLabel)
.help(kind.accessibilityLabel)
.onHover { isHovering = $0 }
.animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
}
}

private struct OverlayActionButtonStyle: ButtonStyle {
let kind: OverlayActionKind
let isHovering: Bool

func makeBody(configuration: Configuration) -> some View {
configuration.label
.font(.system(size: 11, weight: .semibold))
.foregroundStyle(foregroundStyle)
.frame(
width: OverlayControlMetrics.actionButtonSize,
height: OverlayControlMetrics.actionButtonSize
)
.background {
Circle()
.fill(backgroundStyle(isPressed: configuration.isPressed))
}
.overlay {
Circle()
.strokeBorder(borderStyle, lineWidth: 0.5)
}
.contentShape(Circle())
}

private var foregroundStyle: Color {
switch kind {
case .cancel: return .white.opacity(0.72)
case .confirm: return .black.opacity(0.82)
}
}

private func backgroundStyle(isPressed: Bool) -> Color {
switch kind {
case .cancel:
return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
case .confirm:
return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
}
}

private var borderStyle: Color {
switch kind {
case .cancel: return .white.opacity(0.08)
case .confirm: return .white.opacity(0.42)
}
}
}
41 changes: 31 additions & 10 deletions Sources/UI/OverlayPanel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
private var hostingView: NSHostingView<AnyView>?

@MainActor
func show(appState: AppState) {
func show(
appState: AppState,
onCancel: @escaping () -> Void,
onConfirm: @escaping () -> Void
) {
let initialLayout = OverlayLayout(appState: appState)

if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
panel.backgroundColor = .clear
panel.hasShadow = false
panel.hidesOnDeactivate = false
panel.ignoresMouseEvents = true
panel.ignoresMouseEvents = !initialLayout.isInteractive
panel.becomesKeyOnlyIfNeeded = true
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

let view = OverlayContentView { [weak self] layout in
Task { @MainActor in
self?.apply(layout: layout, animated: true)
}
}
let view = OverlayContentView(
onLayoutChange: { [weak self] layout in
Task { @MainActor in
self?.apply(layout: layout, animated: true)
}
},
onCancel: onCancel,
onConfirm: onConfirm
)
.environmentObject(appState)

let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
hostingView.layer?.cornerRadius = layout.outerCornerRadius
hostingView.layer?.cornerCurve = .continuous
window.ignoresMouseEvents = !layout.isInteractive
window.setFrame(frame, display: true, animate: animated)
}

@MainActor
private func frame(for size: CGSize, window: NSWindow) -> NSRect {
let screen = window.screen ?? NSScreen.main
let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
let x = visibleFrame.midX - size.width / 2
let y = visibleFrame.maxY - size.height - 28
return NSRect(origin: NSPoint(x: x, y: y), size: size)
return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
}
}

enum OverlayPanelPlacement {
static let bottomMargin: CGFloat = 24

static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
CGRect(
x: visibleFrame.midX - size.width / 2,
y: visibleFrame.minY + bottomMargin,
width: size.width,
height: size.height
)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refine recording overlay controls#70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

IchenDEV
merged 1 commit into

from

Jul 29, 2026
 Merged


Refine recording overlay controls
#70
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Sources/App/OpenTypeApp.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 let mode: VoiceInputMode = action == .translation
 ? .translation(AppSettings.shared.translationTargetLanguage)
 : .dictation
 Task { await pipeline?.start(mode: mode) }
 Task { await pipeline?.start(mode: mode, targetApp: previousApp) }
 }

 private func stopRecording() {
Expand Down

19 changes: 17 additions & 2 deletions
Sources/App/VoicePipeline+Status.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,20 @@ import Foundation

@MainActor
extension VoicePipeline {
 func showOverlay() {
 overlay.show(
 appState: appState,
 onCancel: { [weak self] in
 self?.cancel()
 },
 onConfirm: { [weak self] in
 Task { @MainActor in
 await self?.stop()
 }
 }
 )
 }

 func showNoSpeechDetected(reason: String) {
 Log.info("[VoicePipeline] no speech detected: \(reason)")
 cancelScreenContextCapture()
Expand All@@ -12,6 +26,7 @@ extension VoicePipeline {
 }

 func resetToIdle() {
 recordingTargetApp = nil
 appState.phase = .idle
 appState.statusMessage = L("status.ready")
 overlay.hide()
Expand All@@ -35,7 +50,7 @@ extension VoicePipeline {
 let saved = appState.statusMessage
 appState.statusMessage = L("pipeline.busy")
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 Task { @MainActor in
 try? await Task.sleep(nanoseconds: 2_000_000_000)
 if appState.statusMessage == L("pipeline.busy") {
Expand All@@ -49,7 +64,7 @@ extension VoicePipeline {
 appState.statusMessage = message
 appState.resetDownloadProgress()
 soundPlayer.playStop()
overlay.show(appState: appState)
showOverlay()
 hideOverlayAfterDelay()
 }

Expand Down

32 changes: 29 additions & 3 deletions
Sources/App/VoicePipeline.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ final class VoicePipeline {
 var processingTask: Task<Void, Never>?
 var replacementTask: Task<Void, Never>?
 var hideOverlayTask: Task<Void, Never>?
 var recordingTargetApp: NSRunningApplication?

 var currentEngine: (any SpeechEngine)? {
 switch appState.settings.speechEngine {
Expand DownExpand Up@@ -64,7 +65,10 @@ final class VoicePipeline {

 // MARK: - Recording

 func start(mode: VoiceInputMode = .dictation) async {
 func start(
 mode: VoiceInputMode = .dictation,
 targetApp: NSRunningApplication? = nil
 ) async {
 if appState.isBusy {
 Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
 showBusyHint()
Expand DownExpand Up@@ -98,6 +102,7 @@ final class VoicePipeline {
 appState.statusMessage = mode.isTranslation
 ? L("pipeline.recording_translation")
 : L("pipeline.recording")
 recordingTargetApp = targetApp

 if mode.isTranslation {
 cancelScreenContextCapture()
Expand All@@ -106,7 +111,7 @@ final class VoicePipeline {
 }

 soundPlayer.playStart()
overlay.show(appState: appState)
showOverlay()

 let micID = appState.settings.microphoneID
 let language = appState.settings.inputLanguage.whisperCode
Expand DownExpand Up@@ -137,6 +142,8 @@ final class VoicePipeline {
 )
 guard micStarted else {
 currentEngine?.cancelListening()
 cancelScreenContextCapture()
 recordingTargetApp = nil
 appState.phase = .error(L("pipeline.mic_failed_permissions"))
 appState.statusMessage = L("pipeline.mic_unavailable")
 overlay.hide()
Expand All@@ -150,6 +157,8 @@ final class VoicePipeline {
 return
 }

 let resolvedTargetApp = targetApp ?? recordingTargetApp
 recordingTargetApp = nil
 soundPlayer.playStop()
 audioCapture.stop()

Expand All@@ -170,11 +179,28 @@ final class VoicePipeline {
 language: language,
 settings: settings,
 inputMode: inputMode,
 targetApp: targetApp
 targetApp: resolvedTargetApp
 )
 }
 }

 func cancel() {
 guard appState.isRecording else {
 Log.info("[VoicePipeline] cancel: not recording (\(appState.phase)), ignoring")
 return
 }

 Log.info("[VoicePipeline] recording cancelled by user")
 clearInFlightWork()
 currentEngine?.cancelListening()
 audioCapture.stop()
 audioCapture.cleanupLastRecording()
 recordingTargetApp = nil
 soundPlayer.playStop()
 appState.reset()
 overlay.hide()
 }

 private func clearInFlightWork() {
 processingTask?.cancel()
 processingTask = nil
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/en.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "The model could not be loaded. Check your network and try again.";
"pipeline.recording" = "Recording…";
"pipeline.recording_translation" = "Recording for translation…";
"overlay.cancel_recording" = "Cancel recording";
"overlay.finish_recording" = "Finish recording";
"pipeline.transcribing" = "Transcribing…";
"pipeline.formatting" = "Formatting…";
"pipeline.translating" = "Translating…";
Expand Down

2 changes: 2 additions & 0 deletions
Sources/Resources/zh-Hans.lproj/Localizable.strings

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
"pipeline.model_load_failed_network" = "模型未能加载，请检查网络后重试";
"pipeline.recording" = "录音中…";
"pipeline.recording_translation" = "正在录音并准备翻译…";
"overlay.cancel_recording" = "取消录音";
"overlay.finish_recording" = "结束录音";
"pipeline.transcribing" = "识别中…";
"pipeline.formatting" = "整理中…";
"pipeline.translating" = "翻译中…";
Expand Down

99 changes: 99 additions & 0 deletions
Sources/UI/OverlayActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import SwiftUI

enum OverlayControlMetrics {
 static let actionButtonSize: CGFloat = 26
 static let recordingControlsWidth: CGFloat = 134
}

enum OverlayActionKind {
 case cancel
 case confirm

 var symbolName: String {
 switch self {
 case .cancel: return "xmark"
 case .confirm: return "checkmark"
 }
 }

 var accessibilityLabel: String {
 switch self {
 case .cancel: return L("overlay.cancel_recording")
 case .confirm: return L("overlay.finish_recording")
 }
 }

 var keyboardShortcut: KeyboardShortcut {
 switch self {
 case .cancel: return .cancelAction
 case .confirm: return .defaultAction
 }
 }
}

struct OverlayActionButton: View {
 let kind: OverlayActionKind
 let action: () -> Void

 @Environment(\.accessibilityReduceMotion) private var reduceMotion
 @State private var isHovering = false

 var body: some View {
 Button(action: action) {
 Image(systemName: kind.symbolName)
 }
 .buttonStyle(OverlayActionButtonStyle(kind: kind, isHovering: isHovering))
 .keyboardShortcut(kind.keyboardShortcut)
 .accessibilityLabel(kind.accessibilityLabel)
 .help(kind.accessibilityLabel)
 .onHover { isHovering = $0 }
 .animation(reduceMotion ? nil : .easeOut(duration: 0.12), value: isHovering)
 }
}

private struct OverlayActionButtonStyle: ButtonStyle {
 let kind: OverlayActionKind
 let isHovering: Bool

 func makeBody(configuration: Configuration) -> some View {
 configuration.label
 .font(.system(size: 11, weight: .semibold))
 .foregroundStyle(foregroundStyle)
 .frame(
 width: OverlayControlMetrics.actionButtonSize,
 height: OverlayControlMetrics.actionButtonSize
 )
 .background {
 Circle()
 .fill(backgroundStyle(isPressed: configuration.isPressed))
 }
 .overlay {
 Circle()
 .strokeBorder(borderStyle, lineWidth: 0.5)
 }
 .contentShape(Circle())
 }

 private var foregroundStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.72)
 case .confirm: return .black.opacity(0.82)
 }
 }

 private func backgroundStyle(isPressed: Bool) -> Color {
 switch kind {
 case .cancel:
 return .white.opacity(isPressed ? 0.18 : isHovering ? 0.13 : 0.07)
 case .confirm:
 return .white.opacity(isPressed ? 0.76 : isHovering ? 1 : 0.9)
 }
 }

 private var borderStyle: Color {
 switch kind {
 case .cancel: return .white.opacity(0.08)
 case .confirm: return .white.opacity(0.42)
 }
 }
}

41 changes: 31 additions & 10 deletions
Sources/UI/OverlayPanel.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ final class OverlayPanel {
 private var hostingView: NSHostingView<AnyView>?

 @MainActor
 func show(appState: AppState) {
 func show(
 appState: AppState,
 onCancel: @escaping () -> Void,
 onConfirm: @escaping () -> Void
 ) {
 let initialLayout = OverlayLayout(appState: appState)

 if window == nil {
Expand All@@ -21,14 +25,19 @@ final class OverlayPanel {
 panel.backgroundColor = .clear
 panel.hasShadow = false
 panel.hidesOnDeactivate = false
 panel.ignoresMouseEvents = true
 panel.ignoresMouseEvents = !initialLayout.isInteractive
 panel.becomesKeyOnlyIfNeeded = true
 panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]

 let view = OverlayContentView { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 }
 let view = OverlayContentView(
 onLayoutChange: { [weak self] layout in
 Task { @MainActor in
 self?.apply(layout: layout, animated: true)
 }
 },
 onCancel: onCancel,
 onConfirm: onConfirm
 )
 .environmentObject(appState)

 let hostingView = NSHostingView(rootView: AnyView(view))
Expand DownExpand Up@@ -62,15 +71,27 @@ final class OverlayPanel {
 hostingView.frame = NSRect(origin: .zero, size: layout.panelSize)
 hostingView.layer?.cornerRadius = layout.outerCornerRadius
 hostingView.layer?.cornerCurve = .continuous
 window.ignoresMouseEvents = !layout.isInteractive
 window.setFrame(frame, display: true, animate: animated)
 }

 @MainActor
 private func frame(for size: CGSize, window: NSWindow) -> NSRect {
 let screen = window.screen ?? NSScreen.main
 let visibleFrame = screen?.visibleFrame ?? NSRect(x: 0, y: 0, width: size.width, height: size.height)
 let x = visibleFrame.midX - size.width / 2
 let y = visibleFrame.maxY - size.height - 28
 return NSRect(origin: NSPoint(x: x, y: y), size: size)
 return OverlayPanelPlacement.frame(for: size, in: visibleFrame)
 }
}

enum OverlayPanelPlacement {
 static let bottomMargin: CGFloat = 24

 static func frame(for size: CGSize, in visibleFrame: CGRect) -> CGRect {
 CGRect(
 x: visibleFrame.midX - size.width / 2,
 y: visibleFrame.minY + bottomMargin,
 width: size.width,
 height: size.height
 )
 }
}
Loading
Loading