Merge pull request #793 from adrielcafe/develop

Clickable URL Spans

Author: 0nko

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

@@ -24,6 +24,8 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: I
     private var onAudioTappedListener: AztecText.OnAudioTappedListener? = null
     private var onMediaDeletedListener: AztecText.OnMediaDeletedListener? = null
     private var onVideoInfoRequestedListener: AztecText.OnVideoInfoRequestedListener? = null
+    private var onLinkTappedListener: AztecText.OnLinkTappedListener? = null
+    private var isLinkTapEnabled: Boolean = false
     private var plugins: ArrayList<IAztecPlugin> = visualEditor.plugins
     var sourceEditor: SourceViewEditText? = null
 
@@ -134,6 +136,18 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: I
         return this
     }
 
+    fun setOnLinkTappedListener(onLinkTappedListener: AztecText.OnLinkTappedListener): Aztec {
+        this.onLinkTappedListener = onLinkTappedListener
+        initLinkTappedListener()
+        return this
+    }
+
+    fun setLinkTapEnabled(isLinkTapEnabled: Boolean): Aztec {
+        this.isLinkTapEnabled = isLinkTapEnabled
+        initLinkTapEnabled()
+        return this
+    }
+
     fun addPlugin(plugin: IAztecPlugin): Aztec {
         plugins.add(plugin)
 
@@ -219,4 +233,14 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: I
             visualEditor.setOnVideoInfoRequestedListener(onVideoInfoRequestedListener!!)
         }
     }
+
+    private fun initLinkTappedListener() {
+        if (onLinkTappedListener != null) {
+            visualEditor.setOnLinkTappedListener(onLinkTappedListener!!)
+        }
+    }
+
+    private fun initLinkTapEnabled() {
+        visualEditor.setLinkTapEnabled(isLinkTapEnabled)
+    }
 }

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

@@ -324,6 +324,10 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         fun onBackspaceKey() : Boolean
     }
 
+    interface OnLinkTappedListener {
+        fun onLinkTapped(widget: View, url: String)
+    }
+
     constructor(context: Context) : super(context) {
         init(null)
     }
@@ -833,6 +837,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         this.onVideoInfoRequestedListener = listener
     }
 
+    fun setOnLinkTappedListener(listener: OnLinkTappedListener) {
+        EnhancedMovementMethod.linkTappedListener = listener
+    }
+
+    fun setLinkTapEnabled(isLinkTapEnabled: Boolean) {
+        EnhancedMovementMethod.isLinkTapEnabled = isLinkTapEnabled
+    }
+
     override fun onKeyPreIme(keyCode: Int, event: KeyEvent): Boolean {
         if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
             onImeBackListener?.onImeBack()
@@ -1845,4 +1857,5 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     override fun dispatchHoverEvent(event: MotionEvent): Boolean {
         return if (accessibilityDelegate.onHoverEvent(event)) true else super.dispatchHoverEvent(event)
     }
+
 }

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

@@ -7,12 +7,16 @@ import android.text.style.ClickableSpan
 import android.view.MotionEvent
 import android.widget.TextView
 import org.wordpress.aztec.spans.AztecMediaClickableSpan
+import org.wordpress.aztec.spans.AztecURLSpan
 import org.wordpress.aztec.spans.UnknownClickableSpan
 
 /**
  * http://stackoverflow.com/a/23566268/569430
  */
 object EnhancedMovementMethod : ArrowKeyMovementMethod() {
+    var isLinkTapEnabled = false
+    var linkTappedListener: AztecText.OnLinkTappedListener? = null
+
     override fun onTouchEvent(widget: TextView, text: Spannable, event: MotionEvent): Boolean {
         val action = event.action
 
@@ -72,11 +76,14 @@ object EnhancedMovementMethod : ArrowKeyMovementMethod() {
                 link = text.getSpans(off, off, ClickableSpan::class.java).firstOrNull { text.getSpanStart(it) == off }
             }
 
-            if (link != null && (link is AztecMediaClickableSpan || link is UnknownClickableSpan)) {
-                if (action == MotionEvent.ACTION_UP) {
+            if (link != null) {
+                if (link is AztecMediaClickableSpan || link is UnknownClickableSpan) {
                     link.onClick(widget)
+                    return true
+                } else if (link is AztecURLSpan && isLinkTapEnabled) {
+                    linkTappedListener?.onLinkTapped(widget, link.url) ?: link.onClick(widget)
+                    return true
                 }
-                return true
             }
         }
 

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         picassoVersion = '2.5.2'
         robolectricVersion = '3.5.1'
         jUnitVersion = '4.12'
-        jSoupVersion = '1.10.3'
+        jSoupVersion = '1.11.3'
         wordpressUtilsVersion = '1.21'
         espressoVersion = '3.0.1'
     }