New Crowdin translations (#267 )

* New translations strings.xml (Catalan) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (Galician) * New translations strings.xml (German) * New translations strings.xml (Indonesian) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Spanish) * New translations strings.xml (Turkish) * New translations strings.xml (French)
Merge pull request #265 from aminecmi/feature/261
2019-01-06 18:46:38 +01:00 · 2019-01-06 18:25:26 +01:00 · 2019-01-06 18:17:10 +01:00 · 2019-01-06 18:12:18 +01:00 · 2019-01-06 16:26:40 +01:00 · 2019-01-06 16:16:35 +01:00
33 changed files with 204 additions and 28 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 **1.7.x**

+- Hiding tags with 0 articles
+
+- Fixed issue with basic auth and images loading
+
+- Added the ability to justify or left align the reader text
+
+- Fixed #251
+
 - Added experimental issue to set a default timeout. Should work for #238.

 - Closing #220.
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -77,6 +77,9 @@
            android:value="true" />

        <meta-data android:name="android.max_aspect" android:value="2.1" />
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
    </application>

 </manifest>
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -152,6 +152,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

    private lateinit var db: AppDatabase

+    private lateinit var config: Config
+
    data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)

    override fun onStart() {
@ -161,6 +163,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(this@HomeActivity)
+        config = Config(this@HomeActivity)

        super.onCreate(savedInstanceState)

@ -1144,7 +1147,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            fullHeightCards,
                            appColors,
                            debugReadingItems,
-                            userIdentifier
+                            userIdentifier,
+                            config
                        ) {
                            updateItems(it)
                        }
@ -1160,7 +1164,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            articleViewer,
                            debugReadingItems,
                            userIdentifier,
-                            appColors
+                            appColors,
+                            config
                        ) {
                            updateItems(it)
                        }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -10,6 +10,7 @@ import android.preference.PreferenceManager
 import androidx.multidex.MultiDexApplication
 import android.widget.ImageView
 import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
@ -42,10 +43,11 @@ import java.util.UUID.randomUUID
    ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA],
          buildConfigClass = BuildConfig::class)
 class MyApp : MultiDexApplication() {
+    private lateinit var config: Config

    override fun onCreate() {
        super.onCreate()
-
+        config = Config(baseContext)
        initAmplify()

        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
@ -105,7 +107,7 @@ class MyApp : MultiDexApplication() {
                tag: String?
            ) {
                Glide.with(imageView?.context)
-                    .load(uri)
+                    .loadMaybeBasicAuth(config, uri.toString())
                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
                    .into(imageView)
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
@ -17,6 +17,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
+import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
@ -51,6 +52,7 @@ class ItemCardAdapter(
    override val appColors: AppColors,
    override val debugReadingItems: Boolean,
    override val userIdentifier: String,
+    override val config: Config,
    override val updateItems: (ArrayList<Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
@ -86,7 +88,7 @@ class ItemCardAdapter(
            holder.mView.itemImage.setImageDrawable(null)
        } else {
            holder.mView.itemImage.visibility = View.VISIBLE
-            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
        }

        if (itm.getIcon(c).isEmpty()) {
@ -99,7 +101,7 @@ class ItemCardAdapter(
                    .build(itm.sourcetitle.toTextDrawableString(c), color)
            holder.mView.sourceImage.setImageDrawable(drawable)
        } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.sourceImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
        }

        holder.mView.favButton.isLiked = itm.starred
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
@ -20,6 +20,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
+import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
@ -52,6 +53,7 @@ class ItemListAdapter(
    override val debugReadingItems: Boolean,
    override val userIdentifier: String,
    override val appColors: AppColors,
+    override val config: Config,
    override val updateItems: (ArrayList<Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
@ -108,10 +110,10 @@ class ItemListAdapter(

                holder.mView.itemImage.setImageDrawable(drawable)
            } else {
-                c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
+                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
            }
        } else {
-            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
        }
    }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
@ -13,6 +13,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
+import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
@ -31,6 +32,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
    abstract val userIdentifier: String
    abstract val app: Activity
    abstract val appColors: AppColors
+    abstract val config: Config
    abstract val updateItems: (ArrayList<Item>) -> Unit

    fun updateAllItems(newItems: ArrayList<Item>) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
@ -12,6 +12,7 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
@ -29,6 +30,7 @@ class SourcesListAdapter(
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private lateinit var config: Config

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val v = LayoutInflater.from(c).inflate(
@ -41,6 +43,7 @@ class SourcesListAdapter(

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        val itm = items[position]
+        config = Config(c)

        if (itm.getIcon(c).isEmpty()) {
            val color = generator.getColor(itm.title)
@ -52,7 +55,7 @@ class SourcesListAdapter(
                    .build(itm.title.toTextDrawableString(c), color)
            holder.mView.itemImage.setImageDrawable(drawable)
        } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
        }

        holder.mView.sourceTitle.text = itm.title
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@ -3,6 +3,8 @@ package apps.amine.bou.readerforselfoss.fragments
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
@ -19,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.res.ResourcesCompat
 import androidx.room.Room
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
@ -34,6 +37,7 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
@ -44,6 +48,7 @@ import apps.amine.bou.readerforselfoss.utils.succeeded
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
+import kotlinx.android.synthetic.main.fragment_article.*
 import kotlinx.android.synthetic.main.fragment_article.view.*
 import org.acra.ACRA
 import retrofit2.Call
@ -68,6 +73,15 @@ class ArticleFragment : Fragment() {
    private lateinit var appColors: AppColors
    private lateinit var db: AppDatabase
    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()
@ -78,6 +92,7 @@ class ArticleFragment : Fragment() {

    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(activity!!)
+        config = Config(activity!!)

        super.onCreate(savedInstanceState)

@ -90,10 +105,6 @@ class ArticleFragment : Fragment() {
        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
    }

-    private var rootView: ViewGroup? = null
-
-    private lateinit var prefs: SharedPreferences
-
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@ -112,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)
@ -201,11 +219,17 @@ class ArticleFragment : Fragment() {
            )

            rootView!!.source.text = contentSource
+            if (typeface != null) {
+                rootView!!.source.typeface = typeface
+            }

            if (contentText.isEmptyOrNullOrNullString()) {
                getContentFromMercury(customTabsIntent, prefs)
            } else {
                rootView!!.titleView.text = contentTitle
+                if (typeface != null) {
+                    rootView!!.titleView.typeface = typeface
+                }

                htmlToWebview()

@ -214,7 +238,7 @@ class ArticleFragment : Fragment() {
                    Glide
                        .with(context!!)
                        .asBitmap()
-                        .load(contentImage)
+                        .loadMaybeBasicAuth(config, contentImage)
                        .apply(RequestOptions.fitCenterTransform())
                        .into(rootView!!.imageView)
                } else {
@ -280,6 +304,9 @@ class ArticleFragment : Fragment() {
                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                                try {
                                    rootView!!.titleView.text = response.body()!!.title
+                                    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)
@ -309,7 +336,7 @@ class ArticleFragment : Fragment() {
                                            Glide
                                                .with(context!!)
                                                .asBitmap()
-                                                .load(response.body()!!.lead_image_url)
+                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
                                                .apply(RequestOptions.fitCenterTransform())
                                                .into(rootView!!.imageView)
                                        } catch (e: Exception) {
@ -361,6 +388,11 @@ class ArticleFragment : Fragment() {
    private fun htmlToWebview() {
        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)

+        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+        val a: TypedArray = context!!.obtainStyledAttributes(resId, attrs)
+
+
+        rootView!!.webcontent.settings.standardFontFamily = a.getString(0)
        rootView!!.webcontent.visibility = View.VISIBLE
        val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
            if (context != null) {
@ -420,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()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+                |<style>
+                |   * {
+                |       font-family: '$fontName';
+                |   }
+                |</style>
+            """.trimMargin()
+        } else {
+            ""
+        }
+
        rootView!!.webcontent.loadDataWithBaseURL(
            baseUrl,
            """<html>
@ -443,6 +493,7 @@ class ArticleFragment : Fragment() {
                |        text-align: $textAlignment;
                |        word-break: break-word;
                |        overflow:hidden;
+                |        line-height: 1.5em;
                |      }
                |      a, pre, code {
                |        text-align: $textAlignment;
@ -453,6 +504,7 @@ class ArticleFragment : Fragment() {
                |        background-color: $stringBackgroundColor;
                |      }
                |   </style>
+                |   $fontLinkAndStyle
                |</head>
                |<body>
                |   $contentText
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
@ -2,30 +2,30 @@ package apps.amine.bou.readerforselfoss.utils.glide

 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.util.Base64
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import android.widget.ImageView
+import apps.amine.bou.readerforselfoss.utils.Config
 import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.BitmapImageViewTarget

-fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
+fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
    Glide.with(this)
        .asBitmap()
-        .load(url)
+        .loadMaybeBasicAuth(config, url)
        .apply(RequestOptions.centerCropTransform())
        .into(iv)

-fun Context.bitmapFitCenter(url: String, iv: ImageView) =
+fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
    Glide.with(this)
        .asBitmap()
-        .load(url)
-        .apply(RequestOptions.fitCenterTransform())
-        .into(iv)
-
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
+        .loadMaybeBasicAuth(config, url)
        .apply(RequestOptions.centerCropTransform())
        .into(object : BitmapImageViewTarget(iv) {
            override fun setResource(resource: Bitmap?) {
@ -36,4 +36,24 @@ fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
                circularBitmapDrawable.isCircular = true
                iv.setImageDrawable(circularBitmapDrawable)
            }
-        })
+        })
+
+fun RequestBuilder<Bitmap>.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Bitmap> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
+
+fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Drawable> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
--- a/app/src/main/res/font/open_sans.xml
+++ b/app/src/main/res/font/open_sans.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Open Sans"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
--- a/app/src/main/res/font/roboto.xml
+++ b/app/src/main/res/font/roboto.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Roboto"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
--- 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"
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Problema con el visor web</string>
    <string name="reader_text_align_left">Alinear a la izquierda</string>
    <string name="reader_text_align_justify">Justificado</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Problème de Webview</string>
    <string name="reader_text_align_left">Aligner à gauche</string>
    <string name="reader_text_align_justify">Justifier le texte</string>
+    <string name="settings_reader_font">Police du lecteur d\'articles</string>
 </resources>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Problema co visor web</string>
    <string name="reader_text_align_left">Aliñar á esquerda</string>
    <string name="reader_text_align_justify">Xustificado</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -172,4 +172,5 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
 </resources>
--- a/app/src/main/res/values/font_certs.xml
+++ b/app/src/main/res/values/font_certs.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
--- a/app/src/main/res/values/preloaded_fonts.xml
+++ b/app/src/main/res/values/preloaded_fonts.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts" translatable="false">
+        <item>@font/open_sans</item>
+        <item>@font/roboto</item>
+    </array>
+</resources>
--- a/app/src/main/res/values/preloaded_fonts_keys.xml
+++ b/app/src/main/res/values/preloaded_fonts_keys.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts_keys" translatable="false">
+        <item></item>
+        <item>@string/open_sans_font_id</item>
+        <item>@string/roboto_font_id</item>
+    </array>
+</resources>
--- a/app/src/main/res/values/preloaded_fonts_values.xml
+++ b/app/src/main/res/values/preloaded_fonts_values.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts_values" translatable="false">
+        <item>Systems</item>
+        <item>Open Sans</item>
+        <item>Roboto</item>
+    </array>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -172,4 +172,7 @@
    <string name="webview_dialog_issue_title">Webview issue</string>
    <string name="reader_text_align_left">Align left</string>
    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="open_sans_font_id" translatable="false">open_sans</string>
+    <string name="roboto_font_id" translatable="false">roboto</string>
 </resources>
--- a/app/src/main/res/xml/pref_viewer.xml
+++ b/app/src/main/res/xml/pref_viewer.xml
@ -13,4 +13,10 @@
        android:selectAllOnFocus="true"
        android:singleLine="true"
        android:title="@string/pref_content_reader_font_size" />
+    <ListPreference
+        android:defaultValue="1"
+        android:entries="@array/preloaded_fonts_values"
+        android:entryValues="@array/preloaded_fonts_keys"
+        android:key="reader_font"
+        android:title="@string/settings_reader_font" />
 </PreferenceScreen>
Author	SHA1	Message	Date
Amine Bou	45747a1506	New Crowdin translations (#267 ) * New translations strings.xml (Catalan) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (Galician) * New translations strings.xml (German) * New translations strings.xml (Indonesian) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Spanish) * New translations strings.xml (Turkish) * New translations strings.xml (French)	2019-01-06 18:46:38 +01:00
Amine Bou	c6e2e08bcb	Merge pull request #265 from aminecmi/feature/261 WIP: Webview font	2019-01-06 18:25:26 +01:00
aminecmi	25bf18661e	Adde a bigger line-height.	2019-01-06 18:17:10 +01:00
aminecmi	6b088dcd24	Font family.	2019-01-06 18:12:18 +01:00
aminecmi	d2b18e1880	Removed lazy loaded fonts.	2019-01-06 16:26:40 +01:00
Amine	eec7c94e98	WIP.	2019-01-06 16:16:35 +01:00
Amine	d1f8fcacc0	Changelog.	2019-01-05 21:47:45 +01:00
Amine	07e4a33cbd	Closes #266 .	2019-01-05 21:43:09 +01:00