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

added Identifiable to LabelAttributeModel

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-09-15 13:59:51 -05:00
parent e07f855eb6
commit a561ea30d8
11 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VDS/Components/Checkbox/CheckboxModel.swift
View File

@ -10,9 +10,9 @@ import UIKit
public protocol CheckboxModel: Modelable, FormFieldable, Errorable, DataTrackable, Accessable, Selectable, BinaryColorable { public protocol CheckboxModel: Modelable, FormFieldable, Errorable, DataTrackable, Accessable, Selectable, BinaryColorable {
var labelText: String? { get set } var labelText: String? { get set }
var labelTextAttributes: [LabelAttributeModel]? { get set } var labelTextAttributes: [any LabelAttributeModel]? { get set }
var childText: String? { get set } var childText: String? { get set }
var childTextAttributes: [LabelAttributeModel]? { get set } var childTextAttributes: [any LabelAttributeModel]? { get set }
} }
extension CheckboxModel { extension CheckboxModel {
@ -67,9 +67,9 @@ public struct DefaultCheckboxModel: CheckboxModel {
public var id = UUID() public var id = UUID()
public var selected: Bool = false public var selected: Bool = false
public var labelText: String? public var labelText: String?
public var labelTextAttributes: [LabelAttributeModel]? public var labelTextAttributes: [any LabelAttributeModel]?
public var childText: String? public var childText: String?
public var childTextAttributes: [LabelAttributeModel]? public var childTextAttributes: [any LabelAttributeModel]?
public var hasError: Bool = false public var hasError: Bool = false
public var errorText: String? public var errorText: String?

1
VDS/Components/Label/Attributes/LabelAttributeAction.swift
View File

@ -18,6 +18,7 @@ public struct LabelAttributeActionModel: LabelAttributeActionable {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Properties // MARK: - Properties
//-------------------------------------------------- //--------------------------------------------------
public var id = UUID()
public var location: Int public var location: Int
public var length: Int public var length: Int
public var action = PassthroughSubject<Void, Never>() public var action = PassthroughSubject<Void, Never>()

1
VDS/Components/Label/Attributes/LabelAttributeColor.swift
View File

@ -12,6 +12,7 @@ public struct LabelAttributeColor: LabelAttributeModel {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Properties // MARK: - Properties
//-------------------------------------------------- //--------------------------------------------------
public var id = UUID()
public var location: Int public var location: Int
public var length: Int public var length: Int
public var color: UIColor public var color: UIColor

1
VDS/Components/Label/Attributes/LabelAttributeFont.swift
View File

@ -12,6 +12,7 @@ public struct LabelAttributeFont: LabelAttributeModel {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Properties // MARK: - Properties
//-------------------------------------------------- //--------------------------------------------------
public var id = UUID()
public var location: Int public var location: Int
public var length: Int public var length: Int
public var style: TypographicalStyle public var style: TypographicalStyle

2
VDS/Components/Label/Attributes/LabelAttributeModel.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
import UIKit import UIKit
public protocol LabelAttributeModel { public protocol LabelAttributeModel: Identifiable where ID == UUID {
var location: Int { get set } var location: Int { get set }
var length: Int { get set } var length: Int { get set }
func setAttribute(on attributedString: NSMutableAttributedString) func setAttribute(on attributedString: NSMutableAttributedString)

1
VDS/Components/Label/Attributes/LabelAttributeStrikeThrough.swift
View File

@ -9,6 +9,7 @@ import Foundation
import UIKit import UIKit
public struct LabelAttributeStrikeThrough: LabelAttributeModel { public struct LabelAttributeStrikeThrough: LabelAttributeModel {
public var id = UUID()
public var location: Int public var location: Int
public var length: Int public var length: Int

1
VDS/Components/Label/Attributes/LabelAttributeUnderline.swift
View File

@ -9,6 +9,7 @@ import Foundation
import UIKit import UIKit
public struct LabelAttributeUnderline: LabelAttributeModel { public struct LabelAttributeUnderline: LabelAttributeModel {
public var id = UUID()
public var location: Int public var location: Int
public var length: Int public var length: Int
public var color: UIColor? public var color: UIColor?

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

@ -47,7 +47,7 @@ open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, ViewProt
} }
@Proxy(\.model.attributes) @Proxy(\.model.attributes)
open var attributes: [LabelAttributeModel]? open var attributes: [any LabelAttributeModel]?
@Proxy(\.model.typograpicalStyle) @Proxy(\.model.typograpicalStyle)
open var typograpicalStyle: TypographicalStyle open var typograpicalStyle: TypographicalStyle

4
VDS/Components/Label/LabelModel.swift
View File

@ -10,13 +10,13 @@ import UIKit
public protocol LabelModel: Modelable, Labelable { public protocol LabelModel: Modelable, Labelable {
var text: String? { get set } var text: String? { get set }
var attributes: [LabelAttributeModel]? { get set } var attributes: [any LabelAttributeModel]? { get set }
} }
public struct DefaultLabelModel: LabelModel { public struct DefaultLabelModel: LabelModel {
public var id = UUID() public var id = UUID()
public var text: String? public var text: String?
public var attributes: [LabelAttributeModel]? public var attributes: [any LabelAttributeModel]?
public var typograpicalStyle: TypographicalStyle = .BodySmall public var typograpicalStyle: TypographicalStyle = .BodySmall
public var textPosition: TextPosition = .left public var textPosition: TextPosition = .left
public var surface: Surface = .light public var surface: Surface = .light

12
VDS/Components/RadioBox/RadioBoxModel.swift
View File

@ -10,11 +10,11 @@ import UIKit
public protocol RadioBoxModel: Modelable, FormFieldable, DataTrackable, Accessable, Selectable, BinaryColorable { public protocol RadioBoxModel: Modelable, FormFieldable, DataTrackable, Accessable, Selectable, BinaryColorable {
var text: String { get set } var text: String { get set }
var textAttributes: [LabelAttributeModel]? { get set } var textAttributes: [any LabelAttributeModel]? { get set }
var subText: String? { get set } var subText: String? { get set }
var subTextAttributes: [LabelAttributeModel]? { get set } var subTextAttributes: [any LabelAttributeModel]? { get set }
var subTextRight: String? { get set } var subTextRight: String? { get set }
var subTextRightAttributes: [LabelAttributeModel]? { get set } var subTextRightAttributes: [any LabelAttributeModel]? { get set }
var strikethrough: Bool { get set } var strikethrough: Bool { get set }
} }
@ -61,11 +61,11 @@ public struct DefaultRadioBoxModel: RadioBoxModel {
public var id = UUID() public var id = UUID()
public var selected: Bool = false public var selected: Bool = false
public var text: String = "Default Text" public var text: String = "Default Text"
public var textAttributes: [LabelAttributeModel]? public var textAttributes: [any LabelAttributeModel]?
public var subText: String? public var subText: String?
public var subTextAttributes: [LabelAttributeModel]? public var subTextAttributes: [any LabelAttributeModel]?
public var subTextRight: String? public var subTextRight: String?
public var subTextRightAttributes: [LabelAttributeModel]? public var subTextRightAttributes: [any LabelAttributeModel]?
public var selectedAccentColor: UIColor? public var selectedAccentColor: UIColor?
public var strikethrough: Bool = false public var strikethrough: Bool = false

8
VDS/Components/RadioButton/RadioButtonModel.swift
View File

@ -10,9 +10,9 @@ import UIKit
public protocol RadioButtonModel: Modelable, FormFieldable, Errorable, DataTrackable, Accessable, Selectable, BinaryColorable { public protocol RadioButtonModel: Modelable, FormFieldable, Errorable, DataTrackable, Accessable, Selectable, BinaryColorable {
var labelText: String? { get set } var labelText: String? { get set }
var labelTextAttributes: [LabelAttributeModel]? { get set } var labelTextAttributes: [any LabelAttributeModel]? { get set }
var childText: String? { get set } var childText: String? { get set }
var childTextAttributes: [LabelAttributeModel]? { get set } var childTextAttributes: [any LabelAttributeModel]? { get set }
} }
extension RadioButtonModel { extension RadioButtonModel {
@ -68,9 +68,9 @@ public struct DefaultRadioButtonModel: RadioButtonModel {
public var selected: Bool = false public var selected: Bool = false
public var labelText: String? public var labelText: String?
public var labelTextAttributes: [LabelAttributeModel]? public var labelTextAttributes: [any LabelAttributeModel]?
public var childText: String? public var childText: String?
public var childTextAttributes: [LabelAttributeModel]? public var childTextAttributes: [any LabelAttributeModel]?
public var hasError: Bool = false public var hasError: Bool = false
public var errorText: String? public var errorText: String?