diff --git a/qksms/src/main/java/presentation/common/widget/QkEditText.kt b/qksms/src/main/java/presentation/common/widget/QkEditText.kt index fa9af20b..e75b632c 100644 --- a/qksms/src/main/java/presentation/common/widget/QkEditText.kt +++ b/qksms/src/main/java/presentation/common/widget/QkEditText.kt @@ -19,6 +19,7 @@ package presentation.common.widget import android.content.Context +import android.graphics.Typeface import android.util.AttributeSet import android.widget.EditText import com.moez.QKSMS.R @@ -46,7 +47,7 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet init { appComponent.inject(this) - fontProvider.getLato { setTypeface(it, typeface.style) } + fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) } context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run { textColorObservable = when (getInt(R.styleable.QkEditText_textColor, -1)) { diff --git a/qksms/src/main/java/presentation/common/widget/QkTextView.kt b/qksms/src/main/java/presentation/common/widget/QkTextView.kt index 6ac316ea..442d171b 100644 --- a/qksms/src/main/java/presentation/common/widget/QkTextView.kt +++ b/qksms/src/main/java/presentation/common/widget/QkTextView.kt @@ -19,6 +19,7 @@ package presentation.common.widget import android.content.Context +import android.graphics.Typeface import android.support.v7.widget.AppCompatTextView import android.util.AttributeSet import com.moez.QKSMS.R @@ -51,7 +52,7 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu init { if (!isInEditMode) { appComponent.inject(this) - fontProvider.getLato { setTypeface(it, typeface.style) } + fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) } } context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {