#1013 - Add option to use system font

This commit is contained in:
Moez Bhatti
2018-04-18 18:18:28 -04:00
parent b0ee5a03bb
commit 597de70748
11 changed files with 79 additions and 25 deletions
@@ -22,16 +22,28 @@ import android.content.Context
import android.graphics.Typeface
import android.support.v4.content.res.ResourcesCompat
import com.moez.QKSMS.R
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import timber.log.Timber
import util.Preferences
import util.extensions.Optional
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class FontProvider @Inject constructor(context: Context) {
class FontProvider @Inject constructor(context: Context, prefs: Preferences) {
private var lato: Typeface? = null
val typeface: Observable<Optional<Typeface>> = prefs.systemFont.asObservable()
.distinctUntilChanged()
.switchMap { systemFont ->
when (systemFont) {
true -> Observable.just(Optional(null))
false -> lato
}
}
private val pendingCallbacks = ArrayList<(Typeface) -> Unit>()
private val lato: Observable<Optional<Typeface>> = BehaviorSubject.create()
init {
ResourcesCompat.getFont(context, R.font.lato, object : ResourcesCompat.FontCallback() {
@@ -40,20 +52,10 @@ class FontProvider @Inject constructor(context: Context) {
}
override fun onFontRetrieved(typeface: Typeface) {
lato = typeface
pendingCallbacks.forEach { lato?.run(it) }
pendingCallbacks.clear()
val subject = lato as Subject<Optional<Typeface>>
subject.onNext(Optional(typeface))
}
}, null)
}
fun getLato(callback: (Typeface) -> Unit) {
lato?.run(callback)
if (lato == null) {
pendingCallbacks += callback
}
}
}
@@ -73,7 +73,6 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet
init {
if (!isInEditMode) {
appComponent.inject(this)
fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) }
context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
val colorAttr = getInt(R.styleable.QkEditText_textColor, -1)
@@ -118,6 +117,10 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet
super.onAttachedToWindow()
if (isInEditMode) return
fontProvider.typeface
.autoDisposable(scope())
.subscribe { setTypeface(it.value, typeface?.style ?: Typeface.NORMAL) }
textColorObservable
?.autoDisposable(scope())
?.subscribe { color -> setTextColor(color) }
@@ -75,7 +75,6 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
init {
if (!isInEditMode) {
appComponent.inject(this)
fontProvider.getLato { setTypeface(it, typeface?.style ?: Typeface.NORMAL) }
}
context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
@@ -143,6 +142,10 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
updateSubscription()
fontProvider.typeface
.autoDisposable(scope())
.subscribe { setTypeface(it.value, typeface?.style ?: Typeface.NORMAL) }
Observables
.combineLatest(prefs.textSize.asObservable(), textSizeAttrSubject, { textSizePref, textSizeAttr ->
when (textSizeAttr) {