Drop support for Android 5.x

2021-04-19 15:29:00 -04:00 · 2021-04-19 15:29:00 -04:00 · 89619b7836
commit 89619b7836
parent 6aff438a16
15 changed files with 40 additions and 81 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
@ -114,10 +114,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
                        latch.countDown()
                    }

-                    // HTTP error codes are only received since M
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                        url == origRequestUrl && !challengeFound
-                    ) {
+                    if (url == origRequestUrl && !challengeFound) {
                        // The first request didn't return the challenge, abort.
                        latch.countDown()
                    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
@ -21,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)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@ -298,23 +298,17 @@ class MangaController :
        fab.setOnClickListener {
            val item = presenter.getNextUnreadChapter()
            if (item != null) {
-                // Create animation listener
-                val revealAnimationListener: Animator.AnimatorListener = object : AnimatorListenerAdapter() {
+                // Get coordinates and start animation
+                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)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
@ -304,18 +304,6 @@ class MangaInfoHeaderAdapter(
                    initialLoad = false
                }
            }
-
-            // backgroundTint attribute doesn't work properly on Android 5
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-                listOf(binding.backdropOverlay, binding.mangaInfoToggleMoreScrim)
-                    .forEach {
-                        @Suppress("DEPRECATION")
-                        it.background.setColorFilter(
-                            view.context.getResourceColor(android.R.attr.colorBackground),
-                            PorterDuff.Mode.SRC_ATOP
-                        )
-                    }
-            }
        }

        private fun showMangaInfo(visible: Boolean) {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
@ -67,7 +67,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
@ -90,7 +89,6 @@ class SettingsAdvancedController : SettingsController() {
                }
            }
        }
-        }

        preferenceCategory {
            titleRes = R.string.label_data
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/BiometricUtil.kt
+++ b/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
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt
+++ b/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,
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/ElevationAppBarLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ElevationAppBarLayout.kt
@ -20,13 +20,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
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt
+++ b/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
    }
 }
--- a/app/src/main/res/values-v23/themes.xml
+++ b/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>
--- a/app/src/main/res/values/themes.xml
+++ b/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">
--- a/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt
+++ b/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
--- a/app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt
+++ b/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 {

--- a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt
+++ b/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 {

--- a/buildSrc/src/main/kotlin/AndroidConfig.kt
+++ b/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"