Skip to content

Added Font Favorite System #64

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

Added Font Favorite System #64

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
109 changes: 108 additions & 1 deletion freewrite/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ struct ContentView: View {
@State private var entries: [HumanEntry] = []
@State private var text: String = "" // Remove initial welcome text since we'll handle it in createNewEntry

// Add state for favorite fonts
@State private var favoriteFonts: [String] = []
@State private var showingFavoritesMenu = false
@State private var isHoveringFavorite = false
@State private var isHoveringFavoritesMenu = false

@State private var isFullscreen = false
@State private var selectedFont: String = "Lato-Regular"
@State private var currentRandomFont: String = ""
Expand Down Expand Up @@ -154,6 +160,8 @@ struct ContentView: View {
// Load saved color scheme preference
let savedScheme = UserDefaults.standard.string(forKey: "colorScheme") ?? "light"
_colorScheme = State(initialValue: savedScheme == "dark" ? .dark : .light)
// Load favorite fonts
loadFavoriteFonts()
}

// Modify getDocumentsDirectory to use cached value
Expand Down Expand Up @@ -552,6 +560,94 @@ struct ContentView: View {
NSCursor.pop()
}
}

// Add the favorite button next to random
if !currentRandomFont.isEmpty {
Button(action: {
if !favoriteFonts.contains(currentRandomFont) {
favoriteFonts.append(currentRandomFont)
saveFavoriteFonts()
}
}) {
Image(systemName: "star")
.font(.system(size: 10))
}
.buttonStyle(.plain)
.foregroundColor(isHoveringFavorite ? textHoverColor : textColor)
.help("Save this font to favorites")
.onHover { hovering in
isHoveringFavorite = hovering
isHoveringBottomNav = hovering
if hovering {
NSCursor.pointingHand.push()
} else {
NSCursor.pop()
}
}
}

// Add favorites button
if !favoriteFonts.isEmpty {
Text("•")
.foregroundColor(.gray)

Button("Favorites") {
showingFavoritesMenu = true
}
.buttonStyle(.plain)
.foregroundColor(isHoveringFavoritesMenu ? textHoverColor : textColor)
.popover(isPresented: $showingFavoritesMenu, attachmentAnchor: .point(UnitPoint(x: 0.5, y: 0)), arrowEdge: .top) {
VStack(spacing: 0) {
ForEach(favoriteFonts, id: \.self) { font in
Button(action: {
selectedFont = font
currentRandomFont = font
showingFavoritesMenu = false
}) {
HStack {
Text(font)
.font(.custom(font, size: 14))
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 4)

Button(action: {
if let index = favoriteFonts.firstIndex(of: font) {
favoriteFonts.remove(at: index)
saveFavoriteFonts()
}
}) {
Image(systemName: "xmark.circle")
.font(.system(size: 10))
.foregroundColor(Color.gray)
}
.buttonStyle(.plain)
.help("Remove from favorites")
}
}
.buttonStyle(.plain)
.foregroundColor(popoverTextColor)
.padding(.horizontal, 12)

if font != favoriteFonts.last {
Divider()
}
}
}
.frame(width: 200)
.background(popoverBackgroundColor)
.cornerRadius(8)
.shadow(color: Color.black.opacity(0.1), radius: 4, y: 2)
}
.onHover { hovering in
isHoveringFavoritesMenu = hovering
isHoveringBottomNav = hovering
if hovering {
NSCursor.pointingHand.push()
} else {
NSCursor.pop()
}
}
}
}
.padding(8)
.cornerRadius(6)
Expand Down Expand Up @@ -1266,6 +1362,17 @@ struct ContentView: View {

return pdfData as Data
}

// Add methods for font favorites persistence
private func loadFavoriteFonts() {
if let savedFonts = UserDefaults.standard.array(forKey: "favoriteFonts") as? [String] {
favoriteFonts = savedFonts
}
}

private func saveFavoriteFonts() {
UserDefaults.standard.set(favoriteFonts, forKey: "favoriteFonts")
}
}

// Helper function to calculate line height
Expand Down Expand Up @@ -1305,4 +1412,4 @@ extension NSView {

#Preview {
ContentView()
}
}