Notify, let the client decide on html mode change

For example, the client can know whether the images have finished uploading or not and might decide to inhibit the toggle until finished.

Author: hypest

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -35,9 +35,9 @@ import org.xml.sax.Attributes
 import org.xml.sax.helpers.AttributesImpl
 import java.io.File
 
-class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback,
-        View.OnTouchListener, PopupMenu.OnMenuItemClickListener, AztecToolbarClickListener,
-        AztecText.OnMediaTappedListener, AztecText.OnImeBackListener {
+class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback, View.OnTouchListener,
+        PopupMenu.OnMenuItemClickListener, AztecToolbarClickListener, AztecText.OnMediaTappedListener,
+        AztecText.OnImeBackListener {
     companion object {
         private val HEADING =
                 "<h1>Heading 1</h1>" +
@@ -148,6 +148,7 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback,
         val attrs = AttributesImpl()
         attrs.addAttribute("", "src", "src", "string", mediaPath) // Temporary source value.  Replace with URL after uploaded.
         attrs.addAttribute("", "id", "id", "string", id)
+        attrs.addAttribute("", "uploading", "uploading", "string", "true")
 
         aztec.insertMedia(BitmapDrawable(resources, bitmap), attrs)
 
@@ -172,6 +173,7 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback,
             progress += 2000
 
             if (progress >= 10000) {
+                attrs.removeAttribute(attrs.getIndex("uploading"))
                 aztec.clearOverlays(predicate, attrs)
             }
         }
@@ -519,6 +521,22 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback,
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
+    override fun onToolbarHtmlModeClicked() {
+        val uploadingPredicate = object : AztecText.AttributePredicate {
+            override fun matches(attrs: Attributes): Boolean {
+                return attrs.getIndex("uploading") > -1
+            }
+        }
+
+        val mediaPending = aztec.getAllMediaAttributes(uploadingPredicate).size > 0
+
+        if (mediaPending) {
+            ToastUtils.showToast(this, R.string.media_upload_dialog_message)
+        } else {
+            formattingToolbar.toggleEditorMode()
+        }
+    }
+
     override fun onToolbarAddMediaClicked() {
         mediaMenu = PopupMenu(this, formattingToolbar)
         mediaMenu?.setOnMenuItemClickListener(this)

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

@@ -962,14 +962,18 @@ class AztecText : EditText, TextWatcher {
     }
 
     fun getMediaAttributes(attributePredicate: AttributePredicate): Attributes? {
-        text.getSpans(0, text.length, AztecMediaSpan::class.java).forEach {
-            if (it.attributes != null) {
-                if (attributePredicate.matches(it.attributes as Attributes)) {
-                    return it.attributes
-                }
-            }
-        }
-
-        return null;
+        return getAllMediaAttributes(attributePredicate).firstOrNull()
+    }
+
+    fun getAllMediaAttributes(attributePredicate: AttributePredicate): List<Attributes?> {
+        return text
+                .getSpans(0, text.length, AztecMediaSpan::class.java)
+                .filter {
+                    if (it.attributes != null) {
+                        return@filter attributePredicate.matches(it.attributes as Attributes)
+                    } else {
+                        return@filter false
+                    }}
+                .map { it.attributes }
     }
 }

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

@@ -9,12 +9,10 @@ import android.widget.PopupMenu
 import android.widget.PopupMenu.OnMenuItemClickListener
 import android.widget.Toast
 import android.widget.ToggleButton
-import org.wordpress.android.util.ToastUtils
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.R
 import org.wordpress.aztec.TextFormat
 import org.wordpress.aztec.source.SourceViewEditText
-import org.wordpress.aztec.spans.AztecMediaSpan
 import java.util.*
 
 class AztecToolbar : FrameLayout, OnMenuItemClickListener {
@@ -169,25 +167,20 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
             ToolbarAction.ADD_MEDIA -> aztecToolbarListener?.onToolbarAddMediaClicked()
             ToolbarAction.HEADING -> headingMenu?.show()
             ToolbarAction.LINK -> editor!!.showLinkDialog()
-            ToolbarAction.HTML -> toggleEditorMode()
+            ToolbarAction.HTML -> aztecToolbarListener?.onToolbarHtmlModeClicked()
             else -> {
                 Toast.makeText(context, "Unsupported action", Toast.LENGTH_SHORT).show()
             }
         }
     }
 
-    fun toggleEditorMode() {
+    public fun toggleEditorMode() {
         if (editor!!.visibility == View.VISIBLE) {
-            if (!editor!!.isMediaAdded || allImagesUploaded()) {
-                sourceEditor!!.displayStyledAndFormattedHtml(editor!!.toHtml(true))
-                editor!!.visibility = View.GONE
-                sourceEditor!!.visibility = View.VISIBLE
+            sourceEditor!!.displayStyledAndFormattedHtml(editor!!.toHtml(true))
+            editor!!.visibility = View.GONE
+            sourceEditor!!.visibility = View.VISIBLE
 
-                toggleHtmlMode(true)
-            } else {
-                toggleButton(findViewById(ToolbarAction.HTML.buttonId), false)
-                ToastUtils.showToast(context, R.string.media_upload_dialog_message)
-            }
+            toggleHtmlMode(true)
         } else {
             editor!!.fromHtml(sourceEditor!!.getPureHtml(true))
             editor!!.visibility = View.VISIBLE
@@ -197,15 +190,6 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         }
     }
 
-    private fun allImagesUploaded(): Boolean {
-        editor!!.text?.getSpans(0, editor!!.length(), AztecMediaSpan::class.java)?.forEach {
-            if (it.getSource().isNullOrBlank() || !it.getSource().startsWith("http")) {
-                return false
-            }
-        }
-        return true
-    }
-
     private fun selectHeaderMenu(textFormats: ArrayList<TextFormat>) {
         headingMenu?.menu?.getItem(0)?.isChecked = true
         textFormats.forEach {

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbarClickListener.kt

@@ -2,4 +2,5 @@ package org.wordpress.aztec.toolbar
 
 interface AztecToolbarClickListener {
     fun onToolbarAddMediaClicked()
+    fun onToolbarHtmlModeClicked()
 }