threeLayer template

scroller molecule
border color.
remove default height
fix missing update view

MVMCoreUI.xcodeproj/project.pbxproj

@@ -169,6 +169,8 @@
 		D2A6390522CBCE160052ED1F /* MoleculeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A6390422CBCE160052ED1F /* MoleculeCollectionViewCell.swift */; };
 		D2C5001821F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D2C5001921F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */; };
+		D2D6CD4022E78C1A00D701B8 /* Scroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */; };
+		D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */; };
 		D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */; };
 		D2E1FADD2268B25E00AEFD8C /* MoleculeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADC2268B25E00AEFD8C /* MoleculeTableViewCell.swift */; };
 		D2E1FADF2268B8E700AEFD8C /* ThreeLayerTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADE2268B8E700AEFD8C /* ThreeLayerTableViewController.swift */; };
@@ -347,6 +349,8 @@
 		D2A6390422CBCE160052ED1F /* MoleculeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeCollectionViewCell.swift; sourceTree = "<group>"; };
 		D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewControllerMappingObject.h; sourceTree = "<group>"; };
 		D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIViewControllerMappingObject.m; sourceTree = "<group>"; };
+		D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scroller.swift; sourceTree = "<group>"; };
+		D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerTemplate.swift; sourceTree = "<group>"; };
 		D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIDelegateObject.swift; sourceTree = "<group>"; };
 		D2E1FADC2268B25E00AEFD8C /* MoleculeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeTableViewCell.swift; sourceTree = "<group>"; };
 		D2E1FADE2268B8E700AEFD8C /* ThreeLayerTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerTableViewController.swift; sourceTree = "<group>"; };
@@ -443,6 +447,7 @@
 				D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */,
 				D296E13B2295969C0051EBE7 /* MoleculeListCellProtocol.h */,
 				D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */,
+				D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */,
 			);
 			path = Templates;
 			sourceTree = "<group>";
@@ -490,6 +495,7 @@
 				D260D7AF22D65BDD007E7233 /* MVMCoreUIPageControl.h */,
 				D260D7B022D65BDD007E7233 /* MVMCoreUIPageControl.m */,
 				D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */,
+				D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */,
 			);
 			path = Molecules;
 			sourceTree = "<group>";
@@ -949,12 +955,14 @@
 				D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */,
 				D2A514672213885800345BFB /* StandardHeaderView.swift in Sources */,
 				DBEFFA04225A829700230692 /* Label.swift in Sources */,
+				D2D6CD4022E78C1A00D701B8 /* Scroller.swift in Sources */,
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
 				D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */,
 				D260D7B222D65BDD007E7233 /* MVMCoreUIPageControl.m in Sources */,
 				D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */,
 				D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */,
 				D282AACB2243C61700C46919 /* ButtonView.swift in Sources */,
+				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				0105618F224BBE7700E1557D /* FormValidator+FormParams.swift in Sources */,
 				D2E1FADD2268B25E00AEFD8C /* MoleculeTableViewCell.swift in Sources */,
 				D29DF2AE21E7B3A4003B2FB9 /* MFTextView.m in Sources */,

MVMCoreUI/Atoms/Views/ViewConstrainingView.m

@@ -307,6 +307,9 @@
     if ([self.constrainedView respondsToSelector:@selector(updateView:)]) {
         [((id<MVMCoreViewProtocol>)self.constrainedView) updateView:size];
     }
+    if (self.molecule != self.constrainedView) {
+        [self.molecule updateView:size];
+    }
     [MFStyler setDefaultMarginsForView:self size:size horizontal:self.updateViewHorizontalDefaults vertical:self.updateViewVerticalDefaults];
     UIEdgeInsets margins = [MVMCoreUIUtility getMarginsForView:self];
     if (self.updateViewHorizontalDefaults) {

MVMCoreUI/BaseControllers/ThreeLayerViewController.swift

@@ -22,7 +22,7 @@ open class ThreeLayerViewController: ProgrammaticScrollViewController {
     var bottomViewOutsideOfScroll = false
     
     private var safeAreaView: UIView?
-    private var heightConstraint: NSLayoutConstraint?
+    var heightConstraint: NSLayoutConstraint?
  
     open override func updateViews() {
         super.updateViews()

MVMCoreUI/Molecules/Carousel.swift

@@ -62,7 +62,7 @@ open class Carousel: ViewConstrainingView {
         pinView(toSuperView: collectionView)
         
         collectionViewHeight = collectionView.heightAnchor.constraint(equalToConstant: 300)
-        collectionViewHeight?.isActive = true
+        collectionViewHeight?.isActive = false
     }
     
     open override func updateView(_ size: CGFloat) {
@@ -81,12 +81,19 @@ open class Carousel: ViewConstrainingView {
     // MARK: - MVMCoreUIMoleculeViewProtocol
     open override func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+        collectionView.backgroundColor = backgroundColor
+        collectionView.layer.borderColor = backgroundColor?.cgColor
+        collectionView.layer.borderWidth = (json?.boolForKey("border") ?? false) ? 1 : 0
+        backgroundColor = .white
         registerCells(with: json, delegateObject: delegateObject)
         setupLayout(with: json)
         prepareMolecules(with: json)
         itemWidthPercent =  (json?.optionalCGFloatForKey("itemWidthPercent") ?? 100) / 100
         setAlignment(with: json?.optionalStringForKey("itemAlignment"))
-        collectionViewHeight?.constant = json?.optionalCGFloatForKey("height") ?? 300
+        if let height = json?.optionalCGFloatForKey("height") {
+            collectionViewHeight?.constant = height
+            collectionViewHeight?.isActive = true
+        }
         setupPagingMolecule(json: json?.optionalDictionaryForKey("pagingMolecule"), delegateObject: delegateObject)
         collectionView.reloadData()
     }

MVMCoreUI/Molecules/Scroller.swift

@@ -0,0 +1,42 @@
+//
+//  Scroller.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 7/23/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+@objcMembers open class Scroller: ViewConstrainingView {
+    public let scrollView = UIScrollView(frame: .zero)
+    public let contentView = MVMCoreUICommonViewsUtility.commonView()
+
+    override open func setupView() {
+        super.setupView()
+        guard scrollView.superview == nil else {
+            return
+        }
+        addConstrainedView(scrollView)
+        scrollView.addSubview(contentView)
+        if let constraints = (NSLayoutConstraint.pinView(toSuperview: contentView, useMargins: false) as NSDictionary).allValues as? [NSLayoutConstraint] {
+            NSLayoutConstraint.activate(constraints)
+        }
+        contentView.widthAnchor.constraint(equalTo: scrollView.widthAnchor, multiplier: 1.0, constant: -0.1).isActive = true
+    }
+    
+    open override func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+        guard let json = json, let moleculeJSON = json.optionalDictionaryForKey(KeyMolecule) else {
+            return
+        }
+        if molecule == nil {
+            if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject, constrainIfNeeded: true) {
+                contentView.addSubview(moleculeView)
+                pinView(toSuperView: moleculeView)
+                molecule = moleculeView
+            }
+        } else {
+            molecule?.setWithJSON(moleculeJSON, delegateObject: delegateObject, additionalData: additionalData)
+        }
+    }
+}

MVMCoreUI/Molecules/StandardHeaderView.swift

@@ -15,11 +15,6 @@ public class StandardHeaderView: ViewConstrainingView {
     open override func updateView(_ size: CGFloat) {
         super.updateView(size)
         separatorView?.updateView(size)
-        if separatorView?.isHidden ?? true {
-            let margins = MVMCoreUIUtility.getMarginsFor(self)
-            MVMCoreUIUtility.setMarginsFor(self, leading: margins.left, top: margins.top, trailing: margins.right, bottom: 0)
-            bottomPin?.constant = 0
-        }
     }
     
     public override func setupView() {

MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

@@ -53,6 +53,7 @@
                      @"carousel": Carousel.class,
                      @"carouselItem": MoleculeCollectionViewCell.class,
                      @"barsPager": MVMCoreUIPageControl.class,
+                     @"scroller": Scroller.class
                      } mutableCopy];
     });
     return mapping;

MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m

@@ -22,7 +22,9 @@
                                    @"textFieldListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[TextFieldListFormViewController class]],
                                    @"moleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackTemplate class]],
                                    @"centerMoleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackCenteredTemplate class]],
-                                   @"moleculeList" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeListTemplate class]]
+                                   @"moleculeList" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeListTemplate class]],
+                                   @"threeLayer" :
+                                       [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ThreeLayerTemplate class]]
                                    } mutableCopy];
     });
     return viewControllerMapping;

MVMCoreUI/Templates/ThreeLayerTemplate.swift

@@ -0,0 +1,52 @@
+//
+//  ThreeLayerTemplate.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 7/23/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+@objcMembers open class ThreeLayerTemplate: ThreeLayerViewController {
+
+    override open func viewDidLoad() {
+        super.viewDidLoad()
+        bottomViewOutsideOfScroll = true
+        // Do any additional setup after loading the view.
+    }
+    
+    open override func newDataBuildScreen() {
+        super.newDataBuildScreen()
+        heightConstraint?.isActive = true
+    }
+    
+    open override func viewForTop() -> UIView? {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
+            return nil
+        }
+        return molecule
+    }
+    
+    open override func viewForMiddle() -> UIView? {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("middle"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
+            return nil
+        }
+        return molecule
+    }
+    
+    override open func viewForBottom() -> UIView? {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
+            return nil
+        }
+        return molecule
+    }
+    
+    open override func spaceBetweenMiddleAndBottom() -> CGFloat? {
+        return 0
+    }
+    
+    open override func spaceBetweenTopAndMiddle() -> CGFloat? {
+        return 0
+    }
+}