Lyric: Fix abnormal scroll when switch lyric line by click

FoedusProgramme · Nov 17, 2024 · f25335a · f25335a
1 parent 6966cfa
commit f25335a
Showing 1 changed file with 32 additions and 6 deletions.
diff --git a/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt
@@ -1400,6 +1400,7 @@ class FullBottomSheet @JvmOverloads constructor(
 
         var currentHighlightLyricPositions = mutableListOf<Int>()
         var currentFocusLyricPosition = -1
+        var ignoredPositionAtMost = -1
 
         val isExtendedLRC: Boolean get() = lyricList.any { it.wordTimestamps.isNotEmpty() }
 
@@ -1476,6 +1477,7 @@ class FullBottomSheet @JvmOverloads constructor(
                 it.label == LrcUtils.SpeakerLabel.Voice2 || it.label == LrcUtils.SpeakerLabel.Female
             }
             val currentLyricHasMultiSpeaker = lyric.label == LrcUtils.SpeakerLabel.Voice2 || lyric.label == LrcUtils.SpeakerLabel.Female
+            val currentLyricIsBgSpeaker = lyric.label == LrcUtils.SpeakerLabel.Background
 
             with(holder.lyricCard) {
                 if (lyric.timeStamp != null) {
@@ -1490,6 +1492,11 @@ class FullBottomSheet @JvmOverloads constructor(
                         performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK)
                         activity.getPlayer()?.apply {
                             animationLock = true
+                            if (currentLyricIsBgSpeaker) {
+                                ignoredPositionAtMost = lyricList.indexOf(lyric) - 1
+                            } else {
+                                ignoredPositionAtMost = lyricList.indexOf(lyric)
+                            }
                             seekTo(it1)
                             if (!isPlaying) play()
                         }
@@ -1577,8 +1584,6 @@ class FullBottomSheet @JvmOverloads constructor(
                     bottom = paddingBottom.dpToPx(context)
                 )
 
-                val currentLyricIsBgSpeaker = lyric.label == LrcUtils.SpeakerLabel.Background
-
                 // Add TextViews
                 if (lyric.wordTimestamps.isNotEmpty()) {
                     // Remove old views
@@ -2015,20 +2020,41 @@ class FullBottomSheet @JvmOverloads constructor(
 
                     // Update extended lyric
                     if (bottomSheetFullLyricAdapter.isExtendedLRC) {
-                        if (newIndex.contains(it)) {
+
+                        /** Fix abnormal shader state when switch lyric line by click
+                         * @see LyricAdapter.ignoredPositionAtMost
+                         */
+                        if (newIndex.contains(it) && it >= bottomSheetFullLyricAdapter.ignoredPositionAtMost) {
                             bottomSheetFullLyricAdapter.notifyItemChanged(it, LYRIC_UPDATE)
                         }
                     }
 
                     // Update highlight
                     if (bottomSheetFullLyricAdapter.currentHighlightLyricPositions != newIndex) {
-                        bottomSheetFullLyricAdapter.updateHighlight(it, !newIndex.contains(it))
+
+                        // Maybe we needn't update highlight for ignored lines
+                        if (it >= bottomSheetFullLyricAdapter.ignoredPositionAtMost || !newIndex.contains(it)) {
+                            bottomSheetFullLyricAdapter.updateHighlight(it, !newIndex.contains(it))
+                        }
                     }
                 }
             }
 
-            // Update focus lyric position
-            val targetFocusLyricPosition = newIndex.minOrNull()
+            // Get new target lyric position
+            var targetFocusLyricPosition = newIndex.minOrNull()
+
+            /** Fix abnormal smooth scroll when switch lyric line by click
+             *  @see LyricAdapter.ignoredPositionAtMost
+             */
+            if (newIndex.size > 1) {
+                targetFocusLyricPosition = newIndex.filter { i ->
+                    i >= bottomSheetFullLyricAdapter.ignoredPositionAtMost
+                }.minOrNull()
+            } else {
+                bottomSheetFullLyricAdapter.ignoredPositionAtMost = -1
+            }
+
+            // Smooth scroll & Update focus lyric position
             if (targetFocusLyricPosition != null) {
                 if (bottomSheetFullLyricAdapter.currentHighlightLyricPositions.contains(targetFocusLyricPosition) &&
                     bottomSheetFullLyricAdapter.currentFocusLyricPosition != targetFocusLyricPosition &&