From 4b97a9676ddc851fb040c8fe6d7a86b386e3c0c9 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 14 Feb 2019 15:19:21 -0500 Subject: [PATCH] remove legacy from core ui --- MVMCoreUI.xcodeproj/project.pbxproj | 4 -- .../MVMCoreUIViewControllerMappingObject.m | 1 - ...LegacyLargeHeaderSingleLabelTemplate.swift | 61 ------------------- 3 files changed, 66 deletions(-) delete mode 100644 MVMCoreUI/Templates/LegacyLargeHeaderSingleLabelTemplate.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 7fda38f1..a65423f7 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -155,7 +155,6 @@ D2A514632213643100345BFB /* MoleculeStackCenteredTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */; }; D2A514672213885800345BFB /* MVMCoreUIHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514662213885800345BFB /* MVMCoreUIHeaderView.swift */; }; D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; }; - D2A5146D2214C1E400345BFB /* LegacyLargeHeaderSingleLabelTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146C2214C1E400345BFB /* LegacyLargeHeaderSingleLabelTemplate.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 */; }; D2C5001D21F8EE67001DA659 /* LabelWithInternalButton.h in Headers */ = {isa = PBXBuildFile; fileRef = D2C5001B21F8EE66001DA659 /* LabelWithInternalButton.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -315,7 +314,6 @@ D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackCenteredTemplate.swift; sourceTree = ""; }; D2A514662213885800345BFB /* MVMCoreUIHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIHeaderView.swift; sourceTree = ""; }; D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerViewController.swift; sourceTree = ""; }; - D2A5146C2214C1E400345BFB /* LegacyLargeHeaderSingleLabelTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyLargeHeaderSingleLabelTemplate.swift; sourceTree = ""; }; D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewControllerMappingObject.h; sourceTree = ""; }; D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIViewControllerMappingObject.m; sourceTree = ""; }; D2C5001B21F8EE66001DA659 /* LabelWithInternalButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelWithInternalButton.h; sourceTree = ""; }; @@ -390,7 +388,6 @@ isa = PBXGroup; children = ( 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */, - D2A5146C2214C1E400345BFB /* LegacyLargeHeaderSingleLabelTemplate.swift */, D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */, D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */, ); @@ -885,7 +882,6 @@ D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */, D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */, D29DF2AE21E7B3A4003B2FB9 /* MFTextView.m in Sources */, - D2A5146D2214C1E400345BFB /* LegacyLargeHeaderSingleLabelTemplate.swift in Sources */, D29DF18121E69E50003B2FB9 /* MFView.m in Sources */, D29DF18321E69E54003B2FB9 /* SeparatorView.m in Sources */, D29DF17A21E69E1F003B2FB9 /* MFCustomButton.m in Sources */, diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m index 1ff95fea..2e135ece 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m @@ -19,7 +19,6 @@ static NSMutableDictionary *viewControllerMapping; dispatch_once(&onceToken, ^{ viewControllerMapping = [@{ - @"legacyLargeHeaderSingleLabel": [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[LegacyLargeHeaderSingleLabelTemplate class]], @"textFieldListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUITextFieldListFormViewController class]], @"moleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackTemplate class]], @"centerMoleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackCenteredTemplate class]] diff --git a/MVMCoreUI/Templates/LegacyLargeHeaderSingleLabelTemplate.swift b/MVMCoreUI/Templates/LegacyLargeHeaderSingleLabelTemplate.swift deleted file mode 100644 index 8c4c1576..00000000 --- a/MVMCoreUI/Templates/LegacyLargeHeaderSingleLabelTemplate.swift +++ /dev/null @@ -1,61 +0,0 @@ -// -// LegacyLargeHeaderSingleLabelTemplate.swift -// MVMCoreUI -// -// Created by Scott Pfeil on 2/13/19. -// Copyright © 2019 Verizon Wireless. All rights reserved. -// - -import UIKit - -public class LegacyLargeHeaderSingleLabelTemplate: TopLabelsAndBottomButtonsViewController { - - // A label that can go below the top labels. Can be a normal label or one with internal buttons. - var labelViewUnderTopLabels: LabelView? - var labelUnderTopLabelsWithInternalButton: LabelWithInternalButton? - - public override func newDataBuildScreen() { - super.newDataBuildScreen() - topLabelsView?.headlineLabel?.setFontH1(true) - topLabelsView?.separatorView?.hide() - } - - public override func buildViewsBetweenLabelsAndButtons() -> [UIView]? { - var views = [UIView]() - if let labelActionMap = actionMapForLabelUnderTopLabelsWithInternalButton(), let labelUnderTopLabelsWithInternalButton = LabelWithInternalButton(actionMap: labelActionMap, additionalData: nil, actionDelegate: self) { - labelUnderTopLabelsWithInternalButton.translatesAutoresizingMaskIntoConstraints = false - labelUnderTopLabelsWithInternalButton.setAlignment(NSTextAlignment.left) - views.append(labelUnderTopLabelsWithInternalButton) - self.labelUnderTopLabelsWithInternalButton = labelUnderTopLabelsWithInternalButton - } else if let labelString = stringForLabelUnderTopLabels() { - let labelView = LabelView(frame: CGRect.zero) - labelView.translatesAutoresizingMaskIntoConstraints = false - labelView.alignLeft() - labelView.label?.styleB2(true) - labelView.label?.text = labelString - labelView.label?.setContentHuggingPriority(UILayoutPriority.required, for: NSLayoutConstraint.Axis.vertical) - views.append(labelView) - self.labelViewUnderTopLabels = labelView - } - return views; - } - - public func actionMapForLabelUnderTopLabelsWithInternalButton() -> [AnyHashable : Any]? { - return loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyButtonMap,"Link"]) - - } - - public func stringForLabelUnderTopLabels() -> String? { - return loadObject?.pageJSON?.optionalStringForKey("description") - } - - public override func spaceAboveBetweenView() -> NSNumber? { - return 0 as NSNumber - } - - public override func paddingForTopLabels() -> UIEdgeInsets { - var padding = super.paddingForTopLabels() - padding.bottom = PaddingTwo - return padding - } -}