remove old extension

MVMCoreUI.xcodeproj/project.pbxproj

@@ -28,7 +28,6 @@
 		012A88EE239858E300FE3DA1 /* ContainerMoleculeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88ED239858E300FE3DA1 /* ContainerMoleculeProtocol.swift */; };
 		012A88F123985E0100FE3DA1 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88F023985E0100FE3DA1 /* Color.swift */; };
 		012CA99A2384A687003F810F /* MFTextField+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA9992384A687003F810F /* MFTextField+ModelExtension.swift */; };
-		012CA99C23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA99B23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift */; };
 		012CA99E2385A2D3003F810F /* MFView+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */; };
 		012CA9DE2388723E003F810F /* (null) in Sources */ = {isa = PBXBuildFile; };
 		012CA9E223888AED003F810F /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -292,7 +291,6 @@
 		012A88ED239858E300FE3DA1 /* ContainerMoleculeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerMoleculeProtocol.swift; sourceTree = "<group>"; };
 		012A88F023985E0100FE3DA1 /* Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		012CA9992384A687003F810F /* MFTextField+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFTextField+ModelExtension.swift"; sourceTree = "<group>"; };
-		012CA99B23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ViewConstrainingView+ModelExtension.swift"; sourceTree = "<group>"; };
 		012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFView+ModelExtension.swift"; sourceTree = "<group>"; };
 		014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeContainerModel.swift; sourceTree = "<group>"; };
 		014AA72223C501E2006F3E93 /* ContainerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerModel.swift; sourceTree = "<group>"; };
@@ -1019,7 +1017,6 @@
 				012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */,
 				D29DF28721E7AC2B003B2FB9 /* ViewConstrainingView.h */,
 				D29DF28821E7AC2B003B2FB9 /* ViewConstrainingView.m */,
-				012CA99B23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift */,
 				D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */,
 				D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */,
 				944589222385DA9500DE9FD4 /* ImageViewModel.swift */,
@@ -1497,7 +1494,6 @@
 				D29DF13221E6851E003B2FB9 /* MVMCoreUITopAlertBaseView.m in Sources */,
 				D29DF29C21E7ADB9003B2FB9 /* MFProgrammaticTableViewController.m in Sources */,
 				0105618E224BBE7700E1557D /* FormValidator+TextFields.swift in Sources */,
-				012CA99C23859FDC003F810F /* ViewConstrainingView+ModelExtension.swift in Sources */,
 				0A1214A022C11A18007C7030 /* ActionDetailWithImage.swift in Sources */,
 				D2B18B922361E65A00A9AEDC /* CoreUIObject.swift in Sources */,
 				D29DF2BE21E7BEA4003B2FB9 /* TopTabbar.m in Sources */,

MVMCoreUI/Atoms/TextFields/MFTextField+ModelExtension.swift

@@ -20,7 +20,7 @@ extension MFTextField: ModelMoleculeViewProtocol {
         //TODO: Need to create setWithModel in ViewConstraining View
         #warning("This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.")
         //TODO: This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.
-        setUpWithModel(model, delegateObject, additionalData)
+        setUpDefaultWithModel(model, delegateObject, additionalData)
 
         guard let textFieldModel = model as? TextFieldModel,
             let delegateObject = delegateObject else {

MVMCoreUI/Atoms/Views/ViewConstrainingView+ModelExtension.swift

@@ -1,89 +0,0 @@
-//
-//  ViewConstrainingView+ModelExtension.swift
-//  MVMCoreUI
-//
-//  Created by Suresh, Kamlesh on 11/20/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-extension ViewConstrainingView {
-    public func setUpWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String: AnyHashable]?) {
-        if self.constrainedView == nil {
-            setUpDefaultWithModel(model, delegateObject, additionalData)
-        }
-
-        if shouldSetupMoleculeFromJSON,
-            let moleculeObject = (model as? ContainerMoleculeProtocol)?.molecule {
-            if molecule != nil {
-                (molecule as? ModelMoleculeViewProtocol)?.setWithModel(moleculeObject, delegateObject, additionalData)
-            } else {
-                if let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(moleculeObject, delegateObject, true) {
-                    addMolecule(molecule)
-                    self.molecule = molecule
-                    setMoleculeAccessibility()
-                }
-            }
-        } else {
-            (molecule as? ModelMoleculeViewProtocol)?.setWithModel(model, delegateObject, additionalData)
-        }
-
-        if let containerMoleculeModel = model as? ContainerModelProtocol {
-            if let useHorizontalMargins = containerMoleculeModel.useHorizontalMargins {
-                updateViewHorizontalDefaults = useHorizontalMargins
-            }
-            if let useVerticalMargins = containerMoleculeModel.useVerticalMargins {
-                updateViewVerticalDefaults = useVerticalMargins
-            }
-
-            if let horizontalAlignment = containerMoleculeModel.horizontalAlignment {
-                alignHorizontal(horizontalAlignment)
-            }
-            if let verticalAlignment = containerMoleculeModel.verticalAlignment {
-                alignVertical(verticalAlignment)
-            }
-        }
-
-        #warning("work on the below")
-        //        let copyBackgroundColor = self.copyBackgroundColor?()
-        //        if copyBackgroundColor {
-        //
-        //        }
-    }
-}
-
-extension ModelMoleculeViewProtocol where Self: ViewConstrainingView {
-    public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String: AnyHashable]?) {
-        setUpWithModel(model, delegateObject, additionalData)
-    }
-}
-
-/*
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
-    // Only treated as a container if we are constraining a molecule.
-
-    NSNumber *useHorizontalMargins = [json optionalNumberForKey:@"useHorizontalMargins"];
-    if (useHorizontalMargins) {
-        self.updateViewHorizontalDefaults = [useHorizontalMargins boolValue];
-    }
-    NSNumber *useVerticalMargins = [json optionalNumberForKey:@"useVerticalMargins"];
-    if (useVerticalMargins) {
-        self.updateViewVerticalDefaults = [useVerticalMargins boolValue];
-    }
-
-    // Set the alignment for the stack in the containing view. The json driven value is for the axis direction alignment.
-    NSString *alignment = [json string:@"horizontalAlignment"];
-    if (alignment) {
-        [self alignHorizontal:[ViewConstrainingView getAlignmentForString:alignment defaultAlignment:UIStackViewAlignmentFill]];
-    }
-    alignment = [json string:@"verticalAlignment"];
-    if (alignment) {
-        [self alignVertical:[ViewConstrainingView getAlignmentForString:alignment defaultAlignment:UIStackViewAlignmentFill]];
-    }
-
-    if ([self.molecule respondsToSelector:@selector(copyBackgroundColor)] && [self.molecule performSelector:@selector(copyBackgroundColor)]) {
-        self.backgroundColor = self.molecule.backgroundColor;
-    }
-}
-*/

MVMCoreUI/Molecules/Scroller.swift

@@ -29,10 +29,9 @@ import UIKit
     }
 
     public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
-        //super.setWithModel(model, delegateObject, additionalData)
         #warning("This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.")
         //TODO: This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.
-        setUpWithModel(model, delegateObject, additionalData)
+        setUpDefaultWithModel(model, delegateObject, additionalData)
 
         guard let model = model,
             let moleculeModel = (model as? ContainerMoleculeProtocol)?.molecule else {

MVMCoreUI/Organisms/Carousel.swift

@@ -88,7 +88,7 @@ open class Carousel: ViewConstrainingView, ModelMoleculeViewProtocol {
 
         #warning("This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.")
         //TODO: This below call should be repaced with super.setWithModel once we get rid of ViewConstrainingView.
-        setUpWithModel(caroselModel, delegateObject, additionalData)
+        setUpDefaultWithModel(model, delegateObject, additionalData)
 
         collectionView.backgroundColor = backgroundColor
         collectionView.layer.borderColor = backgroundColor?.cgColor