From 9b8f7711c27ab6564ade63c345593c6cce8055de Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 23 Jan 2019 15:39:17 -0500 Subject: [PATCH 1/4] move MFTextFieldListView --- MVMCoreUI.xcodeproj/project.pbxproj | 8 ++ .../Atoms/Views/MFTextFieldListView.swift | 122 ++++++++++++++++++ MVMCoreUI/Atoms/Views/test123.swift | 13 ++ 3 files changed, 143 insertions(+) create mode 100644 MVMCoreUI/Atoms/Views/MFTextFieldListView.swift create mode 100644 MVMCoreUI/Atoms/Views/test123.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 8260a8c5..dcc6ccd0 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */; }; + 01DF560621F8FB2500CC099B /* test123.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF560521F8FB2500CC099B /* test123.swift */; }; D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; }; D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; }; D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */; }; @@ -142,6 +144,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = ""; }; + 01DF560521F8FB2500CC099B /* test123.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = test123.swift; sourceTree = ""; }; D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = ""; }; D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = ""; }; D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsAndBottomButtonsTableViewController.m; sourceTree = ""; }; @@ -495,6 +499,7 @@ D29DF17D21E69E26003B2FB9 /* Views */ = { isa = PBXGroup; children = ( + 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */, D29DF17E21E69E2E003B2FB9 /* MFView.h */, D29DF17F21E69E2E003B2FB9 /* MFView.m */, D29DF28521E7AC2B003B2FB9 /* MFLabel.h */, @@ -524,6 +529,7 @@ D29DF32221ED0DA2003B2FB9 /* TextButtonView.m */, D29770FB21F7C77400B2F0D0 /* TextFieldView.h */, D29770FA21F7C77400B2F0D0 /* TextFieldView.m */, + 01DF560521F8FB2500CC099B /* test123.swift */, ); path = Views; sourceTree = ""; @@ -810,6 +816,7 @@ D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */, D29DF2AE21E7B3A4003B2FB9 /* MFTextView.m in Sources */, D29DF18121E69E50003B2FB9 /* MFView.m in Sources */, + 01DF560621F8FB2500CC099B /* test123.swift in Sources */, D29DF18321E69E54003B2FB9 /* SeparatorView.m in Sources */, D29DF17A21E69E1F003B2FB9 /* MFCustomButton.m in Sources */, D29DF26121E6A985003B2FB9 /* MFLoadImageView.m in Sources */, @@ -817,6 +824,7 @@ D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */, D29DF28A21E7AC2B003B2FB9 /* MFLabel.m in Sources */, D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */, + 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */, D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */, D29DF2C721E7BF57003B2FB9 /* MFTabBarInteractor.m in Sources */, D29DF2A521E7B2A0003B2FB9 /* MFCaretView.m in Sources */, diff --git a/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift b/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift new file mode 100644 index 00000000..fe38bd64 --- /dev/null +++ b/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift @@ -0,0 +1,122 @@ +// +// MFTextFieldListView.swift +// MobileFirstFramework +// +// Created by Suresh, Kamlesh on 9/21/18. +// Copyright © 2018 Verizon Wireless. All rights reserved. +// + +import UIKit +import MVMCore + +public class MFTextFieldListView: MFView { + + public var textFieldMapList: [[String: Any]]? + public var parentViewContoller: MFViewController? + public var textFieldsToValidate: [MFTextField] = [] + public var textFields: [MFTextField] = [] + public var primaryButton: PrimaryButton? + + public init(textFieldMapList: [[String: Any]], parentViewContoller: MFViewController, primaryButton: PrimaryButton?) { + self.textFieldMapList = textFieldMapList + self.parentViewContoller = parentViewContoller + self.primaryButton = primaryButton + super.init(frame: .zero) + } + + public required init?(coder decoder: NSCoder) { + super.init(coder: decoder) + } + + public override func updateView(_ size: CGFloat) { + super.updateView(size) + for textField in textFields { + textField.updateView(size) + } + } + + public override func setupView() { + super.setupView() + self.translatesAutoresizingMaskIntoConstraints = false + + guard let textFieldMapList = textFieldMapList else { + return + } + var viewList: [UIView] = [] + + for textFieldMap in textFieldMapList { + if let textField = MFTextField(map: textFieldMap, bothDelegates: self) { + +// if textFieldMap.boolForKey("required") { +// textFieldsToValidate.append(textField) +// } + + textFields.append(textField) + if let fieldKey = textField.fieldKey { + parentViewContoller?.register(textField, forErrorKey: fieldKey as String) + } + viewList.append(textField) + } + } + + StackableViewController.populateView(self, withUIArray: viewList) { (viewObject) -> UIEdgeInsets in + var edgeInsets = StackableViewController.standardSpaceAroundUIObject() + edgeInsets.left = 0 + edgeInsets.right = 0 + edgeInsets.top = 0 + return edgeInsets + } + + primaryButton?.handleEnabling(with: textFieldsToValidate) + } + + public func addParams(requestParameters: MVMCoreRequestParameters) { + requestParameters.add(getTextParamsList()) + } + + public func getTextParamsList() -> [String: Any] { + var extraParam: [String: Any] = [:] + for textField in textFields { + if let fieldKey = textField.fieldKey { + extraParam[fieldKey as String] = textField.text ?? "" + } + } + return extraParam + } +} + +extension MFTextFieldListView: UITextFieldDelegate, UITextViewDelegate, MFTextFieldDelegate { + @objc open func textFieldDidEndEditing(_ textField: UITextField) { + parentViewContoller?.textFieldDidEndEditing(textField) + primaryButton?.handleEnabling(with: textFieldsToValidate) + } + + @objc open func dismissFieldInput(_ sender: Any?) { + parentViewContoller?.dismissFieldInput(sender) + } + + @objc open func textFieldShouldReturn(_ textField: UITextField) -> Bool { + textField.resignFirstResponder() + return true + } + + @objc open func textFieldDidBeginEditing(_ textField: UITextField) { + parentViewContoller?.textFieldDidBeginEditing(textField) + } + + @objc open func entryIsValid(_ textfield: MFTextField?) { + DispatchQueue.main.async { + if self.parentViewContoller?.responds(to: #selector(MFTextFieldDelegate.entryIsValid(_:))) ?? false { + self.parentViewContoller?.entryIsValid(textfield) + } + } + } + + @objc open func entryIsInvalid(_ textfield: MFTextField?) { + DispatchQueue.main.async { + if self.parentViewContoller?.responds(to: #selector(MFTextFieldDelegate.entryIsInvalid(_:))) ?? false { + self.parentViewContoller?.entryIsInvalid(textfield) + } + } + } +} diff --git a/MVMCoreUI/Atoms/Views/test123.swift b/MVMCoreUI/Atoms/Views/test123.swift new file mode 100644 index 00000000..120000cd --- /dev/null +++ b/MVMCoreUI/Atoms/Views/test123.swift @@ -0,0 +1,13 @@ +// +// test123.swift +// MVMCoreUI +// +// Created by Suresh, Kamlesh on 1/23/19. +// Copyright © 2019 Verizon Wireless. All rights reserved. +// + +import UIKit + +class test123: NSObject { + +} From e04949ca8cc12f6e60c8c593520671c19eeacf75 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 24 Jan 2019 12:02:52 -0500 Subject: [PATCH 2/4] fixes --- MVMCoreUI/Atoms/Views/MFTextFieldListView.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift b/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift index fe38bd64..fde03981 100644 --- a/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift +++ b/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift @@ -9,6 +9,7 @@ import UIKit import MVMCore + public class MFTextFieldListView: MFView { public var textFieldMapList: [[String: Any]]? @@ -47,9 +48,9 @@ public class MFTextFieldListView: MFView { for textFieldMap in textFieldMapList { if let textField = MFTextField(map: textFieldMap, bothDelegates: self) { -// if textFieldMap.boolForKey("required") { -// textFieldsToValidate.append(textField) -// } + if textFieldMap.boolForKey("required") { + textFieldsToValidate.append(textField) + } textFields.append(textField) if let fieldKey = textField.fieldKey { From 1207b28540ea76d72f44f1976b4f6bf948c191d3 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 24 Jan 2019 15:24:14 -0500 Subject: [PATCH 3/4] MVMCoreUITextFormViewController --- MVMCoreUI.xcodeproj/project.pbxproj | 10 ++-- MVMCoreUI/Atoms/Views/test123.swift | 13 ----- .../MFTextFieldListView.swift | 0 .../MVMCoreUIViewControllerMappingObject.m | 6 ++- .../MVMCoreUITextFormViewController.swift | 52 +++++++++++++++++++ 5 files changed, 62 insertions(+), 19 deletions(-) delete mode 100644 MVMCoreUI/Atoms/Views/test123.swift rename MVMCoreUI/{Atoms/Views => Molecules}/MFTextFieldListView.swift (100%) create mode 100644 MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index dcc6ccd0..d33b166b 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */; }; - 01DF560621F8FB2500CC099B /* test123.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF560521F8FB2500CC099B /* test123.swift */; }; + 01DF566C21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */; }; D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; }; D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; }; D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */; }; @@ -145,7 +145,7 @@ /* Begin PBXFileReference section */ 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = ""; }; - 01DF560521F8FB2500CC099B /* test123.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = test123.swift; sourceTree = ""; }; + 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUITextFormViewController.swift; sourceTree = ""; }; D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = ""; }; D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = ""; }; D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsAndBottomButtonsTableViewController.m; sourceTree = ""; }; @@ -340,6 +340,7 @@ children = ( D29DF0E021E4F3B6003B2FB9 /* MVMCoreUILargeHeaderSingleLabelTemplate.h */, D29DF0E121E4F3B6003B2FB9 /* MVMCoreUILargeHeaderSingleLabelTemplate.m */, + 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */, ); path = Templates; sourceTree = ""; @@ -366,6 +367,7 @@ D29DF10E21E67A77003B2FB9 /* Molecules */ = { isa = PBXGroup; children = ( + 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */, D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */, D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */, D29770F621F7C73800B2F0D0 /* PrimaryButtonView.h */, @@ -499,7 +501,6 @@ D29DF17D21E69E26003B2FB9 /* Views */ = { isa = PBXGroup; children = ( - 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */, D29DF17E21E69E2E003B2FB9 /* MFView.h */, D29DF17F21E69E2E003B2FB9 /* MFView.m */, D29DF28521E7AC2B003B2FB9 /* MFLabel.h */, @@ -529,7 +530,6 @@ D29DF32221ED0DA2003B2FB9 /* TextButtonView.m */, D29770FB21F7C77400B2F0D0 /* TextFieldView.h */, D29770FA21F7C77400B2F0D0 /* TextFieldView.m */, - 01DF560521F8FB2500CC099B /* test123.swift */, ); path = Views; sourceTree = ""; @@ -803,6 +803,7 @@ D29DF2C521E7BF57003B2FB9 /* MFTabBarSwipeAnimator.m in Sources */, D29DF2B421E7B76D003B2FB9 /* MFLoadingSpinner.m in Sources */, D2C5001921F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m in Sources */, + 01DF566C21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift in Sources */, D29DF12E21E6851E003B2FB9 /* MVMCoreUITopAlertView.m in Sources */, D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */, D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */, @@ -816,7 +817,6 @@ D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */, D29DF2AE21E7B3A4003B2FB9 /* MFTextView.m in Sources */, D29DF18121E69E50003B2FB9 /* MFView.m in Sources */, - 01DF560621F8FB2500CC099B /* test123.swift in Sources */, D29DF18321E69E54003B2FB9 /* SeparatorView.m in Sources */, D29DF17A21E69E1F003B2FB9 /* MFCustomButton.m in Sources */, D29DF26121E6A985003B2FB9 /* MFLoadImageView.m in Sources */, diff --git a/MVMCoreUI/Atoms/Views/test123.swift b/MVMCoreUI/Atoms/Views/test123.swift deleted file mode 100644 index 120000cd..00000000 --- a/MVMCoreUI/Atoms/Views/test123.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// test123.swift -// MVMCoreUI -// -// Created by Suresh, Kamlesh on 1/23/19. -// Copyright © 2019 Verizon Wireless. All rights reserved. -// - -import UIKit - -class test123: NSObject { - -} diff --git a/MVMCoreUI/Atoms/Views/MFTextFieldListView.swift b/MVMCoreUI/Molecules/MFTextFieldListView.swift similarity index 100% rename from MVMCoreUI/Atoms/Views/MFTextFieldListView.swift rename to MVMCoreUI/Molecules/MFTextFieldListView.swift diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m index 3f73bf85..07f1f8b0 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m @@ -9,6 +9,7 @@ #import "MVMCoreUIViewControllerMappingObject.h" #import #import "MVMCoreUILargeHeaderSingleLabelTemplate.h" +#import @implementation MVMCoreUIViewControllerMappingObject @@ -18,7 +19,10 @@ static dispatch_once_t onceToken; static NSMutableDictionary *viewControllerMapping; dispatch_once(&onceToken, ^{ - viewControllerMapping = [@{ @"LargeHeaderSingleLabel": [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUILargeHeaderSingleLabelTemplate class]]} mutableCopy]; + viewControllerMapping = [@{ + @"LargeHeaderSingleLabel": [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUILargeHeaderSingleLabelTemplate class]], + @"textListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUITextFormViewController class]] + } mutableCopy]; }); return viewControllerMapping; } diff --git a/MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift b/MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift new file mode 100644 index 00000000..1188a299 --- /dev/null +++ b/MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift @@ -0,0 +1,52 @@ +// +// MVMCoreUITextFormViewController.swift +// MVMCoreUI +// +// Created by Suresh, Kamlesh on 1/24/19. +// Copyright © 2019 Verizon Wireless. All rights reserved. +// + +import UIKit + +public class MVMCoreUITextFormViewController: TopLabelsAndBottomButtonsViewController { + + + public var textFieldListView: MFTextFieldListView? + + public override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + public override func updateViews() { + super.updateViews() + } + + public override func newDataBuildScreen() { + super.newDataBuildScreen() + topLabelsView?.separatorView?.isHidden = true + } + + public override func buildViewsBetweenLabelsAndButtons() -> [UIView]? { + var viewList: [UIView] = [] + + if let textFieldsList = loadObject?.pageJSON?.arrayForKey("textFieldList") as? [[String: Any]] { + let textFieldListView = MFTextFieldListView(textFieldMapList: textFieldsList, + parentViewContoller: self, + primaryButton: self.primaryButton) + self.textFieldListView = textFieldListView + viewList.append(textFieldListView) + } + return viewList + } + + public override func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable : Any]?, additionalData: [AnyHashable : Any]?) { + textFieldListView?.addParams(requestParameters: requestParameters) + super.handleOpenPage(for: requestParameters, actionInformation: actionInformation, additionalData: additionalData) + } + + public override func spaceAboveBetweenView() -> NSNumber? { + return PaddingFour as NSNumber + } + +} From c22e1f69b206f1dcaedcd0afd5bdfeb9ddbcfc5b Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 24 Jan 2019 15:57:17 -0500 Subject: [PATCH 4/4] rename --- MVMCoreUI.xcodeproj/project.pbxproj | 8 ++++---- .../OtherHandlers/MVMCoreUIViewControllerMappingObject.m | 2 +- ...ift => MVMCoreUITextFieldListFormViewController.swift} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename MVMCoreUI/Templates/{MVMCoreUITextFormViewController.swift => MVMCoreUITextFieldListFormViewController.swift} (94%) diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index d33b166b..5eb1d762 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */; }; - 01DF566C21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */; }; + 01DF567021FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */; }; D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; }; D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; }; D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */; }; @@ -145,7 +145,7 @@ /* Begin PBXFileReference section */ 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = ""; }; - 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUITextFormViewController.swift; sourceTree = ""; }; + 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MVMCoreUITextFieldListFormViewController.swift; sourceTree = ""; }; D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = ""; }; D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = ""; }; D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsAndBottomButtonsTableViewController.m; sourceTree = ""; }; @@ -338,9 +338,9 @@ D29DF0DF21E418B2003B2FB9 /* Templates */ = { isa = PBXGroup; children = ( + 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */, D29DF0E021E4F3B6003B2FB9 /* MVMCoreUILargeHeaderSingleLabelTemplate.h */, D29DF0E121E4F3B6003B2FB9 /* MVMCoreUILargeHeaderSingleLabelTemplate.m */, - 01DF566B21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift */, ); path = Templates; sourceTree = ""; @@ -803,9 +803,9 @@ D29DF2C521E7BF57003B2FB9 /* MFTabBarSwipeAnimator.m in Sources */, D29DF2B421E7B76D003B2FB9 /* MFLoadingSpinner.m in Sources */, D2C5001921F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m in Sources */, - 01DF566C21FA2ACE00CC099B /* MVMCoreUITextFormViewController.swift in Sources */, D29DF12E21E6851E003B2FB9 /* MVMCoreUITopAlertView.m in Sources */, D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */, + 01DF567021FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift in Sources */, D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */, D29DF24D21E6A177003B2FB9 /* MFTextField.m in Sources */, D29DF2A221E7AF4E003B2FB9 /* MVMCoreUIUtility.m in Sources */, diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m index 07f1f8b0..255cade5 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m @@ -21,7 +21,7 @@ dispatch_once(&onceToken, ^{ viewControllerMapping = [@{ @"LargeHeaderSingleLabel": [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUILargeHeaderSingleLabelTemplate class]], - @"textListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUITextFormViewController class]] + @"TextFieldListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MVMCoreUITextFieldListFormViewController class]] } mutableCopy]; }); return viewControllerMapping; diff --git a/MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift b/MVMCoreUI/Templates/MVMCoreUITextFieldListFormViewController.swift similarity index 94% rename from MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift rename to MVMCoreUI/Templates/MVMCoreUITextFieldListFormViewController.swift index 1188a299..6225e429 100644 --- a/MVMCoreUI/Templates/MVMCoreUITextFormViewController.swift +++ b/MVMCoreUI/Templates/MVMCoreUITextFieldListFormViewController.swift @@ -8,7 +8,7 @@ import UIKit -public class MVMCoreUITextFormViewController: TopLabelsAndBottomButtonsViewController { +public class MVMCoreUITextFieldListFormViewController: TopLabelsAndBottomButtonsViewController { public var textFieldListView: MFTextFieldListView?