From cf3b901a6c62bc8f6e0f1ccd5f21bdf8a207b35a Mon Sep 17 00:00:00 2001 From: "Yevhen Babiichuk (DustDFG)" Date: Thu, 8 Jan 2026 23:39:42 +0200 Subject: [PATCH] Convert SeekbarPreviewThumbnailType to normal enum --- .../SeekbarPreviewThumbnailHelper.java | 19 +++++++------------ .../SeekbarPreviewThumbnailHolder.java | 7 ++++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java index 28856d606..f55296c4e 100644 --- a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java @@ -6,7 +6,6 @@ import android.util.Log; import android.view.View; import android.widget.ImageView; -import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.graphics.BitmapCompat; @@ -16,10 +15,8 @@ import androidx.preference.PreferenceManager; import org.schabi.newpipe.R; import org.schabi.newpipe.util.DeviceUtils; -import java.lang.annotation.Retention; import java.util.function.IntSupplier; -import static java.lang.annotation.RetentionPolicy.SOURCE; import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.HIGH_QUALITY; import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.LOW_QUALITY; import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.NONE; @@ -38,21 +35,19 @@ public final class SeekbarPreviewThumbnailHelper { // No impl pls } - @Retention(SOURCE) - @IntDef({HIGH_QUALITY, LOW_QUALITY, - NONE}) - public @interface SeekbarPreviewThumbnailType { - int HIGH_QUALITY = 0; - int LOW_QUALITY = 1; - int NONE = 2; + + public enum SeekbarPreviewThumbnailType { + HIGH_QUALITY, + LOW_QUALITY, + NONE, } //////////////////////////////////////////////////////////////////////////// // Settings Resolution /////////////////////////////////////////////////////////////////////////// - @SeekbarPreviewThumbnailType - public static int getSeekbarPreviewThumbnailType(@NonNull final Context context) { + public static SeekbarPreviewThumbnailType getSeekbarPreviewThumbnailType( + @NonNull final Context context) { final String type = PreferenceManager.getDefaultSharedPreferences(context).getString( context.getString(R.string.seekbar_preview_thumbnail_key), ""); if (type.equals(context.getString(R.string.seekbar_preview_thumbnail_none))) { diff --git a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java index 09c61b8b3..77012acbc 100644 --- a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java @@ -41,7 +41,7 @@ public class SeekbarPreviewThumbnailHolder { private UUID currentUpdateRequestIdentifier = UUID.randomUUID(); public void resetFrom(@NonNull final Context context, final List framesets) { - final int seekbarPreviewType = getSeekbarPreviewThumbnailType(context); + final var seekbarPreviewType = getSeekbarPreviewThumbnailType(context); final UUID updateRequestIdentifier = UUID.randomUUID(); this.currentUpdateRequestIdentifier = updateRequestIdentifier; @@ -59,7 +59,8 @@ public class SeekbarPreviewThumbnailHolder { executorService.shutdown(); } - private void resetFromAsync(final int seekbarPreviewType, final List framesets, + private void resetFromAsync(final SeekbarPreviewThumbnailType seekbarPreviewType, + final List framesets, final UUID updateRequestIdentifier) { Log.d(TAG, "Clearing seekbarPreviewData"); synchronized (seekbarPreviewData) { @@ -90,7 +91,7 @@ public class SeekbarPreviewThumbnailHolder { } private Frameset getFrameSetForType(final List framesets, - final int seekbarPreviewType) { + final SeekbarPreviewThumbnailType seekbarPreviewType) { if (seekbarPreviewType == SeekbarPreviewThumbnailType.HIGH_QUALITY) { Log.d(TAG, "Strategy for seekbarPreviewData: high quality"); return framesets.stream()