Skip to content

Global searcher #69

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
francostan wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Global searcher #69

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5009ead
Centered texting
rk-helper Apr 25, 2025
57ba4af
changes
farzaa Apr 25, 2025
601365c
initial project file
rk-helper Apr 25, 2025
6afc414
Merge branch 'main' of https://github.com/rk-helper/freewrite
rk-helper Apr 25, 2025
fdb429e
Merge pull request #65 from rk-helper/main
farzaa Apr 25, 2025
c89b0c2
add searcher bar
francostan Apr 29, 2025
22da78e
added searcher bar
francostan Apr 29, 2025
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
80 changes: 63 additions & 17 deletions freewrite/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ struct ContentView: View {
@State private var colorScheme: ColorScheme = .light // Add state for color scheme
@State private var isHoveringThemeToggle = false // Add state for theme toggle hover
@State private var didCopyPrompt: Bool = false // Add state for copy prompt feedback
@State private var searchText: String = ""

var filteredEntries: [HumanEntry] {
let query = searchText.trimmed().lowercased()
guard !query.isEmpty else { return entries }

return entries.filter { entry in
let fileURL = getDocumentsDirectory().appendingPathComponent(entry.filename)
if let content = try? String(contentsOf: fileURL, encoding: .utf8) {
return content.lowercased().contains(query)
}
return false
}
}


let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
let entryHeight: CGFloat = 40

Expand Down Expand Up @@ -382,6 +398,8 @@ struct ContentView: View {
return colorScheme == .light ? Color.primary : Color.white
}

@State private var viewHeight: CGFloat = 0

var body: some View {
let buttonBackground = colorScheme == .light ? Color.white : Color.black
let navHeight: CGFloat = 68
Expand All @@ -394,24 +412,27 @@ struct ContentView: View {
Color(colorScheme == .light ? .white : .black)
.ignoresSafeArea()

TextEditor(text: Binding(
get: { text },
set: { newValue in
// Ensure the text always starts with two newlines
if !newValue.hasPrefix("\n\n") {
text = "\n\n" + newValue.trimmingCharacters(in: .newlines)
} else {
text = newValue

TextEditor(text: Binding(
get: { text },
set: { newValue in
// Ensure the text always starts with two newlines
if !newValue.hasPrefix("\n\n") {
text = "\n\n" + newValue.trimmingCharacters(in: .newlines)
} else {
text = newValue
}
}
}
))
))
.background(Color(colorScheme == .light ? .white : .black))
.font(.custom(selectedFont, size: fontSize))
.foregroundColor(colorScheme == .light ? Color(red: 0.20, green: 0.20, blue: 0.20) : Color(red: 0.9, green: 0.9, blue: 0.9))
.scrollContentBackground(.hidden)
.scrollIndicators(.never)
.lineSpacing(lineHeight)
.frame(maxWidth: 650)


.id("\(selectedFont)-\(fontSize)-\(colorScheme)")
.padding(.bottom, bottomNavOpacity > 0 ? navHeight : 0)
.ignoresSafeArea()
Expand All @@ -426,13 +447,20 @@ struct ContentView: View {
Text(placeholderText)
.font(.custom(selectedFont, size: fontSize))
.foregroundColor(colorScheme == .light ? .gray.opacity(0.5) : .gray.opacity(0.6))
// .padding(.top, 8)
// .padding(.leading, 8)
// .padding(.top, 8)
// .padding(.leading, 8)
.allowsHitTesting(false)
.offset(x: 5, y: placeholderOffset)
}
}, alignment: .topLeading
)
.onGeometryChange(for: CGFloat.self) { proxy in
proxy.size.height
} action: { height in
viewHeight = height
}
.contentMargins(.bottom, viewHeight / 4)


VStack {
Spacer()
Expand Down Expand Up @@ -909,10 +937,21 @@ struct ContentView: View {

Divider()

HStack {
TextField("Search entries...", text: $searchText)
.textFieldStyle(PlainTextFieldStyle())
.padding(8)
.background(Color.gray.opacity(0.1))
.cornerRadius(8)
}
.padding([.horizontal, .vertical], 12)

Divider()

// Entries List
ScrollView {
LazyVStack(spacing: 0) {
ForEach(entries) { entry in
ForEach(filteredEntries) { entry in
Button(action: {
if selectedEntryId != entry.id {
// Save current entry before switching
Expand Down Expand Up @@ -944,9 +983,9 @@ struct ContentView: View {
}) {
Image(systemName: "arrow.down.circle")
.font(.system(size: 11))
.foregroundColor(hoveredExportId == entry.id ?
(colorScheme == .light ? .black : .white) :
(colorScheme == .light ? .gray : .gray.opacity(0.8)))
.foregroundColor(hoveredExportId == entry.id ?
(colorScheme == .light ? .black : .white) :
(colorScheme == .light ? .gray : .gray.opacity(0.8)))
}
.buttonStyle(.plain)
.help("Export entry as PDF")
Expand Down Expand Up @@ -1397,6 +1436,13 @@ extension NSView {
}
}

extension String {
func trimmed() -> String {
self.trimmingCharacters(in: .whitespacesAndNewlines)
}
}


#Preview {
ContentView()
}
}