Use more Compat utilities (#5786)

* Use ActivityCompat.recreate

* Use more KTX extensions

* Use PackageInfoCompat.getLongVersionCode

* Remove unnecessary compat usages

app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.util.preference
 
 import androidx.annotation.StringRes
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.CheckBoxPreference
 import androidx.preference.DialogPreference
 import androidx.preference.EditTextPreference
@@ -150,7 +149,7 @@ var Preference.summaryRes: Int
 var Preference.iconTint: Int
     get() = 0 // set only
     set(value) {
-        DrawableCompat.setTint(icon, value)
+        icon.setTint(value)
     }
 
 var ListPreference.entriesRes: Array<Int>

app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt

@@ -7,7 +7,6 @@ import android.os.Environment
 import android.os.StatFs
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
-import androidx.core.os.EnvironmentCompat
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.Hash
 import java.io.File
@@ -51,7 +50,7 @@ object DiskUtil {
             .filterNotNull()
             .mapNotNull {
                 val file = File(it.absolutePath.substringBefore("/Android/"))
-                val state = EnvironmentCompat.getStorageState(file)
+                val state = Environment.getExternalStorageState(file)
                 if (state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY) {
                     file
                 } else {

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -102,7 +102,7 @@ fun Context.copyToClipboard(label: String, content: String) {
  */
 fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder {
     val builder = NotificationCompat.Builder(this, channelId)
-        .setColor(ContextCompat.getColor(this, R.color.accent_blue))
+        .setColor(getColor(R.color.accent_blue))
     if (block != null) {
         builder.block()
     }
@@ -152,7 +152,7 @@ fun Context.hasPermission(permission: String) = ContextCompat.checkSelfPermissio
     val tv = TypedValue()
     return if (this.theme.resolveAttribute(attr, tv, true)) {
         if (tv.resourceId != 0) {
-            ContextCompat.getColor(this, tv.resourceId)
+            getColor(tv.resourceId)
         } else {
             tv.data
         }

app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Rect
 import android.graphics.drawable.ColorDrawable
@@ -12,6 +11,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import androidx.core.graphics.alpha
+import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.blue
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.green
@@ -132,8 +132,9 @@ object ImageUtil {
             Side.RIGHT -> Rect(width - width / 2, 0, width, height)
             Side.LEFT -> Rect(0, 0, width / 2, height)
         }
-        val canvas = Canvas(half)
-        canvas.drawBitmap(imageBitmap, part, singlePage, null)
+        half.applyCanvas {
+            drawBitmap(imageBitmap, part, singlePage, null)
+        }
         val output = ByteArrayOutputStream()
         half.compress(Bitmap.CompressFormat.JPEG, 100, output)
 
@@ -151,21 +152,22 @@ object ImageUtil {
         val width = imageBitmap.width
 
         val result = createBitmap(width / 2, height * 2)
-        val canvas = Canvas(result)
-        // right -> upper
-        val rightPart = when (upperSide) {
-            Side.RIGHT -> Rect(width - width / 2, 0, width, height)
-            Side.LEFT -> Rect(0, 0, width / 2, height)
+        result.applyCanvas {
+            // right -> upper
+            val rightPart = when (upperSide) {
+                Side.RIGHT -> Rect(width - width / 2, 0, width, height)
+                Side.LEFT -> Rect(0, 0, width / 2, height)
+            }
+            val upperPart = Rect(0, 0, width / 2, height)
+            drawBitmap(imageBitmap, rightPart, upperPart, null)
+            // left -> bottom
+            val leftPart = when (upperSide) {
+                Side.LEFT -> Rect(width - width / 2, 0, width, height)
+                Side.RIGHT -> Rect(0, 0, width / 2, height)
+            }
+            val bottomPart = Rect(0, height, width / 2, height * 2)
+            drawBitmap(imageBitmap, leftPart, bottomPart, null)
         }
-        val upperPart = Rect(0, 0, width / 2, height)
-        canvas.drawBitmap(imageBitmap, rightPart, upperPart, null)
-        // left -> bottom
-        val leftPart = when (upperSide) {
-            Side.LEFT -> Rect(width - width / 2, 0, width, height)
-            Side.RIGHT -> Rect(0, 0, width / 2, height)
-        }
-        val bottomPart = Rect(0, height, width / 2, height * 2)
-        canvas.drawBitmap(imageBitmap, leftPart, bottomPart, null)
 
         val output = ByteArrayOutputStream()
         result.compress(Bitmap.CompressFormat.JPEG, 100, output)

app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt

@@ -13,10 +13,10 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.TooltipCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import androidx.core.view.descendants
 import androidx.core.view.forEach
@@ -123,10 +123,10 @@ inline fun View.popupMenu(
 
     if (selectedItemId != null) {
         (popup.menu as? MenuBuilder)?.setOptionalIconsVisible(true)
-        val emptyIcon = ContextCompat.getDrawable(context, R.drawable.ic_blank_24dp)
+        val emptyIcon = AppCompatResources.getDrawable(context, R.drawable.ic_blank_24dp)
         popup.menu.forEach { item ->
             item.icon = when (item.itemId) {
-                selectedItemId -> ContextCompat.getDrawable(context, R.drawable.ic_check_24dp)?.mutate()?.apply {
+                selectedItemId -> AppCompatResources.getDrawable(context, R.drawable.ic_check_24dp)?.mutate()?.apply {
                     setTint(context.getResourceColor(android.R.attr.textColorPrimary))
                 }
                 else -> emptyIcon