damus

nostr ios client
git clone git://jb55.com/damus
Log | Files | Refs | README | LICENSE

commit 57e6f083b8ba3d56dd254ff863062ee4fba23072
parent cfa1e13887c5e777dbda9584b034e30da4dc9de6
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 30 May 2023 19:31:17 -0700

Revert "Updated UI to use custom font"

This reverts commit 020a00bf7eafe3060966f4e2f469e5fdb0002e89.

Diffstat:
Mdamus.xcodeproj/project.pbxproj | 48++++--------------------------------------------
Ddamus/Fonts/Inter-Bold.otf | 0
Ddamus/Fonts/Inter-Italic.otf | 0
Ddamus/Fonts/Inter-Light.otf | 0
Ddamus/Fonts/Inter-Medium.otf | 0
Ddamus/Fonts/Inter-Regular.otf | 0
Ddamus/Fonts/Inter-SemiBold.otf | 0
Ddamus/Fonts/LICENSE.txt | 94-------------------------------------------------------------------------------
Mdamus/Info.plist | 11-----------
Ddamus/Util/FontManager.swift | 63---------------------------------------------------------------
10 files changed, 4 insertions(+), 212 deletions(-)

diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj @@ -268,12 +268,12 @@ 4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6C29CD022E008DB934 /* WideEventView.swift */; }; 4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; }; 50088DA129E8271A008A1FDF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50088DA029E8271A008A1FDF /* WebSocket.swift */; }; + 501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */; }; + 501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */; }; 5019CADD2A0FB0A9000069E1 /* ProfileDatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5019CADC2A0FB0A9000069E1 /* ProfileDatabaseTests.swift */; }; 501F8C5529FF5EF6001AFC1D /* PersistedProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5429FF5EF6001AFC1D /* PersistedProfile.swift */; }; 501F8C5829FF5FC5001AFC1D /* Damus.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5629FF5FC5001AFC1D /* Damus.xcdatamodeld */; }; 501F8C5A29FF70F5001AFC1D /* ProfileDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5929FF70F5001AFC1D /* ProfileDatabase.swift */; }; - 501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */; }; - 501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */; }; 50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */; }; 50B5685329F97CB400A23243 /* CredentialHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B5685229F97CB400A23243 /* CredentialHandler.swift */; }; 50DA11262A16A23F00236234 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DA11252A16A23F00236234 /* Launch.storyboard */; }; @@ -298,14 +298,6 @@ BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; }; BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; }; DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; }; - E4AE2AC92A227E6000680283 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AC82A227E6000680283 /* LICENSE.txt */; }; - E4AE2ACA2A227E7800680283 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AC62A227E4200680283 /* Inter-Regular.otf */; }; - E4AE2ACB2A227E7E00680283 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AC52A227E3600680283 /* Inter-Bold.otf */; }; - E4AE2ACC2A227E8300680283 /* Inter-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AC72A227E5400680283 /* Inter-Light.otf */; }; - E4AE2ACE2A2286D000680283 /* FontManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4AE2ACD2A2286D000680283 /* FontManager.swift */; }; - E4AE2AD32A228CB400680283 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AD12A228CA000680283 /* Inter-SemiBold.otf */; }; - E4AE2AD42A228CB900680283 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2AD22A228CA700680283 /* Inter-Medium.otf */; }; - E4AE2AD52A228CC000680283 /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = E4AE2ACF2A228C7500680283 /* Inter-Italic.otf */; }; E4FA1C032A24BB7F00482697 /* SearchSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */; }; E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; }; E9E4ED0B295867B900DD7078 /* ThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadView.swift */; }; @@ -718,12 +710,12 @@ 4CFF8F6C29CD022E008DB934 /* WideEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WideEventView.swift; sourceTree = "<group>"; }; 4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; }; 50088DA029E8271A008A1FDF /* WebSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = "<group>"; }; + 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = "<group>"; }; + 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorageTests.swift; sourceTree = "<group>"; }; 5019CADC2A0FB0A9000069E1 /* ProfileDatabaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDatabaseTests.swift; sourceTree = "<group>"; }; 501F8C5429FF5EF6001AFC1D /* PersistedProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistedProfile.swift; sourceTree = "<group>"; }; 501F8C5729FF5FC5001AFC1D /* Damus.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Damus.xcdatamodel; sourceTree = "<group>"; }; 501F8C5929FF70F5001AFC1D /* ProfileDatabase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDatabase.swift; sourceTree = "<group>"; }; - 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = "<group>"; }; - 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorageTests.swift; sourceTree = "<group>"; }; 50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; }; 50B5685229F97CB400A23243 /* CredentialHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialHandler.swift; sourceTree = "<group>"; }; 50DA11252A16A23F00236234 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; }; @@ -748,14 +740,6 @@ BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; }; BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; }; DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; }; - E4AE2AC52A227E3600680283 /* Inter-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Bold.otf"; sourceTree = "<group>"; }; - E4AE2AC62A227E4200680283 /* Inter-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Regular.otf"; sourceTree = "<group>"; }; - E4AE2AC72A227E5400680283 /* Inter-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Light.otf"; sourceTree = "<group>"; }; - E4AE2AC82A227E6000680283 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; }; - E4AE2ACD2A2286D000680283 /* FontManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontManager.swift; sourceTree = "<group>"; }; - E4AE2ACF2A228C7500680283 /* Inter-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Italic.otf"; sourceTree = "<group>"; }; - E4AE2AD12A228CA000680283 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-SemiBold.otf"; sourceTree = "<group>"; }; - E4AE2AD22A228CA700680283 /* Inter-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Medium.otf"; sourceTree = "<group>"; }; E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchSettingsView.swift; sourceTree = "<group>"; }; E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; }; E9E4ED0A295867B900DD7078 /* ThreadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadView.swift; sourceTree = "<group>"; }; @@ -1153,7 +1137,6 @@ 4CA5588229F33F5B00DC6A45 /* StringCodable.swift */, 50B5685229F97CB400A23243 /* CredentialHandler.swift */, 4C7D09582A05BEAD00943473 /* KeyboardVisible.swift */, - E4AE2ACD2A2286D000680283 /* FontManager.swift */, ); path = Util; sourceTree = "<group>"; @@ -1311,7 +1294,6 @@ 4CE6DEE527F7A08100C66700 /* damus */ = { isa = PBXGroup; children = ( - E40B46262A2272E6005E70FD /* Fonts */, F7F0BA23297892AE009531F3 /* Modifiers */, 4C4A3A5A288A1B2200453788 /* damus.entitlements */, 4CE4F9DF285287A000C00DD9 /* Components */, @@ -1468,20 +1450,6 @@ path = Extensions; sourceTree = "<group>"; }; - E40B46262A2272E6005E70FD /* Fonts */ = { - isa = PBXGroup; - children = ( - E4AE2AC52A227E3600680283 /* Inter-Bold.otf */, - E4AE2AC62A227E4200680283 /* Inter-Regular.otf */, - E4AE2AC72A227E5400680283 /* Inter-Light.otf */, - E4AE2AD12A228CA000680283 /* Inter-SemiBold.otf */, - E4AE2AD22A228CA700680283 /* Inter-Medium.otf */, - E4AE2ACF2A228C7500680283 /* Inter-Italic.otf */, - E4AE2AC82A227E6000680283 /* LICENSE.txt */, - ); - path = Fonts; - sourceTree = "<group>"; - }; F7F0BA23297892AE009531F3 /* Modifiers */ = { isa = PBXGroup; children = ( @@ -1640,17 +1608,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E4AE2AD52A228CC000680283 /* Inter-Italic.otf in Resources */, - E4AE2AD42A228CB900680283 /* Inter-Medium.otf in Resources */, - E4AE2AD32A228CB400680283 /* Inter-SemiBold.otf in Resources */, - E4AE2ACC2A227E8300680283 /* Inter-Light.otf in Resources */, - E4AE2ACB2A227E7E00680283 /* Inter-Bold.otf in Resources */, - E4AE2ACA2A227E7800680283 /* Inter-Regular.otf in Resources */, 3ACB685F297633BC00C46468 /* Localizable.strings in Resources */, 4CE6DEEE27F7A08200C66700 /* Preview Assets.xcassets in Resources */, 3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */, 50DA11262A16A23F00236234 /* Launch.storyboard in Resources */, - E4AE2AC92A227E6000680283 /* LICENSE.txt in Resources */, 4CE6DEEB27F7A08200C66700 /* Assets.xcassets in Resources */, 4C198DF129F88C6B004C165C /* License.txt in Resources */, 4C198DF029F88C6B004C165C /* Readme.md in Resources */, @@ -1772,7 +1733,6 @@ 4C75EFB128049D510006080F /* NostrResponse.swift in Sources */, 4C7D09592A05BEAD00943473 /* KeyboardVisible.swift in Sources */, 4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */, - E4AE2ACE2A2286D000680283 /* FontManager.swift in Sources */, 4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */, 31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */, F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */, diff --git a/damus/Fonts/Inter-Bold.otf b/damus/Fonts/Inter-Bold.otf Binary files differ. diff --git a/damus/Fonts/Inter-Italic.otf b/damus/Fonts/Inter-Italic.otf Binary files differ. diff --git a/damus/Fonts/Inter-Light.otf b/damus/Fonts/Inter-Light.otf Binary files differ. diff --git a/damus/Fonts/Inter-Medium.otf b/damus/Fonts/Inter-Medium.otf Binary files differ. diff --git a/damus/Fonts/Inter-Regular.otf b/damus/Fonts/Inter-Regular.otf Binary files differ. diff --git a/damus/Fonts/Inter-SemiBold.otf b/damus/Fonts/Inter-SemiBold.otf Binary files differ. diff --git a/damus/Fonts/LICENSE.txt b/damus/Fonts/LICENSE.txt @@ -1,94 +0,0 @@ -Copyright (c) 2016-2020 The Inter Project Authors. -"Inter" is trademark of Rasmus Andersson. -https://github.com/rsms/inter - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION AND CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/damus/Info.plist b/damus/Info.plist @@ -70,16 +70,5 @@ <string>Damus needs access to your camera if you want to upload photos from it</string> <key>NSMicrophoneUsageDescription</key> <string>Damus needs access to your microphone if you want to upload recorded videos from it</string> - <key>CFBundleIdentifier</key> - <string></string> - <key>UIAppFonts</key> - <array> - <string>Inter-Regular.otf</string> - <string>Inter-Bold.otf</string> - <string>Inter-Light.otf</string> - <string>Inter-SemiBold.otf</string> - <string>Inter-Medium.otf</string> - <string>Inter-Italic.otf</string> - </array> </dict> </plist> diff --git a/damus/Util/FontManager.swift b/damus/Util/FontManager.swift @@ -1,63 +0,0 @@ -// -// FontManager.swift -// damus -// -// Created by Ben Weeks on 27/05/2023. -// - -import Foundation -import SwiftUI - -struct FontManager { - struct dynamicSize { - public static var largeTitle: CGFloat = UIFont.preferredFont(forTextStyle: .largeTitle).pointSize - 1 - public static var title1: CGFloat = UIFont.preferredFont(forTextStyle: .title1).pointSize - 0 - public static var title2: CGFloat = UIFont.preferredFont(forTextStyle: .title2).pointSize - 0 - public static var title3: CGFloat = UIFont.preferredFont(forTextStyle: .title3).pointSize - 0 - public static var body: CGFloat = UIFont.preferredFont(forTextStyle: .body).pointSize - 1 - public static var callout: CGFloat = UIFont.preferredFont(forTextStyle: .callout).pointSize - 1 - public static var caption1: CGFloat = UIFont.preferredFont(forTextStyle: .caption1).pointSize - 1 - public static var caption2: CGFloat = UIFont.preferredFont(forTextStyle: .caption2).pointSize - 1 - public static var footnote: CGFloat = UIFont.preferredFont(forTextStyle: .footnote).pointSize - 1 - public static var headline: CGFloat = UIFont.preferredFont(forTextStyle: .headline).pointSize - 1 - public static var subheadline: CGFloat = UIFont.preferredFont(forTextStyle: .subheadline).pointSize - 1 - // repeat for all the dynamic sizes - } - - struct Inter { - static let familyRoot = "Inter" - - static let bold = "\(familyRoot)-Bold" - static let regular = "\(familyRoot)-Regular" - static let light = "\(familyRoot)-Light" - static let medium = "\(familyRoot)-Medium" - static let semibold = "\(familyRoot)-SemiBold" - static let italic = "\(familyRoot)-Italic" - - static let largeTitle: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.largeTitle) - static let title1: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title1) - static let title2: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title2) - static let title3: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title3) - static let body: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.body) - static let caption1: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.caption1) - static let caption2: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.caption2) - static let footnote: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.footnote) - static let headline: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.headline) - static let subheadline: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.subheadline) - // repeat for other sizes - } -} - -extension Font { - public static var largeTitle = FontManager.Inter.largeTitle - public static var title1 = FontManager.Inter.title1 - public static var title2 = FontManager.Inter.title2 - public static var title3 = FontManager.Inter.title3 - public static var body = FontManager.Inter.body - public static var caption1 = FontManager.Inter.caption1 - public static var caption2 = FontManager.Inter.caption2 - public static var footnote = FontManager.Inter.footnote - public static var headline = FontManager.Inter.headline - public static var subheadline = FontManager.Inter.subheadline - // repeat for the rest of the dynamic sizes -}