Merge pull request #234 from wordpress-mobile/issue/229-place-cursor-next-to-image

Only click the Clickable span if inside it

Author: 0nko

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

@@ -202,6 +202,8 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback, Vi
         aztec.imageGetter = PicassoImageLoader(this, aztec)
 //        aztec.imageGetter = GlideImageLoader(this)
 
+        aztec.setOnMediaTappedListener(this)
+
         source = findViewById(R.id.source) as SourceViewEditText
 
         formattingToolbar = findViewById(R.id.formatting_toolbar) as AztecToolbar
@@ -218,8 +220,6 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback, Vi
         aztec.setOnTouchListener(this)
         source.setOnImeBackListener(this)
         source.setOnTouchListener(this)
-
-        aztec.setOnMediaTappedListener(this)
     }
 
     override fun onPause() {

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

@@ -1,9 +1,11 @@
 package org.wordpress.aztec
 
+import android.graphics.Rect
 import android.text.Selection
 import android.text.Spannable
 import android.text.method.ArrowKeyMovementMethod
 import android.text.style.ClickableSpan
+import android.util.Log
 import android.view.MotionEvent
 import android.widget.TextView
 import org.wordpress.aztec.spans.AztecMediaClickableSpan
@@ -30,17 +32,29 @@ object EnhancedMovementMethod : ArrowKeyMovementMethod() {
             val line = layout.getLineForVertical(y)
             val off = layout.getOffsetForHorizontal(line, x.toFloat())
 
-            val link = text.getSpans(off, off, ClickableSpan::class.java).firstOrNull()
+            // get the character's position. This may be the left or the right edge of the character so, find the
+            //  other edge by inspecting nearby characters (if they exist)
+            val charX = layout.getPrimaryHorizontal(off)
+            val charPrevX = if (off > 0) layout.getPrimaryHorizontal(off - 1) else charX
+            val charNextX = if (off < text.length) layout.getPrimaryHorizontal(off + 1) else charX
 
-            // Only react to AztecMediaClickableSpan and UnknownClickableSpan; not to regular links.
-            if (link != null && (link is AztecMediaClickableSpan || link is UnknownClickableSpan)) {
-                if (action == MotionEvent.ACTION_UP) {
-                    link.onClick(widget)
-                } else {
-                    Selection.setSelection(text, text.getSpanStart(link), text.getSpanEnd(link))
-                }
+            val lineRect = Rect()
+            layout.getLineBounds(line, lineRect)
+
+            if (((x >= charPrevX && x <= charX) || (x >= charX && x <= charNextX))
+                    && y >= lineRect.top && y <= lineRect.bottom) {
+                val link = text.getSpans(off, off, ClickableSpan::class.java).firstOrNull()
 
-                return true
+                // Only react to AztecMediaClickableSpan and UnknownClickableSpan; not to regular links.
+                if (link != null && (link is AztecMediaClickableSpan || link is UnknownClickableSpan)) {
+                    if (action == MotionEvent.ACTION_UP) {
+                        link.onClick(widget)
+                    } else {
+                        Selection.setSelection(text, text.getSpanStart(link), text.getSpanEnd(link))
+                    }
+
+                    return true
+                }
             }
         }