Merge branch 'develop' into issue/181-update-placeholder-images

Author: theck13

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.*
 
@@ -140,7 +139,6 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
 
     private fun init(attrs: AttributeSet?) {
         TypefaceCache.setCustomTypeface(context, this, TypefaceCache.TYPEFACE_MERRIWEATHER_REGULAR)
-
         val styles = context.obtainStyledAttributes(attrs, R.styleable.AztecText, 0, R.style.AztecTextStyle)
         setLineSpacing(
                 styles.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)
     }
-}
+}

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

@@ -26,6 +26,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
     private var headingMenu: PopupMenu? = null
     private var sourceEditor: SourceViewEditText? = null
     private var dialogShortcuts: AlertDialog? = null
+    private var isMediaModeEnabled: Boolean = false;
 
     constructor(context: Context) : super(context) {
         initView()
@@ -228,13 +229,15 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         super.onRestoreInstanceState(savedState.superState)
         val restoredState = savedState.state
         toggleHtmlMode(restoredState.getBoolean("isSourceVisible"))
+        enableMediaMode(restoredState.getBoolean("isMediaMode"))
     }
 
     override fun onSaveInstanceState(): Parcelable {
         val superState = super.onSaveInstanceState()
         val savedState = SourceViewEditText.SavedState(superState)
         val bundle = Bundle()
         bundle.putBoolean("isSourceVisible", sourceEditor?.visibility == View.VISIBLE)
+        bundle.putBoolean("isMediaMode", isMediaModeEnabled)
         savedState.state = bundle
         return savedState
     }
@@ -408,6 +411,21 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         }
     }
 
+    fun isMediaModeEnabled(): Boolean {
+        return isMediaModeEnabled;
+    }
+
+    fun enableMediaMode(isEnabled: Boolean) {
+        isMediaModeEnabled = isEnabled;
+        ToolbarAction.values().forEach { action ->
+            if (action == ToolbarAction.ADD_MEDIA) {
+                toggleButton(findViewById(action.buttonId), isEnabled)
+            } else {
+                toggleButtonState(findViewById(action.buttonId), !isEnabled)
+            }
+        }
+    }
+
     private fun showDialogShortcuts() {
         val layout = LayoutInflater.from(context).inflate(R.layout.dialog_shortcuts, null)
         val builder = AlertDialog.Builder(context)

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

@@ -4,6 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_media_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_checked="true" />
     <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_media" />