Merge pull request #349 from wordpress-mobile/issue/342-image-uploading-scroll

Issue/342 image uploading scroll

Author: khaykov

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

@@ -197,7 +197,7 @@ class MainActivity : AppCompatActivity(),
         attrs.setValue("id", id)
         attrs.setValue("uploading", "true")
 
-        aztec.insertMedia(BitmapDrawable(resources, bitmap), attrs)
+        val mediaSpan = aztec.insertMedia(BitmapDrawable(resources, bitmap), attrs)
 
         val predicate = object : AztecText.AttributePredicate {
             override fun matches(attrs: Attributes): Boolean {
@@ -221,7 +221,7 @@ class MainActivity : AppCompatActivity(),
         val runnable: Runnable = Runnable {
             aztec.setOverlayLevel(predicate, 1, progress)
             aztec.updateElementAttributes(predicate, attrs)
-            aztec.refreshText()
+            aztec.updateMediaSpan(mediaSpan)
             progress += 2000
 
             if (progress >= 10000) {

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

@@ -21,7 +21,7 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content" >
 
             <org.wordpress.aztec.AztecText
                 android:id="@+id/aztec"

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

@@ -21,7 +21,7 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content" >
 
             <org.wordpress.aztec.AztecText
                 android:id="@+id/aztec"

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

@@ -778,12 +778,21 @@ class AztecText : android.support.v7.widget.AppCompatEditText, TextWatcher, Unkn
         disableTextChangedListener()
         val selStart = selectionStart
         val selEnd = selectionEnd
-        clearFocus()
+        setFocusOnParentView()
         text = editableText
         setSelection(selStart, selEnd)
         enableTextChangedListener()
     }
 
+    fun setFocusOnParentView() {
+        if (parent is View) {
+            val parentView = parent as View
+            parentView.isFocusable = true
+            parentView.isFocusableInTouchMode = true
+            parentView.requestFocus()
+        }
+    }
+
     fun removeInlineStylesFromRange(start: Int, end: Int) {
         inlineFormatter.removeInlineStyle(TextFormat.FORMAT_BOLD, start, end)
         inlineFormatter.removeInlineStyle(TextFormat.FORMAT_ITALIC, start, end)
@@ -1013,8 +1022,8 @@ class AztecText : android.support.v7.widget.AppCompatEditText, TextWatcher, Unkn
         }
     }
 
-    fun insertMedia(drawable: Drawable?, attributes: Attributes) {
-        lineBlockFormatter.insertMedia(drawable, attributes, onMediaTappedListener)
+    fun insertMedia(drawable: Drawable?, attributes: Attributes): AztecMediaSpan {
+        return lineBlockFormatter.insertMedia(drawable, attributes, onMediaTappedListener)
     }
 
     fun removeMedia(attributePredicate: AttributePredicate) {
@@ -1050,6 +1059,10 @@ class AztecText : android.support.v7.widget.AppCompatEditText, TextWatcher, Unkn
                 .firstOrNull()?.attributes = attrs
     }
 
+    fun updateMediaSpan(mediaSpan: AztecMediaSpan) {
+        editableText.setSpan(mediaSpan, text.getSpanStart(mediaSpan), text.getSpanEnd(mediaSpan), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+
     fun setOverlayLevel(attributePredicate: AttributePredicate, index: Int, level: Int) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
                 .filter {

aztec/src/main/kotlin/org/wordpress/aztec/formatting/LineBlockFormatter.kt

@@ -118,7 +118,7 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
                 if (selectionEnd < EndOfBufferMarkerAdder.safeLength(editor)) selectionEnd + 1 else selectionEnd)
     }
 
-    fun insertMedia(drawable: Drawable?, attributes: Attributes, onMediaTappedListener: OnMediaTappedListener?) {
+    fun insertMedia(drawable: Drawable?, attributes: Attributes, onMediaTappedListener: OnMediaTappedListener?): AztecMediaSpan {
         val span = AztecMediaSpan(editor.context, drawable, AztecAttributes(attributes), onMediaTappedListener, editor)
 
         val spanBeforeMedia = editableText.getSpans(selectionStart, selectionEnd, AztecBlockSpan::class.java)
@@ -164,5 +164,7 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
 
         editor.setSelection(mediaEndIndex)
         editor.isMediaAdded = true
+
+        return span
     }
 }