Skip to content

Added SFPro #144

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

Added SFPro #144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6552a9b
Added SFPro
kyrylopanin1 Jul 18, 2023
15c5ec9
Fix
kyrylopanin1 Jul 18, 2023
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
12 changes: 11 additions & 1 deletion Sources/SwiftRichString/Extensions/SystemFonts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,16 @@ public enum SystemFonts: String, FontConvertible {
case EuphemiaUCAS_Italic = "EuphemiaUCAS-Italic"
case EuphemiaUCAS_Bold = "EuphemiaUCAS-Bold"
case DINCondensed_Bold = "DINCondensed-Bold"
case SFUIText = "SFUIText"
case SFUIText_UltraLight = "SFUIText-UltraLight"
case SFUIText_Thin = "SFUIText-Thin"
case SFUIText_Light = "SFUIText-Light"
case SFUIText_Medium = "SFUIText-Medium"
case SFUIText_Semibold = "SFUIText-Semibold"
case SFUIText_Bold = "SFUIText-Bold"
case SFUIText_Heavy = "SFUIText-Heavy"
case SFUIText_Black = "SFUIText-Black"



/// Transform value to a valid font instance.
Expand All @@ -311,7 +321,7 @@ public enum SystemFonts: String, FontConvertible {
#elseif os(watchOS)
return Font(name: self.rawValue, size: (size ?? WATCHOS_SYSTEMFONT_SIZE))!
#else
return Font(name: self.rawValue, size: (size ?? Font.systemFontSize))!
return Font(name: self.rawValue, size: (size ?? Font.systemFontSize)) ?? Font.systemFont(ofSize: size ?? Font.systemFontSize)
#endif
}

Expand Down