Merge pull request #279 from wordpress-mobile/feature/drop-merriweather

Drop Merriweather font, use default serif and monospace fonts

Author: 0nko

app/src/main/res/layout/activity_main.xml

@@ -36,6 +36,7 @@
                 android:paddingTop="16dp"
                 android:scrollbars="vertical"
                 android:imeOptions="flagNoExtractUi"
+                android:fontFamily="serif"
                 aztec:historyEnable="true"
                 aztec:historySize="10"/>
 
@@ -55,6 +56,7 @@
                 android:textSize="14sp"
                 android:visibility="gone"
                 android:imeOptions="flagNoExtractUi"
+                android:fontFamily="monospace"
                 aztec:codeBackgroundColor="@android:color/transparent"
                 aztec:codeTextColor="@android:color/white"/>
 

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

@@ -48,7 +48,6 @@ import org.wordpress.aztec.source.Format
 import org.wordpress.aztec.source.SourceViewEditText
 import org.wordpress.aztec.spans.*
 import org.wordpress.aztec.toolbar.AztecToolbar
-import org.wordpress.aztec.util.TypefaceCache
 import org.xml.sax.Attributes
 import java.util.*
 
@@ -136,8 +135,6 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
     }
 
     private fun init(attrs: AttributeSet?) {
-        TypefaceCache.setCustomTypeface(context, this, TypefaceCache.TYPEFACE_MERRIWEATHER_REGULAR)
-
         val array = context.obtainStyledAttributes(attrs, R.styleable.AztecText, 0, R.style.AztecTextStyle)
         setLineSpacing(
                 array.getDimension(

aztec/src/main/assets/fonts/Merriweather-Regular.ttf

@@ -17,7 +17,6 @@ import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.History
 import org.wordpress.aztec.R
 import org.wordpress.aztec.spans.AztecCursorSpan
-import org.wordpress.aztec.util.TypefaceCache
 
 class SourceViewEditText : EditText, TextWatcher {
 
@@ -47,9 +46,6 @@ class SourceViewEditText : EditText, TextWatcher {
     }
 
     private fun init(attrs: AttributeSet?) {
-
-        TypefaceCache.setCustomTypeface(context, this, TypefaceCache.TYPEFACE_DEJAVU_SANS_MONO)
-
         val values = context.obtainStyledAttributes(attrs, R.styleable.SourceViewEditText)
         if (values.hasValue(R.styleable.SourceViewEditText_codeBackgroundColor)) {
             setBackgroundColor(values.getColor(R.styleable.SourceViewEditText_codeBackgroundColor, ContextCompat.getColor(context, R.color.background)))
@@ -263,4 +259,4 @@ class SourceViewEditText : EditText, TextWatcher {
         }
         return super.onKeyPreIme(keyCode, event)
     }
-}
+}