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

add protocol func into view

Browse Source
This commit is contained in:
panxi 2019-12-12 17:22:26 -05:00
parent 8d811f229f
commit 52186bf089
9 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -577,7 +577,6 @@
01EB368B23609801006832FA /* MoleculeStackModel.swift */,
01EB368C23609801006832FA /* HeaderModel.swift */,
012A88EB238F084D00FE3DA1 /* FooterModel.swift */,
01EB368D23609801006832FA /* HeadlineBodyModel.swift */,
017BEB3F23620A230024EF95 /* TextFieldModel.swift */,
017BEB4123620AD20024EF95 /* FormModelProtocol.swift */,
017BEB7A236763000024EF95 /* LineModel.swift */,
@ -664,6 +663,7 @@
isa = PBXGroup;
children = (
D2A638FC22CA98280052ED1F /* HeadlineBody.swift */,
01EB368D23609801006832FA /* HeadlineBodyModel.swift */,
D22479952316AF6D003FCCF9 /* HeadlineBodyTextButton.swift */,
D27CD40F2339057800C1DC07 /* EyebrowHeadlineBodyLink.swift */,
);

2
MVMCoreUI/Atoms/Views/CaretView.swift
View File

@ -99,7 +99,7 @@ open class CaretView: View {
//------------------------------------------------------
// Default values for view.
@objc open func setAsMolecule() {
@objc open override func setAsMolecule() {
defaultState()
}

2
MVMCoreUI/Atoms/Views/DashLine.swift
View File

@ -64,7 +64,7 @@ open class DashLine: View {
//------------------------------------------------------
// Default values for view.
@objc open func setAsMolecule() {
@objc open override func setAsMolecule() {
backgroundColor = .clear
isHidden = false
}

7
MVMCoreUI/Atoms/Views/DashLineModel.swift
View File

@ -12,9 +12,12 @@ import Foundation
public static var identifier: String {
get { return "dashLine" }
}
public var moleculeName: String = ""
public var backgroundColor: String?
public var dashColor: String = ""
public var dashColor: String
public var isHidden: Bool?
public init(dashColor: String) {
self.dashColor = dashColor
}
}

4
MVMCoreUI/BaseClasses/View.swift
View File

@ -66,5 +66,9 @@ extension View: MVMCoreUIMoleculeViewProtocol {
open func reset() {
backgroundColor = .clear
}
open func setAsMolecule() {
}
}

4
MVMCoreUI/Molecules/HeadlineBodyButton.swift
View File

@ -9,7 +9,7 @@
import UIKit
@objcMembers open class HeadlineBodyButton: ViewConstrainingView {
@objcMembers open class HeadlineBodyButton: View {
//------------------------------------------------------
// MARK: - Outlets
//------------------------------------------------------
@ -33,7 +33,7 @@ import UIKit
// MARK: - Initialization
//------------------------------------------------------
public init() {
public override init() {
super.init(frame: .zero)
}

2
MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodySwitch.swift
View File

@ -59,7 +59,7 @@ import UIKit
return 30
}
open func setAsMolecule() {
open override func setAsMolecule() {
headlineBody.setAsMolecule()
(mvmSwitch as MVMCoreUIMoleculeViewProtocol).setAsMolecule?()
headlineBody.styleListItem()

35
MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift
View File

@ -8,7 +8,7 @@
import UIKit
open class HeadlineBody: ViewConstrainingView, ModelMoleculeViewProtocol {
open class HeadlineBody: View {
let headlineLabel = Label.commonLabelH2(true)
let messageLabel = Label.commonLabelB2(true)
var spaceBetweenLabelsConstant = PaddingTwo
@ -81,7 +81,7 @@ open class HeadlineBody: ViewConstrainingView, ModelMoleculeViewProtocol {
let view = MVMCoreUICommonViewsUtility.commonView()
addSubview(view)
pinView(toSuperView: view)
NSLayoutConstraint.constraintPinSubview(toSuperview: view)
view.addSubview(headlineLabel)
view.addSubview(messageLabel)
@ -119,9 +119,9 @@ open class HeadlineBody: ViewConstrainingView, ModelMoleculeViewProtocol {
}
}
public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
setUpWithModel(model, delegateObject, additionalData)
super.setWithModel(model, delegateObject, additionalData)
guard let headlineBodyModel = model as? HeadlineBodyModel else {
return
}
@ -131,25 +131,26 @@ open class HeadlineBody: ViewConstrainingView, ModelMoleculeViewProtocol {
headlineLabel.setWithModel(headlineBodyModel.headline, delegateObject, additionalData)
messageLabel.setWithModel(headlineBodyModel.body, delegateObject, additionalData)
}
// // MARK: - MVMCoreUIMoleculeViewProtocol
// open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
// super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
//
// style(with: json?.optionalStringForKey("style"))
//
// let headlineJSON = json?.optionalDictionaryForKey("headline")
// headlineLabel.setWithJSON(headlineJSON, delegateObject: delegateObject, additionalData: additionalData)
//
// let bodyJSON = json?.optionalDictionaryForKey("body")
// messageLabel.setWithJSON(bodyJSON, delegateObject: delegateObject, additionalData: additionalData)
// }
// MARK: - MVMCoreUIMoleculeViewProtocol
open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
style(with: json?.optionalStringForKey("style"))
let headlineJSON = json?.optionalDictionaryForKey("headline")
headlineLabel.setWithJSON(headlineJSON, delegateObject: delegateObject, additionalData: additionalData)
let bodyJSON = json?.optionalDictionaryForKey("body")
messageLabel.setWithJSON(bodyJSON, delegateObject: delegateObject, additionalData: additionalData)
}
open override func reset() {
super.reset()
stylePageHeader()
}
public override class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
public class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
return 58
}
}

4
MVMCoreUI/Models/Molecules/HeadlineBodyModel.swift → MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
View File

@ -15,11 +15,9 @@ import Foundation
public var style: String?
public var backgroundColor: String?
public init(headline: LabelModel, body: LabelModel, style: String?, backgroundColor: String?) {
public init(headline: LabelModel, body: LabelModel) {
self.headline = headline
self.body = body
self.style = style
self.backgroundColor = backgroundColor
}
}