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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/match_android_stack_margin

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-06-09 10:43:44 -04:00
commit 07fe859bed
50 changed files with 257 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift
View File

@ -8,11 +8,18 @@
import Foundation
@objcMembers open class Tag: View {
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
public let label = Label.createLabelRegularBodySmall(true)
public let label = Label(fontStyle: .RegularBodySmall)
//--------------------------------------------------
// MARK: - MVMCoreViewProtocol
//--------------------------------------------------
open override func setupView() {
super.setupView()
layer.borderColor = UIColor.mvmCoolGray6.cgColor
@ -22,9 +29,10 @@ import Foundation
NSLayoutConstraint.constraintPinSubview(label, pinTop: true, topConstant: 13, pinBottom: true, bottomConstant: 13, pinLeft: true, leftConstant: 15, pinRight: true, rightConstant: 15)
}
// MARK: - MoleculeViewProtocol
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
guard let model = model as? TagModel else { return }
label.set(with: model.label, delegateObject, additionalData)
}
@ -36,6 +44,6 @@ import Foundation
open override func reset() {
super.reset()
label.reset()
label.styleRegularBodySmall(true)
label.setFontStyle(.RegularBodySmall)
}
}

4
MVMCoreUI/Atomic/Atoms/Selectors/RadioBox.swift
View File

@ -9,8 +9,8 @@
import Foundation
open class RadioBox: Control {
public let label = Label.createLabelRegularBodySmall(true)
public let subTextLabel = Label.createLabelRegularMicro(true)
public let label = Label(fontStyle: .RegularBodySmall)
public let subTextLabel = Label(fontStyle: .RegularMicro)
public var isOutOfStock = false
public var accentColor = UIColor.mvmRed

2
MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatch.swift
View File

@ -13,7 +13,7 @@ open class RadioSwatch: Control {
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
public let bottomText = Label.createLabelRegularMicro(true)
public let bottomText = Label(fontStyle: .RegularMicro)
private var circleLayer: CAShapeLayer?
private var selectedLayer: CALayer?

2
MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
View File

@ -16,7 +16,7 @@ open class NumericIndicatorView: CarouselIndicator {
/// Text to display the current count of total pages for viewing.
open var pageCount: Label = {
let label = Label.createLabelRegularBodySmall(true)
let label = Label(fontStyle: .RegularBodySmall)
label.isAccessibilityElement = false
label.setContentCompressionResistancePriority(.required, for: .vertical)
label.textAlignment = .center

2
MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
View File

@ -13,7 +13,7 @@
//--------------------------------------------------
public let checkbox = Checkbox()
public let label = Label.createLabelRegularBodySmall(true)
public let label = Label(fontStyle: .RegularBodySmall)
//--------------------------------------------------
// MARK: - Properties

5
MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
View File

@ -21,8 +21,11 @@ import Foundation
public var contentMode: UIView.ContentMode?
public var localBundle: Bundle?
public init(image: String) {
public init(image: String, imageFormat: String? = nil, width: CGFloat? = nil, height: CGFloat? = nil) {
self.image = image
self.imageFormat = imageFormat
self.width = width
self.height = height
}
private enum CodingKeys: String, CodingKey {

166
MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
View File

@ -13,7 +13,6 @@ public typealias ActionBlock = () -> ()
@objcMembers open class Label: UILabel, MVMCoreViewProtocol, MoleculeViewProtocol, MVMCoreUIViewConstrainingProtocol, MFButtonProtocol {
//------------------------------------------------------
// MARK: - Properties
//------------------------------------------------------
@ -97,7 +96,7 @@ public typealias ActionBlock = () -> ()
accessibilityCustomActions = []
accessibilityTraits = .staticText
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(textLinkTapped(_:)))
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(textLinkTapped))
tapGesture.numberOfTapsRequired = 1
addGestureRecognizer(tapGesture)
}
@ -117,6 +116,15 @@ public typealias ActionBlock = () -> ()
setupView()
}
public init(fontStyle: Styler.Font, _ scale: Bool = true) {
super.init(frame: .zero)
setupView()
font = fontStyle.getFont(false)
textColor = fontStyle.color()
setScale(scale)
}
@objc convenience public init(standardFontSize size: CGFloat) {
self.init()
standardFontSize = size
@ -139,91 +147,9 @@ public typealias ActionBlock = () -> ()
}
//------------------------------------------------------
// MARK: - Factory Functions
// MARK: - 2.0 Factory Functions
//------------------------------------------------------
/// Title 2XLarge
@objc public static func createLabelTitle2XLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleTitle2XLarge(scale)
return label
}
/// TitleXLarge
@objc public static func createLabelTitleXLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleTitleXLarge(scale)
return label
}
/// BoldTitleLarge
@objc public static func createLabelBoldTitleLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleBoldTitleLarge(scale)
return label
}
/// RegularTitleLarge
@objc public static func createLabelRegularTitleLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleRegularTitleLarge(scale)
return label
}
/// BoldTitleMedium
@objc public static func createLabelBoldTitleMedium(_ scale: Bool) -> Label {
let label = Label.label()
label.styleBoldTitleMedium(scale)
return label
}
/// RegularTitleMedium
@objc public static func createLabelRegularTitleMedium(_ scale: Bool) -> Label {
let label = Label.label()
label.styleRegularTitleMedium(scale)
return label
}
/// BoldBodyLarge
@objc public static func createLabelBoldBodyLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleBoldBodyLarge(scale)
return label
}
/// RegularBodyLarge
@objc public static func createLabelRegularBodyLarge(_ scale: Bool) -> Label {
let label = Label.label()
label.styleRegularBodyLarge(scale)
return label
}
/// BoldBodySmall
@objc public static func createLabelBoldBodySmall(_ scale: Bool) -> Label {
let label = Label.label()
label.styleBoldBodySmall(scale)
return label
}
/// RegularBodySmall
@objc public static func createLabelRegularBodySmall(_ scale: Bool) -> Label {
let label = Label.label()
label.styleRegularBodySmall(scale)
return label
}
/// BoldMicro
@objc public static func createLabelBoldMicro(_ scale: Bool) -> Label {
let label = Label.label()
label.styleBoldMicro(scale)
return label
}
/// RegularMicro
@objc public static func createLabelRegularMicro(_ scale: Bool) -> Label {
let label = Label.label()
label.styleRegularMicro(scale)
return label
}
//2.0 fonts init methods
/// H1 -> HeadlineLarge
@objc public static func commonLabelH1(_ scale: Bool) -> Label {
@ -569,71 +495,19 @@ public typealias ActionBlock = () -> ()
}
//------------------------------------------------------
// MARK: - Methods
// MARK: - 3.0 Styling Method
//------------------------------------------------------
//mva 3.0 font
@objc public func styleTitle2XLarge(_ scale: Bool) {
MFStyler.styleLabelTitle2XLarge(self, genericScaling: false)
public func setFontStyle(_ fontStyle: Styler.Font, _ scale: Bool = true) {
font = fontStyle.getFont(false)
textColor = .mvmBlack
setScale(scale)
}
@objc public func styleTitleXLarge(_ scale: Bool) {
MFStyler.styleLabelTitleXLarge(self, genericScaling: false)
setScale(scale)
}
@objc public func styleBoldTitleLarge(_ scale: Bool) {
MFStyler.styleLabelBoldTitleLarge(self, genericScaling: false)
setScale(scale)
}
@objc public func styleRegularTitleLarge(_ scale: Bool) {
MFStyler.styleLabelRegularTitleLarge(self, genericScaling: false)
setScale(scale)
}
@objc public func styleBoldTitleMedium(_ scale: Bool) {
MFStyler.styleLabelBoldTitleMedium(self, genericScaling: false)
setScale(scale)
}
@objc public func styleRegularTitleMedium(_ scale: Bool) {
MFStyler.styleLabelRegularTitleMedium(self, genericScaling: false)
setScale(scale)
}
@objc public func styleBoldBodyLarge(_ scale: Bool) {
MFStyler.styleLabelBoldBodyLarge(self, genericScaling: false)
setScale(scale)
}
@objc public func styleRegularBodyLarge(_ scale: Bool) {
MFStyler.styleLabelRegularBodyLarge(self, genericScaling: false)
setScale(scale)
}
@objc public func styleBoldBodySmall(_ scale: Bool) {
MFStyler.styleLabelBoldBodySmall(self, genericScaling: false)
setScale(scale)
}
@objc public func styleRegularBodySmall(_ scale: Bool) {
MFStyler.styleLabelRegularBodySmall(self, genericScaling: false)
setScale(scale)
}
@objc public func styleBoldMicro(_ scale: Bool) {
MFStyler.styleLabelBoldMicro(self, genericScaling: false)
setScale(scale)
}
@objc public func styleRegularMicro(_ scale: Bool) {
MFStyler.styleLabelRegularMicro(self, genericScaling: false)
setScale(scale)
}
//2.0 fonts
//------------------------------------------------------
// MARK: - 2.0 Styling Methods
//------------------------------------------------------
@objc public func styleH1(_ scale: Bool) {
MFStyler.styleLabelH1(self, genericScaling: false)
setScale(scale)

4
MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelView.swift
View File

@ -14,8 +14,8 @@ import Foundation
// MARK: - Outlets
//------------------------------------------------------
let leftTextLabel = Label.createLabelBoldBodySmall(true)
let rightTextLabel = Label.createLabelBoldBodySmall(true)
let leftTextLabel = Label(fontStyle: .BoldBodySmall)
let rightTextLabel = Label(fontStyle: .BoldBodySmall)
//------------------------------------------------------
// MARK: - Constraints

6
MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
View File

@ -71,6 +71,12 @@ import UIKit
self.useVerticalLine = false
}
public init(verticalLineOf type: Style, backgroundColor: Color? = nil) {
self.type = type
self.backgroundColor = backgroundColor
self.useVerticalLine = true
}
//--------------------------------------------------
// MARK: - Keys
//--------------------------------------------------

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
View File

@ -10,10 +10,10 @@ import Foundation
@objcMembers open class ListDeviceComplexButtonMedium: TableViewCell {
public var verticalStack: Stack<StackModel>
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let body2 = Label.createLabelRegularBodySmall(true)
public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
public let body2 = Label(fontStyle: .RegularBodySmall)
public let button = PillButton(frame: .zero)
public let rightImageView = LoadImageView()
public var stack: Stack<StackModel>
@ -67,10 +67,10 @@ import Foundation
}
public func setDefault() {
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
body2.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
body2.setFontStyle(.RegularBodySmall)
eyebrow.textColor = .mvmCoolGray6
}

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
View File

@ -10,10 +10,10 @@ import Foundation
@objcMembers open class ListDeviceComplexButtonSmall: TableViewCell {
public var verticalStack: Stack<StackModel>
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let body2 = Label.createLabelRegularBodySmall(true)
public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
public let body2 = Label(fontStyle: .RegularBodySmall)
public let button = PillButton(frame: .zero)
public let rightImageView = LoadImageView()
public var stack: Stack<StackModel>
@ -67,10 +67,10 @@ import Foundation
}
public func setDefault() {
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
body2.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
body2.setFontStyle(.RegularBodySmall)
eyebrow.textColor = .mvmCoolGray6
}

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
View File

@ -12,10 +12,10 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-----------------------------------------------------
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let body2 = Label.createLabelRegularBodySmall(true)
public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
public let body2 = Label(fontStyle: .RegularBodySmall)
public let twoLinkView = TwoLinkView()
public let rightImage = LoadImageView()
let verticalStack: Stack<StackModel>
@ -68,10 +68,10 @@ import Foundation
open override func reset() {
super.reset()
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
body2.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
body2.setFontStyle(.RegularBodySmall)
eyebrow.textColor = .mvmCoolGray6
}
}

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
View File

@ -12,10 +12,10 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-----------------------------------------------------
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let body2 = Label.createLabelRegularBodySmall(true)
public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
public let body2 = Label(fontStyle: .RegularBodySmall)
public let twoLinkView = TwoLinkView()
public let rightImage = LoadImageView()
let verticalStack: Stack<StackModel>
@ -68,10 +68,10 @@ import Foundation
open override func reset() {
super.reset()
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
body2.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
body2.setFontStyle(.RegularBodySmall)
eyebrow.textColor = .mvmCoolGray6
}
}

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
View File

@ -14,10 +14,10 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
var stack: Stack<StackModel>
let label1 = Label.createLabelRegularBodySmall(true)
let label2 = Label.createLabelRegularBodySmall(true)
let label3 = Label.createLabelRegularBodySmall(true)
let label4 = Label.createLabelRegularBodySmall(true)
let label1 = Label(fontStyle: .RegularBodySmall)
let label2 = Label(fontStyle: .RegularBodySmall)
let label3 = Label(fontStyle: .RegularBodySmall)
let label4 = Label(fontStyle: .RegularBodySmall)
let arrow = Arrow(frame: .zero)
let arrowAndLabel2Stack: Stack<StackModel>
@ -69,9 +69,9 @@ import Foundation
open override func reset() {
super.reset()
label1.styleRegularBodySmall(true)
label2.styleRegularBodySmall(true)
label3.styleRegularBodySmall(true)
label4.styleRegularBodySmall(true)
label1.setFontStyle(.RegularBodySmall)
label2.setFontStyle(.RegularBodySmall)
label3.setFontStyle(.RegularBodySmall)
label4.setFontStyle(.RegularBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
View File

@ -14,8 +14,8 @@ import UIKit
// MARK: - Outlets
//-------------------------------------------------------
let leftImage = LoadImageView(pinnedEdges: .all)
let leftLabel = Label.createLabelRegularBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
let leftLabel = Label(fontStyle: .RegularBodySmall)
let rightLabel = Label(fontStyle: .RegularBodySmall)
var stack: Stack<StackModel>
//-----------------------------------------------------
@ -63,7 +63,7 @@ import UIKit
open override func reset() {
super.reset()
leftLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.RegularBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
}
}

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
View File

@ -13,7 +13,7 @@ import Foundation
//-------------------------------------------------------
public let leftImage = LoadImageView()
public let headlineBody = HeadlineBody()
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
public let rightLabelStackItem: StackItem
public var stack: Stack<StackModel>
@ -73,6 +73,6 @@ import Foundation
open override func reset() {
super.reset()
rightLabel.styleRegularBodySmall(true)
rightLabel.setFontStyle(.RegularBodySmall)
}
}

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
View File

@ -12,7 +12,7 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-----------------------------------------------------
public let leftLabel = Label.createLabelTitle2XLarge(true)
public let leftLabel = Label(fontStyle: .Title2XLarge)
public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
public var stack: Stack<StackModel>
@ -56,7 +56,7 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleTitle2XLarge(true)
leftLabel.setFontStyle(.Title2XLarge)
}
open override func layoutSubviews() {

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
View File

@ -47,7 +47,7 @@ import UIKit
addMolecule(stack)
stack.restack()
eyebrowHeadlineBodyLink.body.textColor = .mvmOrangeAA
eyebrowHeadlineBodyLink.headline.styleBoldBodySmall(true)
eyebrowHeadlineBodyLink.headline.setFontStyle(.BoldBodySmall)
accessibilityTraits = radioButton.accessibilityTraits
accessibilityHint = radioButton.accessibilityHint
@ -61,7 +61,7 @@ import UIKit
open override func reset() {
super.reset()
eyebrowHeadlineBodyLink.body.textColor = .mvmOrangeAA
eyebrowHeadlineBodyLink.headline.styleBoldBodySmall(true)
eyebrowHeadlineBodyLink.headline.setFontStyle(.BoldBodySmall)
}
//----------------------------------------------------

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
View File

@ -15,10 +15,10 @@ import Foundation
//-----------------------------------------------------
var stack: Stack<StackModel>
let eyebrow = Label.createLabelRegularMicro(true)
let headline = Label.createLabelBoldTitleMedium(true)
let subHeadline = Label.createLabelBoldBodySmall(true)
let body = Label.createLabelRegularBodySmall(true)
let eyebrow = Label(fontStyle: .RegularMicro)
let headline = Label(fontStyle: .BoldTitleMedium)
let subHeadline = Label(fontStyle: .BoldBodySmall)
let body = Label(fontStyle: .RegularBodySmall)
let link = Link()
//-----------------------------------------------------
@ -62,9 +62,9 @@ import Foundation
open override func reset() {
super.reset()
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
subHeadline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldTitleMedium)
subHeadline.setFontStyle(.BoldBodySmall)
body.setFontStyle(.RegularBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
View File

@ -9,8 +9,8 @@
import Foundation
@objcMembers open class ListRVWheel: TableViewCell {
let wheel = Wheel(frame: .zero)
let leftLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let rightLabel = Label(fontStyle: .RegularBodySmall)
var stack: Stack<StackModel>
//-----------------------------------------------------
@ -54,8 +54,8 @@ import Foundation
//-------------------------------------------------
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
}
public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
View File

@ -13,7 +13,7 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
let leftLabel = Label.createLabelBoldBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let rightImage = LoadImageView(pinnedEdges: .all)
var stack: Stack<StackModel>
@ -57,6 +57,6 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
}
}

14
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
View File

@ -8,14 +8,15 @@
import Foundation
@objcMembers open class ListRightVariablePriceChangeAllTextAndLinks: TableViewCell {
//-----------------------------------------------------
// MARK: - Outlets
//-----------------------------------------------------
public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
public let arrow = Arrow(frame: .zero)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink()
public let arrow = Arrow()
public let rightLabel = Label(fontStyle: .RegularBodySmall)
private let stack: Stack<StackModel>
private let arrowStackItem: StackItem
private let rightLabelStackItem: StackItem
@ -67,9 +68,11 @@ import Foundation
stack.restack()
}
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.set(with: model, delegateObject, additionalData)
guard let model = model as? ListRightVariablePriceChangeAllTextAndLinksModel else { return }
eyebrowHeadlineBodyLink.set(with: model.eyebrowHeadlineBodyLink, delegateObject, additionalData)
rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
arrow.set(with: model.arrow, delegateObject, additionalData)
@ -79,4 +82,3 @@ import Foundation
return 121
}
}

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
View File

@ -15,7 +15,7 @@ import Foundation
private let stack: Stack<StackModel>
public let headlineBody = HeadlineBody(frame: .zero)
public let arrow = Arrow(frame: .zero)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
let arrowAndRightLabelStack: Stack<StackModel>

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
View File

@ -14,8 +14,8 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
public var stack: Stack<StackModel>
public let leftLabel = Label.createLabelBoldBodySmall(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let leftLabel = Label(fontStyle: .BoldBodySmall)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
public let bar = Line()
//-----------------------------------------------------
@ -61,8 +61,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
bar.setStyle(.heavy)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift
View File

@ -13,9 +13,9 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
public let leftLabel = Label.createLabelRegularBodySmall(true)
public let centerLabel = Label.createLabelRegularBodySmall(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let leftLabel = Label(fontStyle: .RegularBodySmall)
public let centerLabel = Label(fontStyle: .RegularBodySmall)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
var stack: Stack<StackModel>
//------------------------------------------------------
@ -54,8 +54,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleRegularBodySmall(true)
centerLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.RegularBodySmall)
centerLabel.setFontStyle(.RegularBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift
View File

@ -14,9 +14,9 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
open var stack: Stack<StackModel>
public let leftLabel = Label.createLabelRegularBodySmall(true)
public let centerLabel = Label.createLabelRegularBodySmall(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let leftLabel = Label(fontStyle: .RegularBodySmall)
public let centerLabel = Label(fontStyle: .RegularBodySmall)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
public let arrow = Arrow(frame: .zero)
public let arrowAndLabel2Stack: Stack<StackModel>
@ -66,8 +66,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleRegularBodySmall(true)
centerLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.RegularBodySmall)
centerLabel.setFontStyle(.RegularBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
}
}

32
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift
View File

@ -13,15 +13,15 @@ import Foundation
//-------------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
let leftHeadline1 = Label.createLabelBoldBodySmall(true)
let leftHeadline2 = Label.createLabelBoldBodySmall(true)
let leftHeadline3 = Label.createLabelBoldBodySmall(true)
let leftBody = Label.createLabelRegularBodySmall(true)
let leftHeadline1 = Label(fontStyle: .BoldBodySmall)
let leftHeadline2 = Label(fontStyle: .BoldBodySmall)
let leftHeadline3 = Label(fontStyle: .BoldBodySmall)
let leftBody = Label(fontStyle: .RegularBodySmall)
let leftLink = Link()
let rightHeadline1 = Label.createLabelBoldBodySmall(true)
let rightHeadline2 = Label.createLabelBoldBodySmall(true)
let rightHeadline3 = Label.createLabelBoldBodySmall(true)
let rightBody = Label.createLabelRegularBodySmall(true)
let rightHeadline1 = Label(fontStyle: .BoldBodySmall)
let rightHeadline2 = Label(fontStyle: .BoldBodySmall)
let rightHeadline3 = Label(fontStyle: .BoldBodySmall)
let rightBody = Label(fontStyle: .RegularBodySmall)
let rightLink = Link()
let containingStack: Stack<StackModel>
@ -97,14 +97,14 @@ import Foundation
open override func reset() {
super.reset()
leftHeadline1.styleBoldBodySmall(true)
leftHeadline2.styleBoldBodySmall(true)
leftHeadline3.styleBoldBodySmall(true)
leftBody.styleRegularBodySmall(true)
rightHeadline1.styleBoldBodySmall(true)
rightHeadline2.styleBoldBodySmall(true)
rightHeadline3.styleBoldBodySmall(true)
rightBody.styleRegularBodySmall(true)
leftHeadline1.setFontStyle(.BoldBodySmall)
leftHeadline2.setFontStyle(.BoldBodySmall)
leftHeadline3.setFontStyle(.BoldBodySmall)
leftBody.setFontStyle(.RegularBodySmall)
rightHeadline1.setFontStyle(.BoldBodySmall)
rightHeadline2.setFontStyle(.BoldBodySmall)
rightHeadline3.setFontStyle(.BoldBodySmall)
rightBody.setFontStyle(.RegularBodySmall)
}
public override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift
View File

@ -13,10 +13,10 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
public let leftHeadline = Label.createLabelBoldBodySmall(true)
public let leftBody = Label.createLabelRegularBodySmall(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let rightSubLabel = Label.createLabelRegularBodySmall(true)
public let leftHeadline = Label(fontStyle: .BoldBodySmall)
public let leftBody = Label(fontStyle: .RegularBodySmall)
public let rightLabel = Label(fontStyle: .RegularBodySmall)
public let rightSubLabel = Label(fontStyle: .RegularBodySmall)
public let view = MVMCoreUICommonViewsUtility.commonView()
public let leftVerticalStack: UIStackView
@ -86,9 +86,9 @@ import Foundation
super.reset()
leftVerticalStack.reset()
rightVerticalStack.reset()
leftHeadline.styleBoldBodySmall(true)
leftBody.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
rightSubLabel.styleRegularBodySmall(true)
leftHeadline.setFontStyle(.BoldBodySmall)
leftBody.setFontStyle(.RegularBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
rightSubLabel.setFontStyle(.RegularBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift
View File

@ -10,8 +10,8 @@ import UIKit
@objcMembers open class ListTwoColumnPriceDetails: TableViewCell {
let leftLabel = Label.createLabelRegularBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
let leftLabel = Label(fontStyle: .RegularBodySmall)
let rightLabel = Label(fontStyle: .RegularBodySmall)
let view = MVMCoreUICommonViewsUtility.commonView()
// MARK: - MFViewProtocol
@ -44,8 +44,8 @@ import UIKit
super.reset()
leftLabel.reset()
rightLabel.reset()
leftLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
leftLabel.setFontStyle(.RegularBodySmall)
rightLabel.setFontStyle(.RegularBodySmall)
}
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/ListProgressBarData.swift
View File

@ -14,8 +14,8 @@ import UIKit
// MARK: - Outlets
//-----------------------------------------------------
let progressBar = MultiProgress(frame: .zero)
let leftLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelBoldBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let rightLabel = Label(fontStyle: .BoldBodySmall)
let view = MVMCoreUICommonViewsUtility.commonView()
//-----------------------------------------------------
@ -66,8 +66,8 @@ import UIKit
progressBar.reset()
leftLabel.reset()
rightLabel.reset()
leftLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageDivider.swift
View File

@ -11,10 +11,10 @@ import Foundation
@objcMembers open class ListFourColumnDataUsageDivider: TableViewCell {
// MARK: - MFViewProtocol
let label1 = Label.createLabelBoldBodySmall(true)
let label2 = Label.createLabelBoldBodySmall(true)
let label3 = Label.createLabelBoldBodySmall(true)
let label4 = Label.createLabelBoldBodySmall(true)
let label1 = Label(fontStyle: .BoldBodySmall)
let label2 = Label(fontStyle: .BoldBodySmall)
let label3 = Label(fontStyle: .BoldBodySmall)
let label4 = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
// MARK: - Initializers
@ -55,9 +55,9 @@ import Foundation
// MARK: - MoleculeViewProtocol
open override func reset() {
super.reset()
label1.styleBoldBodySmall(true)
label2.styleBoldBodySmall(true)
label3.styleBoldBodySmall(true)
label4.styleBoldBodySmall(true)
label1.setFontStyle(.BoldBodySmall)
label2.setFontStyle(.BoldBodySmall)
label3.setFontStyle(.BoldBodySmall)
label4.setFontStyle(.BoldBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnFullWidthTextDividerSubsection.swift
View File

@ -13,8 +13,8 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
public var stack: Stack<StackModel>
public let headline = Label.createLabelBoldBodySmall(true)
public let body = Label.createLabelRegularBodySmall(true)
public let headline = Label(fontStyle: .BoldBodySmall)
public let body = Label(fontStyle: .RegularBodySmall)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
headline.setFontStyle(.BoldBodySmall)
body.setFontStyle(.RegularBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift
View File

@ -13,8 +13,8 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
public var stack: Stack<StackModel>
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift
View File

@ -13,8 +13,8 @@ import Foundation
// MARK: - Outlets
//-----------------------------------------------------
public var stack: Stack<StackModel>
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
headline.setFontStyle(.BoldTitleMedium)
body.setFontStyle(.RegularBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnBillChangesDivider.swift
View File

@ -9,9 +9,9 @@
import Foundation
@objcMembers open class ListThreeColumnBillChangesDivider: TableViewCell {
public let leftLabel = Label.createLabelBoldBodySmall(true)
public let centerLabel = Label.createLabelBoldBodySmall(true)
public let rightLabel = Label.createLabelBoldBodySmall(true)
public let leftLabel = Label(fontStyle: .BoldBodySmall)
public let centerLabel = Label(fontStyle: .BoldBodySmall)
public let rightLabel = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
// MARK: - Initializers
@ -49,8 +49,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
centerLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
centerLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnDataUsageDivider.swift
View File

@ -13,9 +13,9 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
public let leftLabel = Label.createLabelBoldBodySmall(true)
public let centerLabel = Label.createLabelBoldBodySmall(true)
public let rightLabel = Label.createLabelBoldBodySmall(true)
public let leftLabel = Label(fontStyle: .BoldBodySmall)
public let centerLabel = Label(fontStyle: .BoldBodySmall)
public let rightLabel = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
//------------------------------------------------------
@ -54,8 +54,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
centerLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
centerLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnInternationalDataDivider.swift
View File

@ -13,9 +13,9 @@ import Foundation
//-----------------------------------------------------
// MARK: - Outlets
//-----------------------------------------------------
let leftLabel = Label.createLabelBoldBodySmall(true)
let centerLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelBoldBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let centerLabel = Label(fontStyle: .BoldBodySmall)
let rightLabel = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -59,8 +59,8 @@ import Foundation
//-----------------------------------------------------
override open func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
centerLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
centerLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnSpeedTestDivider.swift
View File

@ -13,9 +13,9 @@ import Foundation
//-------------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
let leftLabel = Label.createLabelBoldBodySmall(true)
let centerLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelBoldBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let centerLabel = Label(fontStyle: .BoldBodySmall)
let rightLabel = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
//-------------------------------------------------------
@ -56,8 +56,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
centerLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
centerLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/TwoColumn/ListTwoColumnSubsectionDivider.swift
View File

@ -13,8 +13,8 @@ import Foundation
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
let leftLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelBoldBodySmall(true)
let leftLabel = Label(fontStyle: .BoldBodySmall)
let rightLabel = Label(fontStyle: .BoldBodySmall)
var stack: Stack<StackModel>
//-------------------------------------------------------
@ -56,7 +56,7 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleBoldBodySmall(true)
rightLabel.styleBoldBodySmall(true)
leftLabel.setFontStyle(.BoldBodySmall)
rightLabel.setFontStyle(.BoldBodySmall)
}
}

2
MVMCoreUI/Atomic/Molecules/Doughnut/ColorViewWithLabel.swift
View File

@ -14,7 +14,7 @@ open class ColorViewWithLabel: View {
// MARK: - Properties
//--------------------------------------------------
public var label = Label.createLabelRegularBodySmall(true)
public var label = Label(fontStyle: .RegularBodySmall, true)
public var colorView = View()
private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: 8)!

4
MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChart.swift
View File

@ -15,8 +15,8 @@ open class DoughnutChart: View {
//--------------------------------------------------
public var doughnutLayer = CALayer()
public var titleLabel = Label.createLabelBoldTitleLarge(true)
public var subTitleLabel = Label.createLabelRegularMicro(true)
public var titleLabel = Label(fontStyle: .BoldTitleLarge)
public var subTitleLabel = Label(fontStyle: .RegularMicro)
public var labelContainer = MVMCoreUICommonViewsUtility.commonView()
public static let heightConstant: CGFloat = 136
private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: heightConstant)!

4
MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBody.swift
View File

@ -18,7 +18,7 @@ import UIKit
open override func setupView() {
super.setupView()
headlineBody.headlineLabel.styleBoldBodySmall(true)
headlineBody.headlineLabel.setFontStyle(.BoldBodySmall)
headlineBody.spaceBetweenLabelsConstant = 0
imageView.addSizeConstraintsForAspectRatio = true
@ -43,7 +43,7 @@ import UIKit
open override func reset() {
super.reset()
headlineBody.reset()
headlineBody.headlineLabel.styleBoldBodySmall(true)
headlineBody.headlineLabel.setFontStyle(.BoldBodySmall)
headlineBody.spaceBetweenLabelsConstant = 0
imageView.reset()
}

16
MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabels.swift
View File

@ -10,10 +10,10 @@ import UIKit
@objcMembers public class CornerLabels: View {
var middleView: UIView?
let topLeftLabel = Label.createLabelBoldBodySmall(true)
let topRightLabel = Label.createLabelBoldBodySmall(true)
let bottomLeftLabel = Label.createLabelRegularMicro(true)
let bottomRightLabel = Label.createLabelRegularMicro(true)
let topLeftLabel = Label(fontStyle: .BoldBodySmall)
let topRightLabel = Label(fontStyle: .BoldBodySmall)
let bottomLeftLabel = Label(fontStyle: .RegularMicro)
let bottomRightLabel = Label(fontStyle: .RegularMicro)
let topLabelsView = MVMCoreUICommonViewsUtility.commonView()
let bottomLabelsView = MVMCoreUICommonViewsUtility.commonView()
@ -151,10 +151,10 @@ import UIKit
}
func styleDefault() {
topLeftLabel.styleBoldBodySmall(true)
topRightLabel.styleBoldBodySmall(true)
bottomLeftLabel.styleRegularMicro(true)
bottomRightLabel.styleRegularMicro(true)
topLeftLabel.setFontStyle(.BoldBodySmall)
topRightLabel.setFontStyle(.BoldBodySmall)
bottomLeftLabel.setFontStyle(.RegularMicro)
bottomRightLabel.setFontStyle(.RegularMicro)
}
public class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

4
MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggle.swift
View File

@ -14,7 +14,7 @@ import UIKit
// MARK: - Properties
//--------------------------------------------------
public let label = Label.createLabelBoldBodySmall(true)
public let label = Label(fontStyle: .BoldBodySmall)
public let toggle = Toggle()
//--------------------------------------------------
@ -58,6 +58,6 @@ import UIKit
super.reset()
label.reset()
toggle.reset()
label.styleBoldBodySmall(true)
label.setFontStyle(.BoldBodySmall)
}
}

12
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
View File

@ -14,9 +14,9 @@ import UIKit
//--------------------------------------------------
public let stack = Stack<StackModel>(frame: .zero)
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldBodySmall(true)
public let body = Label.createLabelRegularBodySmall(true)
public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldBodySmall)
public let body = Label(fontStyle: .RegularBodySmall, true)
public let link = Link()
var castModel: EyebrowHeadlineBodyLinkModel? {
@ -48,9 +48,9 @@ import UIKit
open override func reset() {
super.reset()
stack.reset()
eyebrow.styleRegularMicro(true)
headline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
eyebrow.setFontStyle(.RegularMicro)
headline.setFontStyle(.BoldBodySmall)
body.setFontStyle(.RegularBodySmall)
}
//--------------------------------------------------

20
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
View File

@ -10,8 +10,8 @@ import UIKit
open class HeadlineBody: View {
let headlineLabel = Label.createLabelBoldTitleLarge(true)
let messageLabel = Label.createLabelRegularBodySmall(true)
let headlineLabel = Label(fontStyle: .BoldTitleLarge)
let messageLabel = Label(fontStyle: .RegularBodySmall)
var spaceBetweenLabelsConstant = PaddingOne
var spaceBetweenLabels: NSLayoutConstraint?
var leftConstraintTitle: NSLayoutConstraint?
@ -39,26 +39,26 @@ open class HeadlineBody: View {
}
func styleLandingPageHeader() {
headlineLabel.styleTitle2XLarge(true)
messageLabel.styleRegularBodySmall(true)
headlineLabel.setFontStyle(.Title2XLarge)
messageLabel.setFontStyle(.RegularBodySmall)
spaceBetweenLabelsConstant = PaddingTwo
}
func stylePageHeader() {
headlineLabel.styleBoldTitleLarge(true)
messageLabel.styleRegularBodySmall(true)
headlineLabel.setFontStyle(.BoldTitleLarge)
messageLabel.setFontStyle(.RegularBodySmall)
spaceBetweenLabelsConstant = PaddingOne
}
func styleListItem() {
headlineLabel.styleBoldBodySmall(true)
messageLabel.styleRegularBodySmall(true)
headlineLabel.setFontStyle(.BoldBodySmall)
messageLabel.setFontStyle(.RegularBodySmall)
spaceBetweenLabelsConstant = 0
}
func styleListItemDivider() {
headlineLabel.styleBoldTitleMedium(true)
messageLabel.styleRegularBodySmall(true)
headlineLabel.setFontStyle(.BoldTitleMedium)
messageLabel.setFontStyle(.RegularBodySmall)
spaceBetweenLabelsConstant = 0
}

2
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift
View File

@ -9,7 +9,7 @@
import Foundation
open class StringAndMoleculeView: View {
var label = Label.createLabelRegularBodySmall(true)
var label = Label(fontStyle: .RegularBodySmall)
var molecule: MoleculeViewProtocol
var leftWidthConstraint: NSLayoutConstraint?

2
MVMCoreUI/BaseClasses/CollectionViewCell.swift
View File

@ -98,7 +98,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
}
// MARK: - Override
public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
open func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
guard let action = model?.action else { return }
Button.performButtonAction(with: action, button: self, delegateObject: delegateObject, additionalData: additionalData)
}

2
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -263,7 +263,7 @@ import UIKit
// MARK: - TabBar
open func updateTabBar() {
guard MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() == self,
var tabModel = pageModel as? TabPageModelProtocol else { return }
let tabModel = pageModel as? TabPageModelProtocol else { return }
if let index = tabModel.tabBarIndex {
MVMCoreUISplitViewController.main()?.tabBar?.highlightTab(at: index)
}

12
MVMCoreUI/FormUIHelpers/FormValidator.swift
View File

@ -15,12 +15,12 @@ import MVMCore
// MARK: - Properties
//--------------------------------------------------
static var defaultGroupName: String = "default"
var formRules: [FormGroupRule]?
weak var delegate: FormHolderProtocol?
var fields: [String: FormFieldProtocol] = [:]
var groupWatchers: [FormGroupWatcherFieldProtocol] = []
var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
public static var defaultGroupName: String = "default"
public var formRules: [FormGroupRule]?
public weak var delegate: FormHolderProtocol?
public var fields: [String: FormFieldProtocol] = [:]
public var groupWatchers: [FormGroupWatcherFieldProtocol] = []
public var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
//--------------------------------------------------
// MARK: - Initializer