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

Merge branch 'revert-51315abf' into 'release/11_4_0'

Browse Source 
Revert "Merge branch 'bugfix/PRODDEF-24073' into 'release/11_4_0'"

### Summary
Revert another miss merge.

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1076
This commit is contained in:
Pfeil, Scott Robert 2024-03-15 21:09:25 +00:00
commit b021e14030
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
View File

@ -43,6 +43,7 @@
addSubview(label) addSubview(label)
label.text = "" label.text = ""
checkbox.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true checkbox.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
checkboxBottomConstraint = layoutMarginsGuide.bottomAnchor.constraint(equalTo: checkbox.bottomAnchor) checkboxBottomConstraint = layoutMarginsGuide.bottomAnchor.constraint(equalTo: checkbox.bottomAnchor)
@ -63,8 +64,9 @@
bottomLabelConstraint.isActive = true bottomLabelConstraint.isActive = true
alignCheckbox(.center) alignCheckbox(.center)
isAccessibilityElement = false isAccessibilityElement = true
accessibilityElements = [checkbox, label] accessibilityHint = checkbox.accessibilityHint
accessibilityTraits = checkbox.accessibilityTraits
observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
self?.updateAccessibilityLabel() self?.updateAccessibilityLabel()
} }
@ -137,9 +139,6 @@
open func updateAccessibilityLabel() { open func updateAccessibilityLabel() {
checkbox.updateAccessibilityLabel() checkbox.updateAccessibilityLabel()
accessibilityLabel = [checkbox.accessibilityLabel, label.text].compactMap { $0 }.joined(separator: ",")
if let text = label.text {
checkbox.accessibilityLabel?.append(", \(text)")
}
} }
} }

3
MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
View File

@ -209,9 +209,6 @@ public typealias ActionBlock = () -> ()
if let newFont = UIFont(name: fontName, size: fontSize ?? standardFontSize) { if let newFont = UIFont(name: fontName, size: fontSize ?? standardFontSize) {
font = newFont font = newFont
} }
} else if let fontSize = viewModel.fontSize {
standardFontSize = fontSize
font = textStyle.font.withSize(fontSize)
} }
if let color = viewModel.textColor { if let color = viewModel.textColor {