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

initial generic entryfield

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-07-30 12:24:14 -05:00
parent 06b0c80a58
commit c326213302
8 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VDS/Components/DatePicker/DatePicker.swift
View File

@ -6,7 +6,7 @@ import Combine
/// A dropdown select is an expandable menu of predefined options that allows a customer to make a single selection.
@objcMembers
@objc(VDSDatePicker)
open class DatePicker: EntryFieldBase {
open class DatePicker: EntryFieldBase<String> {
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------

2
VDS/Components/DropdownSelect/DropdownSelect.swift
View File

@ -13,7 +13,7 @@ import Combine
/// A dropdown select is an expandable menu of predefined options that allows a customer to make a single selection.
@objcMembers
@objc(VDSDropdownSelect)
open class DropdownSelect: EntryFieldBase {
open class DropdownSelect: EntryFieldBase<String> {
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------

32
VDS/Components/InputStepper/InputStepper.swift
View File

@ -10,9 +10,10 @@ import UIKit
import VDSCoreTokens
import Combine
/// A stepper is a two-segment control that people use to increase or decrease an incremental value.
/// A stepper is a two-segment control that people use to increase or decrease an incremental value.'
@objcMembers
@objc(VDSInputStepper)
open class InputStepper: EntryFieldBase {
open class InputStepper: EntryFieldBase<Int> {
//--------------------------------------------------
// MARK: - Initializers
@ -70,6 +71,8 @@ open class InputStepper: EntryFieldBase {
/// Allows an id to be passed to input stepper.
open var id: Int? { didSet { setNeedsUpdate() } }
open override var value: Int? { return defaultValue }
/// Maximum value of the input stepper, defaults to '99'.
open var maxValue: Int? = 99 {
didSet {
@ -101,20 +104,9 @@ open class InputStepper: EntryFieldBase {
/// Accepts any text or character to appear next to input stepper value.
open var trailingText: String? { didSet { setNeedsUpdate() } }
/// Value for the textField
open override var value: String? {
return nil
}
//--------------------------------------------------
// MARK: - Private Properties
//--------------------------------------------------
/// Default Int value of the input stepper, defaults to '0'.
internal var defaultIntValue: Int {
guard let intValue = defaultValue as? Int else { return 0 }
return intValue
}
/// This is the view that will be wrapped with the border for userInteraction.
/// The only subview of this view is the stepperStackView.
internal var stepperContainerView = View().with {
@ -186,6 +178,7 @@ open class InputStepper: EntryFieldBase {
super.setup()
// Set initial states
defaultValue = 0
containerView.isEnabled = false
statusIcon.isHidden = true
@ -227,7 +220,7 @@ open class InputStepper: EntryFieldBase {
statusIcon.isHidden = true
// Update label text, style, color, ande surface.
textLabel.text = String(defaultIntValue) + " " + (trailingText ?? "")
textLabel.text = "\(value ?? 0) " + (trailingText ?? "")
textLabel.textStyle = size == .large ? .boldBodyLarge : .boldBodySmall
textLabel.textColorConfiguration = !isEnabled ? labelDisabledColorConfiguration.eraseToAnyColorable() : labelColorConfiguration.eraseToAnyColorable()
textLabel.surface = surface
@ -275,6 +268,7 @@ open class InputStepper: EntryFieldBase {
controlWidthPercentage = nil
widthPercentage = nil
id = nil
defaultValue = 0
minValue = 0
maxValue = 99
trailingText = nil
@ -314,18 +308,18 @@ open class InputStepper: EntryFieldBase {
//--------------------------------------------------
internal func checkDefaultValue() {
if let minValue, let maxValue {
defaultValue = defaultIntValue > maxValue ? maxValue : defaultIntValue < minValue ? minValue : defaultIntValue
defaultValue = defaultValue! > maxValue ? maxValue : defaultValue! < minValue ? minValue : defaultValue!
}
}
internal func decrementButtonClick() {
defaultValue = defaultIntValue - 1
defaultValue = defaultValue! - 1
checkDefaultValue()
updateButtonStates()
}
internal func incrementButtonClick() {
defaultValue = defaultIntValue + 1
defaultValue = defaultValue! + 1
checkDefaultValue()
updateButtonStates()
}
@ -340,8 +334,8 @@ open class InputStepper: EntryFieldBase {
decrementButton.isEnabled = false
incrementButton.isEnabled = false
} else {
decrementButton.isEnabled = defaultIntValue > minValue ?? 0 ? true : false
incrementButton.isEnabled = defaultIntValue < maxValue ?? 99 ? true : false
decrementButton.isEnabled = defaultValue! > minValue ?? 0 ? true : false
incrementButton.isEnabled = defaultValue! < maxValue ?? 99 ? true : false
}
}

19
VDS/Components/TextFields/EntryFieldBase.swift
View File

@ -11,10 +11,7 @@ import VDSCoreTokens
import Combine
/// Base Class used to build out a Input controls.
@objcMembers
@objc(VDSEntryField)
open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
open class EntryFieldBase<ValueType>: Control, Changeable, FormFieldInternalValidatable {
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
@ -229,11 +226,11 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
open var inputId: String? { didSet { setNeedsUpdate() } }
/// The text of this textField.
open var value: String? {
open var value: ValueType? {
get { fatalError("must be read from subclass")}
}
open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } }
open var defaultValue: ValueType? { didSet { setNeedsUpdate() } }
open var isRequired: Bool = false { didSet { setNeedsUpdate() } }
@ -245,7 +242,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
}
}
open var rules = [AnyRule<String>]()
open var rules = [AnyRule<ValueType>]()
open var accessibilityHintText: String = "Double tap to open"
@ -342,8 +339,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
}
containerView.bridge_accessibilityValueBlock = { [weak self] in
guard let self else { return "" }
return value
guard let self, let value else { return "" }
return "\(value)"
}
statusIcon.bridge_accessibilityLabelBlock = { [weak self] in
@ -523,8 +520,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
//--------------------------------------------------
internal func updateRules() {
rules.removeAll()
if isRequired && useRequiredRule {
let rule = RequiredRule()
if isRequired && useRequiredRule && ValueType.self == String.self {
let rule = RequiredRule<ValueType>()
if let errorText, !errorText.isEmpty {
rule.errorMessage = errorText
} else if let labelText{

2
VDS/Components/TextFields/InputField/InputField.swift
View File

@ -15,7 +15,7 @@ import Combine
/// dates and security codes in their correct formats.
@objcMembers
@objc(VDSInputField)
open class InputField: EntryFieldBase {
open class InputField: EntryFieldBase<String> {
//--------------------------------------------------
// MARK: - Initializers

8
VDS/Components/TextFields/Rules/RequiredRule.swift
View File

@ -7,12 +7,14 @@
import Foundation
class RequiredRule: Rule {
class RequiredRule<ValueType>: Rule {
var maxLength: Int?
var errorMessage: String = "This field is required."
func isValid(value: String?) -> Bool {
guard let value, !value.isEmpty, value.count > 0 else { return false }
func isValid(value: ValueType?) -> Bool {
guard let value,
!"\(value)".isEmpty,
"\(value)".count > 0 else { return false }
return true
}
}

2
VDS/Components/TextFields/TextArea/TextArea.swift
View File

@ -14,7 +14,7 @@ import Combine
/// Use a text area when you want customers to enter text that’s longer than a single line.
@objcMembers
@objc(VDSTextArea)
open class TextArea: EntryFieldBase {
open class TextArea: EntryFieldBase<String> {
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------

4
VDS/Protocols/FormFieldable.swift
View File

@ -8,7 +8,7 @@
import Foundation
/// Protocol used for a FormField object.
public protocol FormFieldable {
public protocol FormFieldable<ValueType> {
associatedtype ValueType = AnyHashable
/// Unique Id for the Form Field object within a Form.
@ -19,7 +19,7 @@ public protocol FormFieldable {
}
/// Protocol for FormFieldable that require internal validation.
public protocol FormFieldInternalValidatable: FormFieldable, Errorable {
public protocol FormFieldInternalValidatable<ValueType>: FormFieldable, Errorable {
/// Rules that drive the validator
var rules: [AnyRule<ValueType>] { get set }