forked from upstream-mirrors/quik
Null safety when getting style of textview typeface
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
package presentation.common.widget
|
package presentation.common.widget
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.graphics.Typeface
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.widget.EditText
|
import android.widget.EditText
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
@@ -46,7 +47,7 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
|||||||
|
|
||||||
init {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
fontProvider.getLato { setTypeface(it, typeface.style) }
|
fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) }
|
||||||
|
|
||||||
context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
|
context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
|
||||||
textColorObservable = when (getInt(R.styleable.QkEditText_textColor, -1)) {
|
textColorObservable = when (getInt(R.styleable.QkEditText_textColor, -1)) {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
package presentation.common.widget
|
package presentation.common.widget
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.graphics.Typeface
|
||||||
import android.support.v7.widget.AppCompatTextView
|
import android.support.v7.widget.AppCompatTextView
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
@@ -51,7 +52,7 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
|
|||||||
init {
|
init {
|
||||||
if (!isInEditMode) {
|
if (!isInEditMode) {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
fontProvider.getLato { setTypeface(it, typeface.style) }
|
fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) }
|
||||||
}
|
}
|
||||||
|
|
||||||
context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
|
context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
|
||||||
|
|||||||
Reference in New Issue
Block a user