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

Merge branch 'develop' into feature/revised_accessibility

Browse Source
This commit is contained in:
Kevin G Christiano 2020-05-12 10:14:00 -04:00
commit b58cfb8aa0
30 changed files with 117 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Atoms/Buttons/CaretLink.swift
View File

@ -71,7 +71,7 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
}
public override func updateView(_ size: CGFloat) {
titleLabel?.font = MFStyler.fontB1()
titleLabel?.font = MFStyler.fontBoldBodySmall()
}
//------------------------------------------------------

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

@ -6,9 +6,9 @@
// Copyright © 2020 Verizon Wireless. All rights reserved.
//
import Foundation
import UIKit
open class RadioSwatch: Control {
//--------------------------------------------------
// MARK: - Properties

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.commonLabelB2(true)
let label = Label.createLabelRegularBodySmall(true)
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.commonLabelB2(true)
public let label = Label.createLabelRegularBodySmall(true)
//--------------------------------------------------
// MARK: - Properties

1
MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift
View File

@ -12,6 +12,7 @@ import Foundation
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
let headlineBody = HeadlineBody(frame: .zero)
//-------------------------------------------------------

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.commonLabelB2(true)
let label2 = Label.commonLabelB2(true)
let label3 = Label.commonLabelB2(true)
let label4 = Label.commonLabelB2(true)
let label1 = Label.createLabelRegularBodySmall(true)
let label2 = Label.createLabelRegularBodySmall(true)
let label3 = Label.createLabelRegularBodySmall(true)
let label4 = Label.createLabelRegularBodySmall(true)
let arrow = Arrow(frame: .zero)
let arrowAndLabel2Stack: Stack<StackModel>
@ -69,9 +69,9 @@ import Foundation
open override func reset() {
super.reset()
label1.styleB2(true)
label2.styleB2(true)
label3.styleB2(true)
label4.styleB2(true)
label1.styleRegularBodySmall(true)
label2.styleRegularBodySmall(true)
label3.styleRegularBodySmall(true)
label4.styleRegularBodySmall(true)
}
}

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

@ -6,7 +6,6 @@
// Copyright © 2020 Verizon Wireless. All rights reserved.
//
import Foundation
import UIKit
@objcMembers open class ListLeftVariableIconWithRightCaret: TableViewCell {
@ -15,8 +14,8 @@ import UIKit
// MARK: - Outlets
//-------------------------------------------------------
let leftImage = LoadImageView(pinnedEdges: .all)
let leftLabel = Label.commonLabelB2(true)
let rightLabel = Label.commonLabelB2(true)
let leftLabel = Label.createLabelRegularBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
var stack: Stack<StackModel>
//-----------------------------------------------------
@ -64,7 +63,7 @@ import UIKit
open override func reset() {
super.reset()
leftLabel.styleB2(true)
rightLabel.styleB2(true)
leftLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
}
}

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

@ -15,10 +15,10 @@ import Foundation
//-----------------------------------------------------
var stack: Stack<StackModel>
let eyebrow = Label.commonLabelB3(true)
let headline = Label.commonLabelH3(true)
let subHeadline = Label.commonLabelB1(true)
let body = Label.commonLabelB2(true)
let eyebrow = Label.createLabelRegularMicro(true)
let headline = Label.createLabelBoldTitleMedium(true)
let subHeadline = Label.createLabelBoldBodySmall(true)
let body = Label.createLabelRegularBodySmall(true)
let link = Link()
//-----------------------------------------------------
@ -62,9 +62,9 @@ import Foundation
open override func reset() {
super.reset()
eyebrow.styleB3(true)
headline.styleH3(true)
subHeadline.styleB1(true)
body.styleB2(true)
eyebrow.styleRegularMicro(true)
headline.styleBoldTitleMedium(true)
subHeadline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
}
}

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.commonLabelB1(true)
let rightLabel = Label.commonLabelB2(true)
let leftLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
var stack: Stack<StackModel>
//-----------------------------------------------------
@ -54,8 +54,8 @@ import Foundation
//-------------------------------------------------
open override func reset() {
super.reset()
leftLabel.styleB1(true)
rightLabel.styleB2(true)
leftLabel.styleBoldBodySmall(true)
rightLabel.styleRegularBodySmall(true)
}
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.commonLabelB1(true)
let leftLabel = Label.createLabelBoldBodySmall(true)
let rightImage = LoadImageView(pinnedEdges: .all)
var stack: Stack<StackModel>
@ -57,6 +57,6 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleB1(true)
leftLabel.styleBoldBodySmall(true)
}
}

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

@ -15,7 +15,7 @@ import Foundation
//-----------------------------------------------------
public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
public let arrow = Arrow(frame: .zero)
public let rightLabel = Label.commonLabelB2(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
private let stack: Stack<StackModel>
private let arrowStackItem: StackItem
private let rightLabelStackItem: StackItem

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.commonLabelB2(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
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.commonLabelB1(true)
public let rightLabel = Label.commonLabelB2(true)
public let leftLabel = Label.createLabelBoldBodySmall(true)
public let rightLabel = Label.createLabelRegularBodySmall(true)
public let bar = Line()
//-----------------------------------------------------
@ -61,8 +61,8 @@ import Foundation
open override func reset() {
super.reset()
leftLabel.styleB1(true)
rightLabel.styleB2(true)
leftLabel.styleBoldBodySmall(true)
rightLabel.styleRegularBodySmall(true)
bar.setStyle(.heavy)
}
}

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

@ -13,15 +13,15 @@ import Foundation
//-------------------------------------------------------
// MARK: - Outlets
//-------------------------------------------------------
let leftHeadline1 = Label.commonLabelB1(true)
let leftHeadline2 = Label.commonLabelB1(true)
let leftHeadline3 = Label.commonLabelB1(true)
let leftBody = Label.commonLabelB2(true)
let leftHeadline1 = Label.createLabelBoldBodySmall(true)
let leftHeadline2 = Label.createLabelBoldBodySmall(true)
let leftHeadline3 = Label.createLabelBoldBodySmall(true)
let leftBody = Label.createLabelRegularBodySmall(true)
let leftLink = Link()
let rightHeadline1 = Label.commonLabelB1(true)
let rightHeadline2 = Label.commonLabelB1(true)
let rightHeadline3 = Label.commonLabelB1(true)
let rightBody = Label.commonLabelB2(true)
let rightHeadline1 = Label.createLabelBoldBodySmall(true)
let rightHeadline2 = Label.createLabelBoldBodySmall(true)
let rightHeadline3 = Label.createLabelBoldBodySmall(true)
let rightBody = Label.createLabelRegularBodySmall(true)
let rightLink = Link()
let containingStack: Stack<StackModel>
@ -97,14 +97,14 @@ import Foundation
open override func reset() {
super.reset()
leftHeadline1.styleB1(true)
leftHeadline2.styleB1(true)
leftHeadline3.styleB1(true)
leftBody.styleB2(true)
rightHeadline1.styleB1(true)
rightHeadline2.styleB1(true)
rightHeadline3.styleB1(true)
rightBody.styleB2(true)
leftHeadline1.styleBoldBodySmall(true)
leftHeadline2.styleBoldBodySmall(true)
leftHeadline3.styleBoldBodySmall(true)
leftBody.styleRegularBodySmall(true)
rightHeadline1.styleBoldBodySmall(true)
rightHeadline2.styleBoldBodySmall(true)
rightHeadline3.styleBoldBodySmall(true)
rightBody.styleRegularBodySmall(true)
}
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.commonLabelB1(true)
public let leftBody = Label.commonLabelB2(true)
public let rightLabel = Label.commonLabelB2(true)
public let rightSubLabel = Label.commonLabelB2(true)
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 view = MVMCoreUICommonViewsUtility.commonView()
public let leftVerticalStack: UIStackView
@ -86,9 +86,9 @@ import Foundation
super.reset()
leftVerticalStack.reset()
rightVerticalStack.reset()
leftHeadline.styleB1(true)
leftBody.styleB2(true)
rightLabel.styleB2(true)
rightSubLabel.styleB2(true)
leftHeadline.styleBoldBodySmall(true)
leftBody.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
rightSubLabel.styleRegularBodySmall(true)
}
}

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.commonLabelB2(true)
let rightLabel = Label.commonLabelB2(true)
let leftLabel = Label.createLabelRegularBodySmall(true)
let rightLabel = Label.createLabelRegularBodySmall(true)
let view = MVMCoreUICommonViewsUtility.commonView()
// MARK: - MFViewProtocol
@ -44,8 +44,8 @@ import UIKit
super.reset()
leftLabel.reset()
rightLabel.reset()
leftLabel.styleB2(true)
rightLabel.styleB2(true)
leftLabel.styleRegularBodySmall(true)
rightLabel.styleRegularBodySmall(true)
}
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

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.commonLabelB1(true)
public let body = Label.commonLabelB2(true)
public let headline = Label.createLabelBoldBodySmall(true)
public let body = Label.createLabelRegularBodySmall(true)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleB1(true)
body.styleB2(true)
headline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
}
}

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.commonLabelH3(true)
public let body = Label.commonLabelB2(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleH3(true)
body.styleB2(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
}
}

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.commonLabelH3(true)
public let body = Label.commonLabelB2(true)
public let headline = Label.createLabelBoldTitleMedium(true)
public let body = Label.createLabelRegularBodySmall(true)
// MARK: - Initializers
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -50,7 +50,7 @@ import Foundation
open override func reset() {
super.reset()
headline.styleH3(true)
body.styleB2(true)
headline.styleBoldTitleMedium(true)
body.styleRegularBodySmall(true)
}
}

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

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

4
MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImage.swift
View File

@ -92,8 +92,8 @@ import UIKit
private func setDefaultState() {
headlineBodyButton.headlineBody.headlineLabel.font = MFStyler.fontH3()
headlineBodyButton.headlineBody.messageLabel.font = MFStyler.fontB3()
headlineBodyButton.headlineBody.headlineLabel.font = MFStyler.fontBoldTitleMedium()
headlineBodyButton.headlineBody.messageLabel.font = MFStyler.fontRegularMicro()
imageLoader.imageView.contentMode = .scaleAspectFit
imageLoader.addSizeConstraintsForAspectRatio = true
buttonHeaderPadding = PaddingTwo

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.commonLabelB1(true)
let topRightLabel = Label.commonLabelB1(true)
let bottomLeftLabel = Label.commonLabelB3(true)
let bottomRightLabel = Label.commonLabelB3(true)
let topLeftLabel = Label.createLabelBoldBodySmall(true)
let topRightLabel = Label.createLabelBoldBodySmall(true)
let bottomLeftLabel = Label.createLabelRegularMicro(true)
let bottomRightLabel = Label.createLabelRegularMicro(true)
let topLabelsView = MVMCoreUICommonViewsUtility.commonView()
let bottomLabelsView = MVMCoreUICommonViewsUtility.commonView()
@ -151,10 +151,10 @@ import UIKit
}
func styleDefault() {
topLeftLabel.styleB1(true)
topRightLabel.styleB1(true)
bottomLeftLabel.styleB3(true)
bottomRightLabel.styleB3(true)
topLeftLabel.styleBoldBodySmall(true)
topRightLabel.styleBoldBodySmall(true)
bottomLeftLabel.styleRegularMicro(true)
bottomRightLabel.styleRegularMicro(true)
}
public class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

1
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/BGImageHeadlineBodyButtonModel.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 Verizon Wireless. All rights reserved.
//
import Foundation
import UIKit
public class BGImageHeadlineBodyButtonModel: ContainerModel, MoleculeModelProtocol {

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.commonLabelB3(true)
public let headline = Label.commonLabelB1(true)
public let body = Label.commonLabelB2(true)
public let eyebrow = Label.createLabelRegularMicro(true)
public let headline = Label.createLabelBoldBodySmall(true)
public let body = Label.createLabelRegularBodySmall(true)
public let link = Link()
var castModel: EyebrowHeadlineBodyLinkModel? {
@ -48,9 +48,9 @@ import UIKit
open override func reset() {
super.reset()
stack.reset()
eyebrow.styleB3(true)
headline.styleB1(true)
body.styleB2(true)
eyebrow.styleRegularMicro(true)
headline.styleBoldBodySmall(true)
body.styleRegularBodySmall(true)
}
//--------------------------------------------------

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

@ -10,8 +10,8 @@ import UIKit
open class HeadlineBody: View {
let headlineLabel = Label.commonLabelH2(true)
let messageLabel = Label.commonLabelB2(true)
let headlineLabel = Label.createLabelBoldTitleLarge(true)
let messageLabel = Label.createLabelRegularBodySmall(true)
var spaceBetweenLabelsConstant = PaddingOne
var spaceBetweenLabels: NSLayoutConstraint?
var leftConstraintTitle: NSLayoutConstraint?
@ -39,26 +39,26 @@ open class HeadlineBody: View {
}
func styleLandingPageHeader() {
headlineLabel.styleH1(true)
messageLabel.styleB2(true)
headlineLabel.styleTitle2XLarge(true)
messageLabel.styleRegularBodySmall(true)
spaceBetweenLabelsConstant = PaddingTwo
}
func stylePageHeader() {
headlineLabel.styleH2(true)
messageLabel.styleB2(true)
headlineLabel.styleBoldTitleLarge(true)
messageLabel.styleRegularBodySmall(true)
spaceBetweenLabelsConstant = PaddingOne
}
func styleListItem() {
headlineLabel.styleB1(true)
messageLabel.styleB2(true)
headlineLabel.styleBoldBodySmall(true)
messageLabel.styleRegularBodySmall(true)
spaceBetweenLabelsConstant = 0
}
func styleListItemDivider() {
headlineLabel.styleH3(true)
messageLabel.styleB2(true)
headlineLabel.styleBoldTitleMedium(true)
messageLabel.styleRegularBodySmall(true)
spaceBetweenLabelsConstant = 0
}

4
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButton.swift
View File

@ -82,8 +82,8 @@ import UIKit
private func defaultState() {
headlineBody.headlineLabel.font = MFStyler.fontH3()
headlineBody.messageLabel.font = MFStyler.fontB3()
headlineBody.headlineLabel.font = MFStyler.fontBoldTitleMedium()
headlineBody.messageLabel.font = MFStyler.fontRegularMicro()
button.styleSecondary()
button.isHidden = false
buttonHeadlinePadding = PaddingTwo

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

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

2
MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift
View File

@ -6,8 +6,6 @@
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
import Foundation
import UIKit
import MVMCore.MVMCoreViewProtocol

5
MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
View File

@ -8,7 +8,6 @@
import Foundation
public protocol TemplateProtocol: AnyObject {
associatedtype TemplateModel: TemplateModelProtocol
var templateModel: TemplateModel? { get set }
@ -19,11 +18,9 @@ public extension TemplateProtocol where Self: ViewController {
guard let pageJSON = json else { return }
let data = try JSONSerialization.data(withJSONObject: pageJSON)
let decoder = JSONDecoder()
try decoder.add(delegateObject: delegateObjectIVar)
let templateModel = try decoder.decode(TemplateModel.self, from: data)
self.templateModel = templateModel
self.pageModel = templateModel as? MVMControllerModelProtocol
if let backgroundColor = templateModel.backgroundColor {
view.backgroundColor = backgroundColor.uiColor
}
}
}

12
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -17,7 +17,10 @@ import UIKit
public var manager: (UIViewController & MVMCoreViewManagerProtocol)?
/// A temporary iVar backer for delegateObject() until we change the protocol
public var delegateObjectIVar: MVMCoreUIDelegateObject?
public let delegateObjectIVar: MVMCoreUIDelegateObject = {
return MVMCoreUIDelegateObject.create(withDelegateForAll: self)
}()
public func delegateObject() -> DelegateObject? {
return delegateObjectIVar
}
@ -171,6 +174,10 @@ import UIKit
let rules = pageModel?.formRules
formValidator = FormValidator(rules)
}
if let backgroundColor = pageModel?.backgroundColor {
view.backgroundColor = backgroundColor.uiColor
}
}
// MARK: - Navigation Item (Move to model base)
@ -260,9 +267,6 @@ import UIKit
// Presents from the bottom.
modalPresentationStyle = MVMCoreGetterUtility.isOnIPad() ? .formSheet : .overCurrentContext
// Create the default delegate object.
delegateObjectIVar = MVMCoreUIDelegateObject.create(withDelegateForAll: self)
// Do some initial loading.
if !initialLoadFinished {
initialLoadFinished = true