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

Merge branch 'bugfix/correct_toggle' into 'develop'

Browse Source 
correct toggle

See merge request BPHV_MIPS/mvm_core_ui!512
This commit is contained in:
Pfeil, Scott Robert 2020-06-25 11:00:59 -04:00
commit f2c5f9d043
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
View File

@ -62,8 +62,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
didSet { didSet {
isUserInteractionEnabled = isEnabled isUserInteractionEnabled = isEnabled
changeStateNoAnimation(isEnabled ? isOn : false) changeStateNoAnimation(isEnabled ? isOn : false)
backgroundColor = isEnabled ? (isOn ? containerTintColor.on : containerTintColor.off) : disabledTintColor.container setToggleAppearanceFromState()
knobView.backgroundColor = isEnabled ? (isOn ? knobTintColor.on : knobTintColor.off) : disabledTintColor.knob
} }
} }
@ -96,8 +95,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
}, completion: nil) }, completion: nil)
} else { } else {
backgroundColor = isOn ? containerTintColor.on : containerTintColor.off setToggleAppearanceFromState()
knobView.backgroundColor = isOn ? knobTintColor.on : knobTintColor.off
self.constrainKnob() self.constrainKnob()
} }
@ -350,6 +348,12 @@ public typealias ActionBlockConfirmation = () -> (Bool)
// MARK: - Animations // MARK: - Animations
//-------------------------------------------------- //--------------------------------------------------
public func setToggleAppearanceFromState() {
backgroundColor = isEnabled ? isOn ? containerTintColor.on : containerTintColor.off : disabledTintColor.container
knobView.backgroundColor = isEnabled ? isOn ? knobTintColor.on : knobTintColor.off : disabledTintColor.knob
}
public func knobReformAnimation() { public func knobReformAnimation() {
if isAnimated { if isAnimated {