Skip to content

Replace Inter font with Apple system font #30

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

Merged
dadachi merged 1 commit into from
Apr 1, 2026
Merged

Replace Inter font with Apple system font #30

Show file tree
Hide file tree
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
16 changes: 0 additions & 16 deletions NativeAppTemplate.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@
0182D37825B277FA001E881D /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0182D37625B277D6001E881D /* KeychainStore.swift */; };
0182D38225B296B9001E881D /* ShopkeeperAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0182D38125B296B9001E881D /* ShopkeeperAdapter.swift */; };
0182D39A25B4424B001E881D /* LoggedInShopkeeperKeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0182D39925B4424B001E881D /* LoggedInShopkeeperKeychainStore.swift */; };
018D4EFD2B6350E800CBA736 /* Inter-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 018D4EFC2B6350E800CBA736 /* Inter-Medium.ttf */; };
018D4EFF2B6350F500CBA736 /* Inter-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 018D4EFE2B6350F500CBA736 /* Inter-Bold.ttf */; };
018E21CB2B36367F00FFD1F6 /* MeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 018E21CA2B36367F00FFD1F6 /* MeRequest.swift */; };
018E21CD2B36377800FFD1F6 /* MeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 018E21CC2B36377800FFD1F6 /* MeService.swift */; };
0199CD242E07510200109DC6 /* AccountPasswordRepositoryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0199CD212E07510200109DC6 /* AccountPasswordRepositoryProtocol.swift */; };
Expand Down Expand Up @@ -291,8 +289,6 @@
0182D37625B277D6001E881D /* KeychainStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStore.swift; sourceTree = "<group>"; };
0182D38125B296B9001E881D /* ShopkeeperAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopkeeperAdapter.swift; sourceTree = "<group>"; };
0182D39925B4424B001E881D /* LoggedInShopkeeperKeychainStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInShopkeeperKeychainStore.swift; sourceTree = "<group>"; };
018D4EFC2B6350E800CBA736 /* Inter-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Medium.ttf"; sourceTree = "<group>"; };
018D4EFE2B6350F500CBA736 /* Inter-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Bold.ttf"; sourceTree = "<group>"; };
018E21CA2B36367F00FFD1F6 /* MeRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeRequest.swift; sourceTree = "<group>"; };
018E21CC2B36377800FFD1F6 /* MeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeService.swift; sourceTree = "<group>"; };
0199CD212E07510200109DC6 /* AccountPasswordRepositoryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountPasswordRepositoryProtocol.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -716,7 +712,6 @@
0172046D25AA8325008FD63B /* Styleguide */ = {
isa = PBXGroup;
children = (
018D4EFB2B6350CB00CBA736 /* Inter */,
0172047625AA8325008FD63B /* Color+Extensions.swift */,
0172047525AA8325008FD63B /* Font+Extensions.swift */,
0172046E25AA8325008FD63B /* UIFont+Extensions.swift */,
Expand Down Expand Up @@ -798,15 +793,6 @@
path = KeychainStore;
sourceTree = "<group>";
};
018D4EFB2B6350CB00CBA736 /* Inter */ = {
isa = PBXGroup;
children = (
018D4EFE2B6350F500CBA736 /* Inter-Bold.ttf */,
018D4EFC2B6350E800CBA736 /* Inter-Medium.ttf */,
);
path = Inter;
sourceTree = "<group>";
};
0190B3D3263F7B94009E09FF /* Repositories */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -950,8 +936,6 @@
isa = PBXResourcesBuildPhase;
files = (
015C78052B72DA2C00B6523C /* PrivacyInfo.xcprivacy in Resources */,
018D4EFF2B6350F500CBA736 /* Inter-Bold.ttf in Resources */,
018D4EFD2B6350E800CBA736 /* Inter-Medium.ttf in Resources */,
011F6DF8259EF16600BED22E /* Preview Assets.xcassets in Resources */,
011F6DF5259EF16600BED22E /* Assets.xcassets in Resources */,
);
Expand Down
5 changes: 0 additions & 5 deletions NativeAppTemplate/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
<string>This app uses a NFC to write the application info to the NFC number tag or to read the NFC number tag into the application.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Save a QR code image including web page link used by this app.</string>
<key>UIAppFonts</key>
<array>
<string>Inter-Medium.ttf</string>
<string>Inter-Bold.ttf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down
14 changes: 7 additions & 7 deletions NativeAppTemplate/Styleguide/Font+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ import SwiftUI

extension Font {
static var uiLargeTitle: Font {
.custom("Inter-Bold", size: 36.0, relativeTo: .largeTitle)
.system(size: UIFontMetrics.default.scaledValue(for: 36.0)).weight(.bold)
}

static var uiTitle1: Font {
.custom("Inter-Medium", size: 30.0, relativeTo: .title)
.system(size: UIFontMetrics.default.scaledValue(for: 30.0)).weight(.medium)
}

static var uiTitle2: Font {
.custom("Inter-Bold", size: 24.0, relativeTo: .title2)
.system(size: UIFontMetrics.default.scaledValue(for: 24.0)).weight(.bold)
}

static var uiTitle3: Font {
.custom("Inter-Bold", size: 20.0, relativeTo: .title3)
.system(size: UIFontMetrics.default.scaledValue(for: 20.0)).weight(.bold)
}

static var uiTitle4: Font {
.custom("Inter-Medium", size: 18.0, relativeTo: .title3)
.system(size: UIFontMetrics.default.scaledValue(for: 18.0)).weight(.medium)
}

static var uiTitle5: Font {
.custom("Inter-Medium", size: 18.0, relativeTo: .body)
.system(size: UIFontMetrics.default.scaledValue(for: 18.0)).weight(.medium)
}

static var uiHeadline: Font {
.system(size: UIFontMetrics.default.scaledValue(for: 18.0)).weight(.semibold)
}

static var uiNumberBox: Font {
.custom("Inter-Bold", size: 12.0, relativeTo: .footnote)
.system(size: UIFontMetrics.default.scaledValue(for: 12.0)).weight(.bold)
}

static var uiBodyAppleDefault: Font {
Expand Down
Binary file removed NativeAppTemplate/Styleguide/Inter/Inter-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed NativeAppTemplate/Styleguide/Inter/Inter-Medium.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions NativeAppTemplate/Styleguide/UIFont+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import UIKit

extension UIFont {
static var uiLargeTitle: UIFont {
.init(name: "Inter-Bold", size: 36.0)!
.systemFont(ofSize: 36.0, weight: .bold)
}

static var uiHeadline: UIFont {
.init(name: "Inter-Medium", size: 18.0)!
.systemFont(ofSize: 18.0, weight: .medium)
}
}
Loading