Skip to content

Flexible window sizing, unified settings, and keyboard shortcuts #26

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

Open
nathanael wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Flexible window sizing, unified settings, and keyboard shortcuts #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80b0c55
feat: percentage-based window sizing, unified font slider, and settin…
Mar 22, 2026
81db408
fix: prevent array index out of bounds crash in rewindByWords
Mar 22, 2026
b1a2ecf
feat: keyboard shortcuts, toolbar cleanup, and editable document title
Mar 22, 2026
f8038bd
docs: add design spec and implementation plan for slider-based sizing
Mar 22, 2026
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
218 changes: 110 additions & 108 deletions Textream/Textream/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftUI
import UniformTypeIdentifiers
import CoreImage.CIFilterBuiltins


struct ContentView: View {
@ObservedObject private var service = TextreamService.shared
@State private var isRunning = false
Expand Down Expand Up @@ -219,63 +220,6 @@ Happy presenting! [wave]
)
)

// Bottom bar
VStack {
Spacer()
ZStack {
// Waveform pill centered to full width
if isRecording {
waveformPill
.transition(.scale(scale: 0.8).combined(with: .opacity))
}

// Buttons pinned right
HStack(spacing: 10) {
Spacer()

Button {
if isRecording {
stopRecording()
} else {
startRecording()
}
} label: {
Image(systemName: isRecording ? "pause.fill" : "mic.fill")
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.white)
.frame(width: 44, height: 44)
.background(isRecording ? Color.orange : Color.red)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 8, y: 4)
}
.buttonStyle(.plain)
.disabled(isRunning)
.opacity(isRunning ? 0.4 : 1)

Button {
if isRunning {
stop()
} else {
run()
}
} label: {
Image(systemName: isRunning ? "stop.fill" : "play.fill")
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.white)
.frame(width: 44, height: 44)
.background(isRunning ? Color.red : Color.accentColor)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 8, y: 4)
}
.buttonStyle(.plain)
.disabled((!isRunning && !hasAnyContent) || isRecording)
.opacity((!hasAnyContent && !isRunning) || isRecording ? 0.4 : 1)
}
}
.padding(20)
}
.animation(.easeInOut(duration: 0.25), value: isRecording)

// Drop zone overlay — sits on top so TextEditor doesn't steal the drop
if isDroppingPresentation {
VStack(spacing: 8) {
Expand Down Expand Up @@ -329,6 +273,64 @@ Happy presenting! [wave]
}
.allowsHitTesting(isDroppingPresentation)
}
.overlay(alignment: .bottom) {
ZStack {
// Waveform pill centered to full width
if isRecording {
waveformPill
.transition(.scale(scale: 0.8).combined(with: .opacity))
}

// Buttons pinned right
HStack(spacing: 10) {
Spacer()

Button {
if isRecording {
stopRecording()
} else {
startRecording()
}
} label: {
Image(systemName: isRecording ? "pause.fill" : "mic.fill")
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.white)
.frame(width: 44, height: 44)
.background(isRecording ? Color.orange : Color.red)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 8, y: 4)
}
.buttonStyle(.plain)
.keyboardShortcut("r", modifiers: .command)
.help(isRecording ? "Stop Recording (\u{2318}R)" : "Record (\u{2318}R)")
.disabled(isRunning)
.opacity(isRunning ? 0.4 : 1)

Button {
if isRunning {
stop()
} else {
run()
}
} label: {
Image(systemName: isRunning ? "stop.fill" : "text.viewfinder")
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.white)
.frame(width: 44, height: 44)
.background(isRunning ? Color.red : Color.accentColor)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 8, y: 4)
}
.buttonStyle(.plain)
.keyboardShortcut(.return, modifiers: .command)
.help(isRunning ? "Stop (Esc)" : "Start Teleprompter (\u{2318}\u{23CE})")
.disabled((!isRunning && !hasAnyContent) || isRecording)
.opacity((!hasAnyContent && !isRunning) || isRecording ? 0.4 : 1)
}
}
.padding(20)
.animation(.easeInOut(duration: 0.25), value: isRecording)
}
}
}

Expand Down Expand Up @@ -425,64 +427,47 @@ Happy presenting! [wave]
.frame(minWidth: 360, minHeight: 240)
.background(.ultraThinMaterial)
.toolbar {
ToolbarItem(placement: .automatic) {
HStack(spacing: 8) {
Button {
service.openFile()
} label: {
HStack(spacing: 4) {
if service.currentFileURL != nil && service.pages != service.savedPages {
Circle()
.fill(.orange)
.frame(width: 6, height: 6)
}
Text(service.currentFileURL?.deletingPathExtension().lastPathComponent ?? "Untitled")
.font(.system(size: 11, weight: .medium))
.lineLimit(1)
}
.foregroundStyle(.tertiary)
ToolbarItem(placement: .principal) {
HStack(spacing: 4) {
if service.currentFileURL != nil && service.pages != service.savedPages {
Circle()
.fill(.orange)
.frame(width: 6, height: 6)
}
.buttonStyle(.plain)

// Add page button in toolbar
Button {
withAnimation(.easeInOut(duration: 0.2)) {
service.pages.append("")
service.currentPageIndex = service.pages.count - 1
}
} label: {
HStack(spacing: 3) {
Image(systemName: "plus")
.font(.system(size: 10, weight: .semibold))
Text("Page")
.font(.system(size: 11, weight: .medium))
}
.foregroundStyle(.secondary)
}
.buttonStyle(.plain)

Button {
showSettings = true
} label: {
HStack(spacing: 4) {
Image(systemName: NotchSettings.shared.listeningMode.icon)
.font(.system(size: 10))
Text(NotchSettings.shared.listeningMode == .wordTracking
? languageLabel
: NotchSettings.shared.listeningMode.label)
.font(.system(size: 11, weight: .medium))
.lineLimit(1)
}
.foregroundStyle(.secondary)
}
.buttonStyle(.plain)
TextField("Untitled", text: $service.documentTitle, onCommit: {
renameFile(to: service.documentTitle)
})
.textFieldStyle(.plain)
.font(.system(size: 11, weight: .medium))
.foregroundStyle(.tertiary)
.multilineTextAlignment(.center)
.frame(maxWidth: 200)
}
.onAppear {
service.documentTitle = service.currentFileURL?.deletingPathExtension().lastPathComponent ?? "Untitled"
}
.padding(.horizontal, 8)
.onChange(of: service.currentFileURL) { _, url in
service.documentTitle = url?.deletingPathExtension().lastPathComponent ?? "Untitled"
}
}
}
.onKeyPress(.escape) {
if isRunning {
stop()
return .handled
}
return .ignored
}
.sheet(isPresented: $showSettings) {
SettingsView(settings: NotchSettings.shared)
}
.onChange(of: showSettings) { _, isOpen in
DispatchQueue.main.async {
if let window = NSApplication.shared.mainWindow {
window.level = isOpen ? NSWindow.Level(Int(CGShieldingWindowLevel()) + 2) : .normal
}
}
}
.sheet(isPresented: $showAbout) {
AboutView()
}
Expand Down Expand Up @@ -591,6 +576,23 @@ Happy presenting! [wave]

// MARK: - Actions

private func renameFile(to newName: String) {
guard let url = service.currentFileURL else { return }
let trimmed = newName.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else {
service.documentTitle = url.deletingPathExtension().lastPathComponent
return
}
let newURL = url.deletingLastPathComponent().appendingPathComponent(trimmed).appendingPathExtension(url.pathExtension)
guard newURL != url else { return }
do {
try FileManager.default.moveItem(at: url, to: newURL)
service.currentFileURL = newURL
} catch {
service.documentTitle = url.deletingPathExtension().lastPathComponent
}
}

private func removePage(at index: Int) {
guard service.pages.count > 1 else { return }
withAnimation(.easeInOut(duration: 0.2)) {
Expand Down
4 changes: 2 additions & 2 deletions Textream/Textream/ExternalDisplayController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ struct ExternalDisplayView: View {

private var prompterView: some View {
GeometryReader { geo in
let fontSize = max(48, min(96, geo.size.width / 14))
let fontSize = NotchSettings.shared.fontSize
let hPad = max(40, geo.size.width * 0.08)

VStack(spacing: 0) {
Expand All @@ -223,7 +223,7 @@ struct ExternalDisplayView: View {
SpeechScrollView(
words: words,
highlightedCharCount: effectiveCharCount,
font: .systemFont(ofSize: fontSize, weight: .semibold),
font: NotchSettings.shared.fontFamilyPreset.font(size: fontSize),
highlightColor: NotchSettings.shared.fontColorPreset.color,
cueColor: NotchSettings.shared.cueColorPreset.color,
cueUnreadOpacity: NotchSettings.shared.cueBrightness.unreadOpacity,
Expand Down
Loading