Added font customization

Author: kbiakov

codeview/src/main/assets/fonts/Consolas.ttf

@@ -2,6 +2,7 @@ package io.github.kbiakov.codeview.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Typeface
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
@@ -159,8 +160,6 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         ui(onUpdated)
     }
 
-    private fun monoTypeface() = MonoFontCache.getInstance(context).typeface
-
     // - View holder
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -169,12 +168,12 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         lineView.setBackgroundColor(options.theme.bgContent.color())
 
         val tvLineNum = lineView.findViewById(R.id.tv_line_num) as TextView
-        tvLineNum.typeface = monoTypeface()
+        tvLineNum.typeface = options.font
         tvLineNum.setTextColor(options.theme.numColor.color())
         tvLineNum.setBackgroundColor(options.theme.bgNum.color())
 
         val tvLineContent = lineView.findViewById(R.id.tv_line_content) as TextView
-        tvLineContent.typeface = monoTypeface()
+        tvLineContent.typeface = options.font
 
         val holder = ViewHolder(lineView)
         holder.setIsRecyclable(false)
@@ -292,6 +291,7 @@ data class Options(
         var code: String = "",
         var language: String? = null,
         var theme: ColorThemeData = ColorTheme.DEFAULT.theme(),
+        var font: Typeface = FontCache.get(context).getTypeface(context),
         var shadows: Boolean = false,
         var shortcut: Boolean = false,
         var shortcutNote: String = context.getString(R.string.show_all),
@@ -331,6 +331,24 @@ data class Options(
         withTheme(theme)
     }
 
+    fun withFont(fontPath: String): Options {
+        this.font = FontCache.get(context).getTypeface(context, fontPath)
+        return this
+    }
+
+    fun withFont(font: Font): Options {
+        this.font = FontCache.get(context).getTypeface(context, font)
+        return this
+    }
+
+    fun setFont(fontPath: String) {
+        withFont(fontPath)
+    }
+
+    fun setFont(font: Font) {
+        withFont(font)
+    }
+
     fun withShadows(): Options {
         this.shadows = true
         return this

codeview/src/main/assets/fonts/CourierNew.ttf

@@ -14,8 +14,8 @@ import java.util.*
 object CodeHighlighter {
 
     private val LT_BRACE = "<".toRegex()
-    private val LT_REGULAR = "&lt;"
-    private val LT_TMP = "^"
+    private const val LT_REGULAR = "&lt;"
+    private const val LT_TMP = "^"
 
     private val parser = PrettifyParser()
 
@@ -38,7 +38,6 @@ object CodeHighlighter {
             val content = parseContent(source, it)
             highlighted.append(content.withFontParams(color))
         }
-
         return highlighted.toString()
     }
 
@@ -205,6 +204,24 @@ data class SyntaxColors(
         val attrName: Int = 0x268BD2,
         val attrValue: Int = 0x269186)
 
+/**
+ * Font presets.
+ */
+enum class Font {
+    Consolas,
+    CourierNew,
+    DejaVuSansMono,
+    DroidSansMonoSlashed,
+    Inconsolata,
+    Monaco;
+
+    companion object {
+        val Default = DroidSansMonoSlashed
+    }
+}
+
+// - Helpers
+
 /**
  * @return Converted hex int to color by adding alpha-channel
  */

codeview/src/main/assets/fonts/DejaVuSansMono.ttf

@@ -0,0 +1,80 @@
+package io.github.kbiakov.codeview.highlight;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.Log;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter;
+
+/**
+ * Font cache.
+ *
+ * @see AbstractCodeAdapter
+ * @author Kirill Biakov
+ */
+public class FontCache {
+
+    private static volatile FontCache instance;
+
+    public static FontCache get(Context context) {
+        FontCache localInstance = instance;
+        if (localInstance == null) {
+            synchronized (FontCache.class) {
+                localInstance = instance;
+                if (localInstance == null) {
+                    instance = localInstance = new FontCache(context);
+                }
+            }
+        }
+        return localInstance;
+    }
+
+    private Map<String, Typeface> fonts;
+
+    private FontCache(final Context context) {
+        this.fonts = new WeakHashMap<String, Typeface>() {{
+            String fontPath = getLocalFontPath(Font.Companion.getDefault());
+            put(fontPath, loadFont(context, fontPath));
+        }};
+    }
+
+    private static String getLocalFontPath(Font font) {
+        return String.format("%s.ttf", getLocalFontPath(font.name()));
+    }
+
+    private static String getLocalFontPath(String fontName) {
+        return String.format("fonts/%s", fontName);
+    }
+
+    private static Typeface loadFont(Context context, String fontPath) {
+        return Typeface.createFromAsset(context.getAssets(), fontPath);
+    }
+
+    // - Public methods
+
+    public Typeface getTypeface(Context context) {
+        return getTypeface(context, Font.Companion.getDefault());
+    }
+
+    public Typeface getTypeface(Context context, Font font) {
+        return getTypeface(context, getLocalFontPath(font));
+    }
+
+    public Typeface getLocalTypeface(Context context, String fontPath) {
+        return getTypeface(context, getLocalFontPath(fontPath));
+    }
+
+    public Typeface getTypeface(Context context, String fontPath) {
+        Typeface font = fonts.get(fontPath);
+        if (font != null) {
+            return font;
+        } else {
+            font = loadFont(context, fontPath);
+            fonts.put(fontPath, font);
+            return font;
+        }
+    }
+}

codeview/src/main/assets/fonts/Inconsolata.ttf

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.widget.RelativeLayout
 import android.widget.TextView
 import io.github.kbiakov.codeview.R
-import io.github.kbiakov.codeview.highlight.MonoFontCache
+import io.github.kbiakov.codeview.highlight.FontCache
 
 /**
  * @class CodeDiffView
@@ -43,7 +43,7 @@ class LineDiffView : RelativeLayout {
             val diffView = LineDiffView(context)
             diffView.tvLineDiff.text = if (model.isAddition) "+" else "-"
             diffView.tvLineContent.text = model.content
-            diffView.tvLineContent.typeface = MonoFontCache.getInstance(context).typeface
+            diffView.tvLineContent.typeface = FontCache.get(context).getTypeface(context)
 
             diffView.setBackgroundColor(ContextCompat.getColor(context,
                     if (model.isAddition)