[修复] 切换页面时动画引起的崩溃问题

[修复] 搜索栏无法正常收回历史记录的问题

app/src/main/java/com/yenaly/han1meviewer/ui/activity/PreviewActivity.kt

@@ -33,6 +33,7 @@ import com.yenaly.han1meviewer.ui.adapter.HanimePreviewNewsRvAdapter
 import com.yenaly.han1meviewer.ui.adapter.HanimePreviewTourRvAdapter
 import com.yenaly.han1meviewer.ui.view.CenterLinearLayoutManager
 import com.yenaly.han1meviewer.ui.viewmodel.PreviewViewModel
+import com.yenaly.han1meviewer.util.addUpdateListener
 import com.yenaly.han1meviewer.util.colorTransition
 import com.yenaly.han1meviewer.util.toColorStateList
 import com.yenaly.yenaly_libs.base.YenalyActivity
@@ -309,7 +310,7 @@ class PreviewActivity : YenalyActivity<ActivityPreviewBinding, PreviewViewModel>
         ) {
             duration = animDuration
             interpolator = animInterpolator
-            addUpdateListener {
+            addUpdateListener(lifecycle) {
                 val value = it.animatedValue as Int
                 binding.collapsingToolbar.setContentScrimColor(value)
             }
@@ -320,7 +321,7 @@ class PreviewActivity : YenalyActivity<ActivityPreviewBinding, PreviewViewModel>
         ) {
             duration = animDuration
             interpolator = animInterpolator
-            addUpdateListener {
+            addUpdateListener(lifecycle) {
                 val value = it.animatedValue as Int
                 binding.llTour.setBackgroundColor(value)
             }

app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.core.view.isGone
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
@@ -12,7 +13,10 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
-import com.yenaly.han1meviewer.*
+import com.yenaly.han1meviewer.ADVANCED_SEARCH_MAP
+import com.yenaly.han1meviewer.AdvancedSearchMap
+import com.yenaly.han1meviewer.HAdvancedSearch
+import com.yenaly.han1meviewer.VideoCoverSize
 import com.yenaly.han1meviewer.databinding.ActivitySearchBinding
 import com.yenaly.han1meviewer.logic.entity.SearchHistoryEntity
 import com.yenaly.han1meviewer.logic.model.HanimeInfo
@@ -175,6 +179,12 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>(),
 
     @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
     private fun initSearchBar() {
+        onBackPressedDispatcher.addCallback(this) {
+            if (binding.searchBar.hideHistory()) {
+                return@addCallback
+            }
+            finish()
+        }
         val searchAdapter = HanimeSearchHistoryRvAdapter()
         searchAdapter.listener = object : HanimeSearchHistoryRvAdapter.OnItemViewClickListener {
             override fun onItemClickListener(v: View, history: SearchHistoryEntity) {

app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/HomePageFragment.kt

@@ -37,6 +37,7 @@ import com.yenaly.han1meviewer.ui.adapter.RvWrapper.Companion.wrappedWith
 import com.yenaly.han1meviewer.ui.adapter.VideoColumnTitleAdapter
 import com.yenaly.han1meviewer.ui.fragment.IToolbarFragment
 import com.yenaly.han1meviewer.ui.viewmodel.MainViewModel
+import com.yenaly.han1meviewer.util.addUpdateListener
 import com.yenaly.han1meviewer.util.colorTransition
 import com.yenaly.yenaly_libs.base.YenalyFragment
 import com.yenaly.yenaly_libs.utils.startActivity
@@ -254,7 +255,7 @@ class HomePageFragment : YenalyFragment<FragmentHomePageBinding, MainViewModel>(
         ) {
             interpolator = animInterpolator
             duration = animDuration
-            addUpdateListener {
+            addUpdateListener(viewLifecycleOwner.lifecycle) {
                 val color = it.animatedValue as Int
                 binding.btnBanner.iconTint = ColorStateList.valueOf(color)
             }
@@ -265,7 +266,7 @@ class HomePageFragment : YenalyFragment<FragmentHomePageBinding, MainViewModel>(
         ) {
             interpolator = animInterpolator
             duration = animDuration
-            addUpdateListener {
+            addUpdateListener(viewLifecycleOwner.lifecycle) {
                 val color = it.animatedValue as Int
                 binding.aColor.setBackgroundColor(color)
             }

app/src/main/java/com/yenaly/han1meviewer/ui/view/CollapsibleTags.kt

@@ -20,6 +20,7 @@ import com.google.android.material.chip.ChipGroup
 import com.yenaly.han1meviewer.ADVANCED_SEARCH_MAP
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.ui.activity.SearchActivity
+import com.yenaly.han1meviewer.util.addUpdateListener
 import com.yenaly.han1meviewer.util.readBooleanCompat
 import com.yenaly.han1meviewer.util.writeBooleanCompat
 import com.yenaly.yenaly_libs.utils.activity
@@ -172,7 +173,7 @@ class CollapsibleTags @JvmOverloads constructor(
         return ValueAnimator.ofInt(start, end).apply {
             duration = animDuration
             interpolator = animInterpolator
-            addUpdateListener {
+            addUpdateListener(lifecycle) {
                 val value = it.animatedValue as Int
                 chipGroup.updateLayoutParams {
                     height = value

app/src/main/java/com/yenaly/han1meviewer/ui/view/HanimeSearchBar.kt

@@ -4,7 +4,6 @@ import android.animation.ValueAnimator
 import android.content.Context
 import android.util.AttributeSet
 import android.util.Log
-import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
@@ -134,7 +133,7 @@ class HanimeSearchBar @JvmOverloads constructor(
                 trySend(searchText)
                 Log.d("HanimeSearchBar", "focus: $searchText")
             } else {
-                if (!isCollapsed) hideHistory()
+                hideHistory()
             }
         }
 
@@ -168,7 +167,7 @@ class HanimeSearchBar @JvmOverloads constructor(
         isCollapsed = false
     }
 
-    fun hideHistory() {
+    fun hideHistory(): Boolean {
         if (!isCollapsed) {
             etSearch.hideIme(window)
             Log.d("HanimeSearchBar", "History Height: ${rvHistory.height}")
@@ -179,7 +178,9 @@ class HanimeSearchBar @JvmOverloads constructor(
                 .rotation(0F)
                 .start()
             isCollapsed = true
+            return true
         }
+        return false
     }
 
     private fun View.buildHeightAnimation(
@@ -207,11 +208,14 @@ class HanimeSearchBar @JvmOverloads constructor(
         return measuredHeight
     }
 
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.keyCode == KeyEvent.KEYCODE_BACK && !isCollapsed) {
-            hideHistory()
-            return true
-        }
-        return super.dispatchKeyEvent(event)
-    }
+    // 使用 onBackPressedDispatcher.addCallback 替换
+    // 这个方法在 API 34 以上（貌似）无法返回 key event
+    //
+    // override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+    //     if (event.keyCode == KeyEvent.KEYCODE_BACK && !isCollapsed) {
+    //         hideHistory()
+    //         return true
+    //     }
+    //     return super.dispatchKeyEvent(event)
+    // }
 }

app/src/main/java/com/yenaly/han1meviewer/util/Animations.kt

@@ -0,0 +1,34 @@
+package com.yenaly.han1meviewer.util
+
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import androidx.annotation.ColorInt
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+
+/**
+ * Add an update listener to the [ValueAnimator] and remove it when the [LifecycleOwner] is destroyed.
+ */
+fun ValueAnimator.addUpdateListener(
+    lifecycle: Lifecycle?,
+    listener: ValueAnimator.AnimatorUpdateListener?,
+) {
+    addUpdateListener(listener)
+    lifecycle?.addObserver(object : DefaultLifecycleObserver {
+        override fun onDestroy(owner: LifecycleOwner) {
+            this@addUpdateListener.removeAllUpdateListeners()
+        }
+    })
+}
+
+fun colorTransition(
+    @ColorInt fromColor: Int,
+    @ColorInt toColor: Int,
+    action: (ValueAnimator.() -> Unit)? = null,
+) {
+    val colorAnimation: ValueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), fromColor, toColor)
+    action?.invoke(colorAnimation)
+
+    colorAnimation.start()
+}

app/src/main/java/com/yenaly/han1meviewer/util/Colors.kt

@@ -1,19 +1,6 @@
 package com.yenaly.han1meviewer.util
 
-import android.animation.ArgbEvaluator
-import android.animation.ValueAnimator
 import android.content.res.ColorStateList
 import androidx.annotation.ColorInt
 
-fun colorTransition(
-    @ColorInt fromColor: Int,
-    @ColorInt toColor: Int,
-    action: (ValueAnimator.() -> Unit)? = null,
-) {
-    val colorAnimation: ValueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), fromColor, toColor)
-    action?.invoke(colorAnimation)
-
-    colorAnimation.start()
-}
-
 fun @receiver:ColorInt Int.toColorStateList() = ColorStateList.valueOf(this)

gradle/libs.versions.toml

@@ -61,7 +61,7 @@ permissionX = "1.7.1"
 junit = "4.13.2"
 testJunit = "1.1.5"
 testEspressoCore = "3.5.1"
-guava = "33.1.0-android"
+guava = "33.2.0-android"
 exoplayer = "1.3.1"
 leakCanary = "2.14"
 circularRevealSwitch = "0.4.5"