From 4fc5ff931347a4b83c29f6ba0200bfb0209d156e Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Mon, 12 Aug 2019 09:04:18 -0400 Subject: [PATCH] adjustments made. --- .../Atoms/Views/ActionDetailWithImage.swift | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/ActionDetailWithImage.swift b/MVMCoreUI/Atoms/Views/ActionDetailWithImage.swift index fa718a4e..b1b092ec 100644 --- a/MVMCoreUI/Atoms/Views/ActionDetailWithImage.swift +++ b/MVMCoreUI/Atoms/Views/ActionDetailWithImage.swift @@ -102,7 +102,7 @@ import UIKit imageLoader.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true layoutMarginsGuide.trailingAnchor.constraint(equalTo: imageLoader.trailingAnchor).isActive = true - imageLeadingConstraint = imageLoader.leadingAnchor.constraint(equalTo: leftContainer.trailingAnchor, constant: 16) + imageLeadingConstraint = imageLoader.leadingAnchor.constraint(greaterThanOrEqualTo: leftContainer.trailingAnchor, constant: 16) imageLeadingConstraint?.isActive = true imageLoader.topAnchor.constraint(greaterThanOrEqualTo: layoutMarginsGuide.topAnchor).isActive = true @@ -110,18 +110,6 @@ import UIKit let imageloaderBottom = imageLoader.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor) imageloaderBottom.priority = UILayoutPriority(249) imageloaderBottom.isActive = true - -// title.widthAnchor.constraint(equalTo: leftContainer.widthAnchor).isActive = true -// message.widthAnchor.constraint(equalTo: leftContainer.widthAnchor).isActive = true - -// title.setContentCompressionResistancePriority(UILayoutPriority(970), for: .horizontal) -// title.setContentCompressionResistancePriority(.required, for: .vertical) -// message.setContentCompressionResistancePriority(UILayoutPriority(970), for: .horizontal) -// message.setContentCompressionResistancePriority(.required, for: .vertical) -// button.setContentCompressionResistancePriority(UILayoutPriority(976), for: .horizontal) -// button.setContentCompressionResistancePriority(.required, for: .vertical) -// imageLoader.loadingSpinner.setContentCompressionResistancePriority(UILayoutPriority(975), for: .horizontal) -// imageLoader.imageView.setContentCompressionResistancePriority(UILayoutPriority(975), for: .horizontal) } override open func updateView(_ size: CGFloat) { @@ -152,7 +140,7 @@ import UIKit title.text = "" message.text = "" imageLeadingConstraint?.constant = 16 - backgroundColor = nil + imageLoader.reset() } open override func setAsMolecule() { @@ -163,6 +151,8 @@ import UIKit super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) guard let dictionary = json else { return } + + textPadding = dictionary.optionalCGFloatForKey("textPadding") ?? 0.0 title.setWithJSON(dictionary.optionalDictionaryForKey("title"), delegateObject: delegateObject, additionalData: additionalData) message.setWithJSON(dictionary.optionalDictionaryForKey("message"), delegateObject: delegateObject, additionalData: additionalData)