mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from develop

Browse Source
This commit is contained in:
panxi 2020-01-09 16:17:29 -05:00
commit 99b97fd934
4 changed files with 0 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -34,8 +34,6 @@
0198F79F225679880066C936 /* FormValidationProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0198F79E225679870066C936 /* FormValidationProtocol.swift */; };
0198F7A62256A80B0066C936 /* MFRadioButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 0198F7A02256A80A0066C936 /* MFRadioButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
0198F7A82256A80B0066C936 /* MFRadioButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 0198F7A22256A80A0066C936 /* MFRadioButton.m */; };
01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */; };
01DF567021FA5AB300CC099B /* TextFieldListFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */; };
01E569D3223FFFA500327251 /* ThreeLayerViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
01EB3684236097C0006832FA /* MoleculeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB3683236097C0006832FA /* MoleculeProtocol.swift */; };
01EB368F23609801006832FA /* LabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368823609801006832FA /* LabelModel.swift */; };
@ -276,8 +274,6 @@
0198F79E225679870066C936 /* FormValidationProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormValidationProtocol.swift; sourceTree = "<group>"; };
0198F7A02256A80A0066C936 /* MFRadioButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFRadioButton.h; sourceTree = "<group>"; };
0198F7A22256A80A0066C936 /* MFRadioButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFRadioButton.m; sourceTree = "<group>"; };
01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = "<group>"; };
01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldListFormViewController.swift; sourceTree = "<group>"; };
01EB3683236097C0006832FA /* MoleculeProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeProtocol.swift; sourceTree = "<group>"; };
01EB368823609801006832FA /* LabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelModel.swift; sourceTree = "<group>"; };
01EB368923609801006832FA /* ListItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListItemModel.swift; sourceTree = "<group>"; };
@ -740,7 +736,6 @@
D29DF0DF21E418B2003B2FB9 /* Templates */ = {
isa = PBXGroup;
children = (
01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */,
D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */,
D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */,
D296E13B2295969C0051EBE7 /* MoleculeListCellProtocol.h */,
@ -778,7 +773,6 @@
D224798D2316A988003FCCF9 /* VerticalCombinationViews */,
D2A5145C2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h */,
0A12149F22C11A17007C7030 /* ActionDetailWithImage.swift */,
01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */,
D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */,
D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */,
D2A514662213885800345BFB /* StandardHeaderView.swift */,
@ -1299,7 +1293,6 @@
017BEB3A2360EEB40024EF95 /* PageModel.swift in Sources */,
D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */,
D22D1F572204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m in Sources */,
01DF567021FA5AB300CC099B /* TextFieldListFormViewController.swift in Sources */,
D2A5145F2211DDC100345BFB /* MoleculeStackView.swift in Sources */,
D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */,
D29DF24D21E6A177003B2FB9 /* MFTextField.m in Sources */,
@ -1351,7 +1344,6 @@
94C2D9842386F3F80006CF46 /* LabelAttributeModel.swift in Sources */,
944589212385D6E900DE9FD4 /* DashLineModel.swift in Sources */,
D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */,
01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */,
D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */,
D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */,
9445890E2385C3F800DE9FD4 /* MultiProgressModel.swift in Sources */,

123
MVMCoreUI/Molecules/MFTextFieldListView.swift
View File

@ -1,123 +0,0 @@
//
// 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: ViewConstrainingView {
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)
}
}
}
}

1
MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m
View File

@ -19,7 +19,6 @@
static NSMutableDictionary *viewControllerMapping;
dispatch_once(&onceToken, ^{
viewControllerMapping = [@{
@"textFieldListForm" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[TextFieldListFormViewController class]],
@"moleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackTemplate class]],
@"centerMoleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackCenteredTemplate class]],
@"moleculeList" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeListTemplate class]],

52
MVMCoreUI/Templates/TextFieldListFormViewController.swift
View File

@ -1,52 +0,0 @@
//
// MVMCoreUITextFormViewController.swift
// MVMCoreUI
//
// Created by Suresh, Kamlesh on 1/24/19.
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
import UIKit
public class TextFieldListFormViewController: 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
}
}