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

update listitem

Browse Source
This commit is contained in:
panxi 2019-12-13 11:26:48 -05:00
parent 58ec1abcfe
commit 8612b34ac7
12 changed files with 20 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -27,7 +27,6 @@
012A88EC238F084D00FE3DA1 /* FooterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88EB238F084D00FE3DA1 /* FooterModel.swift */; };
012A88EE239858E300FE3DA1 /* ContainerMoleculeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88ED239858E300FE3DA1 /* ContainerMoleculeProtocol.swift */; };
012A88F123985E0100FE3DA1 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88F023985E0100FE3DA1 /* Color.swift */; };
012CA98923849699003F810F /* SeperatorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA98823849699003F810F /* SeperatorModel.swift */; };
012CA99A2384A687003F810F /* MFTextField+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA9992384A687003F810F /* MFTextField+ModelExtension.swift */; };
012CA99C23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA99B23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift */; };
012CA99E2385A2D3003F810F /* MFView+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */; };
@ -278,7 +277,6 @@
012A88EB238F084D00FE3DA1 /* FooterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterModel.swift; sourceTree = "<group>"; };
012A88ED239858E300FE3DA1 /* ContainerMoleculeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerMoleculeProtocol.swift; sourceTree = "<group>"; };
012A88F023985E0100FE3DA1 /* Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
012CA98823849699003F810F /* SeperatorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeperatorModel.swift; sourceTree = "<group>"; };
012CA9992384A687003F810F /* MFTextField+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFTextField+ModelExtension.swift"; sourceTree = "<group>"; };
012CA99B23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ViewConstrainingView+ModelExtension.swift"; sourceTree = "<group>"; };
012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFView+ModelExtension.swift"; sourceTree = "<group>"; };
@ -587,8 +585,6 @@
01EB368723609801006832FA /* Molecules */ = {
isa = PBXGroup;
children = (
012CA98823849699003F810F /* SeperatorModel.swift */,
01EB368923609801006832FA /* ListItemModel.swift */,
011B58F323A2CCC80085F53C /* DropDownModel.swift */,
011B58F123A2AE2C0085F53C /* DropDownListItemModel.swift */,
01EB368A23609801006832FA /* MoleculeStackItemModel.swift */,
@ -719,6 +715,7 @@
children = (
D2755D7A23689C7500485468 /* TableViewCell.swift */,
01509D8E2327EC6F00EF99AA /* MoleculeTableViewCell.swift */,
01EB368923609801006832FA /* ListItemModel.swift */,
D2A6390422CBCE160052ED1F /* MoleculeCollectionViewCell.swift */,
D224799A231965AD003FCCF9 /* AccordionMoleculeTableViewCell.swift */,
D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */,
@ -1294,7 +1291,6 @@
D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */,
D29B771022C281F400D6ACE0 /* ModuleMolecule.swift in Sources */,
94C2D9A923872E5E0006CF46 /* LabelAttributeImageModel.swift in Sources */,
012CA98923849699003F810F /* SeperatorModel.swift in Sources */,
DBC4391922442197001AB423 /* DashLine.swift in Sources */,
0AA33B34239813C50067DD0F /* UIColor+Extension.swift in Sources */,
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */,

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

@ -9,9 +9,7 @@
import Foundation
@objcMembers public class DashLineModel: MoleculeProtocol {
public static var identifier: String {
get { return "dashLine" }
}
public static var identifier: String = "dashLine"
public var backgroundColor: String?
public var dashColor: String

6
MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
View File

@ -9,11 +9,9 @@
import UIKit
@objcMembers public class LeftRightLabelModel: MoleculeProtocol {
public static var identifier: String = "leftRightLabel"
public var backgroundColor: String?
public var leftText: LabelModel
public var rightText: LabelModel
public static var identifier: String {
get{ return "leftRightLabel" }
}
}

4
MVMCoreUI/Atoms/Views/MultiProgressModel.swift
View File

@ -15,9 +15,7 @@ import Foundation
}
@objcMembers public class MultiProgressBarModel: MoleculeProtocol {
public static var identifier: String {
get{ return "multiProgressBar"}
}
public static var identifier: String = "multiProgressBar"
public var moleculeName: String
public var backgroundColor: String?
public var progressList: [SingleProgressBarModel]

4
MVMCoreUI/Atoms/Views/ProgressBarModel.swift
View File

@ -9,9 +9,7 @@
import Foundation
@objcMembers public class ProgressBarModel: MoleculeProtocol {
public static var identifier: String {
get { return "progressbar" }
}
public static var identifier: String = "progressbar"
public var moleculeName: String
public var isRounded: Bool?

2
MVMCoreUI/Models/ModelProtocols/ListItemModelProtocol.swift
View File

@ -10,5 +10,5 @@ import Foundation
public protocol ListItemModelProtocol: ContainerMoleculeProtocol {
var molecule: MoleculeProtocol? { get }
var separator: SeperatorModel? { get set }
var separator: LineModel? { get set }
}

4
MVMCoreUI/Models/Molecules/DropDownListItemModel.swift
View File

@ -12,7 +12,7 @@ import Foundation
public static var identifier: String = "dropDownListItem"
public var molecules: [[ListItemModel]]
public var backgroundColor: String?
public var separator: SeperatorModel?
public var separator: LineModel?
public var dropDown: DropDownModel
public init(molecules: [[ListItemModel]], dropDown: DropDownModel) {
@ -31,7 +31,7 @@ import Foundation
required public init(from decoder: Decoder) throws {
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
self.molecules = try typeContainer.decode([[ListItemModel]].self, forKey: .molecules)
self.separator = try typeContainer.decode(SeperatorModel.self, forKey: .separator)
self.separator = try typeContainer.decode(LineModel.self, forKey: .separator)
self.backgroundColor = try typeContainer.decodeIfPresent(String.self, forKey: .backgroundColor)
self.dropDown = try typeContainer.decode(DropDownModel.self, forKey: .dropDown)
}

6
MVMCoreUI/Models/Molecules/HeaderModel.swift
View File

@ -13,9 +13,9 @@ import Foundation
public var moleculeName: String?
public var backgroundColor: String?
public var molecule: MoleculeProtocol?
public var seperator: SeperatorModel?
public var seperator: LineModel?
public init(molecule: MoleculeProtocol?, backgroundColor: String?, seperator: SeperatorModel?){
public init(molecule: MoleculeProtocol?, backgroundColor: String?, seperator: LineModel?){
self.molecule = molecule
self.backgroundColor = backgroundColor
self.seperator = seperator
@ -33,7 +33,7 @@ import Foundation
self.moleculeName = try typeContainer.decode(String.self, forKey: .moleculeName)
self.backgroundColor = try typeContainer.decodeIfPresent(String.self, forKey: .backgroundColor)
self.molecule = try typeContainer.decodeIfPresent(codingKey: .molecule)
self.seperator = try typeContainer.decodeIfPresent(SeperatorModel.self, forKey: .separator)
self.seperator = try typeContainer.decodeIfPresent(LineModel.self, forKey: .separator)
}
public func encode(to encoder: Encoder) throws {

4
MVMCoreUI/Models/Molecules/LineModel.swift
View File

@ -12,8 +12,4 @@ import UIKit
public static var identifier: String = "line"
public var backgroundColor: String?
public var type: String?
public init(type: String?) {
self.type = type
}
}

15
MVMCoreUI/Models/Molecules/SeperatorModel.swift
View File

@ -1,15 +0,0 @@
//
// SeperatorModel.swift
// MVMCoreUI
//
// Created by Suresh, Kamlesh on 11/19/19.
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
import UIKit
@objcMembers public class SeperatorModel: MoleculeProtocol {
public static var identifier: String = "line"
public var backgroundColor: String?
public var type: String?
}

24
MVMCoreUI/Models/Molecules/ListItemModel.swift → MVMCoreUI/Molecules/Items/ListItemModel.swift
View File

@ -13,19 +13,10 @@ import Foundation
public var molecule: MoleculeProtocol?
public var backgroundColor: String?
public var action: ActionModel?
public var hideArrow: Bool?
public var separator: SeperatorModel?
public var separator: LineModel?
public var style: String?
public init(molecule: MoleculeProtocol?, actionMap: ActionModel?, hideArrow: Bool?, separator: SeperatorModel?, style: String?) {
self.molecule = molecule
self.action = actionMap
self.hideArrow = hideArrow
self.separator = separator
self.style = style
}
enum CodingKeys: String, CodingKey {
case moleculeName
case molecule
@ -37,19 +28,20 @@ import Foundation
required public init(from decoder: Decoder) throws {
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
self.molecule = try typeContainer.decodeIfPresent(codingKey: .molecule)
molecule = try typeContainer.decodeIfPresent(codingKey: .molecule)
action = try typeContainer.decodeIfPresent(ActionModel.self, forKey: .action)
self.hideArrow = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideArrow)
self.separator = try typeContainer.decodeIfPresent(SeperatorModel.self, forKey: .separator)
self.style = try typeContainer.decodeIfPresent(String.self, forKey: .style)
hideArrow = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideArrow)
separator = try typeContainer.decodeIfPresent(LineModel.self, forKey: .separator)
style = try typeContainer.decodeIfPresent(String.self, forKey: .style)
}
public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(moleculeName, forKey: .moleculeName)
try container.encodeIfPresent(self.molecule, forKey: .molecule)
try container.encodeIfPresent(molecule, forKey: .molecule)
try container.encodeIfPresent(action, forKey: .action)
try container.encodeIfPresent(hideArrow, forKey: .hideArrow)
try container.encodeIfPresent(separator, forKey: .separator)
try container.encodeIfPresent(style, forKey: .style)
}
}

1
MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
View File

@ -18,7 +18,6 @@ import Foundation
ModelRegistry.register(ListItemModel.self)
ModelRegistry.register(TextFieldModel.self)
ModelRegistry.register(LineModel.self)
ModelRegistry.register(SeperatorModel.self)
ModelRegistry.register(ProgressBarModel.self)
ModelRegistry.register(MultiProgressBarModel.self)
ModelRegistry.register(CaretViewModel.self)