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

decision to separate out into a separate molecule.

Browse Source
This commit is contained in:
Kevin G Christiano 2021-02-09 11:30:38 -05:00
parent 38fcf859ae
commit 8b49de569d
6 changed files with 384 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -114,6 +114,8 @@
0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */; };
0AD93A9F24C0AA5100E56A97 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7918F423F5E7EA00772FF4 /* ImageView.swift */; };
0AE14F64238315D2005417F8 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE14F63238315D2005417F8 /* TextField.swift */; };
0AE277E925D2ED4B0048A38D /* MultiItemDropdownEndryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE277E825D2ED4B0048A38D /* MultiItemDropdownEndryField.swift */; };
0AE277EC25D2EE310048A38D /* MultiItemDropdownEndryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE277EB25D2EE310048A38D /* MultiItemDropdownEndryFieldModel.swift */; };
0AE98BAF23FEF956004C5109 /* ExternalLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BAE23FEF956004C5109 /* ExternalLink.swift */; };
0AE98BB323FF0934004C5109 /* ExternalLinkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BB223FF0934004C5109 /* ExternalLinkModel.swift */; };
0AE98BB523FF18D2004C5109 /* Arrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BB423FF18D2004C5109 /* Arrow.swift */; };
@ -659,6 +661,8 @@
0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateDropdownEntryField.swift; sourceTree = "<group>"; };
0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemDropdownEntryField.swift; sourceTree = "<group>"; };
0AE14F63238315D2005417F8 /* TextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = "<group>"; };
0AE277E825D2ED4B0048A38D /* MultiItemDropdownEndryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiItemDropdownEndryField.swift; sourceTree = "<group>"; };
0AE277EB25D2EE310048A38D /* MultiItemDropdownEndryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiItemDropdownEndryFieldModel.swift; sourceTree = "<group>"; };
0AE98BAE23FEF956004C5109 /* ExternalLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExternalLink.swift; sourceTree = "<group>"; };
0AE98BB223FF0934004C5109 /* ExternalLinkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExternalLinkModel.swift; sourceTree = "<group>"; };
0AE98BB423FF18D2004C5109 /* Arrow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arrow.swift; sourceTree = "<group>"; };
@ -2047,6 +2051,8 @@
0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */,
0A25209724645B76000FA9F6 /* TextViewEntryFieldModel.swift */,
0A25209524645AFD000FA9F6 /* TextViewEntryField.swift */,
0AE277EB25D2EE310048A38D /* MultiItemDropdownEndryFieldModel.swift */,
0AE277E825D2ED4B0048A38D /* MultiItemDropdownEndryField.swift */,
);
path = TextFields;
sourceTree = "<group>";
@ -2452,6 +2458,7 @@
D264FAAA2440F97600D98315 /* CollectionView.swift in Sources */,
AAC23FAD24D92A0D009208DF /* ListThreeColumnSpeedTestModel.swift in Sources */,
BBC0C4FF24811DCA0087C44F /* TagModel.swift in Sources */,
0AE277EC25D2EE310048A38D /* MultiItemDropdownEndryFieldModel.swift in Sources */,
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */,
3265B30424BCA749000D154B /* HeadersH1NoButtonsBodyText.swift in Sources */,
AAA7CD69250641F90045B959 /* HeartModel.swift in Sources */,
@ -2466,6 +2473,7 @@
D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */,
94382086243238D100B43AF3 /* WebViewModel.swift in Sources */,
D28764F9245A327200CB882D /* TwoLinkView.swift in Sources */,
0AE277E925D2ED4B0048A38D /* MultiItemDropdownEndryField.swift in Sources */,
D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */,
0A6682B5243769C700AD3CA1 /* TextView.swift in Sources */,
D224799B231965AD003FCCF9 /* AccordionMoleculeTableViewCell.swift in Sources */,

95
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
View File

@ -12,37 +12,24 @@ public typealias TextFieldAndPickerDelegate = (UITextFieldDelegate & UIPickerVie
open class ItemDropdownEntryField: BaseDropdownEntryField {
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
open var pickerView: UIPickerView?
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
/// Datasource of the picker view.
open var pickerComponents: [[String]] {
dropdownModel?.options ?? [[]]
}
open var pickerData: [String] = []
open var pickerView: UIPickerView?
/// When selecting for first responder, allow initial selected value to appear in empty text field.
public var setInitialValueInTextField = true
/// Closure passed here will run as picker changes items.
public var observeDropdownChange: ((String, String) -> ())?
public var observeDropdownChange: ((String, String)->())?
/// Closure passed here will run upon dismissing the selection picker.
public var observeDropdownSelection: ((String) -> ())?
public var observeDropdownSelection: ((String)->())?
public var dropdownModel: ItemDropdownEntryFieldModel? {
model as? ItemDropdownEntryFieldModel
}
/// The number of components available
public var componentCount: Int {
pickerComponents.count
public var itemDropdownEntryFieldModel: ItemDropdownEntryFieldModel? {
return model as? ItemDropdownEntryFieldModel
}
//--------------------------------------------------
@ -57,6 +44,11 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
self.init(frame: .zero)
}
@objc public convenience init(pickerData: [String]) {
self.init(frame: .zero)
self.pickerData = pickerData
}
@objc required public init?(coder: NSCoder) {
fatalError("ItemDropdownEntryField init(coder:) has not been implemented")
}
@ -87,89 +79,66 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
/// Sets the textField with the first value of the available picker data.
@objc private func setInitialValueFromPicker() {
guard setInitialValueInTextField,
!pickerComponents.isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
guard !pickerData.isEmpty else { return }
observeDropdownChange?(text ?? "", rowText)
text = rowText
for component in 0..<componentCount {
let pickerIndex = pickerView?.selectedRow(inComponent: component)
dropdownModel?.selectedIndicies[component] = pickerIndex
if setInitialValueInTextField, let pickerIndex = pickerView?.selectedRow(inComponent: 0) {
observeDropdownChange?(text ?? "", pickerData[pickerIndex])
text = pickerData[pickerIndex]
itemDropdownEntryFieldModel?.selectedIndex = pickerIndex
}
}
//--------------------------------------------------
// MARK: - TextField Observation
//--------------------------------------------------
/// Observing action of the textfield for initial interaction with the picker.
@objc override func startEditing() {
super.startEditing()
setInitialValueFromPicker()
}
/// Observing action for when the user has ended inputting with the picker.
@objc override func endInputing() {
super.endInputing()
guard !pickerComponents.isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
guard !pickerData.isEmpty else { return }
observeDropdownSelection?(rowText)
if let pickerIndex = pickerView?.selectedRow(inComponent: 0) {
observeDropdownSelection?(pickerData[pickerIndex])
}
}
//--------------------------------------------------
// MARK: - MoleculeViewProtocol
//--------------------------------------------------
public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.set(with: model, delegateObject, additionalData)
guard let model = model as? ItemDropdownEntryFieldModel else { return }
pickerData = model.options
setPickerDelegates(delegate: self)
if let pickerView = pickerView {
for (component, index) in model.selectedIndicies {
self.pickerView(pickerView, didSelectRow: index, inComponent: component)
}
if let pickerView = pickerView, let index = model.selectedIndex {
self.pickerView(pickerView, didSelectRow: index, inComponent: 0)
}
}
}
// MARK:- Picker Delegate
// MARK:- Base Picker Delegate
extension ItemDropdownEntryField: UIPickerViewDelegate, UIPickerViewDataSource {
@objc public func numberOfComponents(in pickerView: UIPickerView) -> Int { componentCount }
@objc public func numberOfComponents(in pickerView: UIPickerView) -> Int { 1 }
@objc public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
pickerComponents[component].count
pickerData.count
}
@objc public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
guard !pickerData.isEmpty else { return nil }
guard !pickerComponents.isEmpty,
!pickerComponents[component].isEmpty
else { return nil }
return pickerComponents[component][row]
return pickerData[row]
}
@objc public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
guard !pickerData.isEmpty else { return }
guard !pickerComponents.isEmpty,
!pickerComponents[component].isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
observeDropdownChange?(text ?? "", rowText)
text = rowText
dropdownModel?.selectedIndicies[component] = row
observeDropdownChange?(text ?? "", pickerData[row])
text = pickerData[row]
itemDropdownEntryFieldModel?.selectedIndex = row
}
}

66
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
View File

@ -13,46 +13,15 @@
public override class var identifier: String { "dropDown" }
public var options: [[String]] = [[]]
public var selectedIndicies: [Int: Int] = [:]
@available(*, deprecated, message: "Here for backwards compatibility for when this options was a single array.")
public var options: [String] = []
public var selectedIndex: Int?
//--------------------------------------------------
// MARK: - Validation
//--------------------------------------------------
public override func formFieldValue() -> AnyHashable? {
guard !options.isEmpty,
let index = selectedIndex
else { return nil }
guard !options.isEmpty && !selectedIndicies.isEmpty else { return nil }
return selectedRowText
}
/// A string of the picker row concatenated by whitespace.
public var selectedRowText: String {
var text = ""
for i in 0..<options.count {
let pickerIndex = selectedIndicies[i] ?? 0
text += options[i][pickerIndex] + (i == options.count - 1 ? "" : " ")
}
return text
}
public var selectedIndiciesArray: [Int] {
var indexArray: [Int] = []
for i in 0..<selectedIndicies.count {
guard let selectIndex = selectedIndicies[i] else { return [] }
indexArray.append(selectIndex)
}
return indexArray
return options[index]
}
//--------------------------------------------------
@ -61,10 +30,9 @@
private enum CodingKeys: String, CodingKey {
case options
case selectedIndex // Deprecated: for backwards compatability
case selectedIndicies
case selectedIndex
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
@ -73,25 +41,14 @@
try super.init(from: decoder)
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
if let singleOptions = try? typeContainer.decodeIfPresent([String].self, forKey: .options) {
options = [singleOptions]
} else {
options = try typeContainer.decode([[String]].self, forKey: .options)
}
options = try typeContainer.decode([String].self, forKey: .options)
if let selectedIndex = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex) {
self.selectedIndicies[0] = selectedIndex
self.selectedIndex = selectedIndex
}
if let index = self.selectedIndicies[0] {
if let index = selectedIndex {
baseValue = options.indices.contains(index) ? options[index] : nil
} else if let indicies = try typeContainer.decodeIfPresent([Int].self, forKey: .selectedIndicies) {
for (component, index) in indicies.enumerated() {
self.selectedIndicies[component] = index
}
baseValue = selectedRowText
}
}
@ -100,6 +57,5 @@
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(options, forKey: .options)
try container.encodeIfPresent(options, forKey: .selectedIndex)
try container.encode(selectedIndiciesArray, forKey: .selectedIndicies)
}
}

210
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEndryField.swift Normal file
View File

@ -0,0 +1,210 @@
//
// MultiItemDropdownEndryField.swift
// MVMCoreUI
//
// Created by Kevin Christiano on 2/9/21.
// Copyright © 2021 Verizon Wireless. All rights reserved.
//
import Foundation
class MultiItemDropdownEndryField {
}
/*
//
// ItemDropdownEntryField.swift
// MVMCoreUI
//
// Created by Kevin Christiano on 11/14/19.
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
import UIKit
public typealias TextFieldAndPickerDelegate = (UITextFieldDelegate & UIPickerViewDelegate & UIPickerViewDataSource)
open class ItemDropdownEntryField: BaseDropdownEntryField {
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
open var pickerView: UIPickerView?
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
/// Datasource of the picker view.
open var pickerComponents: [[String]] {
dropdownModel?.options ?? [[]]
}
/// When selecting for first responder, allow initial selected value to appear in empty text field.
public var setInitialValueInTextField = true
/// Closure passed here will run as picker changes items.
public var observeDropdownChange: ((String, String) -> ())?
/// Closure passed here will run upon dismissing the selection picker.
public var observeDropdownSelection: ((String) -> ())?
public var dropdownModel: ItemDropdownEntryFieldModel? {
model as? ItemDropdownEntryFieldModel
}
/// The number of components available
public var componentCount: Int {
pickerComponents.count
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
@objc public override init(frame: CGRect) {
super.init(frame: frame)
}
@objc public convenience init() {
self.init(frame: .zero)
}
@objc required public init?(coder: NSCoder) {
fatalError("ItemDropdownEntryField init(coder:) has not been implemented")
}
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.init(model: model, delegateObject, additionalData)
}
//--------------------------------------------------
// MARK: - Methods
//--------------------------------------------------
@objc open override func setupFieldContainerContent(_ container: UIView) {
super.setupFieldContainerContent(container)
pickerView = UIPickerView.addPicker(to: textField, delegate: self, dismissAction: #selector(dismissFieldInput))
textField.hideBlinkingCaret = true
textField.autocorrectionType = .no
uiTextFieldDelegate = self
}
@objc public func setPickerDelegates(delegate: UIPickerViewDelegate & UIPickerViewDataSource) {
pickerView?.delegate = delegate
pickerView?.dataSource = delegate
}
/// Sets the textField with the first value of the available picker data.
@objc private func setInitialValueFromPicker() {
guard setInitialValueInTextField,
!pickerComponents.isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
observeDropdownChange?(text ?? "", rowText)
text = rowText
for component in 0..<componentCount {
let pickerIndex = pickerView?.selectedRow(inComponent: component)
dropdownModel?.selectedIndicies[component] = pickerIndex
}
}
//--------------------------------------------------
// MARK: - TextField Observation
//--------------------------------------------------
/// Observing action of the textfield for initial interaction with the picker.
@objc override func startEditing() {
super.startEditing()
setInitialValueFromPicker()
}
/// Observing action for when the user has ended inputting with the picker.
@objc override func endInputing() {
super.endInputing()
guard !pickerComponents.isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
observeDropdownSelection?(rowText)
}
//--------------------------------------------------
// MARK: - MoleculeViewProtocol
//--------------------------------------------------
public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.set(with: model, delegateObject, additionalData)
guard let model = model as? ItemDropdownEntryFieldModel else { return }
setPickerDelegates(delegate: self)
if let pickerView = pickerView {
for (component, index) in model.selectedIndicies {
self.pickerView(pickerView, didSelectRow: index, inComponent: component)
}
}
}
}
// MARK:- Picker Delegate
extension ItemDropdownEntryField: UIPickerViewDelegate, UIPickerViewDataSource {
@objc public func numberOfComponents(in pickerView: UIPickerView) -> Int { componentCount }
@objc public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
pickerComponents[component].count
}
@objc public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
guard !pickerComponents.isEmpty,
!pickerComponents[component].isEmpty
else { return nil }
return pickerComponents[component][row]
}
@objc public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
guard !pickerComponents.isEmpty,
!pickerComponents[component].isEmpty,
let rowText = dropdownModel?.selectedRowText
else { return }
observeDropdownChange?(text ?? "", rowText)
text = rowText
dropdownModel?.selectedIndicies[component] = row
}
}
// MARK: - Accessibility
extension ItemDropdownEntryField {
@objc open override func setAccessibilityString(_ accessibilityString: String?) {
var accessibilityString = accessibilityString ?? ""
if let textPickerItem = MVMCoreUIUtility.hardcodedString(withKey: "textfield_picker_item") {
accessibilityString += textPickerItem
}
textField.accessibilityLabel = "\(accessibilityString) \(textField.isEnabled ? "" : MVMCoreUIUtility.hardcodedString(withKey: "textfield_disabled_state") ?? "")"
}
}
*/

116
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEndryFieldModel.swift Normal file
View File

@ -0,0 +1,116 @@
//
// MultiItemDropdownEndryFieldModel.swift
// MVMCoreUI
//
// Created by Kevin Christiano on 2/9/21.
// Copyright © 2021 Verizon Wireless. All rights reserved.
//
import Foundation
class MultiItemDropdownEndryFieldModel {
}
/*
@objcMembers open class ItemDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
public override class var identifier: String { "dropDown" }
public var options: [[String]] = [[]]
public var selectedIndicies: [Int: Int] = [:]
@available(*, deprecated, message: "Here for backwards compatibility for when this options was a single array.")
public var selectedIndex: Int?
//--------------------------------------------------
// MARK: - Validation
//--------------------------------------------------
public override func formFieldValue() -> AnyHashable? {
guard !options.isEmpty && !selectedIndicies.isEmpty else { return nil }
return selectedRowText
}
/// A string of the picker row concatenated by whitespace.
public var selectedRowText: String {
var text = ""
for i in 0..<options.count {
let pickerIndex = selectedIndicies[i] ?? 0
text += options[i][pickerIndex] + (i == options.count - 1 ? "" : " ")
}
return text
}
public var selectedIndiciesArray: [Int] {
var indexArray: [Int] = []
for i in 0..<selectedIndicies.count {
guard let selectIndex = selectedIndicies[i] else { return [] }
indexArray.append(selectIndex)
}
return indexArray
}
//--------------------------------------------------
// MARK: - Keys
//--------------------------------------------------
private enum CodingKeys: String, CodingKey {
case options
case selectedIndex // Deprecated: for backwards compatability
case selectedIndicies
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
required public init(from decoder: Decoder) throws {
try super.init(from: decoder)
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
if let singleOptions = try? typeContainer.decodeIfPresent([String].self, forKey: .options) {
options = [singleOptions]
} else {
options = try typeContainer.decode([[String]].self, forKey: .options)
}
if let selectedIndex = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex) {
self.selectedIndicies[0] = selectedIndex
}
if let index = self.selectedIndicies[0] {
baseValue = options.indices.contains(index) ? options[index] : nil
} else if let indicies = try typeContainer.decodeIfPresent([Int].self, forKey: .selectedIndicies) {
for (component, index) in indicies.enumerated() {
self.selectedIndicies[component] = index
}
baseValue = selectedRowText
}
}
public override func encode(to encoder: Encoder) throws {
try super.encode(to: encoder)
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(options, forKey: .options)
try container.encodeIfPresent(options, forKey: .selectedIndex)
try container.encode(selectedIndiciesArray, forKey: .selectedIndicies)
}
}
*/

15
MVMCoreUI/Atomic/Molecules/Items/DropDownFilterTableViewCell.swift
View File

@ -12,7 +12,6 @@ import UIKit
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
let dropDown = ItemDropdownEntryField()
var delegateObject: MVMCoreUIDelegateObject?
var previousIndex = NSNotFound
@ -23,16 +22,16 @@ import UIKit
override public func setupView() {
super.setupView()
addMolecule(dropDown)
dropDown.observeDropdownChange = { [weak self] oldValue, newValue in
guard oldValue != newValue,
let self = self,
let index = self.dropDown.pickerComponents.first?.firstIndex(of: newValue),
let model = self.listItemModel as? DropDownListItemModel
else { return }
guard newValue != oldValue,
let self = self,
let index = self.dropDown.pickerData.firstIndex(of: newValue),
let model = self.listItemModel as? DropDownListItemModel
else { return }
if self.previousIndex != NSNotFound {
self.delegateObject?.moleculeDelegate?.removeMolecules(model.molecules[self.previousIndex], animation: .fade)
}