Add a skip option for UI suppression

intro-skipper · Oct 14, 2024 · 9c1054f · 9c1054f
1 parent 58b0f60
commit 9c1054f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
@@ -654,6 +654,14 @@ public void switchChannel(UUID id, boolean hideGuide) {
         }
     }
 
+    public void hideImmediately() {
+        if (mIsVisible) {
+            mHandler.removeCallbacks(mHideTask);
+            hide();
+            leanbackOverlayFragment.hideOverlay();
+        }
+    }
+
     private void startFadeTimer() {
         mFadeEnabled = true;
         mHandler.removeCallbacks(mHideTask);

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/SelectSkipAction.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/SelectSkipAction.kt
@@ -13,11 +13,10 @@ import org.jellyfin.androidtv.ui.playback.segments.SegmentMode
 
 class SelectSkipAction(
 	context: Context,
-	customPlaybackTransportControlGlue: CustomPlaybackTransportControlGlue,
+	val customPlaybackTransportControlGlue: CustomPlaybackTransportControlGlue,
 	userPreferences: UserPreferences
 ) : CustomAction(context, customPlaybackTransportControlGlue) {
 	private val preferences = userPreferences
-	private val customPlaybackTransportControlGlue1 = customPlaybackTransportControlGlue
 
 	private val SegmentMode.icon: Int
 		get() = when (this) {
@@ -53,7 +52,7 @@ class SelectSkipAction(
 				preferences[UserPreferences.skipMode] = SegmentMode.entries[item.itemId]
 
 				initializeWithIcon(preferences[UserPreferences.skipMode].icon)
-				customPlaybackTransportControlGlue1.notifyActionChanged(this@SelectSkipAction)
+				customPlaybackTransportControlGlue.notifyActionChanged(this@SelectSkipAction)
 				true
 			}
 		}.show()

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
@@ -43,26 +43,25 @@ class SegmentSkipFragment : Fragment() {
 		super.onViewCreated(view, savedInstanceState)
 
 		button = view.findViewById<Button>(R.id.skip_segment_button).apply {
-			setOnClickListener {
-				doSkip()
-			}
+			setOnClickListener { doSkip() }
 		}
 	}
 
-	private fun doSkip() {
+	private fun doSkip(isAuto: Boolean = false) {
 		lastSegment?.let { segment ->
 			playbackControllerContainer.playbackController?.run {
 				if ((segment.endTime + 3).millis > getDuration() && hasNextItem()) {
 					next()
 				} else {
 					seek(segment.endTime.millis)
+					if (isAuto) fragment.hideImmediately()
 				}
 			}
 		}
 	}
 
 	fun handleProgress(currentPosition: Long) {
-		// Check if server is full auto
+		// Check if server is full auto or missing plugin
 		if ((buttonConfig?.autoSkip == true && buttonConfig?.autoSkipCredits == true) || buttonConfig?.skipButtonVisible == null) {
 			button.isVisible = false
 			return
@@ -75,7 +74,7 @@ class SegmentSkipFragment : Fragment() {
 
 		preferences[UserPreferences.skipMode].let { setting ->
 			when {
-				isSkipSegment && setting == SegmentMode.AUTO_SKIP -> doSkip()
+				isSkipSegment && setting == SegmentMode.AUTO_SKIP -> { doSkip(true) }
 				isSkipSegment && setting == SegmentMode.SHOW_SKIP_BUTTON -> {
 					if (!button.isVisible) {
 						button.text = when (currentSegment.type) {
@@ -87,9 +86,7 @@ class SegmentSkipFragment : Fragment() {
 						button.requestFocus()
 					}
 				}
-				else -> {
-					button.isVisible = false
-				}
+				else -> { button.isVisible = false }
 			}
 		}
 	}

diff --git a/app/src/main/res/layout/fragment_segment_skip.xml b/app/src/main/res/layout/fragment_segment_skip.xml
@@ -14,7 +14,6 @@
         android:layout_marginEnd="56dp"
         android:layout_marginBottom="32.5dp"
         android:elevation="0dp"
-        android:text="Skip"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name_release" translatable="false" tools:ignore="UnusedResources">Jellyfin (iSkip)</string>
-    <string name="app_name_debug" translatable="false" tools:ignore="UnusedResources">Jellyfin Debug</string>
+    <string name="app_name_release" translatable="false" tools:ignore="UnusedResources">Jellyfang</string>
+    <string name="app_name_debug" translatable="false" tools:ignore="UnusedResources">Jellyfang Debug</string>
     <string name="video_error_unknown_error">Failed to load video</string>
     <string name="loading">Loading…</string>
     <string name="btn_cancel">Cancel</string>