mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored fonts

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-03 15:25:25 -05:00
parent ffe3641500
commit 358e663bdc
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
VDS.xcodeproj/project.pbxproj
View File

@ -33,8 +33,8 @@
EA3362072891E14D0071C351 /* VerizonNHGeDS-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = EA3362032891E14D0071C351 /* VerizonNHGeDS-Regular.otf */; };
EA33622C2891E73B0071C351 /* FontProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33622B2891E73B0071C351 /* FontProtocol.swift */; };
EA33622E2891EA3C0071C351 /* DispatchQueue+Once.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33622D2891EA3C0071C351 /* DispatchQueue+Once.swift */; };
EA3362302891EB4A0071C351 /* VDSFonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33622F2891EB4A0071C351 /* VDSFonts.swift */; };
EA3362322891F2ED0071C351 /* VDSFontStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3362312891F2ED0071C351 /* VDSFontStyles.swift */; };
EA3362302891EB4A0071C351 /* Fonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33622F2891EB4A0071C351 /* Fonts.swift */; };
EA3362322891F2ED0071C351 /* FontStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3362312891F2ED0071C351 /* FontStyles.swift */; };
EA33623E2892EE950071C351 /* UIDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33623D2892EE950071C351 /* UIDevice.swift */; };
EA3362402892EF6C0071C351 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33623F2892EF6B0071C351 /* Label.swift */; };
EA3362432892EFF20071C351 /* LabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3362422892EFF20071C351 /* LabelModel.swift */; };
@ -47,6 +47,8 @@
EAF7F09E289AAEC000B287F5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09D289AAEC000B287F5 /* Constants.swift */; };
EAF7F0A0289AB7EC00B287F5 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09F289AB7EC00B287F5 /* View.swift */; };
EAF7F0A2289AFB3900B287F5 /* Errorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0A1289AFB3900B287F5 /* Errorable.swift */; };
EAF7F0A4289B017C00B287F5 /* LabelAttributeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0A3289B017C00B287F5 /* LabelAttributeModel.swift */; };
EAF7F0A6289B0CE000B287F5 /* Resetable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0A5289B0CE000B287F5 /* Resetable.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -87,8 +89,8 @@
EA3362032891E14D0071C351 /* VerizonNHGeDS-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeDS-Regular.otf"; sourceTree = "<group>"; };
EA33622B2891E73B0071C351 /* FontProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontProtocol.swift; sourceTree = "<group>"; };
EA33622D2891EA3C0071C351 /* DispatchQueue+Once.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DispatchQueue+Once.swift"; sourceTree = "<group>"; };
EA33622F2891EB4A0071C351 /* VDSFonts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSFonts.swift; sourceTree = "<group>"; };
EA3362312891F2ED0071C351 /* VDSFontStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSFontStyles.swift; sourceTree = "<group>"; };
EA33622F2891EB4A0071C351 /* Fonts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fonts.swift; sourceTree = "<group>"; };
EA3362312891F2ED0071C351 /* FontStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontStyles.swift; sourceTree = "<group>"; };
EA33623D2892EE950071C351 /* UIDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDevice.swift; sourceTree = "<group>"; };
EA33623F2892EF6B0071C351 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
EA3362422892EFF20071C351 /* LabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelModel.swift; sourceTree = "<group>"; };
@ -101,6 +103,8 @@
EAF7F09D289AAEC000B287F5 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
EAF7F09F289AB7EC00B287F5 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
EAF7F0A1289AFB3900B287F5 /* Errorable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errorable.swift; sourceTree = "<group>"; };
EAF7F0A3289B017C00B287F5 /* LabelAttributeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeModel.swift; sourceTree = "<group>"; };
EAF7F0A5289B0CE000B287F5 /* Resetable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Resetable.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -222,6 +226,7 @@
EA3361BE288B2EA60071C351 /* ModelHandlerable.swift */,
EA3361C8289054C50071C351 /* Surfaceable.swift */,
EA3361B7288B2AAA0071C351 /* ViewProtocol.swift */,
EAF7F0A5289B0CE000B287F5 /* Resetable.swift */,
);
path = Protocols;
sourceTree = "<group>";
@ -248,8 +253,8 @@
EA3361DF2891D0F10071C351 /* Fonts */ = {
isa = PBXGroup;
children = (
EA33622F2891EB4A0071C351 /* VDSFonts.swift */,
EA3362312891F2ED0071C351 /* VDSFontStyles.swift */,
EA33622F2891EB4A0071C351 /* Fonts.swift */,
EA3362312891F2ED0071C351 /* FontStyles.swift */,
EA33622B2891E73B0071C351 /* FontProtocol.swift */,
);
path = Fonts;
@ -279,6 +284,7 @@
children = (
EA33623F2892EF6B0071C351 /* Label.swift */,
EA3362422892EFF20071C351 /* LabelModel.swift */,
EAF7F0A3289B017C00B287F5 /* LabelAttributeModel.swift */,
);
path = Label;
sourceTree = "<group>";
@ -405,7 +411,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EA3362322891F2ED0071C351 /* VDSFontStyles.swift in Sources */,
EA3362322891F2ED0071C351 /* FontStyles.swift in Sources */,
EAF7F0A6289B0CE000B287F5 /* Resetable.swift in Sources */,
EA3361C328902D960071C351 /* Toggle.swift in Sources */,
EAF7F0A0289AB7EC00B287F5 /* View.swift in Sources */,
EA3362402892EF6C0071C351 /* Label.swift in Sources */,
@ -417,6 +424,7 @@
EA3361A2288B1E840071C351 /* ToggleModel.swift in Sources */,
EA3362432892EFF20071C351 /* LabelModel.swift in Sources */,
EA33624728931B050071C351 /* Initable.swift in Sources */,
EAF7F0A4289B017C00B287F5 /* LabelAttributeModel.swift in Sources */,
EA3361BD288B2C760071C351 /* TypeAlias.swift in Sources */,
EAF7F09A2899B17200B287F5 /* CATransaction.swift in Sources */,
EAF7F0A2289AFB3900B287F5 /* Errorable.swift in Sources */,
@ -431,7 +439,7 @@
EA3362452892F9130071C351 /* Labelable.swift in Sources */,
EA3361AD288B26190071C351 /* DataTrackable.swift in Sources */,
EA33623E2892EE950071C351 /* UIDevice.swift in Sources */,
EA3362302891EB4A0071C351 /* VDSFonts.swift in Sources */,
EA3362302891EB4A0071C351 /* Fonts.swift in Sources */,
EA3361B8288B2AAA0071C351 /* ViewProtocol.swift in Sources */,
EA3361BF288B2EA60071C351 /* ModelHandlerable.swift in Sources */,
EA3361A8288B23300071C351 /* UIColor.swift in Sources */,

18
VDS/Fonts/VDSFontStyles.swift → VDS/Fonts/FontStyles.swift
View File

@ -9,7 +9,7 @@ import Foundation
import UIKit
import VDSTypographyTokens
public enum VDSFontWeight: String, Codable {
public enum FontWeight: String, Codable {
case regular
case bold
@ -21,7 +21,7 @@ public enum VDSFontWeight: String, Codable {
}
}
public enum VDSTextPosition: String, Codable, CaseIterable {
public enum TextPosition: String, Codable, CaseIterable {
case left, right, center
var textAlignment: NSTextAlignment {
@ -36,7 +36,7 @@ public enum VDSTextPosition: String, Codable, CaseIterable {
}
}
public enum VDSFontCategory: String, Codable, CaseIterable {
public enum FontCategory: String, Codable, CaseIterable {
case feature
case title
case body
@ -52,7 +52,7 @@ public enum VDSFontCategory: String, Codable, CaseIterable {
}
}
public enum VDSFontSize: String, Codable, CaseIterable {
public enum FontSize: String, Codable, CaseIterable {
case xxlarge
case xlarge
case large
@ -72,7 +72,7 @@ public enum VDSFontSize: String, Codable, CaseIterable {
}
}
public enum VDSFontStyle: String, Codable, CaseIterable {
public enum FontStyle: String, Codable, CaseIterable {
public enum Error: Swift.Error {
case fontNotFound
}
@ -141,7 +141,7 @@ public enum VDSFontStyle: String, Codable, CaseIterable {
}
}
public var fontFace: VDSFonts {
public var fontFace: Fonts {
switch self {
case .BoldFeatureXLarge,
.BoldFeatureLarge,
@ -189,10 +189,10 @@ public enum VDSFontStyle: String, Codable, CaseIterable {
return fontFace.font(ofSize: pointSize / 2)
}
public static func font(for category: VDSFontCategory, fontWeight: VDSFontWeight, fontSize: VDSFontSize, isSuperScript: Bool = false) throws -> UIFont {
public static func font(for category: FontCategory, fontWeight: FontWeight, fontSize: FontSize, isSuperScript: Bool = false) throws -> UIFont {
let fontName = "\(fontWeight.titleCase)\(category.titleCase)\(fontSize.titleCase)"
guard let fontStyle = VDSFontStyle(rawValue: fontName) else {
throw VDSFontStyle.Error.fontNotFound
guard let fontStyle = FontStyle(rawValue: fontName) else {
throw FontStyle.Error.fontNotFound
}
return fontStyle.font
}

2
VDS/Fonts/VDSFonts.swift → VDS/Fonts/Fonts.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum VDSFonts: String, FontProtocol {
public enum Fonts: String, FontProtocol {
case dsBold
case dsRegular
case txBold