null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Prevent NPE crashes on touch event

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-08-31 12:14:39 +07:00
parent cb9f8fa398
commit 59f9e556ec
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt
View file

@ -15,12 +15,10 @@ import androidx.core.view.marginTop
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.swiperefreshlayout.widget.CircularProgressDrawable import androidx.swiperefreshlayout.widget.CircularProgressDrawable
import co.touchlab.kermit.Logger
import com.github.florent37.viewtooltip.ViewTooltip import com.github.florent37.viewtooltip.ViewTooltip
import eu.davidea.flexibleadapter.SelectableAdapter import eu.davidea.flexibleadapter.SelectableAdapter
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import yokai.i18n.MR
import yokai.util.lang.getString
import dev.icerock.moko.resources.compose.stringResource
import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@ -36,6 +34,8 @@ import eu.kanade.tachiyomi.util.view.setText
import eu.kanade.tachiyomi.util.view.text import eu.kanade.tachiyomi.util.view.text
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import yokai.i18n.MR
import yokai.util.lang.getString
class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) :
BaseFlexibleViewHolder(view, adapter, true) { BaseFlexibleViewHolder(view, adapter, true) {
@ -96,11 +96,18 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) :
} }
when (event?.action) { when (event?.action) {
MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> { MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
itemView.parent.requestDisallowInterceptTouchEvent(false) try {
itemView.parent.requestDisallowInterceptTouchEvent(false)
} catch (e: NullPointerException) {
Logger.e(e) { "Failed to request disallow intercept touch event" }
return@setOnTouchListener false
}
if (isCancelling) { if (isCancelling) {
isCancelling = false isCancelling = false
return@setOnTouchListener false return@setOnTouchListener false
} }
val result = gestureDetector.onTouchEvent(event) val result = gestureDetector.onTouchEvent(event)
if (!result) { if (!result) {
val anim = binding.categoryHeaderLayout.animate().setDuration(150L) val anim = binding.categoryHeaderLayout.animate().setDuration(150L)