diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index 0a0a18a6..0f1b0f1f 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -114,6 +114,10 @@
+
+
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/FontProvider.kt b/qksms/src/main/java/common/util/FontProvider.kt
new file mode 100644
index 00000000..26695b0f
--- /dev/null
+++ b/qksms/src/main/java/common/util/FontProvider.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package common.util
+
+import android.content.Context
+import android.graphics.Typeface
+import android.support.v4.content.res.ResourcesCompat
+import com.moez.QKSMS.R
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FontProvider @Inject constructor(private val context: Context) {
+
+ private var lato: Typeface? = null
+
+ private val pendingCallbacks = ArrayList<(Typeface) -> Unit>()
+
+ init {
+ ResourcesCompat.getFont(context, R.font.lato, object : ResourcesCompat.FontCallback() {
+ override fun onFontRetrievalFailed(reason: Int) {
+ Timber.w("Font retrieval failed: $reason")
+ }
+
+ override fun onFontRetrieved(typeface: Typeface) {
+ lato = typeface
+
+ pendingCallbacks.forEach { lato?.run(it) }
+ pendingCallbacks.clear()
+ }
+ }, null)
+ }
+
+ fun getLato(callback: (Typeface) -> Unit) {
+ lato?.run(callback)
+
+ if (lato == null) {
+ pendingCallbacks += callback
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/presentation/common/widget/QkEditText.kt b/qksms/src/main/java/presentation/common/widget/QkEditText.kt
index 44ccd00a..fa9af20b 100644
--- a/qksms/src/main/java/presentation/common/widget/QkEditText.kt
+++ b/qksms/src/main/java/presentation/common/widget/QkEditText.kt
@@ -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? = null
private var textColorHintObservable: Observable? = 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)) {
diff --git a/qksms/src/main/java/presentation/common/widget/QkTextView.kt b/qksms/src/main/java/presentation/common/widget/QkTextView.kt
index 9ecf341b..3ecc653c 100644
--- a/qksms/src/main/java/presentation/common/widget/QkTextView.kt
+++ b/qksms/src/main/java/presentation/common/widget/QkTextView.kt
@@ -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? = 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 {
diff --git a/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt b/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt
index f2c2b5dd..604945eb 100644
--- a/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt
+++ b/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt
@@ -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(), 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(), 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 ->
diff --git a/qksms/src/main/res/font/lato.xml b/qksms/src/main/res/font/lato.xml
new file mode 100644
index 00000000..015fa0c8
--- /dev/null
+++ b/qksms/src/main/res/font/lato.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/qksms/src/main/res/values/font_certs.xml b/qksms/src/main/res/values/font_certs.xml
new file mode 100644
index 00000000..0dca3f35
--- /dev/null
+++ b/qksms/src/main/res/values/font_certs.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ - @array/com_google_android_gms_fonts_certs_dev
+ - @array/com_google_android_gms_fonts_certs_prod
+
+
+ -
+ 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
+
+
+
diff --git a/qksms/src/main/res/values/preloaded_fonts.xml b/qksms/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 00000000..dba31952
--- /dev/null
+++ b/qksms/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ - @font/lato
+
+