Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

move history pins beside timestamps (#1072)

ALTICfb3b238abcb0
diff --git a/.github/screenshots/history-pinned-filter.png b/.github/screenshots/history-pinned-filter.png
new file mode 100644
index 00000000..3736bc78
Binary files /dev/null and b/.github/screenshots/history-pinned-filter.png differ
diff --git a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift
index 9223fca6..9f9f8297 100644
--- a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift
+++ b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift
@@ -439,19 +439,23 @@ final class TranscriptionHistoryStore: ObservableObject {
}
/// Search entries by text content
- func search(query: String, starredOnly: Bool = false) -> [TranscriptionHistoryEntry] {
+ func search(query: String, starredOnly: Bool = false, pinnedFirst: Bool = false) -> [TranscriptionHistoryEntry] {
let entries = starredOnly ? self.entries.filter(\.isStarred) : self.entries
- guard !query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
- return entries
- }
-
- let lowercased = query.lowercased()
- return entries.filter { entry in
- entry.rawText.lowercased().contains(lowercased) ||
- entry.processedText.lowercased().contains(lowercased) ||
- entry.appName.lowercased().contains(lowercased) ||
- entry.windowTitle.lowercased().contains(lowercased)
+ let matches: [TranscriptionHistoryEntry]
+ if query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+ matches = entries
+ } else {
+ let lowercased = query.lowercased()
+ matches = entries.filter { entry in
+ entry.rawText.lowercased().contains(lowercased) ||
+ entry.processedText.lowercased().contains(lowercased) ||
+ entry.appName.lowercased().contains(lowercased) ||
+ entry.windowTitle.lowercased().contains(lowercased)
+ }
}
+ guard pinnedFirst, !starredOnly else { return matches }
+ // Stable, linear partition for History's display; stored chronology and other readers stay unchanged.
+ return matches.filter(\.isStarred) + matches.filter { !$0.isStarred }
}
/// Get entries filtered by date range
diff --git a/Sources/Fluid/UI/TranscriptionHistoryView.swift b/Sources/Fluid/UI/TranscriptionHistoryView.swift
index 2858fd70..dc893acb 100644
--- a/Sources/Fluid/UI/TranscriptionHistoryView.swift
+++ b/Sources/Fluid/UI/TranscriptionHistoryView.swift
@@ -2,6 +2,16 @@ import AppKit
import SwiftUI
import UniformTypeIdentifiers
+nonisolated struct HistoryPinRevealRequest: Equatable {
+ let entryID: UUID
+ private let nonce = UUID()
+
+ func target(selectedID: UUID?, visibleIDs: [UUID]) -> UUID? {
+ guard selectedID == self.entryID, visibleIDs.contains(self.entryID) else { return nil }
+ return self.entryID
+ }
+}
+
/// A hidden existing row can be selected from sidebar search even when the list is empty.
nonisolated enum HistorySelectionRevealPolicy {
static func needsFilterReset(
@@ -22,7 +32,8 @@ struct TranscriptionHistoryView: View {
@Environment(\.theme) private var theme
@State private var searchQuery: String = ""
- @State private var starredOnly = false
+ @State private var pinnedOnly = false
+ @State private var pinRevealRequest: HistoryPinRevealRequest?
@State private var showClearConfirmation: Bool = false
@State private var showReportConfirmation: Bool = false
@State private var selectedReportEntry: TranscriptionHistoryEntry?
@@ -52,7 +63,7 @@ struct TranscriptionHistoryView: View {
}
private var filteredEntries: [TranscriptionHistoryEntry] {
- self.historyStore.search(query: self.searchQuery, starredOnly: self.starredOnly)
+ self.historyStore.search(query: self.searchQuery, starredOnly: self.pinnedOnly, pinnedFirst: true)
}
private var selectedEntry: TranscriptionHistoryEntry? {
@@ -65,15 +76,14 @@ struct TranscriptionHistoryView: View {
// MARK: - Left Panel: Entry List
VStack(spacing: 0) {
- VStack(spacing: 10) {
+ HStack(spacing: 8) {
self.searchBar
-
- Picker("History filter", selection: self.$starredOnly) {
+ FluidDropdownPicker("History filter", selectedTitle: self.pinnedOnly ? "Pinned" : "All", selection: self.$pinnedOnly) {
Text("All").tag(false)
- Text("Starred").tag(true)
+ Text("Pinned").tag(true)
}
- .pickerStyle(.segmented)
- .labelsHidden()
+ .fluidDropdownStyle()
+ .fixedSize()
}
.padding(12)
@@ -129,6 +139,7 @@ struct TranscriptionHistoryView: View {
self.audioEntryID = nil
}
.onDisappear {
+ self.pinRevealRequest = nil
self.availableAudioFiles = []
self.audioEntryID = nil
self.copyFeedbackTask?.cancel()
@@ -164,7 +175,7 @@ struct TranscriptionHistoryView: View {
}
}
} message: {
- Text("This will permanently delete all \(self.historyStore.entries.count) transcription entries, including starred entries. This action cannot be undone.")
+ Text("This will permanently delete all \(self.historyStore.entries.count) transcription entries, including pinned entries. This action cannot be undone.")
}
.alert("Report Sent", isPresented: self.$showReportConfirmation) {
Button("OK", role: .cancel) {}
@@ -227,6 +238,16 @@ struct TranscriptionHistoryView: View {
}
.onAppear { self.reveal(self.selectedEntryID, with: proxy) }
.onChange(of: self.historyStore.selectedEntryID) { _, id in self.reveal(id, with: proxy) }
+ .task(id: self.pinRevealRequest) {
+ guard let request = self.pinRevealRequest else { return }
+ // Let the reordered rows reach the list before following the selected one.
+ await Task.yield()
+ guard !Task.isCancelled, self.pinRevealRequest == request else { return }
+ if let id = request.target(selectedID: self.selectedEntryID, visibleIDs: self.filteredEntries.map(\.id)) {
+ proxy.scrollTo(id)
+ }
+ if self.pinRevealRequest == request { self.pinRevealRequest = nil }
+ }
}
}
@@ -241,7 +262,7 @@ struct TranscriptionHistoryView: View {
visibleEntries: self.filteredEntries
) else { return }
self.searchQuery = ""
- self.starredOnly = false
+ self.pinnedOnly = false
}
/// The parent clears a hidden selection's filters; scroll after that view update.
@@ -263,17 +284,13 @@ struct TranscriptionHistoryView: View {
} label: {
VStack(alignment: .leading, spacing: 7) {
HStack(spacing: 8) {
- if entry.isStarred {
- Image(systemName: "star.fill")
- .font(self.theme.typography.captionStrong)
- .foregroundStyle(self.theme.palette.accent)
- .accessibilityLabel("Starred")
- }
HistoryAppIcon(appName: entry.appName)
Spacer(minLength: 4)
Text(entry.relativeTimeString)
.font(self.theme.typography.caption).foregroundStyle(.secondary)
}
+ .padding(.trailing, 36)
+ .frame(minHeight: 28)
Text(entry.previewText)
.font(self.theme.typography.body)
.lineLimit(2).multilineTextAlignment(.leading)
@@ -318,6 +335,9 @@ struct TranscriptionHistoryView: View {
.accessibilityAddTraits(isSelected ? .isSelected : [])
.accessibilityAction(named: Text("Copy final text")) { self.copyFinalText(entry) }
.accessibilityAction(named: Text("Report issue")) { self.openFeedbackReport(for: entry) }
+ .accessibilityAction(named: Text(entry.isStarred ? "Unpin transcription" : "Pin transcription")) {
+ self.togglePin(entry)
+ }
HStack(spacing: 8) {
Button {
self.copyFinalText(entry)
@@ -348,6 +368,21 @@ struct TranscriptionHistoryView: View {
.allowsHitTesting(showsActions)
.accessibilityHidden(!showsActions)
}
+ .overlay(alignment: .topTrailing) {
+ Button {
+ self.togglePin(entry)
+ } label: {
+ Image(systemName: entry.isStarred ? "pin.fill" : "pin")
+ .font(self.theme.typography.body)
+ .frame(width: 28, height: 28)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .foregroundStyle(entry.isStarred ? self.theme.palette.accent : self.theme.palette.secondaryText)
+ .help(entry.isStarred ? "Unpin transcription" : "Pin transcription")
+ .accessibilityLabel(entry.isStarred ? "Unpin transcription" : "Pin transcription")
+ .accessibilityIdentifier("History.Pin.\(entry.id.uuidString)")
+ }
}
.padding(12)
.background(self.theme.palette.accent.opacity(isSelected ? 0.12 : 0), in: RoundedRectangle(cornerRadius: 14))
@@ -359,9 +394,9 @@ struct TranscriptionHistoryView: View {
@ViewBuilder
private func entryActions(_ entry: TranscriptionHistoryEntry) -> some View {
Button {
- self.historyStore.toggleStar(id: entry.id)
+ self.togglePin(entry)
} label: {
- Label(entry.isStarred ? "Unstar" : "Star", systemImage: entry.isStarred ? "star.slash" : "star")
+ Label(entry.isStarred ? "Unpin" : "Pin", systemImage: entry.isStarred ? "pin.slash" : "pin")
}
Divider()
@@ -423,22 +458,29 @@ struct TranscriptionHistoryView: View {
}
}
+ private func togglePin(_ entry: TranscriptionHistoryEntry) {
+ self.pinRevealRequest = nil
+ self.historyStore.toggleStar(id: entry.id)
+ guard self.selectedEntryID == entry.id, self.filteredEntries.contains(where: { $0.id == entry.id }) else { return }
+ self.pinRevealRequest = HistoryPinRevealRequest(entryID: entry.id)
+ }
+
// MARK: - Empty State
private var emptyStateIcon: String {
if !self.searchQuery.isEmpty { return "magnifyingglass" }
- return self.starredOnly ? "star" : "clock.arrow.circlepath"
+ return self.pinnedOnly ? "pin" : "clock.arrow.circlepath"
}
private var emptyStateTitle: String {
if !self.searchQuery.isEmpty { return "No Results" }
- return self.starredOnly ? "No Starred Transcriptions" : "No History Yet"
+ return self.pinnedOnly ? "No Pinned Transcriptions" : "No History Yet"
}
private var emptyStateMessage: String {
if !self.searchQuery.isEmpty { return "Try a different search term" }
- return self.starredOnly
- ? "Star a transcription to find it here quickly"
+ return self.pinnedOnly
+ ? "Pin a transcription to keep it at the top of History"
: "Your transcriptions will appear here"
}
@@ -516,19 +558,6 @@ struct TranscriptionHistoryView: View {
self.detailActions(entry)
}
}
- HStack {
- Spacer()
- Button {
- self.historyStore.toggleStar(id: entry.id)
- } label: {
- Label(entry.isStarred ? "Starred" : "Star", systemImage: entry.isStarred ? "star.fill" : "star")
- }
- .buttonStyle(.bordered)
- .controlSize(.small)
- .tint(entry.isStarred ? self.theme.palette.accent : nil)
- .accessibilityLabel(entry.isStarred ? "Unstar transcription" : "Star transcription")
- .help(entry.isStarred ? "Remove from Starred" : "Save to Starred")
- }
if self.audioEntryID == entry.id {
HistoryInlineAudioView(entry: entry)
.id(entry.id)
diff --git a/Tests/HistoryPersistenceBoundaryTests.swift b/Tests/HistoryPersistenceBoundaryTests.swift
index 416f27c3..9f70524b 100644
--- a/Tests/HistoryPersistenceBoundaryTests.swift
+++ b/Tests/HistoryPersistenceBoundaryTests.swift
@@ -218,6 +218,18 @@ final class DebugLogger {
)
store.restore(from: [older, newer])
precondition(store.search(query: "").map(\.id) == [newer.id, older.id], "Stars must preserve chronological order")
+ precondition(store.search(query: "", pinnedFirst: true).map(\.id) == [older.id, newer.id], "History displays pins first")
+ precondition(store.search(query: "prompt", pinnedFirst: true).map(\.id) == [older.id, newer.id], "Pin ordering applies after text filtering")
+ precondition(store.search(query: "Another", pinnedFirst: true).map(\.id) == [newer.id], "Pins must not bypass the search filter")
+ let storedOrder = store.entries
+ let selectedID = store.selectedEntryID
+ store.toggleStar(id: newer.id)
+ precondition(store.search(query: "", pinnedFirst: true).map(\.id) == [newer.id, older.id], "Multiple pins retain newest-first order")
+ store.toggleStar(id: older.id)
+ precondition(store.search(query: "", pinnedFirst: true).map(\.id) == [newer.id, older.id], "Unpin returns the entry to its date position")
+ store.toggleStar(id: newer.id)
+ store.toggleStar(id: older.id)
+ precondition(store.entries == storedOrder && store.selectedEntryID == selectedID, "Pinning must preserve persisted chronology, all metadata, and selection")
precondition(store.search(query: " ", starredOnly: true).map(\.id) == [older.id])
for query in ["PROMPT", "Original", "Editor", "Reference"] {
precondition(store.search(query: query, starredOnly: true).map(\.id) == [older.id], "Search must intersect with stars across every field")
diff --git a/Tests/HistoryPresentationTests.swift b/Tests/HistoryPresentationTests.swift
index 116c007f..64ab30a1 100644
--- a/Tests/HistoryPresentationTests.swift
+++ b/Tests/HistoryPresentationTests.swift
@@ -15,6 +15,15 @@ enum PrivateAIModelRegistry {
@main
struct HistoryPresentationTests {
static func main() async throws {
+ let pinID = UUID()
+ let otherID = UUID()
+ let pinRequest = HistoryPinRevealRequest(entryID: pinID)
+ precondition(pinRequest.target(selectedID: pinID, visibleIDs: [otherID, pinID]) == pinID)
+ precondition(pinRequest.target(selectedID: otherID, visibleIDs: [pinID, otherID]) == nil, "Pin must not navigate to an unrelated selection")
+ precondition(pinRequest.target(selectedID: pinID, visibleIDs: [otherID]) == nil, "Unpinned, filtered, or deleted rows must not be revealed")
+ precondition(pinRequest.target(selectedID: nil, visibleIDs: [pinID]) == nil)
+ precondition(pinRequest != HistoryPinRevealRequest(entryID: pinID), "Rapid toggles need distinct requests to cancel stale scroll work")
+ print("PASS: selected pin reveal, unrelated/hidden/deleted/nil non-effects and rapid request identity")
let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
defer { try? FileManager.default.removeItem(at: directory) }