Merge inheritors of newpipe/player/playqueue/PlayQueueEvent and

convert it to kotlin

Author: Yevhen Babiichuk (DustDFG)

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -17,10 +17,10 @@
 import org.schabi.newpipe.player.mediasource.ManagedMediaSourcePlaylist;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.player.playqueue.events.MoveEvent;
-import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
-import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
-import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.MoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.RemoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.ReorderEvent;
 
 import java.util.Collection;
 import java.util.Collections;

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java

@@ -4,15 +4,14 @@
 import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.player.playqueue.events.AppendEvent;
-import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
-import org.schabi.newpipe.player.playqueue.events.InitEvent;
-import org.schabi.newpipe.player.playqueue.events.MoveEvent;
-import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
-import org.schabi.newpipe.player.playqueue.events.RecoveryEvent;
-import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
-import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
-import org.schabi.newpipe.player.playqueue.events.SelectEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.AppendEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.ErrorEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.InitEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.MoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.RecoveryEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.RemoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.ReorderEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.SelectEvent;
 
 import java.io.Serializable;
 import java.util.ArrayList;

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java

@@ -10,12 +10,11 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.player.playqueue.events.AppendEvent;
-import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
-import org.schabi.newpipe.player.playqueue.events.MoveEvent;
-import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
-import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
-import org.schabi.newpipe.player.playqueue.events.SelectEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.AppendEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.ErrorEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.MoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.RemoveEvent;
+import org.schabi.newpipe.player.playqueue.PlayQueueEvent.SelectEvent;
 import org.schabi.newpipe.util.FallbackViewHolder;
 
 import java.util.List;

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueEvent.kt

@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2026 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package org.schabi.newpipe.player.playqueue
+
+import java.io.Serializable
+
+sealed interface PlayQueueEvent : Serializable {
+    fun type(): Type
+
+    class InitEvent : PlayQueueEvent {
+        override fun type() = Type.INIT
+    }
+
+    // sent when the index is changed
+    class SelectEvent(val oldIndex: Int, val newIndex: Int) : PlayQueueEvent {
+        override fun type() = Type.SELECT
+    }
+
+    // sent when more streams are added to the play queue
+    class AppendEvent(val amount: Int) : PlayQueueEvent {
+        override fun type() = Type.APPEND
+    }
+
+    // sent when a pending stream is removed from the play queue
+    class RemoveEvent(val removeIndex: Int, val queueIndex: Int) : PlayQueueEvent {
+        override fun type() = Type.REMOVE
+    }
+
+    // sent when two streams swap place in the play queue
+    class MoveEvent(val fromIndex: Int, val toIndex: Int) : PlayQueueEvent {
+        override fun type() = Type.MOVE
+    }
+
+    // sent when queue is shuffled
+    class ReorderEvent(val fromSelectedIndex: Int, val toSelectedIndex: Int) : PlayQueueEvent {
+        override fun type() = Type.REORDER
+    }
+
+    // sent when recovery record is set on a stream
+    class RecoveryEvent(val index: Int, val position: Long) : PlayQueueEvent {
+        override fun type() = Type.RECOVERY
+    }
+
+    // sent when the item at index has caused an exception
+    class ErrorEvent(val errorIndex: Int, val queueIndex: Int) : PlayQueueEvent {
+        override fun type() = Type.ERROR
+    }
+
+    // It is necessary only for use in java code. Remove it and use kotlin pattern
+    // matching when all users of this enum are converted to kotlin
+    enum class Type { INIT, SELECT, APPEND, REMOVE, MOVE, REORDER, RECOVERY, ERROR }
+}