From 587b3bb6f3381fe11f2d478bb071046f3feeb59c Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Tue, 28 Apr 2020 11:08:44 -0400 Subject: [PATCH] BGImage --- MVMCoreUI.xcodeproj/project.pbxproj | 46 +++++++++------- MVMCoreUI/Atomic/MoleculeObjectMapping.swift | 1 + .../Molecules/Items/ListItemModel.swift | 7 ++- .../OtherContainers/BGImageMolecule.swift | 25 +++++++++ .../BGImageMoleculeModel.swift | 52 +++++++++++++++++++ .../ModuleMolecule.swift | 0 .../ModuleMoleculeModel.swift | 0 .../OtherContainers}/MoleculeContainer.swift | 0 .../MoleculeContainerModel.swift | 2 +- .../MoleculeContainerProtocol.swift | 0 .../{ => OtherContainers}/Scroller.swift | 0 .../{ => OtherContainers}/ScrollerModel.swift | 0 MVMCoreUI/BaseClasses/TableViewCell.swift | 2 + .../Views/{Container => }/Container.swift | 0 .../{Container => }/ContainerHelper.swift | 0 .../{Container => }/ContainerModel.swift | 0 .../{Container => }/ContainerProtocol.swift | 0 17 files changed, 113 insertions(+), 22 deletions(-) create mode 100644 MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift create mode 100644 MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift rename MVMCoreUI/Atomic/Molecules/{ => OtherContainers}/ModuleMolecule.swift (100%) rename MVMCoreUI/Atomic/Molecules/{ => OtherContainers}/ModuleMoleculeModel.swift (100%) rename MVMCoreUI/{Containers/Views => Atomic/Molecules/OtherContainers}/MoleculeContainer.swift (100%) rename MVMCoreUI/{Containers/Views => Atomic/Molecules/OtherContainers}/MoleculeContainerModel.swift (92%) rename MVMCoreUI/{Containers/Views => Atomic/Molecules/OtherContainers}/MoleculeContainerProtocol.swift (100%) rename MVMCoreUI/Atomic/Molecules/{ => OtherContainers}/Scroller.swift (100%) rename MVMCoreUI/Atomic/Molecules/{ => OtherContainers}/ScrollerModel.swift (100%) rename MVMCoreUI/Containers/Views/{Container => }/Container.swift (100%) rename MVMCoreUI/Containers/Views/{Container => }/ContainerHelper.swift (100%) rename MVMCoreUI/Containers/Views/{Container => }/ContainerModel.swift (100%) rename MVMCoreUI/Containers/Views/{Container => }/ContainerProtocol.swift (100%) diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 2bee8ecf..1f45fe14 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -277,6 +277,8 @@ D236E5B5241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */; }; D236E5B7242007C500C38625 /* MVMControllerModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */; }; D243859923A16B1800332775 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = D243859823A16B1800332775 /* Container.swift */; }; + D253BB9C245874F8002DE544 /* BGImageMolecule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D253BB9B245874F8002DE544 /* BGImageMolecule.swift */; }; + D253BB9E2458751F002DE544 /* BGImageMoleculeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D253BB9D2458751F002DE544 /* BGImageMoleculeModel.swift */; }; D256E9932412880000360572 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = D256E9922412880000360572 /* Header.swift */; }; D260105323CEA61600764D80 /* ToggleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105223CEA61600764D80 /* ToggleModel.swift */; }; D260105923D0A92900764D80 /* ContainerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105823D0A92900764D80 /* ContainerProtocol.swift */; }; @@ -730,6 +732,8 @@ D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescriptionModel.swift; sourceTree = ""; }; D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMControllerModelProtocol.swift; sourceTree = ""; }; D243859823A16B1800332775 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = ""; }; + D253BB9B245874F8002DE544 /* BGImageMolecule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageMolecule.swift; sourceTree = ""; }; + D253BB9D2458751F002DE544 /* BGImageMoleculeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageMoleculeModel.swift; sourceTree = ""; }; D256E9922412880000360572 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = ""; }; D260105223CEA61600764D80 /* ToggleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleModel.swift; sourceTree = ""; }; D260105823D0A92900764D80 /* ContainerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerProtocol.swift; sourceTree = ""; }; @@ -1017,10 +1021,10 @@ isa = PBXGroup; children = ( 9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */, - D29E28DE23D740FC00ACEA85 /* Container */, - D2D90B432404789000DD6EC9 /* MoleculeContainerProtocol.swift */, - 014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */, - D2FB151A23A2B65B00C20E10 /* MoleculeContainer.swift */, + D260105823D0A92900764D80 /* ContainerProtocol.swift */, + D29E28DC23D7404C00ACEA85 /* ContainerHelper.swift */, + 014AA72223C501E2006F3E93 /* ContainerModel.swift */, + D243859823A16B1800332775 /* Container.swift */, ); path = Views; sourceTree = ""; @@ -1483,6 +1487,22 @@ path = TwoColumn; sourceTree = ""; }; + D253BB9A24587023002DE544 /* OtherContainers */ = { + isa = PBXGroup; + children = ( + D2D90B432404789000DD6EC9 /* MoleculeContainerProtocol.swift */, + 014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */, + D2FB151A23A2B65B00C20E10 /* MoleculeContainer.swift */, + D28A838423CCCA8900DFE4FC /* ScrollerModel.swift */, + D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */, + 012A88C5238DA34000FE3DA1 /* ModuleMoleculeModel.swift */, + D29B770F22C281F400D6ACE0 /* ModuleMolecule.swift */, + D253BB9D2458751F002DE544 /* BGImageMoleculeModel.swift */, + D253BB9B245874F8002DE544 /* BGImageMolecule.swift */, + ); + path = OtherContainers; + sourceTree = ""; + }; D260105723CF9CC500764D80 /* Doughnut */ = { isa = PBXGroup; children = ( @@ -1606,6 +1626,7 @@ D29DF10E21E67A77003B2FB9 /* Molecules */ = { isa = PBXGroup; children = ( + D253BB9A24587023002DE544 /* OtherContainers */, D22B38E923F4E07800490EF6 /* DesignedComponents */, D22479912316A9EF003FCCF9 /* Items */, D224798F2316A99F003FCCF9 /* LeftRightViews */, @@ -1617,10 +1638,6 @@ D2A514662213885800345BFB /* MoleculeHeaderView.swift */, 012A88EB238F084D00FE3DA1 /* FooterModel.swift */, D274CA322236A78900B01B62 /* FooterView.swift */, - 012A88C5238DA34000FE3DA1 /* ModuleMoleculeModel.swift */, - D29B770F22C281F400D6ACE0 /* ModuleMolecule.swift */, - D28A838423CCCA8900DFE4FC /* ScrollerModel.swift */, - D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */, D260105723CF9CC500764D80 /* Doughnut */, D20FB164241A5D75004AFC3A /* NavigationItemModelProtocol.swift */, ); @@ -1916,17 +1933,6 @@ path = StringAndMoleculeStack; sourceTree = ""; }; - D29E28DE23D740FC00ACEA85 /* Container */ = { - isa = PBXGroup; - children = ( - 014AA72223C501E2006F3E93 /* ContainerModel.swift */, - D260105823D0A92900764D80 /* ContainerProtocol.swift */, - D243859823A16B1800332775 /* Container.swift */, - D29E28DC23D7404C00ACEA85 /* ContainerHelper.swift */, - ); - path = Container; - sourceTree = ""; - }; D2B18B7D236090D500A9AEDC /* BaseClasses */ = { isa = PBXGroup; children = ( @@ -2377,6 +2383,7 @@ AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */, 522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */, 8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */, + D253BB9E2458751F002DE544 /* BGImageMoleculeModel.swift in Sources */, 0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */, 8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */, BBAA4F03243D8E3B005AAD5F /* RadioBoxes.swift in Sources */, @@ -2400,6 +2407,7 @@ D2092355244FA0FD0044AD09 /* ThreeLayerTemplateModelProtocol.swift in Sources */, 0AE14F64238315D2005417F8 /* TextField.swift in Sources */, 0AB764D124460F6300E7FE72 /* UIDatePicker+Extension.swift in Sources */, + D253BB9C245874F8002DE544 /* BGImageMolecule.swift in Sources */, D29DF17B21E69E1F003B2FB9 /* PrimaryButton.m in Sources */, D2C78CD224228BBD00B69FDE /* ActionOpenPanelModel.swift in Sources */, AA617AB02453010A00910B8F /* ListDeviceComplexLinkSmall.swift in Sources */, diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift index b8ffb9e6..58ad387c 100644 --- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift +++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift @@ -125,6 +125,7 @@ import Foundation MoleculeObjectMapping.shared()?.register(viewClass: FooterView.self, viewModelClass: FooterModel.self) MoleculeObjectMapping.shared()?.register(viewClass: Scroller.self, viewModelClass: ScrollerModel.self) MoleculeObjectMapping.shared()?.register(viewClass: ModuleMolecule.self, viewModelClass: ModuleMoleculeModel.self) + MoleculeObjectMapping.shared()?.register(viewClass: BGImageMolecule.self, viewModelClass: BGImageMoleculeModel.self) // Other Molecules MoleculeObjectMapping.shared()?.register(viewClass: DoughnutChartView.self, viewModelClass: DoughnutChartModel.self) diff --git a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift index 8fdb4d77..81b896f0 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift @@ -45,8 +45,11 @@ import Foundation if useVerticalMargins == nil { useVerticalMargins = true } - if style == nil { - style = "standard" + if topPadding == nil { + topPadding = 24 + } + if bottomPadding == nil { + bottomPadding = 24 } } diff --git a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift new file mode 100644 index 00000000..89eedfe3 --- /dev/null +++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift @@ -0,0 +1,25 @@ +// +// BGImageMolecule.swift +// MVMCoreUI +// +// Created by Scott Pfeil on 4/28/20. +// Copyright © 2020 Verizon Wireless. All rights reserved. +// + +import Foundation + +open class BGImageMolecule: MoleculeContainer { + + let image = MFLoadImageView(pinnedEdges: .all) + + public override func setupView() { + super.setupView() + insertSubview(image, at: 0) + NSLayoutConstraint.constraintPinSubview(toSuperview: image) + } + + public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + image.setOptional(with: (model as? BGImageMoleculeModel)?.image, delegateObject, additionalData) + super.set(with: model, delegateObject, additionalData) + } +} diff --git a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift new file mode 100644 index 00000000..83b5931d --- /dev/null +++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift @@ -0,0 +1,52 @@ +// +// BGImageMoleculeModel.swift +// MVMCoreUI +// +// Created by Scott Pfeil on 4/28/20. +// Copyright © 2020 Verizon Wireless. All rights reserved. +// + +import Foundation + +open class BGImageMoleculeModel: MoleculeContainerModel { + public override class var identifier: String { + return "bgImageContainer" + } + public var image: ImageViewModel + + open override func setDefaults() { + if useHorizontalMargins == nil { + useHorizontalMargins = true + } + if useVerticalMargins == nil { + useVerticalMargins = true + } + if topPadding == nil { + topPadding = PaddingDefaultVerticalSpacing3 + } + if bottomPadding == nil { + bottomPadding = PaddingDefaultVerticalSpacing3 + } + } + + private enum CodingKeys: String, CodingKey { + case image + } + + public init(_ image: ImageViewModel, molecule: MoleculeModelProtocol) { + self.image = image + super.init(with: molecule) + } + + required public init(from decoder: Decoder) throws { + let typeContainer = try decoder.container(keyedBy: CodingKeys.self) + image = try typeContainer.decode(ImageViewModel.self, forKey:.image) + try super.init(from: decoder) + } + + public override func encode(to encoder: Encoder) throws { + try super.encode(to: encoder) + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(image, forKey: .image) + } +} diff --git a/MVMCoreUI/Atomic/Molecules/ModuleMolecule.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMolecule.swift similarity index 100% rename from MVMCoreUI/Atomic/Molecules/ModuleMolecule.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMolecule.swift diff --git a/MVMCoreUI/Atomic/Molecules/ModuleMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift similarity index 100% rename from MVMCoreUI/Atomic/Molecules/ModuleMoleculeModel.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift diff --git a/MVMCoreUI/Containers/Views/MoleculeContainer.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainer.swift similarity index 100% rename from MVMCoreUI/Containers/Views/MoleculeContainer.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainer.swift diff --git a/MVMCoreUI/Containers/Views/MoleculeContainerModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainerModel.swift similarity index 92% rename from MVMCoreUI/Containers/Views/MoleculeContainerModel.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainerModel.swift index 86693823..30b5e95e 100644 --- a/MVMCoreUI/Containers/Views/MoleculeContainerModel.swift +++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainerModel.swift @@ -8,7 +8,7 @@ import Foundation -public class MoleculeContainerModel: ContainerModel, MoleculeContainerModelProtocol, MoleculeModelProtocol { +open class MoleculeContainerModel: ContainerModel, MoleculeContainerModelProtocol, MoleculeModelProtocol { public class var identifier: String { return "container" } diff --git a/MVMCoreUI/Containers/Views/MoleculeContainerProtocol.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainerProtocol.swift similarity index 100% rename from MVMCoreUI/Containers/Views/MoleculeContainerProtocol.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/MoleculeContainerProtocol.swift diff --git a/MVMCoreUI/Atomic/Molecules/Scroller.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/Scroller.swift similarity index 100% rename from MVMCoreUI/Atomic/Molecules/Scroller.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/Scroller.swift diff --git a/MVMCoreUI/Atomic/Molecules/ScrollerModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/ScrollerModel.swift similarity index 100% rename from MVMCoreUI/Atomic/Molecules/ScrollerModel.swift rename to MVMCoreUI/Atomic/Molecules/OtherContainers/ScrollerModel.swift diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift index 30f9df22..b549b6d0 100644 --- a/MVMCoreUI/BaseClasses/TableViewCell.swift +++ b/MVMCoreUI/BaseClasses/TableViewCell.swift @@ -148,6 +148,7 @@ import UIKit preservesSuperviewLayoutMargins = false contentView.insetsLayoutMarginsFromSafeArea = false contentView.preservesSuperviewLayoutMargins = false + styleStandard() } //TODO: ModelProtocol, Change to model @@ -183,6 +184,7 @@ import UIKit open func reset() { molecule?.reset() + styleStandard() backgroundColor = .white } diff --git a/MVMCoreUI/Containers/Views/Container/Container.swift b/MVMCoreUI/Containers/Views/Container.swift similarity index 100% rename from MVMCoreUI/Containers/Views/Container/Container.swift rename to MVMCoreUI/Containers/Views/Container.swift diff --git a/MVMCoreUI/Containers/Views/Container/ContainerHelper.swift b/MVMCoreUI/Containers/Views/ContainerHelper.swift similarity index 100% rename from MVMCoreUI/Containers/Views/Container/ContainerHelper.swift rename to MVMCoreUI/Containers/Views/ContainerHelper.swift diff --git a/MVMCoreUI/Containers/Views/Container/ContainerModel.swift b/MVMCoreUI/Containers/Views/ContainerModel.swift similarity index 100% rename from MVMCoreUI/Containers/Views/Container/ContainerModel.swift rename to MVMCoreUI/Containers/Views/ContainerModel.swift diff --git a/MVMCoreUI/Containers/Views/Container/ContainerProtocol.swift b/MVMCoreUI/Containers/Views/ContainerProtocol.swift similarity index 100% rename from MVMCoreUI/Containers/Views/Container/ContainerProtocol.swift rename to MVMCoreUI/Containers/Views/ContainerProtocol.swift