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

Call super reset in vcv. Further adjustments to atom.

Browse Source
This commit is contained in:
Kevin G Christiano 2019-08-12 09:40:15 -04:00
parent 4fc5ff9313
commit 57f82aa60a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MVMCoreUI/Atoms/Views/ActionDetailWithImage.swift
View File

@ -24,7 +24,7 @@ import UIKit
// MARK: - Properties // MARK: - Properties
//------------------------------------------------------ //------------------------------------------------------
var textPadding: CGFloat = PaddingOne var titlePadding: CGFloat = PaddingOne
//------------------------------------------------------ //------------------------------------------------------
// MARK: - Constraints // MARK: - Constraints
@ -62,12 +62,12 @@ import UIKit
override open func setupView() { override open func setupView() {
super.setupView() super.setupView()
imageLoader.addSizeConstraintsForAspectRatio = true
guard subviews.isEmpty else { return } guard subviews.isEmpty else { return }
button.setAsSecondaryCustom() button.setAsSecondaryCustom()
button.isHidden = false
imageLoader.imageView.contentMode = .scaleAspectFit imageLoader.imageView.contentMode = .scaleAspectFit
imageLoader.addSizeConstraintsForAspectRatio = true
addSubview(leftContainer) addSubview(leftContainer)
addSubview(imageLoader) addSubview(imageLoader)
@ -121,9 +121,9 @@ import UIKit
imageLoader.updateView(size) imageLoader.updateView(size)
leftContainer.updateView(size) leftContainer.updateView(size)
let titlePadding = title.hasText ? textPadding : 0 let topPadding = title.hasText ? titlePadding : 0
messageTopConstraint?.constant = titlePadding messageTopConstraint?.constant = topPadding
buttonTopConstraint?.constant = message.hasText ? PaddingTwo : titlePadding buttonTopConstraint?.constant = message.hasText ? PaddingTwo : topPadding
} }
public override static func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat { public override static func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
@ -152,11 +152,18 @@ import UIKit
guard let dictionary = json else { return } guard let dictionary = json else { return }
textPadding = dictionary.optionalCGFloatForKey("textPadding") ?? 0.0 if let padding = dictionary.optionalCGFloatForKey("titlePadding") {
titlePadding = padding
}
title.setWithJSON(dictionary.optionalDictionaryForKey("title"), delegateObject: delegateObject, additionalData: additionalData) title.setWithJSON(dictionary.optionalDictionaryForKey("title"), delegateObject: delegateObject, additionalData: additionalData)
message.setWithJSON(dictionary.optionalDictionaryForKey("message"), delegateObject: delegateObject, additionalData: additionalData) message.setWithJSON(dictionary.optionalDictionaryForKey("message"), delegateObject: delegateObject, additionalData: additionalData)
button.setWithJSON(dictionary.optionalDictionaryForKey("button"), delegateObject: delegateObject, additionalData: additionalData)
imageLoader.setWithJSON(dictionary.optionalDictionaryForKey("image"), delegateObject: delegateObject, additionalData: additionalData) imageLoader.setWithJSON(dictionary.optionalDictionaryForKey("image"), delegateObject: delegateObject, additionalData: additionalData)
if let buttonDictionary = dictionary.optionalDictionaryForKey("button") {
button.setWithJSON(buttonDictionary, delegateObject: delegateObject, additionalData: additionalData)
button.isHidden = false
} else {
button.isHidden = true
}
} }
} }

1
MVMCoreUI/Atoms/Views/ViewConstrainingView.m
View File

@ -336,6 +336,7 @@
} }
- (void)reset { - (void)reset {
[super reset];
self.updateViewHorizontalDefaults = NO; self.updateViewHorizontalDefaults = NO;
self.updateViewVerticalDefaults = NO; self.updateViewVerticalDefaults = NO;
if ([self.molecule respondsToSelector:@selector(alignment)]) { if ([self.molecule respondsToSelector:@selector(alignment)]) {