Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions apps/Mac/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<string></string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<!-- Bundled fonts (Libre Franklin) — registers all .ttf in Resources/ -->
<key>ATSApplicationFontsPath</key>
<string>.</string>
<key>GIDClientID</key>
<string>771367679852-bns841o89en9bfdulo5s5vltpucqj1vh.apps.googleusercontent.com</string>
<key>CFBundleURLTypes</key>
Expand Down
Binary file added apps/Shared/Fonts/LibreFranklin-Black.ttf
Binary file not shown.
Binary file added apps/Shared/Fonts/LibreFranklin-Bold.ttf
Binary file not shown.
Binary file added apps/Shared/Fonts/LibreFranklin-Light.ttf
Binary file not shown.
Binary file added apps/Shared/Fonts/LibreFranklin-Medium.ttf
Binary file not shown.
Binary file added apps/Shared/Fonts/LibreFranklin-Regular.ttf
Binary file not shown.
Binary file added apps/Shared/Fonts/LibreFranklin-SemiBold.ttf
Binary file not shown.
26 changes: 22 additions & 4 deletions apps/Shared/Support/ApproachNoteTheme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ struct ApproachNoteTheme {
// MARK: - Typography

/// Font family for headings (largeTitle, title, title2, title3, headline)
/// Options: "Futura", "Avenir", "Helvetica Neue", "Gill Sans", "Optima"
static let headingFontFamily = "Baskerville"
/// Options: "Libre Franklin", "Futura", "Avenir", "Helvetica Neue", "Gill Sans", "Optima", "Baskerville"
static let headingFontFamily = "Libre Franklin"

/// Font family for body text (body, callout, subheadline, footnote, caption)
/// Options: "Baskerville", "Georgia", "Palatino", "Didot", "Cochin", "Charter", "Avenir", "Futura"
static let bodyFontFamily = "Avenir"
/// Options: "Libre Franklin", "Baskerville", "Georgia", "Palatino", "Didot", "Cochin", "Charter", "Avenir", "Futura"
static let bodyFontFamily = "Libre Franklin"

// MARK: - Heading Fonts

Expand Down Expand Up @@ -85,6 +85,15 @@ struct ApproachNoteTheme {
/// Helper to get the correct heading font name variant for the weight
private static func headingFontName(for weight: Font.Weight) -> String {
switch headingFontFamily {
case "Libre Franklin":
switch weight {
case .black, .heavy: return "LibreFranklin-Black"
case .bold: return "LibreFranklin-Bold"
case .semibold: return "LibreFranklin-SemiBold"
case .medium: return "LibreFranklin-Medium"
case .light, .ultraLight, .thin: return "LibreFranklin-Light"
default: return "LibreFranklin-Regular"
}
case "Futura":
switch weight {
case .bold, .heavy, .black: return "Futura-Bold"
Expand Down Expand Up @@ -134,6 +143,15 @@ struct ApproachNoteTheme {
/// Helper to get the correct body font name variant for the weight
private static func bodyFontName(for weight: Font.Weight) -> String {
switch bodyFontFamily {
case "Libre Franklin":
switch weight {
case .black, .heavy: return "LibreFranklin-Black"
case .bold: return "LibreFranklin-Bold"
case .semibold: return "LibreFranklin-SemiBold"
case .medium: return "LibreFranklin-Medium"
case .light, .ultraLight, .thin: return "LibreFranklin-Light"
default: return "LibreFranklin-Regular"
}
case "Futura":
switch weight {
case .bold, .heavy, .black: return "Futura-Bold"
Expand Down
11 changes: 11 additions & 0 deletions apps/iOS/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@
</dict>
</array>

<!-- Bundled fonts (Libre Franklin) -->
<key>UIAppFonts</key>
<array>
<string>LibreFranklin-Light.ttf</string>
<string>LibreFranklin-Regular.ttf</string>
<string>LibreFranklin-Medium.ttf</string>
<string>LibreFranklin-SemiBold.ttf</string>
<string>LibreFranklin-Bold.ttf</string>
<string>LibreFranklin-Black.ttf</string>
</array>

<!-- UI Configuration -->
<key>UIApplicationSceneManifest</key>
<dict>
Expand Down
Loading