Skip to content

Commit cf3b901

Browse files
author
Yevhen Babiichuk (DustDFG)
committed
Convert SeekbarPreviewThumbnailType to normal enum
1 parent 9e540db commit cf3b901

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.view.View;
77
import android.widget.ImageView;
88

9-
import androidx.annotation.IntDef;
109
import androidx.annotation.NonNull;
1110
import androidx.annotation.Nullable;
1211
import androidx.core.graphics.BitmapCompat;
@@ -16,10 +15,8 @@
1615
import org.schabi.newpipe.R;
1716
import org.schabi.newpipe.util.DeviceUtils;
1817

19-
import java.lang.annotation.Retention;
2018
import java.util.function.IntSupplier;
2119

22-
import static java.lang.annotation.RetentionPolicy.SOURCE;
2320
import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.HIGH_QUALITY;
2421
import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.LOW_QUALITY;
2522
import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType.NONE;
@@ -38,21 +35,19 @@ private SeekbarPreviewThumbnailHelper() {
3835
// No impl pls
3936
}
4037

41-
@Retention(SOURCE)
42-
@IntDef({HIGH_QUALITY, LOW_QUALITY,
43-
NONE})
44-
public @interface SeekbarPreviewThumbnailType {
45-
int HIGH_QUALITY = 0;
46-
int LOW_QUALITY = 1;
47-
int NONE = 2;
38+
39+
public enum SeekbarPreviewThumbnailType {
40+
HIGH_QUALITY,
41+
LOW_QUALITY,
42+
NONE,
4843
}
4944

5045
////////////////////////////////////////////////////////////////////////////
5146
// Settings Resolution
5247
///////////////////////////////////////////////////////////////////////////
5348

54-
@SeekbarPreviewThumbnailType
55-
public static int getSeekbarPreviewThumbnailType(@NonNull final Context context) {
49+
public static SeekbarPreviewThumbnailType getSeekbarPreviewThumbnailType(
50+
@NonNull final Context context) {
5651
final String type = PreferenceManager.getDefaultSharedPreferences(context).getString(
5752
context.getString(R.string.seekbar_preview_thumbnail_key), "");
5853
if (type.equals(context.getString(R.string.seekbar_preview_thumbnail_none))) {

app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class SeekbarPreviewThumbnailHolder {
4141
private UUID currentUpdateRequestIdentifier = UUID.randomUUID();
4242

4343
public void resetFrom(@NonNull final Context context, final List<Frameset> framesets) {
44-
final int seekbarPreviewType = getSeekbarPreviewThumbnailType(context);
44+
final var seekbarPreviewType = getSeekbarPreviewThumbnailType(context);
4545

4646
final UUID updateRequestIdentifier = UUID.randomUUID();
4747
this.currentUpdateRequestIdentifier = updateRequestIdentifier;
@@ -59,7 +59,8 @@ public void resetFrom(@NonNull final Context context, final List<Frameset> frame
5959
executorService.shutdown();
6060
}
6161

62-
private void resetFromAsync(final int seekbarPreviewType, final List<Frameset> framesets,
62+
private void resetFromAsync(final SeekbarPreviewThumbnailType seekbarPreviewType,
63+
final List<Frameset> framesets,
6364
final UUID updateRequestIdentifier) {
6465
Log.d(TAG, "Clearing seekbarPreviewData");
6566
synchronized (seekbarPreviewData) {
@@ -90,7 +91,7 @@ private void resetFromAsync(final int seekbarPreviewType, final List<Frameset> f
9091
}
9192

9293
private Frameset getFrameSetForType(final List<Frameset> framesets,
93-
final int seekbarPreviewType) {
94+
final SeekbarPreviewThumbnailType seekbarPreviewType) {
9495
if (seekbarPreviewType == SeekbarPreviewThumbnailType.HIGH_QUALITY) {
9596
Log.d(TAG, "Strategy for seekbarPreviewData: high quality");
9697
return framesets.stream()

0 commit comments

Comments
 (0)