From 7d4e530b5a39a75c94c767269036aee3d0d987ab Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 29 Jun 2022 03:54:02 -0400 Subject: [PATCH] Compile sdk 33 --- app/src/main/AndroidManifest.xml | 1 + .../ui/library/LibraryGestureDetector.kt | 6 +++--- .../ui/library/LibraryHeaderGestureDetector.kt | 8 ++++---- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 16 ++++++++-------- .../manga/process/MigrationListController.kt | 4 ++-- .../ui/reader/ReaderNavGestureDetector.kt | 10 +++++----- .../ui/reader/viewer/ReaderPageImageView.kt | 2 +- .../ui/reader/viewer/ReaderProgressBar.kt | 4 ++-- .../ui/reader/viewer/webtoon/WebtoonFrame.kt | 8 ++++---- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 11 files changed, 32 insertions(+), 31 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec0767436e..091debdd1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@ android:preserveLegacyExternalStorage="true" android:hardwareAccelerated="true" android:usesCleartextTraffic="true" + android:enableOnBackInvokedCallback="true" android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true" android:supportsRtl="true" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt index 8693b70186..c052c95915 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt @@ -18,8 +18,8 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur } override fun onScroll( - e1: MotionEvent?, - e2: MotionEvent?, + e1: MotionEvent, + e2: MotionEvent, distanceX: Float, distanceY: Float, ): Boolean { @@ -29,7 +29,7 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur return super.onScroll(e1, e2, distanceX, distanceY) } - override fun onSingleTapUp(e: MotionEvent?): Boolean { + override fun onSingleTapUp(e: MotionEvent): Boolean { return super.onSingleTapUp(e) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt index 12e3fc9145..1bb06f4920 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt @@ -18,19 +18,19 @@ class LibraryHeaderGestureDetector( ) : GestureDetector.SimpleOnGestureListener() { var vibrated = false - override fun onDown(e: MotionEvent?): Boolean { + override fun onDown(e: MotionEvent): Boolean { vibrated = false return super.onDown(e) } override fun onScroll( - e1: MotionEvent?, - e2: MotionEvent?, + e1: MotionEvent, + e2: MotionEvent, distanceX: Float, distanceY: Float, ): Boolean { if (binding == null || header == null) return false - val distance = ((e1?.rawX ?: 0f) - (e2?.rawX ?: 0f)) + val distance = (e1.rawX - e2.rawX) val poa = 0.75f binding.categoryHeaderLayout.translationX = abs(distance).pow(poa) * -sign(distance) binding.rearView.isVisible = distance != 0f diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 6b86fdf960..039a2bb1b7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -385,7 +385,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi binding.searchToolbar.searchItem?.setOnActionExpandListener( object : MenuItem.OnActionExpandListener { - override fun onMenuItemActionExpand(item: MenuItem?): Boolean { + override fun onMenuItemActionExpand(item: MenuItem): Boolean { val controller = router.backstack.lastOrNull()?.controller binding.appBar.compactSearchMode = binding.appBar.useLargeToolbar && resources.configuration.screenHeightDp < 600 @@ -404,7 +404,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi return true } - override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { + override fun onMenuItemActionCollapse(item: MenuItem): Boolean { val controller = router.backstack.lastOrNull()?.controller binding.appBar.compactSearchMode = false controller?.mainRecyclerView?.requestApplyInsets() @@ -1059,14 +1059,14 @@ open class MainActivity : BaseActivity(), DownloadServiceLi @SuppressLint("RestrictedApi") private fun updateSubMenu(oldMenuItem: MenuItem, menuItem: MenuItem) { if (oldMenuItem.hasSubMenu()) { - val oldSubMenu = oldMenuItem.subMenu + val oldSubMenu = oldMenuItem.subMenu ?: return val newMenuIds = oldSubMenu.children.toList().map { it.itemId } - val currentItemsId = menuItem.subMenu.children.toList().map { it.itemId } + val currentItemsId = menuItem.subMenu?.children?.toList()?.map { it.itemId } ?: return var isExclusiveCheckable = false var isCheckable = false oldSubMenu.children.toList().forEachIndexed { index, oldSubMenuItem -> val isSubVisible = oldSubMenuItem.isVisible - addOrUpdateMenuItem(oldSubMenuItem, menuItem.subMenu, isSubVisible, currentItemsId, index) + addOrUpdateMenuItem(oldSubMenuItem, menuItem.subMenu!!, isSubVisible, currentItemsId, index) if (!isExclusiveCheckable) { isExclusiveCheckable = (oldSubMenuItem as? MenuItemImpl)?.isExclusiveCheckable ?: false } @@ -1074,10 +1074,10 @@ open class MainActivity : BaseActivity(), DownloadServiceLi isCheckable = oldSubMenuItem.isCheckable } } - menuItem.subMenu.setGroupCheckable(oldSubMenu.children.first().groupId, isCheckable, isExclusiveCheckable) - menuItem.subMenu.children.toList().forEach { + menuItem.subMenu?.setGroupCheckable(oldSubMenu.children.first().groupId, isCheckable, isExclusiveCheckable) + menuItem.subMenu?.children?.toList()?.forEach { if (!newMenuIds.contains(it.itemId)) { - menuItem.subMenu.removeItem(it.itemId) + menuItem.subMenu?.removeItem(it.itemId) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt index 2880272e8a..599cfedaf9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt @@ -462,8 +462,8 @@ class MigrationListController(bundle: Bundle? = null) : ) } - menuCopy.icon.mutate() - menuMigrate.icon.mutate() + menuCopy.icon?.mutate() + menuMigrate.icon?.mutate() val tintColor = activity?.getResourceColor(R.attr.actionBarTintColor) ?: Color.WHITE val translucentWhite = ColorUtils.setAlphaComponent(tintColor, 127) menuCopy.icon?.setTint(if (allMangasDone) tintColor else translucentWhite) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt index 5ad2b7b2af..77c21b8ce8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt @@ -19,14 +19,14 @@ class ReaderNavGestureDetector(private val activity: ReaderActivity) : GestureDe } override fun onScroll( - e1: MotionEvent?, - e2: MotionEvent?, + e1: MotionEvent, + e2: MotionEvent, distanceX: Float, distanceY: Float, ): Boolean { - val newDistanceX = (e1?.rawX ?: 0f) - (e2?.rawX ?: 0f) - val newDistanceY = (e1?.rawY ?: 0f) - (e2?.rawY ?: 0f) - if ((!hasScrollHorizontal || lockVertical) && e2 != null) { + val newDistanceX = e1.rawX - e2.rawX + val newDistanceY = e1.rawY - e2.rawY + if ((!hasScrollHorizontal || lockVertical)) { hasScrollHorizontal = abs(newDistanceX) > abs(newDistanceY) && abs(newDistanceX) > 40 if (!lockVertical) { lockVertical = abs(newDistanceX) < abs(newDistanceY) && abs(newDistanceY) > 150 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index 8619583dbb..fa431d34b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -251,7 +251,7 @@ open class ReaderPageImageView @JvmOverloads constructor( return true } - override fun onSingleTapConfirmed(e: MotionEvent?): Boolean { + override fun onSingleTapConfirmed(e: MotionEvent): Boolean { this@ReaderPageImageView.onViewClicked() return super.onSingleTapConfirmed(e) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt index 3a9a33f3ad..bb3886f5fa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt @@ -176,12 +176,12 @@ class ReaderProgressBar @JvmOverloads constructor( duration = 1000 addListener( object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationEnd(animation: Animator) { visibility = View.GONE alpha = 1f } - override fun onAnimationCancel(animation: Animator?) { + override fun onAnimationCancel(animation: Animator) { alpha = 1f } }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt index 2fc2c42349..3e27f9c193 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt @@ -50,7 +50,7 @@ class WebtoonFrame(context: Context) : FrameLayout(context) { * Scale listener used to delegate events to the recycler view. */ inner class ScaleListener : ScaleGestureDetector.SimpleOnScaleGestureListener() { - override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean { + override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { recycler?.onScaleBegin() return true } @@ -69,13 +69,13 @@ class WebtoonFrame(context: Context) : FrameLayout(context) { * Fling listener used to delegate events to the recycler view. */ inner class FlingListener : GestureDetector.SimpleOnGestureListener() { - override fun onDown(e: MotionEvent?): Boolean { + override fun onDown(e: MotionEvent): Boolean { return true } override fun onFling( - e1: MotionEvent?, - e2: MotionEvent?, + e1: MotionEvent, + e2: MotionEvent, velocityX: Float, velocityY: Float, ): Boolean { diff --git a/build.gradle.kts b/build.gradle.kts index a6ab16a674..7cbb430605 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ subprojects { buildscript { dependencies { - classpath("com.android.tools.build:gradle:7.2.0") + classpath("com.android.tools.build:gradle:7.2.1") classpath("com.google.gms:google-services:4.3.10") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${AndroidVersions.kotlin}") classpath("com.google.android.gms:oss-licenses-plugin:0.10.5") diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 960271288a..4fbf86a478 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,5 +1,5 @@ object AndroidVersions { - const val compileSdk = 31 + const val compileSdk = 33 const val minSdk = 23 const val targetSdk = 30 const val versionCode = 92