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

Merge branch 'mbruce/bugfixes' into 'develop'

Browse Source 
refactored out canHighlight and added shouldHighlight to be able to override

See merge request BPHV_MIPS/vds_ios!111
This commit is contained in:
Bruce, Matt R 2023-09-14 21:46:10 +00:00
commit fcb8cc3ac7
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
VDS/BaseClasses/Control.swift
View File

@ -60,25 +60,21 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
/// Whether the Control is selected or not. /// Whether the Control is selected or not.
open override var isSelected: Bool { didSet { setNeedsUpdate() } } open override var isSelected: Bool { didSet { setNeedsUpdate() } }
/// Whether the Control can handle the isHighlighted state. /// State of animating isHighlight.
open var canHighlight: Bool = true public var isHighlighting = false
var isHighlightAnimating = false /// Whether the Control should handle the isHighlighted state.
open var shouldHighlight: Bool { isHighlighting == false && onClickSubscriber != nil }
/// Whether the Control is highlighted or not. /// Whether the Control is highlighted or not.
open override var isHighlighted: Bool { open override var isHighlighted: Bool {
didSet { didSet {
if canHighlight && isHighlightAnimating == false && onClickSubscriber != nil { if shouldHighlight {
isHighlightAnimating = true isHighlighting = true
UIView.animate(withDuration: 0.1, animations: { [weak self] in UIView.animate(withDuration: 0.1, animations: { [weak self] in
self?.setNeedsUpdate() self?.setNeedsUpdate()
}) { [weak self] _ in self?.isHighlighting = false
//you update the view since this is typically a quick change })
UIView.animate(withDuration: 0.1, animations: { [weak self] in
self?.setNeedsUpdate()
self?.isHighlightAnimating = false
})
}
} }
} }
} }

4
VDS/Components/Tabs/Tab.swift
View File

@ -86,6 +86,8 @@ extension Tabs {
///Minimum width for the tab ///Minimum width for the tab
open var minWidth: CGFloat = 44.0 { didSet { setNeedsUpdate() } } open var minWidth: CGFloat = 44.0 { didSet { setNeedsUpdate() } }
open override var shouldHighlight: Bool { false }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Configuration // MARK: - Configuration
//-------------------------------------------------- //--------------------------------------------------
@ -129,8 +131,6 @@ extension Tabs {
open override func setup() { open override func setup() {
super.setup() super.setup()
canHighlight = false
addLayoutGuide(layoutGuide) addLayoutGuide(layoutGuide)
addSubview(label) addSubview(label)
accessibilityTraits = .button accessibilityTraits = .button

3
VDS/Components/Toggle/Toggle.swift
View File

@ -166,6 +166,8 @@ open class Toggle: Control, Changeable, FormFieldable {
} }
} }
open override var shouldHighlight: Bool { false }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Overrides // MARK: - Overrides
//-------------------------------------------------- //--------------------------------------------------
@ -181,7 +183,6 @@ open class Toggle: Control, Changeable, FormFieldable {
open override func setup() { open override func setup() {
super.setup() super.setup()
canHighlight = false
isAccessibilityElement = true isAccessibilityElement = true
accessibilityTraits = .button accessibilityTraits = .button
addSubview(label) addSubview(label)