Fix the logic for showing the button

This is essentially the same logic, only broken down to cover a missed case and make it easier to follow
intro-skipper · Oct 11, 2024 · 0193d65 · 0193d65
1 parent bdcfbc5
commit 0193d65
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipFragment.kt
@@ -73,18 +73,21 @@ class SegmentSkipFragment : Fragment() {
 		val currentSegment = getCurrentSegment(currentPosition) ?: lastSegment ?: return
 		lastSegment = currentSegment
 
-		val shouldPerformSkip = currentPosition >= currentSegment.showAt.millis && currentPosition < currentSegment.hideAt.millis
-
-		if (!button.isVisible && shouldPerformSkip && preferences[UserPreferences.skipMode] == SegmentMode.SHOW_SKIP_BUTTON
-			&& buttonConfig?.skipButtonVisible == true) {
-			button.isVisible = true
-			updateButtonText(currentSegment)
-			button.requestFocus()
-		} else if (button.isVisible && (!shouldPerformSkip || preferences[UserPreferences.skipMode] != SegmentMode.SHOW_SKIP_BUTTON)) {
+		val isSkipSegment = currentPosition >= currentSegment.showAt.millis && currentPosition < currentSegment.hideAt.millis
+
+		if (preferences[UserPreferences.skipMode] == SegmentMode.SHOW_SKIP_BUTTON) {
+			if (!button.isVisible && isSkipSegment && buttonConfig?.skipButtonVisible == true) {
+				button.isVisible = true
+				updateButtonText(currentSegment)
+				button.requestFocus()
+			} else if (button.isVisible && !isSkipSegment) {
+				button.isVisible = false
+			}
+		} else {
 			button.isVisible = false
 		}
 
-		if (shouldPerformSkip && preferences[UserPreferences.skipMode] == SegmentMode.AUTO_SKIP) {
+		if (isSkipSegment && preferences[UserPreferences.skipMode] == SegmentMode.AUTO_SKIP) {
 			doSkip()
 		}
 	}