Migrated ContextCompat to AppCompatResources to support API 16+ devices

anitaa1990 · anitaa1990 · commit 279a2decfae1 · 2020-04-06T13:08:59.000+05:30
diff --git a/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt b/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt
@@ -29,8 +29,8 @@ import android.widget.PopupMenu
 import android.widget.ToggleButton
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.ImageUtils
@@ -339,7 +339,7 @@ open class MainActivity : AppCompatActivity(),
         aztec.visualEditor.setOverlay(predicate, 0, ColorDrawable(0x80000000.toInt()), Gravity.FILL)
         aztec.visualEditor.updateElementAttributes(predicate, attrs)
 
-        val progressDrawable = ContextCompat.getDrawable(this, android.R.drawable.progress_horizontal)!!
+        val progressDrawable = AppCompatResources.getDrawable(this, android.R.drawable.progress_horizontal)!!
         // set the height of the progress bar to 2 (it's in dp since the drawable will be adjusted by the span)
         progressDrawable.setBounds(0, 0, 0, 4)
 
@@ -361,7 +361,7 @@ open class MainActivity : AppCompatActivity(),
 
                 if (attrs.hasAttribute("video")) {
                     attrs.removeAttribute(attrs.getIndex("video"))
-                    aztec.visualEditor.setOverlay(predicate, 0, ContextCompat.getDrawable(this, android.R.drawable.ic_media_play), Gravity.CENTER)
+                    aztec.visualEditor.setOverlay(predicate, 0, AppCompatResources.getDrawable(this, android.R.drawable.ic_media_play), Gravity.CENTER)
                 }
 
                 aztec.visualEditor.updateElementAttributes(predicate, attrs)
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt
@@ -23,9 +23,9 @@ package org.wordpress.aztec
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
 import android.text.Editable
 import android.text.Spanned
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.plugins.IAztecPlugin
 import org.wordpress.aztec.plugins.html2visual.IHtmlTagHandler
 import org.wordpress.aztec.spans.AztecAudioSpan
@@ -58,7 +58,7 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
 
     init {
         val styles = context.obtainStyledAttributes(R.styleable.AztecText)
-        loadingDrawable = ContextCompat.getDrawable(context, styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading))!!
+        loadingDrawable = AppCompatResources.getDrawable(context, styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading))!!
         styles.recycle()
     }
 
@@ -124,7 +124,7 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
             LINE -> {
                 if (opening) {
                     // Add an extra newline above the line to prevent weird typing on the line above
-                    start(output, AztecHorizontalRuleSpan(context, ContextCompat.getDrawable(context, R.drawable.img_hr)!!,
+                    start(output, AztecHorizontalRuleSpan(context, AppCompatResources.getDrawable(context, R.drawable.img_hr)!!,
                             nestingLevel, AztecAttributes(attributes)))
                     output.append(Constants.MAGIC_CHAR)
                 } else {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -54,6 +54,7 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
@@ -154,7 +155,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         var watchersNestingLevel: Int = 0
 
         private fun getPlaceholderDrawableFromResID(context: Context, @DrawableRes drawableId: Int, maxImageWidthForVisualEditor: Int): BitmapDrawable {
-            val drawable = ContextCompat.getDrawable(context, drawableId)
+            val drawable = AppCompatResources.getDrawable(context, drawableId)
             var bitmap: Bitmap
             if (drawable is BitmapDrawable) {
                 bitmap = drawable.bitmap
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/formatting/LineBlockFormatter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/formatting/LineBlockFormatter.kt
@@ -1,10 +1,10 @@
 package org.wordpress.aztec.formatting
 
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.TextUtils
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.AztecText.OnImageTappedListener
@@ -103,7 +103,7 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
 
         val span = AztecHorizontalRuleSpan(
                 editor.context,
-                ContextCompat.getDrawable(editor.context, R.drawable.img_hr)!!,
+                AppCompatResources.getDrawable(editor.context, R.drawable.img_hr)!!,
                 nestingLevel,
                 AztecAttributes(),
                 editor
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecAudioSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecAudioSpan.kt
@@ -2,8 +2,8 @@ package org.wordpress.aztec.spans
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
 import android.view.Gravity
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
 
@@ -16,7 +16,7 @@ class AztecAudioSpan(context: Context, drawable: Drawable?, override var nesting
     override val TAG: String = "audio"
 
     init {
-        setOverlay(0, ContextCompat.getDrawable(context, android.R.drawable.ic_lock_silent_mode_off), Gravity.CENTER)
+        setOverlay(0, AppCompatResources.getDrawable(context, android.R.drawable.ic_lock_silent_mode_off), Gravity.CENTER)
     }
 
     override fun onClick() {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecVideoSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecVideoSpan.kt
@@ -2,8 +2,8 @@ package org.wordpress.aztec.spans
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
 import android.view.Gravity
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
 
@@ -16,7 +16,7 @@ class AztecVideoSpan(context: Context, drawable: Drawable?, override var nesting
     override val TAG: String = "video"
 
     init {
-        setOverlay(0, ContextCompat.getDrawable(context, android.R.drawable.ic_media_play), Gravity.CENTER)
+        setOverlay(0, AppCompatResources.getDrawable(context, android.R.drawable.ic_media_play), Gravity.CENTER)
     }
 
     override fun onClick() {
diff --git a/wordpress-comments/build.gradle b/wordpress-comments/build.gradle
@@ -9,6 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionName "1.0"
+        vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
diff --git a/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/HiddenGutenbergPlugin.kt b/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/HiddenGutenbergPlugin.kt
@@ -1,9 +1,9 @@
 package org.wordpress.aztec.plugins.wpcomments
 
-import androidx.core.content.ContextCompat
 import android.text.Editable
 import android.text.Spannable
 import android.text.style.CharacterStyle
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
 import org.wordpress.aztec.plugins.IAztecPlugin
@@ -62,7 +62,7 @@ class HiddenGutenbergPlugin @JvmOverloads constructor(private val aztecText: Azt
                     GutenbergInlineCommentSpan(
                             text,
                             aztecText.context,
-                            ContextCompat.getDrawable(aztecText.context, android.R.drawable.ic_menu_help)!!,
+                            AppCompatResources.getDrawable(aztecText.context, android.R.drawable.ic_menu_help)!!,
                             nestingLevel
                     ),
                     spanStart,
diff --git a/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/WordPressCommentsPlugin.kt b/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/WordPressCommentsPlugin.kt
@@ -1,9 +1,9 @@
 package org.wordpress.aztec.plugins.wpcomments
 
-import androidx.core.content.ContextCompat
 import android.text.Editable
 import android.text.Spannable
 import android.text.style.CharacterStyle
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
 import org.wordpress.aztec.plugins.html2visual.IHtmlCommentHandler
@@ -41,7 +41,7 @@ class WordPressCommentsPlugin(private val visualEditor: AztecText) : IInlineSpan
                     WordPressCommentSpan(
                             text,
                             visualEditor.context,
-                            ContextCompat.getDrawable(visualEditor.context, R.drawable.img_more)!!,
+                            AppCompatResources.getDrawable(visualEditor.context, R.drawable.img_more)!!,
                             nestingLevel
                     ),
                     spanStart,
@@ -57,7 +57,7 @@ class WordPressCommentsPlugin(private val visualEditor: AztecText) : IInlineSpan
                     WordPressCommentSpan(
                             text,
                             visualEditor.context,
-                            ContextCompat.getDrawable(visualEditor.context, R.drawable.img_page)!!,
+                            AppCompatResources.getDrawable(visualEditor.context, R.drawable.img_page)!!,
                             nestingLevel
                     ),
                     spanStart,
diff --git a/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/toolbar/MoreToolbarButton.kt b/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/toolbar/MoreToolbarButton.kt
@@ -1,12 +1,12 @@
 package org.wordpress.aztec.plugins.wpcomments.toolbar
 
-import androidx.core.content.ContextCompat
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ToggleButton
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.android.util.DeviceUtils
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
@@ -31,7 +31,7 @@ class MoreToolbarButton(val visualEditor: AztecText) : IToolbarButton {
         val span = WordPressCommentSpan(
                 WordPressCommentSpan.Comment.MORE.html,
                 visualEditor.context,
-                ContextCompat.getDrawable(visualEditor.context, R.drawable.img_more)!!,
+                AppCompatResources.getDrawable(visualEditor.context, R.drawable.img_more)!!,
                 nestingLevel,
                 visualEditor
         )
diff --git a/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/toolbar/PageToolbarButton.kt b/wordpress-comments/src/main/java/org/wordpress/aztec/plugins/wpcomments/toolbar/PageToolbarButton.kt
@@ -1,12 +1,12 @@
 package org.wordpress.aztec.plugins.wpcomments.toolbar
 
-import androidx.core.content.ContextCompat
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ToggleButton
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
 import org.wordpress.aztec.plugins.IToolbarButton
@@ -31,7 +31,7 @@ class PageToolbarButton(val visualEditor: AztecText) : IToolbarButton {
         val span = WordPressCommentSpan(
                 WordPressCommentSpan.Comment.PAGE.html,
                 visualEditor.context,
-                ContextCompat.getDrawable(visualEditor.context, R.drawable.img_page)!!,
+                AppCompatResources.getDrawable(visualEditor.context, R.drawable.img_page)!!,
                 nestingLevel,
                 visualEditor
         )
diff --git a/wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/extensions/VideoPressExtensions.kt b/wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/extensions/VideoPressExtensions.kt
@@ -1,7 +1,7 @@
 package org.wordpress.aztec.plugins.shortcodes.extensions
 
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Html
 import org.wordpress.aztec.spans.AztecVideoSpan
@@ -10,7 +10,7 @@ val ATTRIBUTE_VIDEOPRESS_HIDDEN_ID = "videopress_hidden_id"
 val ATTRIBUTE_VIDEOPRESS_HIDDEN_SRC = "videopress_hidden_src"
 
 fun AztecText.updateVideoPressThumb(thumbURL: String, videoURL: String, videoPressID: String) {
-    val loadingDrawable = ContextCompat.getDrawable(context, this.drawableLoading)
+    val loadingDrawable = AppCompatResources.getDrawable(context, this.drawableLoading)
     val callbacks = object : Html.ImageGetter.Callbacks {
         private fun replaceImage(drawable: Drawable?) {
             val spans = text.getSpans(0, text.length, AztecVideoSpan::class.java)
@@ -29,7 +29,7 @@ fun AztecText.updateVideoPressThumb(thumbURL: String, videoURL: String, videoPre
         }
 
         override fun onImageFailed() {
-            replaceImage(ContextCompat.getDrawable(context, drawableFailed))
+            replaceImage(AppCompatResources.getDrawable(context, drawableFailed))
         }
 
         override fun onImageLoaded(drawable: Drawable?) {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ android {`
`9`	`9`	`minSdkVersion 16`
`10`	`10`	`targetSdkVersion 28`
`11`	`11`	`versionName "1.0"`
	`12`	`+ vectorDrawables.useSupportLibrary = true`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`buildTypes {`