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

refactored label

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-16 18:16:16 -05:00
parent aab0cd86ac
commit cade12b0cd
3 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VDS/Components/Label/Label.swift
View File

@ -24,6 +24,12 @@ open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, ViewProt
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
@Proxy(\.model.surface)
open var surface: Surface
@Proxy(\.model.disabled)
open var disabled: Bool
@Proxy(\.model.attributes)
open var attributes: [LabelAttributeModel]?

14
VDS/Components/Toggle/Toggle.swift
View File

@ -115,7 +115,7 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
}
}
public var fontWeight: TypographicalStyle.FontWeight = .regular {
public var isBold: Bool = false {
didSet {
updateTypography()
}
@ -182,16 +182,16 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
//fontWeight: regular, bold
private func updateTypography() {
if fontSize == .small {
if fontWeight == .regular {
model.typograpicalStyle = .BodySmall
} else {
if isBold {
model.typograpicalStyle = .BoldBodySmall
} else {
model.typograpicalStyle = .BodySmall
}
} else {
if fontWeight == .regular {
model.typograpicalStyle = .BodyLarge
} else {
if isBold {
model.typograpicalStyle = .BoldBodyLarge
} else {
model.typograpicalStyle = .BodyLarge
}
}
}

87
VDS/Typography/Typography.swift
View File

@ -62,64 +62,47 @@ public enum TypographicalStyle: String, Codable, CaseIterable {
}
}
//MARK: FontSize
//MARK: FontCategory
extension TypographicalStyle {
public enum FontSize: String, Codable, CaseIterable {
case xxlarge
case xlarge
case large
case medium
case small
case xsmall
public enum FontCategory: String, Codable, CaseIterable {
case feature = "Feature"
case title = "Title"
case body = "Body"
case micro = "Micro"
public var sizes: [FontSize] {
switch self {
case .feature:
return [.xlarge, .large, .medium, .small, .xsmall]
case .title:
return [.xxlarge, .xlarge, .large, .medium, .small]
case .body:
return [.large, .medium, .small]
case .micro:
return []
}
}
public func style(for fontSize: FontSize, isBold: Bool = false) -> TypographicalStyle? {
let styleName = "\(isBold ? "Bold" : "")\(self.rawValue)\(fontSize.rawValue)"
guard let style = TypographicalStyle(rawValue: styleName) else {
return nil
}
return style
}
}
}
//MARK: FontWeight
//MARK: FontSize
extension TypographicalStyle {
public enum FontWeight: String, Codable, CaseIterable {
case light
case regular
case bold
public enum FontSize: String, Codable, CaseIterable {
case xxlarge = "2XLarge"
case xlarge = "XLarge"
case large = "Large"
case medium = "Medium"
case small = "Small"
case xsmall = "XSmall"
}
public var fontWeight: FontWeight {
switch self {
case .BoldFeatureXLarge,
.BoldFeatureLarge,
.BoldFeatureMedium,
.BoldFeatureSmall,
.BoldFeatureXSmall,
.BoldTitle2XLarge,
.BoldTitleXLarge,
.BoldTitleLarge,
.BoldTitleMedium,
.BoldTitleSmall,
.BoldBodyLarge,
.BoldBodyMedium,
.BoldBodySmall,
.BoldMicro:
return .bold
case .FeatureXLarge,
.FeatureLarge,
.FeatureMedium,
.FeatureSmall,
.FeatureXSmall,
.Title2XLarge,
.TitleXLarge,
.TitleLarge:
return .light
case .TitleMedium,
.TitleSmall,
.BodyLarge,
.BodyMedium,
.BodySmall,
.Micro:
return .regular
}
}
}
//MARK: PointSize