Compare commits
No commits in common. "develop" and "feature/atomic-vds-sept2024" have entirely different histories.
develop
...
feature/at
@ -3625,7 +3625,7 @@
|
||||
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
|
||||
INFOPLIST_FILE = MVMCoreUI/Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
@ -3655,7 +3655,7 @@
|
||||
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
|
||||
INFOPLIST_FILE = MVMCoreUI/Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
|
||||
@ -38,10 +38,7 @@ open class ButtonGroup: VDS.ButtonGroup, VDSMoleculeViewProtocol {
|
||||
return PillButton.estimatedHeight(with: buttonModel, delegateObject)
|
||||
}
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
public func viewModelDidUpdate() {
|
||||
surface = viewModel.surface
|
||||
isEnabled = viewModel.enabled
|
||||
alignment = viewModel.alignment
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import MVMCore
|
||||
import VDS
|
||||
|
||||
public class ButtonGroupModel: ParentMoleculeModelProtocol {
|
||||
@ -18,7 +17,6 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "buttonGroup"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var children: [MoleculeModelProtocol] { buttons }
|
||||
|
||||
@ -40,7 +38,6 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case buttons
|
||||
case alignment
|
||||
@ -59,7 +56,6 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
surface = try typeContainer.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
|
||||
enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
|
||||
buttons = try typeContainer.decodeModels(codingKey: .buttons)
|
||||
@ -74,7 +70,6 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(surface, forKey: .surface)
|
||||
try container.encode(enabled, forKey: .enabled)
|
||||
try container.encodeModels(buttons, forKey: .buttons)
|
||||
|
||||
@ -15,8 +15,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
|
||||
|
||||
public static var identifier: String = "imageButton"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var image: ImageViewModel?
|
||||
|
||||
@ -46,7 +45,6 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case image
|
||||
case backgroundColor
|
||||
case accessibilityText
|
||||
@ -66,7 +64,6 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
image = try typeContainer.decodeIfPresent(ImageViewModel.self, forKey: .image)
|
||||
accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
@ -94,7 +91,6 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(image, forKey: .image)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||
|
||||
@ -12,15 +12,13 @@ import MVMCore
|
||||
@objcMembers public class TagModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "tag"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var label: LabelModel
|
||||
public var action: ActionModelProtocol?
|
||||
public var backgroundColor: Color?
|
||||
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case label
|
||||
case action
|
||||
@ -44,7 +42,6 @@ import MVMCore
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
label = try typeContainer.decode(LabelModel.self, forKey: .label)
|
||||
action = try typeContainer.decodeModelIfPresent(codingKey: .action)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
@ -53,7 +50,6 @@ import MVMCore
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(label, forKey: .label)
|
||||
try container.encodeModelIfPresent(action, forKey: .action)
|
||||
|
||||
@ -12,14 +12,12 @@ import MVMCore
|
||||
@objcMembers public class TagsModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "tags"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var tags: [TagModel]
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case tags
|
||||
@ -36,7 +34,6 @@ import MVMCore
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
tags = try typeContainer.decode([TagModel].self, forKey: .tags)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
}
|
||||
@ -44,7 +41,6 @@ import MVMCore
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(tags, forKey: .tags)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
|
||||
@ -123,9 +123,6 @@ import VDS
|
||||
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
//forms
|
||||
FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate)
|
||||
groupName = viewModel.groupName
|
||||
|
||||
@ -28,9 +28,6 @@ open class Checkboxes: VDS.CheckboxGroup, VDSMoleculeViewProtocol {
|
||||
|
||||
// MARK: - MoleculeViewProtocol
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
showError = viewModel.showError
|
||||
isEnabled = viewModel.enabled && !viewModel.readOnly
|
||||
|
||||
@ -28,9 +28,7 @@ import VDS
|
||||
//--------------------------------------------------
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
text = viewModel.text
|
||||
subText = viewModel.subText
|
||||
subTextRight = viewModel.subTextRight
|
||||
|
||||
@ -28,9 +28,6 @@ open class RadioBoxes: VDS.RadioBoxGroup, VDSMoleculeViewProtocol {
|
||||
|
||||
// MARK: - MoleculeViewProtocol
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
boxes = viewModel.boxes
|
||||
surface = viewModel.surface
|
||||
selectorModels = viewModel.boxes.convertToVDSRadioBoxModel(surface: surface)
|
||||
|
||||
@ -79,11 +79,6 @@ import VDS
|
||||
//--------------------------------------------------
|
||||
open override func setup() {
|
||||
super.setup()
|
||||
|
||||
// Radio button should never be smaller that its content size.
|
||||
setContentCompressionResistancePriority(.required, for: .vertical)
|
||||
setContentCompressionResistancePriority(.required, for: .horizontal)
|
||||
|
||||
publisher(for: .valueChanged)
|
||||
.sink { [weak self] control in
|
||||
guard let self, isEnabled else { return }
|
||||
@ -93,9 +88,7 @@ import VDS
|
||||
}
|
||||
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
//events
|
||||
viewModel.updateUI = {
|
||||
MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
|
||||
|
||||
@ -28,9 +28,6 @@ open class RadioButtons: VDS.RadioButtonGroup, VDSMoleculeViewProtocol {
|
||||
|
||||
// MARK: - MoleculeViewProtocol
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
showError = viewModel.showError
|
||||
isEnabled = viewModel.isEnabled
|
||||
surface = viewModel.surface
|
||||
|
||||
@ -103,9 +103,6 @@ public typealias ActionBlockConfirmation = () -> (Bool)
|
||||
}
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate)
|
||||
|
||||
isOn = viewModel.selected
|
||||
|
||||
@ -19,8 +19,7 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
|
||||
}
|
||||
public var moleculeName: String?
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var disabledColor: Color = Color(uiColor: .mvmCoolGray3)
|
||||
public var color: Color = Color(uiColor: .mvmBlack)
|
||||
@ -60,7 +59,6 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case disabledColor
|
||||
@ -81,8 +79,7 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
if let disabledColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledColor) {
|
||||
self.disabledColor = disabledColor
|
||||
}
|
||||
@ -119,7 +116,6 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(disabledColor, forKey: .disabledColor)
|
||||
|
||||
@ -27,14 +27,10 @@ open class Badge: VDS.Badge, VDSMoleculeViewProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
text = viewModel.text
|
||||
textColor = viewModel.textColorStyle
|
||||
maxWidth = viewModel.maxWidth
|
||||
numberOfLines = viewModel.numberOfLines
|
||||
fillColor = viewModel.fillColorStyle
|
||||
fillColor = viewModel.fillColor
|
||||
surface = viewModel.surface
|
||||
}
|
||||
|
||||
|
||||
@ -25,9 +25,6 @@ open class BadgeIndicator: VDS.BadgeIndicator, VDSMoleculeViewProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
number = viewModel.number
|
||||
fillColor = viewModel.fillColor
|
||||
|
||||
@ -17,8 +17,7 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
|
||||
public static var identifier: String { "badgeIndicator" }
|
||||
public var id: String = UUID().uuidString
|
||||
public var backgroundColor: Color?
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - VDS Properties
|
||||
//--------------------------------------------------
|
||||
@ -44,7 +43,6 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case inverted
|
||||
case accessibilityText
|
||||
case number
|
||||
@ -69,7 +67,6 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
self.init()
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
|
||||
accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
number = try container.decodeIfPresent(Int.self, forKey: .number)
|
||||
@ -94,7 +91,6 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||
try container.encodeIfPresent(number, forKey: .number)
|
||||
try container.encodeIfPresent(fillColor, forKey: .fillColor)
|
||||
|
||||
@ -16,46 +16,28 @@ open class BadgeModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "badge"
|
||||
public var id: String = UUID().uuidString
|
||||
public var backgroundColor: Color?
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - VDS Properties
|
||||
//--------------------------------------------------
|
||||
public var text: String = ""
|
||||
public var textColorStyle: Badge.TextColor? = nil
|
||||
public var accessibilityText: String?
|
||||
public var maxWidth: CGFloat?
|
||||
public var numberOfLines: Int = 1
|
||||
public var fillColorStyle = Badge.FillColor.red
|
||||
public var fillColor = Badge.FillColor.red
|
||||
public var surface: Surface = .light
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id, accessibilityIdentifier, accessibilityText
|
||||
case surface, numberOfLines, maxWidth
|
||||
case text, textColor
|
||||
case fillColor, fillColorStyle
|
||||
case id, text, accessibilityText, fillColor, surface, numberOfLines, maxWidth
|
||||
}
|
||||
|
||||
required public convenience init(from decoder: Decoder) throws {
|
||||
self.init()
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
text = try container.decode(String.self, forKey: .text)
|
||||
accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
|
||||
//look for a textColor
|
||||
if let textColor = try container.decodeIfPresent(Color.self, forKey: .textColor) {
|
||||
textColorStyle = .custom(textColor.uiColor)
|
||||
}
|
||||
|
||||
//look for a style
|
||||
fillColorStyle = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColorStyle) ?? .red
|
||||
|
||||
//look for a color and set the style
|
||||
if let fillColor = try container.decodeIfPresent(Color.self, forKey: .fillColor) {
|
||||
fillColorStyle = .custom(fillColor.uiColor)
|
||||
}
|
||||
fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColor) ?? .red
|
||||
surface = try container.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
|
||||
numberOfLines = try container.decodeIfPresent(Int.self, forKey: .numberOfLines) ?? 1
|
||||
maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: .maxWidth)
|
||||
@ -66,24 +48,16 @@ open class BadgeModel: MoleculeModelProtocol {
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(text, forKey: .text)
|
||||
try container.encode(accessibilityText, forKey: .accessibilityText)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(fillColor, forKey: .fillColor)
|
||||
try container.encode(surface, forKey: .surface)
|
||||
try container.encode(numberOfLines, forKey: .numberOfLines)
|
||||
try container.encodeIfPresent(maxWidth, forKey: .maxWidth)
|
||||
try container.encode(fillColorStyle, forKey: .fillColorStyle)
|
||||
switch textColorStyle {
|
||||
case .custom(let color):
|
||||
try container.encode(Color(uiColor: color), forKey: .textColor)
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
public func isEqual(to model: any ModelComparisonProtocol) -> Bool {
|
||||
guard let model = model as? BadgeModel else { return false }
|
||||
return self.backgroundColor == model.backgroundColor
|
||||
&& self.fillColorStyle == model.fillColorStyle
|
||||
&& self.textColorStyle == model.textColorStyle
|
||||
&& self.fillColor == model.fillColor
|
||||
&& self.numberOfLines == model.numberOfLines
|
||||
&& self.text == model.text
|
||||
&& self.surface == model.surface
|
||||
|
||||
@ -25,9 +25,6 @@ open class ButtonIcon: VDS.ButtonIcon, VDSMoleculeViewProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
|
||||
onClick = { [weak self] control in
|
||||
|
||||
@ -16,8 +16,7 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
|
||||
public static var identifier: String = "buttonIcon"
|
||||
public var id: String = UUID().uuidString
|
||||
public var backgroundColor: Color?
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - VDS Properties
|
||||
//--------------------------------------------------
|
||||
@ -78,7 +77,6 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case inverted
|
||||
case accessibilityText
|
||||
case action
|
||||
@ -107,7 +105,6 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
action = try container.decodeModel(codingKey: .action)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
|
||||
accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
badgeIndicator = try container.decodeIfPresent(BadgeIndicatorModel.self, forKey: .badgeIndicator)
|
||||
@ -131,7 +128,6 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||
try container.encodeIfPresent(badgeIndicator, forKey: .badgeIndicator)
|
||||
|
||||
@ -22,9 +22,6 @@ open class CalendarView: VDS.CalendarBase, VDSMoleculeViewProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
if let _selectedDate = viewModel.selectedDate {
|
||||
selectedDate = _selectedDate
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@ open class CalendarViewModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "calendar"
|
||||
public var id: String = UUID().uuidString
|
||||
public var backgroundColor: Color?
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
public var dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
@ -52,8 +51,6 @@ open class CalendarViewModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case inverted
|
||||
case dateFormat
|
||||
case hideContainerBorder
|
||||
@ -79,8 +76,7 @@ open class CalendarViewModel: MoleculeModelProtocol {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
hideContainerBorder = try container.decodeIfPresent(Bool.self, forKey: .hideContainerBorder)
|
||||
hideCurrentDateIndicator = try container.decodeIfPresent(Bool.self, forKey: .hideCurrentDateIndicator)
|
||||
|
||||
@ -115,9 +111,7 @@ open class CalendarViewModel: MoleculeModelProtocol {
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
try container.encode(dateFormat, forKey: .dateFormat)
|
||||
try container.encode(hideContainerBorder, forKey: .hideContainerBorder)
|
||||
|
||||
@ -16,7 +16,6 @@ import MVMCore
|
||||
|
||||
public static var identifier: String = "caretView"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var strokeColor: Color = Color(uiColor: .mvmBlack)
|
||||
public var strokeColor_inverted: Color = Color(uiColor: .mvmWhite)
|
||||
@ -31,7 +30,6 @@ import MVMCore
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case strokeColor
|
||||
@ -56,8 +54,7 @@ import MVMCore
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
if let strokeColor = try typeContainer.decodeIfPresent(Color.self, forKey: .strokeColor) {
|
||||
self.strokeColor = strokeColor
|
||||
}
|
||||
@ -87,7 +84,6 @@ import MVMCore
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(strokeColor, forKey: .strokeColor)
|
||||
try container.encode(strokeColor_inverted, forKey: .strokeColor_inverted)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
|
||||
@ -19,7 +19,6 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
|
||||
}
|
||||
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var moleculeName: String?
|
||||
|
||||
@ -49,7 +48,6 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case currentIndex
|
||||
@ -72,7 +70,6 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
moleculeName = try typeContainer.decodeIfPresent(String.self, forKey: .moleculeName)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
|
||||
@ -121,7 +118,6 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(currentIndex, forKey: .currentIndex)
|
||||
try container.encode(alwaysSendAction, forKey: .alwaysSendAction)
|
||||
|
||||
@ -31,20 +31,23 @@ import VDS
|
||||
// MARK: - Atomic
|
||||
//--------------------------------------------------
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
|
||||
updateCheckbox()
|
||||
|
||||
//primary label
|
||||
labelText = viewModel.label?.text
|
||||
labelTextAttributes = viewModel.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
labelText = viewModel.label.text
|
||||
if let attributes = viewModel.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
|
||||
labelTextAttributes = attributes
|
||||
}
|
||||
|
||||
//secondary label
|
||||
childText = viewModel.subTitle?.text
|
||||
childTextAttributes = viewModel.subTitle?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
if let subTitleModel = viewModel.subTitle {
|
||||
childText = subTitleModel.text
|
||||
if let attributes = subTitleModel.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
|
||||
childTextAttributes = attributes
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
|
||||
|
||||
@ -14,20 +14,17 @@ import VDS
|
||||
open class var identifier: String { "checkboxLabel" }
|
||||
public var moleculeName: String = CheckboxLabelModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var checkbox: CheckboxModel
|
||||
public var label: LabelModel?
|
||||
public var label: LabelModel
|
||||
public var subTitle: LabelModel?
|
||||
public var inverted: Bool? = false
|
||||
public var surface: Surface { inverted ?? false ? .dark : .light }
|
||||
|
||||
public var children: [MoleculeModelProtocol] {
|
||||
var values: [MoleculeModelProtocol] = [checkbox]
|
||||
if let label { values.append(label) }
|
||||
if let subTitle { values.append(subTitle) }
|
||||
return values
|
||||
guard let subTitle else { return [checkbox, label] }
|
||||
return [checkbox, label, subTitle]
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -57,8 +54,8 @@ extension Array where Element == CheckboxLabelModel {
|
||||
return compactMap({ model in
|
||||
var item = CheckboxGroup.CheckboxItemModel()
|
||||
item.inputId = model.checkbox.fieldKey
|
||||
item.labelText = model.label?.text
|
||||
if let attributes = model.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
|
||||
item.labelText = model.label.text
|
||||
if let attributes = model.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
|
||||
item.labelTextAttributes = attributes
|
||||
}
|
||||
item.childText = model.subTitle?.text
|
||||
|
||||
@ -107,15 +107,15 @@ import UIKit
|
||||
// configure attributed string for progress percentage.
|
||||
let attributedString = NSMutableAttributedString(string: String(percent) + "%")
|
||||
// percent value
|
||||
attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.BoldTitleXLarge], range: NSMakeRange(0, percentLen))
|
||||
attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldTitleLarge()], range: NSMakeRange(0, percentLen))
|
||||
// % symbol
|
||||
attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.RegularMicro], range: NSMakeRange(percentLen, 1))
|
||||
attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldBodyLarge()], range: NSMakeRange(percentLen, 1))
|
||||
|
||||
// show progress percentage in a text layer
|
||||
let width = viewWidth
|
||||
let height = width
|
||||
labelLayer.string = attributedString
|
||||
labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 40)/2, 80, 40)
|
||||
labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 30)/2, 60, 30)
|
||||
self.layer.addSublayer(labelLayer)
|
||||
}
|
||||
|
||||
|
||||
@ -14,8 +14,7 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "circularProgress"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var percent: Int = 0
|
||||
public var diameter: CGFloat? = 64
|
||||
public var lineWidth: CGFloat? = 4
|
||||
@ -32,7 +31,6 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case percent
|
||||
case size
|
||||
@ -50,8 +48,7 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
super.init()
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
percent = try typeContainer.decode(Int.self, forKey: .percent)
|
||||
|
||||
if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) {
|
||||
@ -92,7 +89,6 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(percent, forKey: .percent)
|
||||
try container.encodeIfPresent(size, forKey: .size)
|
||||
try container.encodeIfPresent(diameter, forKey: .diameter)
|
||||
|
||||
@ -31,9 +31,6 @@ open class Icon: VDS.Icon, VDSMoleculeViewProtocol{
|
||||
// MARK: - Public
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
color = viewModel.color.uiColor
|
||||
size = viewModel.size
|
||||
|
||||
@ -21,8 +21,6 @@ open class IconModel: MoleculeModelProtocol {
|
||||
|
||||
public var backgroundColor: Color?
|
||||
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
/// A representation that will be used to render the icon with corresponding name.
|
||||
public var name: Icon.Name
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
public var backgroundColor: Color?
|
||||
public var moleculeName: String = ImageViewModel.identifier
|
||||
public var image: String
|
||||
public var accessibilityIdentifier: String?
|
||||
public var accessibilityText: String?
|
||||
public var fallbackImage: String?
|
||||
public var imageFormat: String?
|
||||
@ -48,7 +47,6 @@
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case image
|
||||
|
||||
@ -182,9 +182,6 @@ public typealias ActionBlock = () -> ()
|
||||
}
|
||||
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
shouldMaskWhileRecording = viewModel.shouldMaskRecordedView ?? false
|
||||
text = viewModel.text
|
||||
hero = viewModel.hero
|
||||
|
||||
@ -14,8 +14,7 @@ import VDS
|
||||
|
||||
open class var identifier: String { "label" }
|
||||
public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var text: String
|
||||
public var accessibilityText: String?
|
||||
@ -39,7 +38,6 @@ import VDS
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case text
|
||||
case accessibilityText
|
||||
@ -90,7 +88,6 @@ import VDS
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
text = try typeContainer.decode(String.self, forKey: .text)
|
||||
accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
textColor = try typeContainer.decodeIfPresent(Color.self, forKey: .textColor)
|
||||
@ -118,7 +115,6 @@ import VDS
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(text, forKey: .text)
|
||||
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||
try container.encodeIfPresent(textColor, forKey: .textColor)
|
||||
|
||||
@ -16,8 +16,7 @@ import UIKit
|
||||
public static var identifier: String = "leftRightLabelView"
|
||||
public var moleculeName: String = LeftRightLabelModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var leftText: LabelModel
|
||||
public var rightText: LabelModel?
|
||||
|
||||
@ -93,9 +93,6 @@ import VDS
|
||||
// MARK: - VDSMoleculeViewProtocol
|
||||
//--------------------------------------------------
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
style = VDS.Line.Style(rawValue: viewModel.type.rawValue) ?? .primary
|
||||
orientation = viewModel.orientation
|
||||
|
||||
@ -55,7 +55,6 @@ public class LineModel: MoleculeModelProtocol, Invertable {
|
||||
|
||||
public static var identifier: String = "line"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
|
||||
public var type: Style = .secondary
|
||||
@ -84,7 +83,6 @@ public class LineModel: MoleculeModelProtocol, Invertable {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case type
|
||||
case frequency
|
||||
@ -101,8 +99,7 @@ public class LineModel: MoleculeModelProtocol, Invertable {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
if let type = try typeContainer.decodeIfPresent(Style.self, forKey: .type) {
|
||||
self.type = type
|
||||
}
|
||||
@ -127,7 +124,6 @@ public class LineModel: MoleculeModelProtocol, Invertable {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(type, forKey: .type)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
try container.encodeIfPresent(frequency, forKey: .frequency)
|
||||
|
||||
@ -22,9 +22,6 @@ open class LoadingSpinner: VDS.Loader, VDSMoleculeViewProtocol {
|
||||
// MARK: - Public Functions
|
||||
//--------------------------------------------------
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
size = Int(viewModel.diameter)
|
||||
surface = viewModel.surface
|
||||
}
|
||||
|
||||
@ -16,8 +16,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
public static var identifier: String = "loadingSpinner"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var inverted: Bool = false
|
||||
public var diameter: CGFloat = 40
|
||||
@ -28,7 +27,6 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case strokeColor
|
||||
case diameter
|
||||
@ -49,8 +47,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) {
|
||||
self.diameter = diameter
|
||||
}
|
||||
@ -68,7 +65,6 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(diameter, forKey: .diameter)
|
||||
try container.encodeIfPresent(inverted, forKey: .inverted)
|
||||
}
|
||||
|
||||
@ -22,8 +22,7 @@ import Foundation
|
||||
|
||||
public static var identifier: String = "multiProgressBar"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var progressList: [SingleProgressBarModel]
|
||||
public var backgroundColor: Color?
|
||||
public var thickness: CGFloat?
|
||||
@ -31,7 +30,6 @@ import Foundation
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case progressList
|
||||
case thickness
|
||||
@ -46,7 +44,6 @@ import Foundation
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
progressList = try typeContainer.decode([SingleProgressBarModel].self, forKey: .progressList)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
thickness = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .thickness)
|
||||
@ -57,7 +54,6 @@ import Foundation
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(progressList, forKey: .progressList)
|
||||
try container.encodeIfPresent(thickness, forKey: .thickness)
|
||||
try container.encodeIfPresent(roundedCorners, forKey: .roundedCorners)
|
||||
|
||||
@ -39,9 +39,6 @@ import VDS
|
||||
}
|
||||
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
isEnabled = viewModel.enabled
|
||||
surface = viewModel.surface
|
||||
total = viewModel.totalPages
|
||||
|
||||
@ -19,8 +19,7 @@ open class PaginationModel: MoleculeModelProtocol {
|
||||
open var moleculeName: String { Self.identifier }
|
||||
open var backgroundColor: Color?
|
||||
open var id: String = UUID().uuidString
|
||||
open var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
open var totalPages: Int = 0
|
||||
open var selectedPage: Int = 0
|
||||
open var enabled: Bool = true
|
||||
@ -32,9 +31,6 @@ open class PaginationModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case totalPages
|
||||
case selectedPage
|
||||
case enabled
|
||||
@ -47,8 +43,6 @@ open class PaginationModel: MoleculeModelProtocol {
|
||||
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decode(String.self, forKey: .id)
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
totalPages = try container.decode(Int.self, forKey: .totalPages)
|
||||
selectedPage = try container.decodeIfPresent(Int.self, forKey: .selectedPage) ?? 0
|
||||
enabled = try container.decodeIfPresent(Bool.self, forKey: .enabled) ?? false
|
||||
@ -57,9 +51,6 @@ open class PaginationModel: MoleculeModelProtocol {
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(totalPages, forKey: .totalPages)
|
||||
try container.encode(selectedPage, forKey: .selectedPage)
|
||||
try container.encode(enabled, forKey: .enabled)
|
||||
|
||||
@ -75,9 +75,6 @@ import Foundation
|
||||
guard let progressBarModel = model as? ProgressBarModel else { return }
|
||||
|
||||
self.progressBarModel = progressBarModel
|
||||
if let accessibilityIdentifier = model.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
thickness = progressBarModel.thickness ?? 8
|
||||
progress = Float((progressBarModel.percent) / 100.0)
|
||||
progressTintColor = progressBarModel.color.uiColor
|
||||
|
||||
@ -11,8 +11,7 @@ import Foundation
|
||||
@objcMembers open class ProgressBarModel: MoleculeModelProtocol {
|
||||
open class var identifier: String { "progressBar" }
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
@Percent public var percent: CGFloat
|
||||
public var color: Color = Color(uiColor: .mfCerulean())
|
||||
public var backgroundColor: Color? = Color(uiColor: .mfLightSilver())
|
||||
@ -21,7 +20,6 @@ import Foundation
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case roundedCorners
|
||||
case thickness
|
||||
@ -37,7 +35,6 @@ import Foundation
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
percent = try typeContainer.decode(CGFloat.self, forKey: .percent)
|
||||
if let color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) {
|
||||
self.color = color
|
||||
@ -53,7 +50,6 @@ import Foundation
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(percent, forKey: .percent)
|
||||
try container.encode(color, forKey: .color)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
|
||||
@ -14,8 +14,7 @@ open class StarModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
public static var identifier: String = "star"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
@Percent public var percent: CGFloat = 0
|
||||
public var borderColor: Color?
|
||||
@ -27,7 +26,6 @@ open class StarModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case percent
|
||||
@ -49,7 +47,6 @@ open class StarModel: MoleculeModelProtocol {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
if let percent = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .percent) {
|
||||
self.percent = percent
|
||||
}
|
||||
@ -66,7 +63,6 @@ open class StarModel: MoleculeModelProtocol {
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(percent, forKey: .percent)
|
||||
try container.encodeIfPresent(borderColor, forKey: .borderColor)
|
||||
try container.encodeIfPresent(fillColor, forKey: .fillColor)
|
||||
|
||||
@ -14,8 +14,7 @@ import MVMCore
|
||||
//--------------------------------------------------
|
||||
public static var identifier: String = "stars"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var starBackgroundColor: Color?
|
||||
public var stars: [StarModel]
|
||||
@ -29,7 +28,6 @@ import MVMCore
|
||||
//--------------------------------------------------
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case starBackgroundColor
|
||||
@ -55,7 +53,6 @@ import MVMCore
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
stars = try typeContainer.decode([StarModel].self, forKey: .stars)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
starBackgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .starBackgroundColor)
|
||||
@ -73,7 +70,6 @@ import MVMCore
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(stars, forKey: .stars)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(starBackgroundColor, forKey: .starBackgroundColor)
|
||||
|
||||
@ -40,9 +40,7 @@ open class TileContainer: VDS.TileContainer, VDSMoleculeViewProtocol{
|
||||
// MARK: - Public
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
if let moleculeModel = viewModel.molecule {
|
||||
if let molecule,
|
||||
moleculeModel.moleculeName == molecule.model?.moleculeName {
|
||||
|
||||
@ -70,10 +70,8 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
|
||||
public var aspectRatio: TileContainerType.AspectRatio = .none
|
||||
public var backgroundEffect: TileContainerType.BackgroundEffect = .none
|
||||
public var surface: Surface { inverted ? .dark : .light }
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case accessibilityIdentifier
|
||||
case inverted
|
||||
case backgroundImage
|
||||
case action
|
||||
@ -90,7 +88,6 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
|
||||
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
|
||||
backgroundImage = try container.decodeIfPresent(String.self, forKey: .backgroundImage)
|
||||
action = try container.decodeModelIfPresent(codingKey: .action)
|
||||
@ -107,7 +104,6 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundImage, forKey: .backgroundImage)
|
||||
try container.encodeModelIfPresent(action, forKey: .action)
|
||||
try container.encodeIfPresent(imageFallbackColor, forKey: .imageFallbackColor)
|
||||
|
||||
@ -39,9 +39,6 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
|
||||
// MARK: - Public
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
//tilelet specific properties
|
||||
if let value = viewModel.textWidth {
|
||||
textWidth = .value(value)
|
||||
@ -51,7 +48,7 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
|
||||
eyebrowModel = viewModel.eyebrowModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
badgeModel = viewModel.badgeModel()
|
||||
badgeModel = viewModel.badge
|
||||
descriptiveIconModel = viewModel.descriptiveIcon
|
||||
directionalIconModel = viewModel.directionalIcon
|
||||
//setup action
|
||||
|
||||
@ -18,7 +18,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
|
||||
public var id: String = UUID().uuidString
|
||||
public var backgroundColor: Color?
|
||||
|
||||
public var badge: BadgeModel?
|
||||
public var badge: Tilelet.BadgeModel?
|
||||
public var eyebrow: LabelModel?
|
||||
public var eyebrowColor: TitleLockup.TextColor = .primary
|
||||
public var title: LabelModel?
|
||||
@ -49,7 +49,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
badge = try container.decodeIfPresent(BadgeModel.self, forKey: .badge)
|
||||
badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge)
|
||||
eyebrow = try container.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
|
||||
title = try container.decodeIfPresent(LabelModel.self, forKey: .title)
|
||||
subTitle = try container.decodeIfPresent(LabelModel.self, forKey: .subTitle)
|
||||
@ -91,48 +91,32 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
|
||||
try super.init(from: decoder)
|
||||
}
|
||||
|
||||
public func badgeModel() -> Tilelet.BadgeModel? {
|
||||
guard let badge else { return nil }
|
||||
return .init(text: badge.text,
|
||||
textColor: badge.textColorStyle,
|
||||
fillColor: badge.fillColorStyle,
|
||||
surface: badge.surface,
|
||||
numberOfLines: badge.numberOfLines,
|
||||
maxWidth: badge.maxWidth
|
||||
)
|
||||
}
|
||||
|
||||
public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? {
|
||||
guard let eyebrow else { return nil }
|
||||
let attrs = eyebrow.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
var isBold: Bool = true
|
||||
do {
|
||||
if let style = eyebrow.fontStyle {
|
||||
isBold = style.isBold()
|
||||
return .init(text: eyebrow.text,
|
||||
textColor: eyebrowColor,
|
||||
textAttributes: attrs,
|
||||
isBold: isBold,
|
||||
textAttributes: attrs, isBold: style.isBold(),
|
||||
standardStyle: try style.vdsSubsetStyle())
|
||||
}
|
||||
} catch MVMCoreError.errorObject(let object) {
|
||||
MVMCoreLoggingHandler.shared()?.addError(toLog: object)
|
||||
} catch { }
|
||||
|
||||
return .init(text: eyebrow.text, textColor: eyebrowColor, textAttributes: attrs, isBold: isBold)
|
||||
return .init(text: eyebrow.text, textColor: eyebrowColor, textAttributes: attrs)
|
||||
}
|
||||
|
||||
public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? {
|
||||
guard let title else { return nil }
|
||||
let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
var isBold: Bool = true
|
||||
|
||||
do {
|
||||
if let style = title.fontStyle {
|
||||
isBold = style.isBold()
|
||||
return .init(text: title.text,
|
||||
textColor: titleColor,
|
||||
textAttributes: attrs,
|
||||
isBold: isBold,
|
||||
standardStyle: try style.vdsSubsetStyle())
|
||||
}
|
||||
|
||||
@ -140,7 +124,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
|
||||
MVMCoreLoggingHandler.shared()?.addError(toLog: object)
|
||||
} catch { }
|
||||
|
||||
return .init(text: title.text, textColor: titleColor, textAttributes: attrs, isBold: isBold)
|
||||
return .init(text: title.text, textColor: titleColor, textAttributes: attrs)
|
||||
}
|
||||
|
||||
public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? {
|
||||
|
||||
@ -28,9 +28,6 @@ open class Tooltip: VDS.Tooltip, VDSMoleculeViewProtocol{
|
||||
// MARK: - Public
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
fillColor = viewModel.fillColor
|
||||
size = viewModel.size
|
||||
|
||||
@ -22,8 +22,6 @@ open class TooltipModel: MoleculeModelProtocol {
|
||||
|
||||
public var backgroundColor: Color?
|
||||
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
public var size: VDS.Tooltip.Size = .medium
|
||||
|
||||
public var fillColor: VDS.Tooltip.FillColor = .primary
|
||||
@ -41,7 +39,6 @@ open class TooltipModel: MoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case closeButtonText
|
||||
@ -55,14 +52,13 @@ open class TooltipModel: MoleculeModelProtocol {
|
||||
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
self.backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
|
||||
title = try container.decodeIfPresent(String.self, forKey: .title)
|
||||
content = try container.decodeIfPresent(String.self, forKey: .content)
|
||||
self.title = try container.decodeIfPresent(String.self, forKey: .title)
|
||||
self.content = try container.decodeIfPresent(String.self, forKey: .content)
|
||||
|
||||
molecule = try container.decodeModelIfPresent(codingKey: .contentView)
|
||||
self.molecule = try container.decodeModelIfPresent(codingKey: .contentView)
|
||||
|
||||
if let closeButtonText = try container.decodeIfPresent(String.self, forKey: .closeButtonText) {
|
||||
self.closeButtonText = closeButtonText
|
||||
@ -85,7 +81,6 @@ open class TooltipModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(surface, forKey: .surface)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
|
||||
@ -11,7 +11,6 @@ import Foundation
|
||||
open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
|
||||
public static var identifier = "video"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var video: String
|
||||
public var showControls = false
|
||||
@ -46,7 +45,6 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case video
|
||||
case showControls
|
||||
@ -62,7 +60,6 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
video = try typeContainer.decode(String.self, forKey:.video)
|
||||
if let showControls = try typeContainer.decodeIfPresent(Bool.self, forKey: .showControls) {
|
||||
self.showControls = showControls
|
||||
@ -79,7 +76,6 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
|
||||
open func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(video, forKey: .video)
|
||||
try container.encode(showControls, forKey: .showControls)
|
||||
|
||||
@ -13,8 +13,7 @@ import MVMCore
|
||||
public static var identifier: String = "webview"
|
||||
public var moleculeName: String = WebViewModel.identifier
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var url: URL?
|
||||
public var htmlString: String?
|
||||
@ -27,7 +26,6 @@ import MVMCore
|
||||
|
||||
private enum CodingKeys: String, CodingKey{
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case backgroundColor
|
||||
case url
|
||||
@ -45,7 +43,6 @@ import MVMCore
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
url = try typeContainer.decodeIfPresent(URL.self, forKey: .url)
|
||||
htmlString = try typeContainer.decodeIfPresent(String.self, forKey: .htmlString)
|
||||
@ -60,7 +57,6 @@ import MVMCore
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(url, forKey: .url)
|
||||
try container.encodeIfPresent(htmlString, forKey: .htmlString)
|
||||
|
||||
@ -16,8 +16,7 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "wheel"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var style: GraphStyle = .unlimited {
|
||||
didSet {
|
||||
updateStyle()
|
||||
@ -39,7 +38,6 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case style
|
||||
case size
|
||||
case diameter
|
||||
@ -55,8 +53,7 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
super.init()
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
if let style = try typeContainer.decodeIfPresent(GraphStyle.self, forKey: .style) {
|
||||
self.style = style
|
||||
}
|
||||
@ -87,7 +84,6 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(style, forKey: .style)
|
||||
try container.encode(size, forKey: .size)
|
||||
try container.encode(diameter, forKey: .diameter)
|
||||
|
||||
@ -16,6 +16,7 @@ import MVMCore
|
||||
//--------------------------------------------------
|
||||
|
||||
extension VDS.Surface: Codable {}
|
||||
extension VDS.Badge.FillColor: Codable {}
|
||||
extension VDS.BadgeIndicator.FillColor: Codable {}
|
||||
extension VDS.BadgeIndicator.Kind: Codable {}
|
||||
extension VDS.BadgeIndicator.MaximumDigits: Codable {}
|
||||
@ -293,45 +294,6 @@ extension VDS.TitleLockup.TextColor: Codable {
|
||||
}
|
||||
}
|
||||
|
||||
extension VDS.Badge.FillColor: Codable {
|
||||
public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.singleValueContainer()
|
||||
let type = try container.decode(String.self)
|
||||
switch type {
|
||||
case "red":
|
||||
self = .red
|
||||
case "yellow":
|
||||
self = .yellow
|
||||
case "green":
|
||||
self = .green
|
||||
case "orange":
|
||||
self = .orange
|
||||
case "blue":
|
||||
self = .blue
|
||||
case "black":
|
||||
self = .black
|
||||
case "white":
|
||||
self = .white
|
||||
default:
|
||||
if let color = try? Color(from: decoder) {
|
||||
self = .custom(color.uiColor)
|
||||
} else {
|
||||
self = .custom(UIColor(hexString: type))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.singleValueContainer()
|
||||
switch self {
|
||||
case .custom(let value):
|
||||
try container.encode(Color(uiColor: value))
|
||||
default:
|
||||
try container.encode(String(reflecting: self))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension VDS.TitleLockup.TitleTextColor: Codable {
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
|
||||
@ -69,8 +69,6 @@ extension LabelAttributeFontModel: VDSLabelAttributeConvertable {
|
||||
var textStyle: TextStyle?
|
||||
if let found = style?.vdsTextStyle() {
|
||||
textStyle = found
|
||||
} else if let name, let size, let font = UIFont(name: name, size: size) {
|
||||
textStyle = TextStyle.convert(font: font)
|
||||
} else if let name, let found = TextStyle(rawValue: name) {
|
||||
textStyle = found
|
||||
}
|
||||
|
||||
@ -30,9 +30,6 @@ import VDS
|
||||
}
|
||||
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
isEnabled = viewModel.enabled
|
||||
surface = viewModel.surface
|
||||
breadcrumbModels = viewModel.breadcrumbs.compactMap { [unowned self] breadcrumb in
|
||||
|
||||
@ -19,7 +19,6 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
|
||||
open var moleculeName: String { Self.identifier }
|
||||
open var backgroundColor: Color?
|
||||
open var id: String = UUID().uuidString
|
||||
open var accessibilityIdentifier: String?
|
||||
open var children: [any MoleculeModelProtocol] { breadcrumbs }
|
||||
|
||||
open var breadcrumbs: [BreadcrumbModel] = []
|
||||
@ -32,8 +31,6 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
|
||||
//--------------------------------------------------
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case accessibilityIdentifier
|
||||
case moleculeName
|
||||
case breadcrumbs
|
||||
case enabled
|
||||
case inverted
|
||||
@ -45,7 +42,6 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
|
||||
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
breadcrumbs = try container.decode([BreadcrumbModel].self, forKey: .breadcrumbs)
|
||||
enabled = try container.decodeIfPresent(Bool.self, forKey: .enabled) ?? false
|
||||
inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
|
||||
@ -53,9 +49,6 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(breadcrumbs, forKey: .breadcrumbs)
|
||||
try container.encode(enabled, forKey: .enabled)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
}
|
||||
@ -75,7 +68,6 @@ open class BreadcrumbModel: MoleculeModelProtocol {
|
||||
open var moleculeName: String { Self.identifier }
|
||||
open var backgroundColor: Color?
|
||||
open var id: String = UUID().uuidString
|
||||
open var accessibilityIdentifier: String?
|
||||
|
||||
open var text: String = ""
|
||||
open var selected: Bool = false
|
||||
@ -87,8 +79,6 @@ open class BreadcrumbModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case text
|
||||
case selected
|
||||
case action
|
||||
@ -100,7 +90,6 @@ open class BreadcrumbModel: MoleculeModelProtocol {
|
||||
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
text = try container.decode(String.self, forKey: .text)
|
||||
selected = try container.decodeIfPresent(Bool.self, forKey: .selected) ?? false
|
||||
action = try container.decodeModel(codingKey: .action)
|
||||
@ -108,8 +97,6 @@ open class BreadcrumbModel: MoleculeModelProtocol {
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(text, forKey: .text)
|
||||
try container.encode(selected, forKey: .selected)
|
||||
try container.encodeModelIfPresent(action, forKey: .action)
|
||||
|
||||
@ -52,9 +52,6 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
|
||||
@ -31,9 +31,6 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
|
||||
@ -47,15 +47,18 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
|
||||
//--------------------------------------------------
|
||||
|
||||
public override func setDefaults() {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
}
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -42,15 +42,18 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
|
||||
// MARK: - Methods
|
||||
//--------------------------------------------------
|
||||
public override func setDefaults() {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
}
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -46,15 +46,18 @@ public class HeadersH2LinkModel: HeaderModel, ParentMoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
|
||||
public override func setDefaults() {
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
}
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -36,15 +36,18 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
|
||||
}
|
||||
|
||||
public override func setDefaults() {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
}
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -57,6 +57,12 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol, P
|
||||
// MARK: - Methods
|
||||
//--------------------------------------------------
|
||||
public override func setDefaults() {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if headline.accessibilityTraits == nil {
|
||||
headline.accessibilityTraits = .header
|
||||
}
|
||||
|
||||
@ -47,15 +47,18 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
|
||||
//--------------------------------------------------
|
||||
|
||||
public override func setDefaults() {
|
||||
if topPadding == nil {
|
||||
topPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = Padding.Component.VerticalMarginSpacing
|
||||
}
|
||||
if titleLockup.title.fontStyle == nil {
|
||||
titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
}
|
||||
if titleLockup.subTitle?.fontStyle == nil {
|
||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
if titleLockup.title.accessibilityTraits == nil {
|
||||
titleLockup.title.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
button.style = .secondary
|
||||
button.size = .small
|
||||
|
||||
@ -14,8 +14,7 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
public static var identifier: String = "planNamesLockup"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var headline: LabelModel
|
||||
public var subHeadline: LabelModel
|
||||
@ -36,7 +35,6 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case headline
|
||||
case subHeadline
|
||||
@ -49,7 +47,6 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
headline = try typeContainer.decode(LabelModel.self, forKey: .headline)
|
||||
subHeadline = try typeContainer.decode(LabelModel.self, forKey: .subHeadline)
|
||||
@ -60,7 +57,6 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(headline, forKey: .headline)
|
||||
try container.encode(subHeadline, forKey: .subHeadline)
|
||||
|
||||
@ -15,8 +15,7 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "planLockup"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var planLabel : LabelModel
|
||||
public var headline : LabelModel
|
||||
@ -48,7 +47,6 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case planLabel
|
||||
case headline
|
||||
@ -63,7 +61,6 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
planLabel = try typeContainer.decode(LabelModel.self, forKey: .planLabel)
|
||||
headline = try typeContainer.decode(LabelModel.self, forKey: .headline)
|
||||
@ -76,7 +73,6 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(planLabel, forKey: .planLabel)
|
||||
try container.encode(headline, forKey: .headline)
|
||||
|
||||
@ -20,9 +20,6 @@ import VDS
|
||||
// MARK: - Public Functions
|
||||
//--------------------------------------------------
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
surface = viewModel.surface
|
||||
textAlignment = viewModel.textAlignment
|
||||
eyebrowModel = viewModel.eyebrowModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||
|
||||
@ -18,8 +18,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
public static var identifier: String = "titleLockup"
|
||||
public var moleculeName: String = TitleLockupModel.identifier
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var textAlignment: TitleLockup.TextAlignment = .left
|
||||
public var eyebrow: LabelModel?
|
||||
public var eyebrowColor: TitleLockup.TextColor = .primary
|
||||
@ -27,6 +26,8 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
public var titleColor: TitleLockup.TitleTextColor = .primary
|
||||
public var subTitle: LabelModel?
|
||||
public var subTitleColor: TitleLockup.TextColor = .primary
|
||||
|
||||
public var alignment: VDS.TitleLockup.TextAlignment = .left
|
||||
public var inverted: Bool = false
|
||||
|
||||
public var backgroundColor: Color?
|
||||
@ -48,6 +49,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
public func isEqual(to model: any ModelComparisonProtocol) -> Bool {
|
||||
guard let model = model as? Self else { return false }
|
||||
return textAlignment == model.textAlignment
|
||||
&& alignment == model.alignment
|
||||
&& titleColor == model.titleColor
|
||||
&& subTitleColor == model.subTitleColor
|
||||
&& inverted == model.inverted
|
||||
@ -73,7 +75,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case textAlignment
|
||||
case eyebrow
|
||||
case eyebrowColor
|
||||
@ -82,6 +83,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
case subTitle
|
||||
case subTitleColor
|
||||
case inverted
|
||||
case alignment
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -91,7 +93,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
textAlignment = try typeContainer.decodeIfPresent(TitleLockup.TextAlignment.self, forKey: .textAlignment) ?? .left
|
||||
title = try typeContainer.decodeMolecule(codingKey: .title)
|
||||
eyebrow = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
|
||||
@ -127,6 +128,10 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
subTitleColor = .primary
|
||||
}
|
||||
|
||||
if let newAlignment = try typeContainer.decodeIfPresent(VDS.TitleLockup.TextAlignment.self, forKey: .alignment) {
|
||||
alignment = newAlignment
|
||||
}
|
||||
|
||||
if let inverted = try typeContainer.decodeIfPresent(Bool.self, forKey: .inverted) {
|
||||
self.inverted = inverted
|
||||
} else {
|
||||
@ -139,7 +144,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(textAlignment, forKey: .textAlignment)
|
||||
try container.encodeIfPresent(eyebrow, forKey: .eyebrow)
|
||||
try container.encode(eyebrowColor, forKey: .eyebrowColor)
|
||||
@ -147,6 +151,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
|
||||
try container.encode(titleColor, forKey: .titleColor)
|
||||
try container.encodeIfPresent(subTitle, forKey: .subTitle)
|
||||
try container.encode(subTitleColor, forKey: .subTitleColor)
|
||||
try container.encode(alignment, forKey: .alignment)
|
||||
try container.encode(inverted, forKey: .inverted)
|
||||
}
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import Foundation
|
||||
//-----------------------------------------------------
|
||||
|
||||
public var stack: Stack<StackModel>
|
||||
public let headline = Label(fontStyle: .BoldTitleLarge)
|
||||
public let headline = Label(fontStyle: .BoldTitleMedium)
|
||||
public let body = Label(fontStyle: .RegularBodySmall)
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -24,7 +24,7 @@ import Foundation
|
||||
|
||||
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
||||
(view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
|
||||
(view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
|
||||
axis: .vertical)
|
||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||
}
|
||||
@ -63,7 +63,7 @@ import Foundation
|
||||
|
||||
open override func reset() {
|
||||
super.reset()
|
||||
headline.setFontStyle(.BoldTitleLarge)
|
||||
headline.setFontStyle(.BoldTitleMedium)
|
||||
body.setFontStyle(.RegularBodySmall)
|
||||
}
|
||||
|
||||
|
||||
@ -47,9 +47,6 @@ public class ListOneColumnTextWithWhitespaceDividerShortModel: ListItemModel, Mo
|
||||
|
||||
override public func setDefaults() {
|
||||
style = .shortDivider
|
||||
if headline.accessibilityTraits == nil {
|
||||
headline.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import Foundation
|
||||
//-----------------------------------------------------
|
||||
|
||||
public var stack: Stack<StackModel>
|
||||
public let headline = Label(fontStyle: .BoldTitleLarge)
|
||||
public let headline = Label(fontStyle: .BoldTitleMedium)
|
||||
public let body = Label(fontStyle: .RegularBodySmall)
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -24,7 +24,7 @@ import Foundation
|
||||
|
||||
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
||||
(view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
|
||||
(view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
|
||||
axis: .vertical)
|
||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||
}
|
||||
@ -62,7 +62,7 @@ import Foundation
|
||||
|
||||
open override func reset() {
|
||||
super.reset()
|
||||
headline.setFontStyle(.BoldTitleLarge)
|
||||
headline.setFontStyle(.BoldTitleMedium)
|
||||
body.setFontStyle(.RegularBodySmall)
|
||||
accessibilityLabel = nil
|
||||
}
|
||||
|
||||
@ -47,9 +47,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol
|
||||
|
||||
override public func setDefaults() {
|
||||
style = .tallDivider
|
||||
if headline.accessibilityTraits == nil {
|
||||
headline.accessibilityTraits = [.header]
|
||||
}
|
||||
super.setDefaults()
|
||||
}
|
||||
|
||||
|
||||
@ -17,8 +17,7 @@ import Foundation
|
||||
public static var identifier: String = "doughnutChartItem"
|
||||
public var moleculeName: String = DoughnutChartItemModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var label: LabelModel
|
||||
@Percent public var percent: CGFloat
|
||||
@ -29,8 +28,6 @@ import Foundation
|
||||
//--------------------------------------------------
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case label
|
||||
case percent
|
||||
|
||||
@ -17,8 +17,7 @@ import Foundation
|
||||
public static var identifier: String = "doughnutChart"
|
||||
public var moleculeName: String = DoughnutChartModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var title: LabelModel?
|
||||
public var subtitle: LabelModel?
|
||||
|
||||
@ -16,8 +16,7 @@ public class ImageHeadlineBodyModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "imageHeadlineBody"
|
||||
public var moleculeName: String = ImageHeadlineBodyModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var image: ImageViewModel
|
||||
public var headlineBody: HeadlineBodyModel
|
||||
|
||||
@ -80,10 +80,6 @@ import VDS
|
||||
// MARK: - Atomic
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
surface = viewModel.surface
|
||||
|
||||
updateRadioButton()
|
||||
|
||||
@ -10,15 +10,14 @@ import Foundation
|
||||
import MVMCore
|
||||
import VDS
|
||||
|
||||
public class RadioButtonLabelModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {
|
||||
@objcMembers public class RadioButtonLabelModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {
|
||||
//--------------------------------------------------
|
||||
// MARK: - Properties
|
||||
//--------------------------------------------------
|
||||
|
||||
public static var identifier: String = "radioButtonLabel"
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var moleculeName: String = RadioButtonLabelModel.identifier
|
||||
public var radioButton: RadioButtonModel
|
||||
|
||||
@ -38,10 +38,6 @@ import VDSCoreTokens
|
||||
guard let model = model as? TabBarModel else { return }
|
||||
self.model = model
|
||||
|
||||
if let accessibilityIdentifier = model.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
// Set appearance
|
||||
let appearance = UITabBarAppearance()
|
||||
appearance.backgroundColor = model.backgroundColor?.uiColor
|
||||
@ -55,9 +51,6 @@ import VDSCoreTokens
|
||||
for (index, tab) in model.tabs.enumerated() {
|
||||
let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index)
|
||||
tabBarItem.accessibilityLabel = tab.accessibilityText
|
||||
if let accessibilityIdentifier = tab.accessibilityIdentifier {
|
||||
tabBarItem.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
tabs.append(tabBarItem)
|
||||
}
|
||||
setItems(tabs, animated: false)
|
||||
|
||||
@ -12,8 +12,7 @@ import VDSCoreTokens
|
||||
open class TabBarModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "tabBar"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
open var tabs: [TabBarItemModel]
|
||||
|
||||
private var _backgroundColor: Color?
|
||||
@ -63,7 +62,6 @@ open class TabBarModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case tabs
|
||||
case selectedColor
|
||||
@ -79,7 +77,6 @@ open class TabBarModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
tabs = try typeContainer.decode([TabBarItemModel].self, forKey: .tabs)
|
||||
if let color = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) {
|
||||
backgroundColor = color
|
||||
@ -102,7 +99,6 @@ open class TabBarModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(tabs, forKey: .tabs)
|
||||
try container.encodeIfPresent(_backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(_selectedColor, forKey: .selectedColor)
|
||||
@ -138,14 +134,12 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
|
||||
open var image: String
|
||||
open var action: ActionModelProtocol
|
||||
open var accessibilityText: String?
|
||||
open var accessibilityIdentifier: String?
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case title
|
||||
case image
|
||||
case action
|
||||
case accessibilityText
|
||||
case accessibilityIdentifier
|
||||
}
|
||||
|
||||
public init(with title: String?, image: String, action: ActionModelProtocol) {
|
||||
@ -160,7 +154,6 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
|
||||
image = try typeContainer.decode(String.self, forKey: .image)
|
||||
action = try typeContainer.decodeModel(codingKey: .action)
|
||||
accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
}
|
||||
|
||||
open func encode(to encoder: Encoder) throws {
|
||||
@ -169,7 +162,6 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
|
||||
try container.encode(image, forKey: .image)
|
||||
try container.encodeModel(action, forKey: .action)
|
||||
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
}
|
||||
|
||||
public static func == (lhs: TabBarItemModel, rhs: TabBarItemModel) -> Bool {
|
||||
|
||||
@ -63,9 +63,6 @@ import VDS
|
||||
//-------------------------------------------------
|
||||
|
||||
open func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
borderLine = viewModel.borderLine
|
||||
if let minWidth = viewModel.minWidth {
|
||||
self.minWidth = minWidth
|
||||
|
||||
@ -13,8 +13,7 @@ open class TabsModel: MoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "tabs"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
open var tabs: [TabItemModel]
|
||||
|
||||
open var style: Surface?
|
||||
@ -34,7 +33,6 @@ open class TabsModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case tabs
|
||||
case backgroundColor
|
||||
case selectedIndex
|
||||
@ -55,7 +53,6 @@ open class TabsModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
tabs = try typeContainer.decode([TabItemModel].self, forKey: .tabs)
|
||||
style = try typeContainer.decodeIfPresent(Surface.self, forKey: .style)
|
||||
|
||||
@ -97,7 +94,6 @@ open class TabsModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encode(tabs, forKey: .tabs)
|
||||
try container.encode(selectedIndex, forKey: .selectedIndex)
|
||||
try container.encode(fillContainer, forKey: .fillContainer)
|
||||
|
||||
@ -64,10 +64,6 @@ import VDS
|
||||
// MARK: - VDSMoleculeViewProtocol
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
var buttons = [PillButton]()
|
||||
if let secondaryModel = viewModel.secondaryButton {
|
||||
secondaryButton.set(with: secondaryModel, delegateObject, additionalData)
|
||||
|
||||
@ -16,7 +16,6 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "twoButtonView"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var primaryButton: ButtonModel?
|
||||
public var secondaryButton: ButtonModel?
|
||||
@ -40,7 +39,6 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case primaryButton
|
||||
case secondaryButton
|
||||
@ -64,8 +62,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
|
||||
|
||||
//set context value for 'primary' style to be set for the primaryButton in case the
|
||||
//property is not returned in the JSON and once decoded, this value is removed from the context
|
||||
try decoder.setContext(value: Use.primary, for: "style") {
|
||||
@ -84,7 +81,6 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(primaryButton, forKey: .primaryButton)
|
||||
try container.encodeIfPresent(secondaryButton, forKey: .secondaryButton)
|
||||
|
||||
@ -105,10 +105,6 @@ import VDS
|
||||
// MARK: - VDSMoleculeViewProtocol
|
||||
//--------------------------------------------------
|
||||
public func viewModelDidUpdate() {
|
||||
if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
|
||||
self.accessibilityIdentifier = accessibilityIdentifier
|
||||
}
|
||||
|
||||
buttons.removeAll()
|
||||
|
||||
if let model = viewModel.leftLink {
|
||||
|
||||
@ -11,8 +11,7 @@ import Foundation
|
||||
public class TwoLinkViewModel: ParentMoleculeModelProtocol {
|
||||
public static var identifier: String = "twoLinkView"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var rightLink: LinkModel?
|
||||
public var leftLink: LinkModel?
|
||||
@ -22,7 +21,6 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case rightLink
|
||||
case leftLink
|
||||
@ -36,7 +34,6 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
rightLink = try typeContainer.decodeIfPresent(LinkModel.self, forKey: .rightLink)
|
||||
leftLink = try typeContainer.decodeIfPresent(LinkModel.self, forKey: .leftLink)
|
||||
@ -46,7 +43,6 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(rightLink, forKey: .rightLink)
|
||||
try container.encodeIfPresent(leftLink, forKey: .leftLink)
|
||||
|
||||
@ -72,9 +72,9 @@ import MVMCore
|
||||
case .standard:
|
||||
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: Padding.Component.VerticalMarginSpacing)
|
||||
case .shortDivider:
|
||||
set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Five)
|
||||
set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Four)
|
||||
case .tallDivider:
|
||||
set(topPadding: Padding.Twelve, bottomPadding: Padding.Five)
|
||||
set(topPadding: Padding.Twelve, bottomPadding: Padding.Four)
|
||||
case .sectionFooter:
|
||||
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0)
|
||||
case ListItemStyle.none:
|
||||
|
||||
@ -12,8 +12,7 @@ public class ActionDetailWithImageModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "actionDetailWithImage"
|
||||
public var moleculeName: String = ActionDetailWithImageModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var headlineBodyButton: HeadlineBodyButtonModel
|
||||
public var image: ImageViewModel
|
||||
|
||||
@ -12,7 +12,6 @@ import MVMCore
|
||||
public class CornerLabelsModel: ParentMoleculeModelProtocol {
|
||||
public static var identifier: String = "cornerLabels"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var topLeftLabel: LabelModel?
|
||||
public var topRightLabel: LabelModel?
|
||||
@ -42,7 +41,6 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case topLeftLabel
|
||||
case topRightLabel
|
||||
@ -55,7 +53,6 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
molecule = try typeContainer.decodeModelIfPresent(codingKey: .molecule)
|
||||
topLeftLabel = try typeContainer.decodeMoleculeIfPresent(codingKey: .topLeftLabel)
|
||||
@ -67,7 +64,6 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeModelIfPresent(molecule, forKey: .molecule)
|
||||
try container.encodeModelIfPresent(topLeftLabel, forKey: .topLeftLabel)
|
||||
|
||||
@ -11,7 +11,6 @@ public class HeadlineBodyLinkToggleModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "headlineBodyLinkToggle"
|
||||
public var moleculeName: String = HeadlineBodyLinkToggleModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
public var backgroundColor: Color?
|
||||
public var headlineBodyLink: HeadlineBodyLinkModel
|
||||
public var toggle: ToggleModel
|
||||
|
||||
@ -13,7 +13,6 @@ open class HeadlineBodyToggleModel: MoleculeModelProtocol, ParentMoleculeModelPr
|
||||
public static var identifier: String = "headlineBodyToggle"
|
||||
public var moleculeName: String = HeadlineBodyToggleModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
open var backgroundColor: Color?
|
||||
open var headlineBody: HeadlineBodyModel
|
||||
open var toggle: ToggleModel
|
||||
|
||||
@ -13,8 +13,7 @@ public class LabelToggleModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "labelToggle"
|
||||
public var moleculeName: String = LabelToggleModel.identifier
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var label: LabelModel
|
||||
public var toggle: ToggleModel
|
||||
@ -27,7 +26,6 @@ public class LabelToggleModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case label
|
||||
case toggle
|
||||
@ -36,7 +34,6 @@ public class LabelToggleModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor)
|
||||
label = try typeContainer.decode(LabelModel.self, forKey:.label)
|
||||
toggle = try typeContainer.decode(ToggleModel.self, forKey:.toggle)
|
||||
@ -46,7 +43,6 @@ public class LabelToggleModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(label, forKey: .label)
|
||||
try container.encode(toggle, forKey: .toggle)
|
||||
|
||||
@ -20,8 +20,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
|
||||
|
||||
open class var identifier: String { "navigationBar" }
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
open var title: String?
|
||||
open var hidden: Bool?
|
||||
open var hidesSystemBackButton: Bool?
|
||||
@ -86,7 +85,6 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case title
|
||||
case hidden
|
||||
case backgroundColor
|
||||
@ -109,7 +107,6 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
|
||||
hidden = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidden)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
@ -129,7 +126,6 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(title, forKey: .title)
|
||||
try container.encodeIfPresent(hidden, forKey: .hidden)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
|
||||
@ -16,8 +16,6 @@ open class BGImageMolecule: MoleculeContainer {
|
||||
super.setupView()
|
||||
insertSubview(image, at: 0)
|
||||
NSLayoutConstraint.constraintPinSubview(toSuperview: image)
|
||||
image.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
|
||||
image.imageView.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
|
||||
}
|
||||
|
||||
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
|
||||
@ -37,8 +37,7 @@ import VDSCoreTokens
|
||||
verticalStack.alignment = .fill
|
||||
verticalStack.distribution = .fill
|
||||
addSubview(verticalStack)
|
||||
verticalStack.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor).isActive = true
|
||||
NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: false, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
|
||||
NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: true, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
|
||||
|
||||
reset()
|
||||
subscribeForNotifications()
|
||||
@ -224,10 +223,6 @@ extension CollapsableNotification: StatusBarUI {
|
||||
topView.label.textColor.getWhite(&greyScale, alpha: nil)
|
||||
return (color, greyScale > 0.5 ? .lightContent : .default)
|
||||
}
|
||||
|
||||
public func shouldUseSafeAreaLayoutGuide() -> Bool {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
extension CollapsableNotification: AccessibilityProtocol {
|
||||
|
||||
@ -13,15 +13,13 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
|
||||
|
||||
public static var identifier: String = "notificationXButton"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
public var action: ActionModelProtocol = ActionNoopModel()
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case action
|
||||
}
|
||||
|
||||
@ -32,7 +30,6 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
|
||||
public required init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
if let action: ActionModelProtocol = try typeContainer.decodeModelIfPresent(codingKey: .action) {
|
||||
self.action = action
|
||||
}
|
||||
@ -42,7 +39,6 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encode(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeModel(action, forKey: .action)
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,6 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
|
||||
|
||||
public static var identifier: String = "eyebrowHeadlineBodyLink"
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
public var moleculeName: String = EyebrowHeadlineBodyLinkModel.identifier
|
||||
public var backgroundColor: Color?
|
||||
public var eyebrow: LabelModel?
|
||||
@ -71,7 +70,6 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case eyebrow
|
||||
case headline
|
||||
@ -86,7 +84,6 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
eyebrow = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
|
||||
headline = try typeContainer.decodeMoleculeIfPresent(codingKey: .headline)
|
||||
@ -103,7 +100,6 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encodeIfPresent(eyebrow, forKey: .eyebrow)
|
||||
try container.encodeModelIfPresent(headline, forKey: .headline)
|
||||
|
||||
@ -15,8 +15,7 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "headlineBodyButton"
|
||||
public var moleculeName: String = HeadlineBodyButtonModel.identifier
|
||||
public var id: String = UUID().uuidString
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var backgroundColor: Color?
|
||||
|
||||
public var headlineBody: HeadlineBodyModel
|
||||
@ -50,7 +49,6 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case moleculeName
|
||||
case accessibilityIdentifier
|
||||
case backgroundColor
|
||||
case headlineBody
|
||||
case button
|
||||
@ -64,7 +62,6 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
|
||||
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
|
||||
headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
|
||||
button = try typeContainer.decode(ButtonModel.self, forKey: .button)
|
||||
@ -76,7 +73,6 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encode(moleculeName, forKey: .moleculeName)
|
||||
try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
|
||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||
try container.encode(headlineBody, forKey: .headlineBody)
|
||||
try container.encode(button, forKey: .button)
|
||||
|
||||
@ -17,8 +17,7 @@ public class HeadlineBodyLinkModel: MoleculeModelProtocol {
|
||||
public static var identifier: String = "headlineBodyLink"
|
||||
public var moleculeName: String = HeadlineBodyLinkModel.identifier
|
||||
@DecodableDefault.UUIDString public var id: String
|
||||
public var accessibilityIdentifier: String?
|
||||
|
||||
|
||||
public var headlineBody: HeadlineBodyModel
|
||||
public var link: LinkModel
|
||||
public var backgroundColor: Color?
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user