change vertical

This commit is contained in:
Pfeil, Scott Robert 2019-08-15 15:24:37 -04:00
parent d810667473
commit 10755d888f
3 changed files with 4 additions and 7 deletions

View File

@ -123,11 +123,6 @@ import UIKit
contentView.addSubview(moleculeView)
let standardConstraints = (moleculeView as? MVMCoreUIViewConstrainingProtocol)?.useStandardConstraints?() ?? true
NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: moleculeView, useMargins: standardConstraints).values))
if standardConstraints {
let constraint = contentView.heightAnchor.constraint(equalToConstant: 80)
constraint.priority = .defaultLow
constraint.isActive = true
}
molecule = moleculeView
}
} else {
@ -152,7 +147,7 @@ import UIKit
guard let moleculeJSON = json?.optionalDictionaryForKey(KeyMolecule), let height = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: moleculeJSON)?.estimatedHeight?(forRow: moleculeJSON, delegateObject: delegateObject) else {
return 80
}
return max(80, height)
return max(2 * PaddingDefaultVerticalSpacing3, height)
}
public static func name(forReuse molecule: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> String? {

View File

@ -29,6 +29,7 @@ typedef NS_ENUM(NSUInteger, MFTimeFormatUnit) {
extern CGFloat const PaddingDefault;
extern CGFloat const PaddingDefaultHorizontalSpacing;
extern CGFloat const PaddingDefaultVerticalSpacing;
extern CGFloat const PaddingDefaultVerticalSpacing3;
extern CGFloat const PaddingBetweenFields;
extern CGFloat const PaddingHorizontalHeadlineWhiteView;
extern CGFloat const PaddingHorizontalLarge;

View File

@ -18,6 +18,7 @@
CGFloat const PaddingDefault = 24;
CGFloat const PaddingDefaultHorizontalSpacing = 32;
CGFloat const PaddingDefaultVerticalSpacing = 32;
CGFloat const PaddingDefaultVerticalSpacing3 = 24;
CGFloat const PaddingBetweenFields = 24;
CGFloat const PaddingHorizontalHeadlineWhiteView = 60;
CGFloat const PaddingHorizontalLarge = 72;
@ -97,7 +98,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
+ (void)setDefaultMarginsForView:(nullable UIView *)view size:(CGFloat)size horizontal:(BOOL)horizontal vertical:(BOOL)vertical {
[MVMCoreDispatchUtility performBlockOnMainThread:^{
CGFloat horizontalPadding = horizontal ? [MFStyler defaultHorizontalPaddingForSize:size] : 0;
CGFloat verticalPadding = vertical ? 24 : 0;
CGFloat verticalPadding = vertical ? PaddingDefaultVerticalSpacing3 : 0;
[MVMCoreUIUtility setMarginsForView:view leading:horizontalPadding top:verticalPadding trailing:horizontalPadding bottom:verticalPadding];
}];
}