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

Merge branch 'mbruce/bugfix' into 'develop'

Browse Source 
Merge 1.0.64

See merge request BPHV_MIPS/vds_ios!232
This commit is contained in:
Bruce, Matt R 2024-05-23 21:12:13 +00:00
commit 33dac6848c
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VDS.xcodeproj/project.pbxproj
View File

@ -1509,7 +1509,7 @@
BUILD_LIBRARY_FOR_DISTRIBUTION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 63; CURRENT_PROJECT_VERSION = 64;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
@ -1546,7 +1546,7 @@
BUILD_LIBRARY_FOR_DISTRIBUTION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 63; CURRENT_PROJECT_VERSION = 64;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;

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

@ -222,11 +222,11 @@ open class DropdownSelect: EntryFieldBase {
updatedLabelText = showInlineLabel ? "" : updatedLabelText updatedLabelText = showInlineLabel ? "" : updatedLabelText
if let oldText = updatedLabelText, !isRequired, !oldText.hasSuffix("Optional") { if let oldText = updatedLabelText, !isRequired, !oldText.hasSuffix("Optional") {
let optionColorAttr = ColorLabelAttribute(location: oldText.count + 2, let optionColorAttr = ColorLabelAttribute(location: oldText.count + 1,
length: 8, length: 8,
color: secondaryColorConfiguration.getColor(self)) color: secondaryColorConfiguration.getColor(self))
updatedLabelText = showInlineLabel ? "Optional" : "\(oldText) Optional" updatedLabelText = showInlineLabel ? "Optional" : "\(oldText) Optional"
attributes.append(optionColorAttr) attributes.append(optionColorAttr)
} }

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

@ -43,7 +43,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
internal let mainStackView = UIStackView().with { internal let mainStackView = UIStackView().with {
$0.axis = .vertical $0.axis = .vertical
$0.alignment = .fill $0.alignment = .fill
$0.spacing = 8 $0.spacing = VDSLayout.space1X
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false
} }
@ -51,7 +51,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
$0.axis = .vertical $0.axis = .vertical
$0.alignment = .fill $0.alignment = .fill
$0.distribution = .fill $0.distribution = .fill
$0.spacing = 8 $0.spacing = VDSLayout.space2X
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false
} }
@ -285,7 +285,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
// Add arranged subviews to mainStackView // Add arranged subviews to mainStackView
mainStackView.addArrangedSubview(titleLabel) mainStackView.addArrangedSubview(titleLabel)
mainStackView.addArrangedSubview(contentStackView) mainStackView.addArrangedSubview(contentStackView)
// Initial position of the helper label // Initial position of the helper label
updateHelperTextPosition() updateHelperTextPosition()
@ -360,13 +360,13 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
//dealing with the "Optional" addition to the text //dealing with the "Optional" addition to the text
if let oldText = updatedLabelText, !isRequired, !oldText.hasSuffix("Optional") { if let oldText = updatedLabelText, !isRequired, !oldText.hasSuffix("Optional") {
if isEnabled { if isEnabled {
let optionColorAttr = ColorLabelAttribute(location: oldText.count + 2, let optionColorAttr = ColorLabelAttribute(location: oldText.count + 1,
length: 8, length: 8,
color: VDSColor.elementsSecondaryOnlight) color: VDSColor.elementsSecondaryOnlight)
attributes.append(optionColorAttr) attributes.append(optionColorAttr)
} }
updatedLabelText = "\(oldText) Optional" updatedLabelText = "\(oldText) Optional"
} }
if let tooltipModel { if let tooltipModel {

9
VDS/Components/TextFields/InputField/FieldTypes/SecurityCode.swift
View File

@ -42,21 +42,21 @@ extension InputField {
let surface = inputField.surface let surface = inputField.surface
var contentView: UIView var contentView: UIView
var code3Label = Label().with { let code3Label = Label().with {
$0.text = "Most credit or debit cards have a 3-digit security code on the back." $0.text = "Most credit or debit cards have a 3-digit security code on the back."
$0.isEnabled = true $0.isEnabled = true
$0.surface = surface $0.surface = surface
} }
var code4Label = Label().with { let code4Label = Label().with {
$0.text = "American Express cards have a 4-digit code on the front." $0.text = "American Express cards have a 4-digit code on the front."
$0.isEnabled = true $0.isEnabled = true
$0.surface = surface $0.surface = surface
} }
var code3ImageView = UIImageView().with { let code3ImageView = UIImageView().with {
$0.image = BundleManager.shared.image(for: "securityCode\(surface == .dark ? "-inverted": "")") $0.image = BundleManager.shared.image(for: "securityCode\(surface == .dark ? "-inverted": "")")
} }
var code4ImageView = UIImageView().with { let code4ImageView = UIImageView().with {
$0.image = BundleManager.shared.image(for: "securityCodeAmex\(surface == .dark ? "-inverted": "")") $0.image = BundleManager.shared.image(for: "securityCodeAmex\(surface == .dark ? "-inverted": "")")
} }
@ -84,7 +84,6 @@ extension InputField {
} }
} }
let title: String = inputField.cardType.rawValue
switch inputField.cardType { switch inputField.cardType {
case .amex: case .amex:
contentView = view4() contentView = view4()

5
VDS/SupportingFiles/ReleaseNotes.txt
View File

@ -1,3 +1,8 @@
1.0.64
----------------
- CXTDT-555846 - DropdownSelect - Tooltip Icon Spacing
- CXTDT-555858 - DropdownSSelect - Disabled/required helper text
1.0.63 1.0.63
---------------- ----------------
- CXTDT-555860 - Dropdown Select - Form Elements layout option missing - CXTDT-555860 - Dropdown Select - Form Elements layout option missing