Skip to content

Commit d33f294

Browse files
committed
Remove TypefaceCache and Merriweather font files
1 parent d3cbfba commit d33f294

File tree

5 files changed

+1
-53
lines changed

5 files changed

+1
-53
lines changed
-333 KB
Binary file not shown.
-45.5 KB
Binary file not shown.

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import org.wordpress.aztec.source.Format
4848
import org.wordpress.aztec.source.SourceViewEditText
4949
import org.wordpress.aztec.spans.*
5050
import org.wordpress.aztec.toolbar.AztecToolbar
51-
import org.wordpress.aztec.util.TypefaceCache
5251
import org.xml.sax.Attributes
5352
import java.util.*
5453

@@ -136,8 +135,6 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
136135
}
137136

138137
private fun init(attrs: AttributeSet?) {
139-
TypefaceCache.setCustomTypeface(context, this, TypefaceCache.TYPEFACE_MERRIWEATHER_REGULAR)
140-
141138
val array = context.obtainStyledAttributes(attrs, R.styleable.AztecText, 0, R.style.AztecTextStyle)
142139
setLineSpacing(
143140
array.getDimension(

aztec/src/main/kotlin/org/wordpress/aztec/source/SourceViewEditText.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.wordpress.aztec.AztecText
1717
import org.wordpress.aztec.History
1818
import org.wordpress.aztec.R
1919
import org.wordpress.aztec.spans.AztecCursorSpan
20-
import org.wordpress.aztec.util.TypefaceCache
2120

2221
class SourceViewEditText : EditText, TextWatcher {
2322

@@ -47,9 +46,6 @@ class SourceViewEditText : EditText, TextWatcher {
4746
}
4847

4948
private fun init(attrs: AttributeSet?) {
50-
51-
TypefaceCache.setCustomTypeface(context, this, TypefaceCache.TYPEFACE_DEJAVU_SANS_MONO)
52-
5349
val values = context.obtainStyledAttributes(attrs, R.styleable.SourceViewEditText)
5450
if (values.hasValue(R.styleable.SourceViewEditText_codeBackgroundColor)) {
5551
setBackgroundColor(values.getColor(R.styleable.SourceViewEditText_codeBackgroundColor, ContextCompat.getColor(context, R.color.background)))
@@ -263,4 +259,4 @@ class SourceViewEditText : EditText, TextWatcher {
263259
}
264260
return super.onKeyPreIme(keyCode, event)
265261
}
266-
}
262+
}

aztec/src/main/kotlin/org/wordpress/aztec/util/TypefaceCache.kt

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)