Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
a91a3e7f
Unverified
Commit
a91a3e7f
authored
May 19, 2019
by
Daniel Jonathan
Committed by
GitHub
May 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1231 from OrkhanAlikhanov/storyboard-fix
Storyboard hot fixes
parents
3e263783
ccaf29fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
Sources/iOS/Button/Button.swift
+2
-1
Sources/iOS/Text/TextField.swift
+5
-1
No files found.
Sources/iOS/Button/Button.swift
View file @
a91a3e7f
...
...
@@ -179,7 +179,9 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/
public
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
/// Set these here to avoid overriding storyboard values
tintColor
=
Color
.
blue
.
base
titleLabel
?
.
font
=
Theme
.
font
.
regular
(
with
:
fontSize
)
prepare
()
}
...
...
@@ -274,7 +276,6 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/
open
func
prepare
()
{
contentScaleFactor
=
Screen
.
scale
titleLabel
?
.
font
=
Theme
.
font
.
regular
(
with
:
fontSize
)
prepareVisualLayer
()
preparePulse
()
applyCurrentTheme
()
...
...
Sources/iOS/Text/TextField.swift
View file @
a91a3e7f
...
...
@@ -205,6 +205,8 @@ open class TextField: UITextField, Themeable {
@IBInspectable
open
var
placeholderActiveColor
=
Color
.
blue
.
base
{
didSet
{
/// Keep tintColor update here. See #1229
tintColor
=
placeholderActiveColor
updatePlaceholderLabelColor
()
}
}
...
...
@@ -397,6 +399,9 @@ open class TextField: UITextField, Themeable {
public
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
prepare
()
/// Fire didSet here to update tintColor
placeholderActiveColor
=
{
placeholderActiveColor
}()
}
open
override
func
layoutSubviews
()
{
...
...
@@ -533,7 +538,6 @@ fileprivate extension TextField {
/// Updates the placeholderLabel text color.
func
updatePlaceholderLabelColor
()
{
tintColor
=
placeholderActiveColor
placeholderLabel
.
textColor
=
isEditing
?
placeholderActiveColor
:
placeholderNormalColor
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment