Added missed ability to set Typeface font

kbiakov · Sep 2, 2017 · dd718d1 · dd718d1
1 parent 60bfb03
commit dd718d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt b/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
@@ -366,13 366,19 @@ data class Options(
  withTheme(theme)
  }
 
- fun withFont(fontPath: String): Options {
- this.font = FontCache.get(context).getTypeface(context, fontPath)
  fun withFont(font: Font): Options {
  this.font = FontCache.get(context).getTypeface(context, font)
  return this
  }
 
- fun withFont(font: Font): Options {
- this.font = FontCache.get(context).getTypeface(context, font)
  fun withFont(font: Typeface): Options {
  FontCache.get(context).saveTypeface(font)
  this.font = font
  return this
  }
 
  fun withFont(fontPath: String): Options {
  this.font = FontCache.get(context).getTypeface(context, fontPath)
  return this
  }
 

diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/highlight/FontCache.java b/codeview/src/main/java/io/github/kbiakov/codeview/highlight/FontCache.java
@@ -77,4 77,8 @@ public Typeface getTypeface(Context context, String fontPath) {
  return font;
  }
  }
 
  public void saveTypeface(Typeface fontTypeface) {
  fonts.put(fontTypeface.toString(), fontTypeface);
  }
 }