Drop support for Android 5.x

(cherry picked from commit 89619b7836145130b4bf5d92ebc0f6fe70de7233)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt

app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.network
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.webkit.WebSettings
@@ -114,10 +113,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
                         latch.countDown()
                     }
 
-                    // HTTP error codes are only received since M
+                    if (url == origRequestUrl && !challengeFound) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                        url == origRequestUrl && !challengeFound
-                    ) {
                         // The first request didn't return the challenge, abort.
                         latch.countDown()
                     }

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.base.controller
 
 import android.content.Intent
 import android.content.pm.PackageManager.PERMISSION_GRANTED
-import android.os.Build
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.bluelinelabs.conductor.Controller
@@ -22,14 +21,12 @@ fun Router.popControllerWithTag(tag: String): Boolean {
 
 fun Controller.requestPermissionsSafe(permissions: Array<String>, requestCode: Int) {
     val activity = activity ?: return
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
     permissions.forEach { permission ->
         if (ContextCompat.checkSelfPermission(activity, permission) != PERMISSION_GRANTED) {
             requestPermissions(arrayOf(permission), requestCode)
         }
     }
 }
-}
 
 fun Controller.withFadeTransaction(): RouterTransaction {
     return RouterTransaction.with(this)

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -407,23 +407,17 @@ class MangaController :
         fab.setOnClickListener {
             val item = presenter.getNextUnreadChapter()
             if (item != null) {
-                // Create animation listener
+                // Get coordinates and start animation
-                val revealAnimationListener: Animator.AnimatorListener = object : AnimatorListenerAdapter() {
+                actionFab?.getCoordinates()?.let { coordinates ->
+                    binding.revealView.showRevealEffect(
+                        coordinates.x,
+                        coordinates.y,
+                        object : AnimatorListenerAdapter() {
                             override fun onAnimationStart(animation: Animator?) {
                                 openChapter(item.chapter, true)
                             }
                         }
-
-                // Get coordinates and start animation
-                actionFab?.getCoordinates()?.let { coordinates ->
-                    if (!binding.revealView.showRevealEffect(
-                            coordinates.x,
-                            coordinates.y,
-                            revealAnimationListener
                     )
-                    ) {
-                        openChapter(item.chapter)
-                    }
                 }
             } else {
                 view?.context?.toast(R.string.no_next_chapter)

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt

@@ -1,7 +1,5 @@
 package eu.kanade.tachiyomi.ui.manga.info
 
-import android.graphics.PorterDuff
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -23,7 +21,6 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.merged.sql.models.MergedMangaReference
 import exh.source.MERGED_SOURCE_ID
 import exh.util.SourceTagsUtil
@@ -299,14 +296,6 @@ class MangaInfoHeaderAdapter(
                             .into(it)
                     }
             }
-
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-                @Suppress("DEPRECATION")
-                binding.backdropOverlay.background.setColorFilter(
-                    view.context.getResourceColor(android.R.attr.colorBackground),
-                    PorterDuff.Mode.SRC_ATOP
-                )
-            }
         }
 
         /**

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoItemAdapter.kt

@@ -1,7 +1,5 @@
 package eu.kanade.tachiyomi.ui.manga.info
 
-import android.graphics.PorterDuff
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,7 +17,6 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.online.NamespaceSource
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
 import exh.source.getMainSource
@@ -178,15 +175,6 @@ class MangaInfoItemAdapter(
                     initialLoad = false
                 }
             }
-
-            // backgroundTint attribute doesn't work properly on Android 5
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-                @Suppress("DEPRECATION")
-                binding.mangaInfoToggleMoreScrim.background.setColorFilter(
-                    view.context.getResourceColor(android.R.attr.colorBackground),
-                    PorterDuff.Mode.SRC_ATOP
-                )
-            }
         }
 
         private fun showMangaInfo(visible: Boolean) {

app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt

@@ -163,11 +163,6 @@ class AboutController : SettingsController() {
     private fun checkVersion() {
         if (activity == null) return
 
-        if (Build.VERSION.SDK_INT under Build.VERSION_CODES.M) {
-            activity?.toast(R.string.update_check_eol)
-            return
-        }
-
         activity?.toast(R.string.update_check_look_for_updates)
 
         launchNow {

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.widget.Toast
@@ -77,7 +76,6 @@ class SettingsAdvancedController : SettingsController() {
             }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         preference {
             key = "pref_disable_battery_optimization"
             titleRes = R.string.pref_disable_battery_optimization
@@ -100,7 +98,6 @@ class SettingsAdvancedController : SettingsController() {
                 }
             }
         }
-        }
 
         preferenceCategory {
             titleRes = R.string.label_data

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

@@ -33,7 +33,7 @@ object BiometricUtil {
      * Returns whether the device is secured with a PIN, pattern or password.
      */
     private fun isLegacySecured(context: Context): Boolean {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
             if (context.keyguardManager.isDeviceSecure) {
                 return true
             }

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

@@ -54,7 +54,6 @@ abstract class WebViewClientCompat : WebViewClient() {
         return shouldInterceptRequestCompat(view, url)
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     final override fun onReceivedError(
         view: WebView,
         request: WebResourceRequest,
@@ -78,7 +77,6 @@ abstract class WebViewClientCompat : WebViewClient() {
         onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url)
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     final override fun onReceivedHttpError(
         view: WebView,
         request: WebResourceRequest,

app/src/main/java/eu/kanade/tachiyomi/widget/ElevationAppBarLayout.kt

@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.widget
 import android.animation.ObjectAnimator
 import android.animation.StateListAnimator
 import android.content.Context
-import android.os.Build
 import android.util.AttributeSet
 import com.google.android.material.R
 import com.google.android.material.appbar.AppBarLayout
@@ -20,13 +19,8 @@ class ElevationAppBarLayout @JvmOverloads constructor(
     }
 
     fun enableElevation(liftOnScroll: Boolean) {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-            // Delay to avoid crash
-            post { setElevation(liftOnScroll) }
-        } else {
         setElevation(liftOnScroll)
     }
-    }
 
     private fun setElevation(liftOnScroll: Boolean) {
         stateListAnimator = origStateAnimator

app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt

@@ -49,10 +49,8 @@ class RevealAnimationView @JvmOverloads constructor(context: Context, attrs: Att
      * @param centerX x starting point
      * @param centerY y starting point
      * @param listener animation listener
-     *
-     * @return sdk version lower then 21
      */
-    fun showRevealEffect(centerX: Int, centerY: Int, listener: Animator.AnimatorListener): Boolean {
+    fun showRevealEffect(centerX: Int, centerY: Int, listener: Animator.AnimatorListener) {
         this.isVisible = true
 
         val height = this.height
@@ -71,6 +69,5 @@ class RevealAnimationView @JvmOverloads constructor(context: Context, attrs: Att
 
         anim.addListener(listener)
         anim.start()
-        return true
     }
 }

app/src/main/java/exh/EXHMigrations.kt

@@ -1,7 +1,6 @@
 package exh
 
 import android.content.Context
-import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.pushtorefresh.storio.sqlite.queries.Query
@@ -35,7 +34,6 @@ import exh.source.MERGED_SOURCE_ID
 import exh.source.PERV_EDEN_EN_SOURCE_ID
 import exh.source.PERV_EDEN_IT_SOURCE_ID
 import exh.source.TSUMINO_SOURCE_ID
-import exh.util.over
 import exh.util.under
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -68,7 +66,7 @@ object EXHMigrations {
                 // Fresh install
                 if (oldVersion == 0) {
                     // Set up default background tasks
-                    if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT over Build.VERSION_CODES.LOLLIPOP_MR1) {
+                    if (BuildConfig.INCLUDE_UPDATER) {
                         UpdaterJob.setupTask(context)
                     }
                     ExtensionUpdateJob.setupTask(context)
@@ -234,9 +232,9 @@ object EXHMigrations {
                     // Reset rotation to Free after replacing Lock
                     preferences.rotation().set(1)
                     // Disable update check for Android 5.x users
-                    if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT under Build.VERSION_CODES.M) {
+                    //if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT under Build.VERSION_CODES.M) {
-                        UpdaterJob.cancelTask(context)
+                     //   UpdaterJob.cancelTask(context)
-                    }
+                    //}
                 }
 
                 // if (oldVersion under 1) { } (1 is current release version)

app/src/main/res/values-v23/themes.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Base.V23.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
-    <style name="Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light" />
-</resources>

app/src/main/res/values-v27/themes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light">
+    <style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
         <item name="android:navigationBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>

app/src/main/res/values/themes.xml

@@ -91,7 +91,10 @@
     <!--===========-->
     <!-- Main Theme-->
     <!--===========-->
-    <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base" />
+    <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base">
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
     <style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
 
     <style name="Theme.Tachiyomi.Light.Blue">

app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt

@@ -41,7 +41,7 @@ import uy.kohesive.injekt.api.addSingleton
  * Test class for the [LegacyBackupManager].
  * Note that this does not include the backup create/restore services.
  */
-@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.LOLLIPOP])
+@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.M])
 @RunWith(CustomRobolectricGradleTestRunner::class)
 class BackupTest {
     // Create root object

app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt

@@ -13,7 +13,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
-@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.LOLLIPOP])
+@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.M])
 @RunWith(CustomRobolectricGradleTestRunner::class)
 class CategoryTest {
 

app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt

@@ -28,7 +28,7 @@ import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addSingleton
 
-@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.LOLLIPOP])
+@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.M])
 @RunWith(CustomRobolectricGradleTestRunner::class)
 class LibraryUpdateServiceTest {
 

buildSrc/src/main/kotlin/AndroidConfig.kt

@@ -1,6 +1,6 @@
 object AndroidConfig {
     const val compileSdk = 29
-    const val minSdk = 21
+    const val minSdk = 23
     const val targetSdk = 29
     const val buildTools = "30.0.3"
     const val ndk = "22.1.7171670"