mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +01:00
Update typeface to Lato
This commit is contained in:
@@ -26,6 +26,7 @@ import com.uber.autodispose.android.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import common.util.Colors
|
||||
import common.util.FontProvider
|
||||
import io.reactivex.Observable
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -38,12 +39,14 @@ import javax.inject.Inject
|
||||
class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : EditText(context, attrs) {
|
||||
|
||||
@Inject lateinit var colors: Colors
|
||||
@Inject lateinit var fontProvider: FontProvider
|
||||
|
||||
private var textColorObservable: Observable<Int>? = null
|
||||
private var textColorHintObservable: Observable<Int>? = null
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
fontProvider.getLato { setTypeface(it, typeface.style) }
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
|
||||
textColorObservable = when (getInt(R.styleable.QkEditText_textColor, -1)) {
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.util.AttributeSet
|
||||
import com.moez.QKSMS.R
|
||||
import common.di.appComponent
|
||||
import common.util.Colors
|
||||
import common.util.FontProvider
|
||||
import common.util.extensions.getColorCompat
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.disposables.Disposable
|
||||
@@ -42,6 +43,7 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
|
||||
}
|
||||
|
||||
@Inject lateinit var colors: Colors
|
||||
@Inject lateinit var fontProvider: FontProvider
|
||||
|
||||
private var textColorDisposable: Disposable? = null
|
||||
private var textColorObservable: Observable<Int>? = null
|
||||
@@ -64,6 +66,7 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
|
||||
init {
|
||||
if (!isInEditMode) {
|
||||
appComponent.inject(this)
|
||||
fontProvider.getLato { setTypeface(it, typeface.style) }
|
||||
}
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
package presentation.feature.plus
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.os.Bundle
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
@@ -25,15 +26,19 @@ import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import common.util.BillingManager
|
||||
import common.util.FontProvider
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.setTint
|
||||
import common.util.extensions.setVisible
|
||||
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
||||
import presentation.common.base.QkActivity
|
||||
import presentation.common.widget.QkTextView
|
||||
import javax.inject.Inject
|
||||
|
||||
class PlusActivity : QkActivity<PlusViewModel>(), PlusView {
|
||||
|
||||
@Inject lateinit var fontProvider: FontProvider
|
||||
|
||||
override val viewModelClass = PlusViewModel::class
|
||||
override val supporterSelectedIntent by lazy { supporter.clicks() }
|
||||
override val donorSelectedIntent by lazy { donor.clicks() }
|
||||
@@ -47,6 +52,12 @@ class PlusActivity : QkActivity<PlusViewModel>(), PlusView {
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
fontProvider.getLato {
|
||||
val typeface = Typeface.create(it, Typeface.BOLD)
|
||||
collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
}
|
||||
|
||||
colors.textPrimary
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color ->
|
||||
|
||||
Reference in New Issue
Block a user