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 
fixed layout issue for entryfield base

See merge request BPHV_MIPS/vds_ios!204
This commit is contained in:
Bruce, Matt R 2024-04-15 18:08:35 +00:00
commit df90e16d58
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
VDS/Components/BadgeIndicator/BadgeIndicator.swift
View File

@ -74,11 +74,11 @@ open class BadgeIndicator: View {
/// Enum type describing size of Badge Indicator. /// Enum type describing size of Badge Indicator.
public enum Size: String, CaseIterable { public enum Size: String, CaseIterable {
case xxlarge = "2XLarge" case xxlarge
case xlarge = "XLarge" case xlarge
case large = "Large" case large
case medium = "Medium" case medium
case small = "Small" case small
/// Dynamic TextStyle for the size. /// Dynamic TextStyle for the size.
public var textStyle: TextStyle { public var textStyle: TextStyle {

2
VDS/Components/Icon/ButtonIcon/ButtonIconBadgeIndicatorModel.swift
View File

@ -61,7 +61,7 @@ extension ButtonIcon {
/// Hide Border that will be used for the badge indicator. /// Hide Border that will be used for the badge indicator.
public var hideBorder: Bool = false public var hideBorder: Bool = false
public init(kind: BadgeIndicator.Kind = .simple, fillColor: BadgeIndicator.FillColor = .red, expandDirection: ExpandDirection = .right, size: BadgeIndicator.Size = .xxlarge, maximumDigits: BadgeIndicator.MaximumDigits = .two, width: CGFloat? = nil, height: CGFloat? = nil, number: Int? = nil, leadingCharacter: String = "", trailingText: String = "", dotSize: CGFloat? = nil, verticalPadding: CGFloat? = nil, horizontalPadding: CGFloat? = nil, hideDot: Bool = false, hideBorder: Bool = false) { public init(kind: BadgeIndicator.Kind = .simple, fillColor: BadgeIndicator.FillColor = .red, expandDirection: ExpandDirection = .right, size: BadgeIndicator.Size = .xxlarge, maximumDigits: BadgeIndicator.MaximumDigits = .two, width: CGFloat? = nil, height: CGFloat? = nil, number: Int? = nil, leadingCharacter: String? = "", trailingText: String? = "", dotSize: CGFloat? = nil, verticalPadding: CGFloat? = nil, horizontalPadding: CGFloat? = nil, hideDot: Bool = false, hideBorder: Bool = false) {
self.kind = kind self.kind = kind
self.fillColor = fillColor self.fillColor = fillColor
self.expandDirection = expandDirection self.expandDirection = expandDirection

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

@ -257,7 +257,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
//add bottomContainerStackView //add bottomContainerStackView
//this is the vertical stack that contains error text, helper text //this is the vertical stack that contains error text, helper text
bottomContainer.addSubview(bottomContainerStackView) bottomContainerView.addSubview(bottomContainerStackView)
bottomContainerStackView.pinToSuperView() bottomContainerStackView.pinToSuperView()
bottomContainerStackView.addArrangedSubview(errorLabel) bottomContainerStackView.addArrangedSubview(errorLabel)
bottomContainerStackView.addArrangedSubview(helperLabel) bottomContainerStackView.addArrangedSubview(helperLabel)

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

@ -44,12 +44,6 @@ open class TextArea: EntryFieldBase {
} }
}() }()
internal var bottomView: UIView = {
return UIView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
}
}()
internal var bottomStackView: UIStackView = { internal var bottomStackView: UIStackView = {
return UIStackView().with { return UIStackView().with {
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false
@ -237,11 +231,9 @@ open class TextArea: EntryFieldBase {
/// Container for the area showing helper text, error text, character count, maximum length value. /// Container for the area showing helper text, error text, character count, maximum length value.
open override func getBottomContainer() -> UIView { open override func getBottomContainer() -> UIView {
bottomView.addSubview(bottomStackView)
bottomStackView.pinToSuperView()
bottomStackView.addArrangedSubview(bottomContainerView) bottomStackView.addArrangedSubview(bottomContainerView)
bottomStackView.addArrangedSubview(characterCounterLabel) bottomStackView.addArrangedSubview(characterCounterLabel)
return bottomView return bottomStackView
} }
/// Used to update any Accessibility properties. /// Used to update any Accessibility properties.