Removing context from spans (cont)

Author: khaykov

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

@@ -104,7 +104,6 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
         }
 
         val span = AztecHorizontalRuleSpan(
-                editor.context,
                 AppCompatResources.getDrawable(editor.context, R.drawable.img_hr)!!,
                 nestingLevel,
                 AztecAttributes(),
@@ -134,7 +133,7 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
     fun insertImage(inline: Boolean, drawable: Drawable?, attributes: Attributes, onImageTappedListener: AztecText.OnImageTappedListener?,
                     onMediaDeletedListener: AztecText.OnMediaDeletedListener?) {
         val nestingLevel = if (inline) IAztecNestable.getNestingLevelAt(editableText, selectionStart) else 0
-        val span = AztecImageSpan(editor.context, drawable, nestingLevel, AztecAttributes(attributes), onImageTappedListener,
+        val span = AztecImageSpan(drawable, nestingLevel, AztecAttributes(attributes), onImageTappedListener,
                 onMediaDeletedListener, editor)
         insertMediaSpan(inline, span)
     }

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecVideoSpan.kt

@@ -12,7 +12,7 @@ class AztecVideoSpan(context: Context, drawable: Drawable?, override var nesting
                      var onVideoTappedListener: AztecText.OnVideoTappedListener? = null,
                      onMediaDeletedListener: AztecText.OnMediaDeletedListener? = null,
                      editor: AztecText? = null) :
-        AztecMediaSpan(context, drawable, attributes, onMediaDeletedListener, editor), IAztecFullWidthImageSpan, IAztecSpan {
+        AztecMediaSpan(drawable, attributes, onMediaDeletedListener, editor), IAztecFullWidthImageSpan, IAztecSpan {
     override val TAG: String = "video"
 
     init {

wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/HiddenGutenbergPlugin.kt

@@ -61,7 +61,6 @@ class HiddenGutenbergPlugin @JvmOverloads constructor(private val aztecText: Azt
             output.setSpan(
                     GutenbergInlineCommentSpan(
                             text,
-                            aztecText.context,
                             AppCompatResources.getDrawable(aztecText.context, android.R.drawable.ic_menu_help)!!,
                             nestingLevel
                     ),

wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/spans/GutenbergInlineCommentSpan.kt

@@ -1,14 +1,13 @@
 package org.wordpress.aztec.plugins.wpcomments.spans
 
-import android.content.Context
 import android.graphics.drawable.Drawable
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.spans.AztecDynamicImageSpan
 import org.wordpress.aztec.spans.IAztecFullWidthImageSpan
 import java.lang.ref.WeakReference
 
-class GutenbergInlineCommentSpan @JvmOverloads constructor(val commentText: String, context: Context, drawable: Drawable, override var nestingLevel: Int, editor: AztecText? = null) :
-        AztecDynamicImageSpan(context, drawable), IAztecFullWidthImageSpan {
+class GutenbergInlineCommentSpan @JvmOverloads constructor(val commentText: String, drawable: Drawable, override var nestingLevel: Int, editor: AztecText? = null) :
+        AztecDynamicImageSpan(drawable), IAztecFullWidthImageSpan {
 
     init {
         textView = WeakReference(editor)