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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui.git into feature/atomic-vds-isEqual

Browse Source 
# Conflicts:
#	MVMCoreUI/Atomic/Atoms/Views/IconModel.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-08-26 14:54:47 -05:00
commit ef7fa4a693
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Atomic/Atoms/Views/Icon.swift
View File

@ -36,6 +36,7 @@ open class Icon: VDS.Icon, VDSMoleculeViewProtocol{
size = viewModel.size size = viewModel.size
customSize = viewModel.customSize customSize = viewModel.customSize
name = viewModel.name name = viewModel.name
isAccessibilityElement = viewModel.isAccessibilityElement ?? true
} }
//-------------------------------------------------- //--------------------------------------------------

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

@ -36,11 +36,14 @@ open class IconModel: MoleculeModelProtocol {
/// A custom size of the icon. /// A custom size of the icon.
public var customSize: Int? public var customSize: Int?
public var isAccessibilityElement: Bool?
open func isEqual(to model: any ModelComparisonProtocol) -> Bool { open func isEqual(to model: any ModelComparisonProtocol) -> Bool {
guard let model = model as? Self else { return false } guard let model = model as? Self else { return false }
return color == model.color return color == model.color
&& size == model.size && size == model.size
&& surface == model.surface && surface == model.surface
&& customSize == model.customSize && customSize == model.customSize
&& isAccessibilityElement == model.isAccessibilityElement
} }
} }

6
MVMCoreUI/Atomic/Protocols/ModelProtocols/AccessibilityModelProtocol.swift
View File

@ -16,6 +16,7 @@ public protocol AccessibilityModelProtocol {
var accessibilityText: String? { get set } var accessibilityText: String? { get set }
var accessibilityValue: String? { get set } var accessibilityValue: String? { get set }
var accessibilityHint: String? { get set } var accessibilityHint: String? { get set }
var isAccessibilityElement: Bool? { get set }
} }
public extension AccessibilityModelProtocol { public extension AccessibilityModelProtocol {
@ -44,4 +45,9 @@ public extension AccessibilityModelProtocol {
get { nil } get { nil }
set {} set {}
} }
var isAccessibilityElement: Bool? {
get { nil }
set { }
}
} }