From 6b088dcd240f10a9369f8ff1b38ddea8fa99f3c1 Mon Sep 17 00:00:00 2001 From: aminecmi Date: Sun, 6 Jan 2019 18:12:18 +0100 Subject: [PATCH] Font family. --- app/src/main/AndroidManifest.xml | 3 + .../fragments/ArticleFragment.kt | 56 ++++++++++++++---- app/src/main/res/font/aguafina_script.ttf | Bin 47228 -> 0 bytes app/src/main/res/font/open_sans.xml | 7 +++ app/src/main/res/font/roboto.xml | 7 +++ app/src/main/res/layout/fragment_article.xml | 2 +- app/src/main/res/values/font_certs.xml | 17 ++++++ app/src/main/res/values/preloaded_fonts.xml | 7 +++ .../main/res/values/preloaded_fonts_keys.xml | 8 +++ .../res/values/preloaded_fonts_values.xml | 8 +++ app/src/main/res/values/strings.xml | 3 + app/src/main/res/xml/pref_viewer.xml | 8 +-- 12 files changed, 108 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/res/font/aguafina_script.ttf create mode 100644 app/src/main/res/font/open_sans.xml create mode 100644 app/src/main/res/font/roboto.xml create mode 100644 app/src/main/res/values/font_certs.xml create mode 100644 app/src/main/res/values/preloaded_fonts.xml create mode 100644 app/src/main/res/values/preloaded_fonts_keys.xml create mode 100644 app/src/main/res/values/preloaded_fonts_values.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a8f33..343d907 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -77,6 +77,9 @@ android:value="true" /> + diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt index b0e9e13..e6402a8 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt @@ -75,6 +75,14 @@ class ArticleFragment : Fragment() { private lateinit var textAlignment: String private lateinit var config: Config + private var rootView: ViewGroup? = null + + private lateinit var prefs: SharedPreferences + + private var typeface: Typeface? = null + private var resId: Int = 0 + private var font = "" + override fun onStop() { super.onStop() if (mCustomTabActivityHelper != null) { @@ -97,13 +105,6 @@ class ArticleFragment : Fragment() { ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build() } - private var rootView: ViewGroup? = null - - private lateinit var prefs: SharedPreferences - - private lateinit var typeface: Typeface - private var resId: Int = 0 - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -113,9 +114,6 @@ class ArticleFragment : Fragment() { rootView = inflater .inflate(R.layout.fragment_article, container, false) as ViewGroup - resId = context!!.resources.getIdentifier("aguafina_script", "font", context!!.packageName) - typeface = ResourcesCompat.getFont(context!!, resId)!! - url = allItems[pageNumber.toInt()].getLinkDecoded() contentText = allItems[pageNumber.toInt()].content contentTitle = allItems[pageNumber.toInt()].title @@ -125,6 +123,13 @@ class ArticleFragment : Fragment() { prefs = PreferenceManager.getDefaultSharedPreferences(activity) editor = prefs.edit() fontSize = prefs.getString("reader_font_size", "16").toInt() + + font = prefs.getString("reader_font", "") + if (font.isNotEmpty()) { + resId = context!!.resources.getIdentifier(font, "font", context!!.packageName) + typeface = ResourcesCompat.getFont(context!!, resId)!! + } + refreshAlignment() val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE) @@ -214,13 +219,17 @@ class ArticleFragment : Fragment() { ) rootView!!.source.text = contentSource - rootView!!.source.typeface = typeface + if (typeface != null) { + rootView!!.source.typeface = typeface + } if (contentText.isEmptyOrNullOrNullString()) { getContentFromMercury(customTabsIntent, prefs) } else { rootView!!.titleView.text = contentTitle - rootView!!.titleView.typeface = typeface + if (typeface != null) { + rootView!!.titleView.typeface = typeface + } htmlToWebview() @@ -295,7 +304,9 @@ class ArticleFragment : Fragment() { if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) { try { rootView!!.titleView.text = response.body()!!.title - rootView!!.titleView.typeface = typeface + if (typeface != null) { + rootView!!.titleView.typeface = typeface + } try { // Note: Mercury may return relative urls... If it does the url val will not be changed. URL(response.body()!!.url) @@ -441,6 +452,24 @@ class ArticleFragment : Fragment() { ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!) } + val fontName = when (font) { + getString(R.string.open_sans_font_id) -> "Open Sans" + getString(R.string.roboto_font_id) -> "Roboto" + else -> "" + } + + val fontLinkAndStyle = if (font.isNotEmpty()) { + """ + | + """.trimMargin() + } else { + "" + } + rootView!!.webcontent.loadDataWithBaseURL( baseUrl, """ @@ -474,6 +503,7 @@ class ArticleFragment : Fragment() { | background-color: $stringBackgroundColor; | } | + | $fontLinkAndStyle | | | $contentText diff --git a/app/src/main/res/font/aguafina_script.ttf b/app/src/main/res/font/aguafina_script.ttf deleted file mode 100644 index 78a3555fb247bb056af0aca8ca71b367cdcb228e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47228 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 diff --git a/app/src/main/res/font/open_sans.xml b/app/src/main/res/font/open_sans.xml new file mode 100644 index 0000000..f9284b2 --- /dev/null +++ b/app/src/main/res/font/open_sans.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml new file mode 100644 index 0000000..2641caf --- /dev/null +++ b/app/src/main/res/font/roboto.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/layout/fragment_article.xml b/app/src/main/res/layout/fragment_article.xml index ee087c4..18ee65e 100644 --- a/app/src/main/res/layout/fragment_article.xml +++ b/app/src/main/res/layout/fragment_article.xml @@ -31,8 +31,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" android:layout_marginTop="8dp" + android:layout_marginRight="16dp" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textSize="12sp" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml new file mode 100644 index 0000000..d2226ac --- /dev/null +++ b/app/src/main/res/values/font_certs.xml @@ -0,0 +1,17 @@ + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + 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 + + + diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml new file mode 100644 index 0000000..467da32 --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts.xml @@ -0,0 +1,7 @@ + + + + @font/open_sans + @font/roboto + + diff --git a/app/src/main/res/values/preloaded_fonts_keys.xml b/app/src/main/res/values/preloaded_fonts_keys.xml new file mode 100644 index 0000000..083f6b2 --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts_keys.xml @@ -0,0 +1,8 @@ + + + + + @string/open_sans_font_id + @string/roboto_font_id + + \ No newline at end of file diff --git a/app/src/main/res/values/preloaded_fonts_values.xml b/app/src/main/res/values/preloaded_fonts_values.xml new file mode 100644 index 0000000..dca50bc --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts_values.xml @@ -0,0 +1,8 @@ + + + + Systems + Open Sans + Roboto + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ecd75c..3e28001 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -172,4 +172,7 @@ Webview issue Align left Justify + Reader font + open_sans + roboto diff --git a/app/src/main/res/xml/pref_viewer.xml b/app/src/main/res/xml/pref_viewer.xml index 8cee815..53a3b98 100644 --- a/app/src/main/res/xml/pref_viewer.xml +++ b/app/src/main/res/xml/pref_viewer.xml @@ -15,10 +15,10 @@ android:title="@string/pref_content_reader_font_size" /> + android:entries="@array/preloaded_fonts_values" + android:entryValues="@array/preloaded_fonts_keys" + android:key="reader_font" + android:title="@string/settings_reader_font" />