From d388f5be8448f3649b3f8633b481bc5fb01e7ba3 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Thu, 6 Aug 2020 20:21:14 +0530 Subject: [PATCH] Added bgColor implementation in image --- MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift | 4 ++++ .../Molecules/OtherContainers/BGImageMolecule.swift | 12 ++---------- .../OtherContainers/BGImageMoleculeModel.swift | 4 ---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift index 4357537c..2359f5b3 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift @@ -252,6 +252,10 @@ import UIKit imageView.clipsToBounds = true imageView.layer.cornerRadius = cornerRadius } + + if let backgroundColor = imageModel.backgroundColor?.uiColor { + imageView.backgroundColor = backgroundColor + } } // MARK: - load functions diff --git a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift index e7d354ea..1c39975e 100644 --- a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift +++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift @@ -19,15 +19,7 @@ open class BGImageMolecule: MoleculeContainer { } open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { - guard let castModel = model as? BGImageMoleculeModel else { - super.set(with: model, delegateObject, additionalData) - return - } - image.setOptional(with: castModel.image, delegateObject, additionalData) - super.set(with: castModel, delegateObject, additionalData) - if let cornerRadius = castModel.cornerRadius { - layer.cornerRadius = cornerRadius - clipsToBounds = true - } + 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 index f0200455..83b5931d 100644 --- a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift @@ -13,7 +13,6 @@ open class BGImageMoleculeModel: MoleculeContainerModel { return "bgImageContainer" } public var image: ImageViewModel - public var cornerRadius: CGFloat? open override func setDefaults() { if useHorizontalMargins == nil { @@ -32,7 +31,6 @@ open class BGImageMoleculeModel: MoleculeContainerModel { private enum CodingKeys: String, CodingKey { case image - case cornerRadius } public init(_ image: ImageViewModel, molecule: MoleculeModelProtocol) { @@ -43,7 +41,6 @@ open class BGImageMoleculeModel: MoleculeContainerModel { required public init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) image = try typeContainer.decode(ImageViewModel.self, forKey:.image) - cornerRadius = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .cornerRadius) try super.init(from: decoder) } @@ -51,6 +48,5 @@ open class BGImageMoleculeModel: MoleculeContainerModel { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(image, forKey: .image) - try container.encodeIfPresent(cornerRadius, forKey: .cornerRadius) } }