Commit a91a3e7f by Daniel Jonathan Committed by GitHub

Merge pull request #1231 from OrkhanAlikhanov/storyboard-fix

Storyboard hot fixes
parents 3e263783 ccaf29fa
...@@ -179,7 +179,9 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable { ...@@ -179,7 +179,9 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/ */
public override init(frame: CGRect) { public override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
/// Set these here to avoid overriding storyboard values
tintColor = Color.blue.base tintColor = Color.blue.base
titleLabel?.font = Theme.font.regular(with: fontSize)
prepare() prepare()
} }
...@@ -274,7 +276,6 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable { ...@@ -274,7 +276,6 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/ */
open func prepare() { open func prepare() {
contentScaleFactor = Screen.scale contentScaleFactor = Screen.scale
titleLabel?.font = Theme.font.regular(with: fontSize)
prepareVisualLayer() prepareVisualLayer()
preparePulse() preparePulse()
applyCurrentTheme() applyCurrentTheme()
......
...@@ -205,6 +205,8 @@ open class TextField: UITextField, Themeable { ...@@ -205,6 +205,8 @@ open class TextField: UITextField, Themeable {
@IBInspectable @IBInspectable
open var placeholderActiveColor = Color.blue.base { open var placeholderActiveColor = Color.blue.base {
didSet { didSet {
/// Keep tintColor update here. See #1229
tintColor = placeholderActiveColor
updatePlaceholderLabelColor() updatePlaceholderLabelColor()
} }
} }
...@@ -397,6 +399,9 @@ open class TextField: UITextField, Themeable { ...@@ -397,6 +399,9 @@ open class TextField: UITextField, Themeable {
public override init(frame: CGRect) { public override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
prepare() prepare()
/// Fire didSet here to update tintColor
placeholderActiveColor = { placeholderActiveColor }()
} }
open override func layoutSubviews() { open override func layoutSubviews() {
...@@ -533,7 +538,6 @@ fileprivate extension TextField { ...@@ -533,7 +538,6 @@ fileprivate extension TextField {
/// Updates the placeholderLabel text color. /// Updates the placeholderLabel text color.
func updatePlaceholderLabelColor() { func updatePlaceholderLabelColor() {
tintColor = placeholderActiveColor
placeholderLabel.textColor = isEditing ? placeholderActiveColor : placeholderNormalColor placeholderLabel.textColor = isEditing ? placeholderActiveColor : placeholderNormalColor
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment