From bcfd8a24505eded83e415a5c4e78a463e9a1e8bb Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sun, 15 Apr 2018 20:35:00 +0200 Subject: [PATCH] rename playlist to player.playqueue --- .../org/schabi/newpipe/RouterActivity.java | 8 ++++---- .../database/stream/model/StreamEntity.java | 2 +- .../fragments/detail/VideoDetailFragment.java | 4 ++-- .../fragments/list/BaseListFragment.java | 2 +- .../list/channel/ChannelFragment.java | 6 +++--- .../list/playlist/PlaylistFragment.java | 6 +++--- .../local/dialog/PlaylistAppendDialog.java | 2 +- .../local/history/LastPlayedFragment.java | 2 +- .../local/history/MostPlayedFragment.java | 2 +- .../local/playlist/LocalPlaylistFragment.java | 4 ++-- .../newpipe/player/BackgroundPlayer.java | 2 +- .../org/schabi/newpipe/player/BasePlayer.java | 6 +++--- .../newpipe/player/MainVideoPlayer.java | 8 ++++---- .../schabi/newpipe/player/PlayerState.java | 2 +- .../newpipe/player/PopupVideoPlayer.java | 2 +- .../newpipe/player/ServicePlayerActivity.java | 10 +++++----- .../schabi/newpipe/player/VideoPlayer.java | 2 +- .../newpipe/player/helper/PlayerHelper.java | 6 +++--- .../player/mediasource/FailedMediaSource.java | 2 +- .../player/mediasource/LoadedMediaSource.java | 2 +- .../mediasource/ManagedMediaSource.java | 2 +- .../mediasource/PlaceholderMediaSource.java | 2 +- .../playback/BasePlayerMediaSession.java | 2 +- .../player/playback/MediaSourceManager.java | 14 ++++++------- .../player/playback/PlaybackListener.java | 2 +- .../playqueue}/AbstractInfoPlayQueue.java | 2 +- .../playqueue}/ChannelPlayQueue.java | 2 +- .../playqueue}/PlayQueue.java | 20 +++++++++---------- .../playqueue}/PlayQueueAdapter.java | 14 ++++++------- .../playqueue}/PlayQueueItem.java | 2 +- .../playqueue}/PlayQueueItemBuilder.java | 2 +- .../playqueue}/PlayQueueItemHolder.java | 2 +- .../PlayQueueItemTouchCallback.java | 2 +- .../playqueue}/PlaylistPlayQueue.java | 2 +- .../playqueue}/SinglePlayQueue.java | 2 +- .../StatisticsPlaylistFragment.java | 2 +- .../playqueue}/events/AppendEvent.java | 2 +- .../playqueue}/events/ErrorEvent.java | 2 +- .../playqueue}/events/InitEvent.java | 2 +- .../playqueue}/events/MoveEvent.java | 2 +- .../playqueue}/events/PlayQueueEvent.java | 2 +- .../playqueue}/events/PlayQueueEventType.java | 2 +- .../playqueue}/events/RecoveryEvent.java | 2 +- .../playqueue}/events/RemoveEvent.java | 2 +- .../playqueue}/events/ReorderEvent.java | 2 +- .../playqueue}/events/SelectEvent.java | 2 +- .../schabi/newpipe/util/NavigationHelper.java | 2 +- 47 files changed, 88 insertions(+), 88 deletions(-) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/AbstractInfoPlayQueue.java (99%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/ChannelPlayQueue.java (97%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueue.java (96%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueueAdapter.java (95%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueueItem.java (98%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueueItemBuilder.java (98%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueueItemHolder.java (98%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlayQueueItemTouchCallback.java (98%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/PlaylistPlayQueue.java (97%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/SinglePlayQueue.java (96%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/StatisticsPlaylistFragment.java (99%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/AppendEvent.java (87%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/ErrorEvent.java (93%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/InitEvent.java (77%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/MoveEvent.java (91%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/PlayQueueEvent.java (72%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/PlayQueueEventType.java (91%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/RecoveryEvent.java (91%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/RemoveEvent.java (92%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/ReorderEvent.java (92%) rename app/src/main/java/org/schabi/newpipe/{playlist => player/playqueue}/events/SelectEvent.java (91%) diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java index 2ddf6b122..485a7d8e2 100644 --- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java +++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java @@ -32,10 +32,10 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.playlist.PlaylistInfo; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.player.helper.PlayerHelper; -import org.schabi.newpipe.playlist.ChannelPlayQueue; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.PlaylistPlayQueue; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.ChannelPlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.PlaylistPlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.NavigationHelper; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java index 0a9a0bb66..605834ee6 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java @@ -9,7 +9,7 @@ import android.arch.persistence.room.PrimaryKey; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.Constants; import java.io.Serializable; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index e1fee28bb..4d4825faf 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -71,8 +71,8 @@ import org.schabi.newpipe.player.MainVideoPlayer; import org.schabi.newpipe.player.PopupVideoPlayer; import org.schabi.newpipe.player.helper.PlayerHelper; import org.schabi.newpipe.player.old.PlayVideoActivity; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.ExtractorHelper; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index c2eabb6a0..ba5f40c8f 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -24,7 +24,7 @@ import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.local.history.HistoryInfoItem; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.info_list.InfoListAdapter; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; import org.schabi.newpipe.util.StateSaver; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index 4636150bb..30fd82600 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -36,9 +36,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.info_list.InfoItemDialog; -import org.schabi.newpipe.playlist.ChannelPlayQueue; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.ChannelPlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.local.subscription.SubscriptionService; import org.schabi.newpipe.util.AnimationUtils; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java index f1803cdc5..f0a0a2eff 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java @@ -31,9 +31,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.local.playlist.RemotePlaylistManager; import org.schabi.newpipe.info_list.InfoItemDialog; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.PlaylistPlayQueue; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.PlaylistPlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.ImageDisplayConstants; diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java index f8e2bb4a9..01103157a 100644 --- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java @@ -20,7 +20,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.local.LocalItemListAdapter; import org.schabi.newpipe.local.playlist.LocalPlaylistManager; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.OnClickGesture; import java.util.ArrayList; diff --git a/app/src/main/java/org/schabi/newpipe/local/history/LastPlayedFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/LastPlayedFragment.java index b2c341756..50008ebaa 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/LastPlayedFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/LastPlayedFragment.java @@ -2,7 +2,7 @@ package org.schabi.newpipe.fragments.local.history; import org.schabi.newpipe.R; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; -import org.schabi.newpipe.playlist.StatisticsPlaylistFragment; +import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/local/history/MostPlayedFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/MostPlayedFragment.java index daf667e58..02685acec 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/MostPlayedFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/MostPlayedFragment.java @@ -2,7 +2,7 @@ package org.schabi.newpipe.fragments.local.history; import org.schabi.newpipe.R; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; -import org.schabi.newpipe.playlist.StatisticsPlaylistFragment; +import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java index dd2ce546e..e4f620d8a 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java @@ -28,8 +28,8 @@ import org.schabi.newpipe.database.playlist.PlaylistStreamEntry; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.local.BaseLocalListFragment; import org.schabi.newpipe.info_list.InfoItemDialog; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.NavigationHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java index 2d990e43e..7ee52f5de 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java @@ -48,7 +48,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.player.event.PlayerEventListener; import org.schabi.newpipe.player.helper.LockManager; import org.schabi.newpipe.player.helper.PlayerHelper; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.ThemeHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java index fc106e0ca..084b74fb5 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java @@ -69,9 +69,9 @@ import org.schabi.newpipe.player.playback.BasePlayerMediaSession; import org.schabi.newpipe.player.playback.CustomTrackSelector; import org.schabi.newpipe.player.playback.MediaSourceManager; import org.schabi.newpipe.player.playback.PlaybackListener; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.PlayQueueAdapter; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.PlayQueueAdapter; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.SerializedCache; import java.io.IOException; diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java index aedcdb791..894b50f4b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java @@ -62,10 +62,10 @@ import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; import org.schabi.newpipe.player.helper.PlaybackParameterDialog; import org.schabi.newpipe.player.helper.PlayerHelper; -import org.schabi.newpipe.playlist.PlayQueueItem; -import org.schabi.newpipe.playlist.PlayQueueItemBuilder; -import org.schabi.newpipe.playlist.PlayQueueItemHolder; -import org.schabi.newpipe.playlist.PlayQueueItemTouchCallback; +import org.schabi.newpipe.playqueue.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItemBuilder; +import org.schabi.newpipe.playqueue.PlayQueueItemHolder; +import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.NavigationHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java index 6f38ce835..fcdb68938 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java +++ b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java @@ -7,7 +7,7 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; -import org.schabi.newpipe.playlist.PlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; import java.io.Serializable; diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java index 9528bf2bc..3d8da5f02 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java @@ -64,7 +64,7 @@ import org.schabi.newpipe.player.event.PlayerEventListener; import org.schabi.newpipe.player.helper.LockManager; import org.schabi.newpipe.player.helper.PlayerHelper; import org.schabi.newpipe.player.old.PlayVideoActivity; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.ThemeHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java index ccaa6f225..39206dcf7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java +++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java @@ -32,11 +32,11 @@ import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.player.event.PlayerEventListener; import org.schabi.newpipe.player.helper.PlaybackParameterDialog; -import org.schabi.newpipe.playlist.PlayQueueAdapter; -import org.schabi.newpipe.playlist.PlayQueueItem; -import org.schabi.newpipe.playlist.PlayQueueItemBuilder; -import org.schabi.newpipe.playlist.PlayQueueItemHolder; -import org.schabi.newpipe.playlist.PlayQueueItemTouchCallback; +import org.schabi.newpipe.playqueue.PlayQueueAdapter; +import org.schabi.newpipe.playqueue.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItemBuilder; +import org.schabi.newpipe.playqueue.PlayQueueItemHolder; +import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.ThemeHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java index 6cf2076eb..327356422 100644 --- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java @@ -68,7 +68,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.player.helper.PlayerHelper; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ListHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java index 7d3550c91..1f81c8b55 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java @@ -24,9 +24,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.SubtitlesFormat; import org.schabi.newpipe.extractor.stream.VideoStream; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.PlayQueueItem; -import org.schabi.newpipe.playlist.SinglePlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.PlayQueueItem; +import org.schabi.newpipe.playqueue.SinglePlayQueue; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java index 878d7c711..885228123 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java @@ -7,7 +7,7 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.upstream.Allocator; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import java.io.IOException; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java index fe7508ecc..72ef01c47 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java @@ -7,7 +7,7 @@ import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.upstream.Allocator; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import java.io.IOException; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java index 46fd149bb..0c4476c90 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java @@ -4,7 +4,7 @@ import android.support.annotation.NonNull; import com.google.android.exoplayer2.source.MediaSource; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; public interface ManagedMediaSource extends MediaSource { /** diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java index 2c57f2f9c..4eee3728d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java @@ -6,7 +6,7 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.upstream.Allocator; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import java.io.IOException; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java index 616879917..00e01511d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java @@ -5,7 +5,7 @@ import android.support.v4.media.MediaDescriptionCompat; import org.schabi.newpipe.player.BasePlayer; import org.schabi.newpipe.player.mediasession.MediaSessionCallback; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; public class BasePlayerMediaSession implements MediaSessionCallback { private BasePlayer player; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java index b4236d3c5..94e901397 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java @@ -16,12 +16,12 @@ import org.schabi.newpipe.player.mediasource.LoadedMediaSource; import org.schabi.newpipe.player.mediasource.ManagedMediaSource; import org.schabi.newpipe.player.mediasource.ManagedMediaSourcePlaylist; import org.schabi.newpipe.player.mediasource.PlaceholderMediaSource; -import org.schabi.newpipe.playlist.PlayQueue; -import org.schabi.newpipe.playlist.PlayQueueItem; -import org.schabi.newpipe.playlist.events.MoveEvent; -import org.schabi.newpipe.playlist.events.PlayQueueEvent; -import org.schabi.newpipe.playlist.events.RemoveEvent; -import org.schabi.newpipe.playlist.events.ReorderEvent; +import org.schabi.newpipe.playqueue.PlayQueue; +import org.schabi.newpipe.playqueue.PlayQueueItem; +import org.schabi.newpipe.playqueue.events.MoveEvent; +import org.schabi.newpipe.playqueue.events.PlayQueueEvent; +import org.schabi.newpipe.playqueue.events.RemoveEvent; +import org.schabi.newpipe.playqueue.events.ReorderEvent; import org.schabi.newpipe.util.ServiceHelper; import java.util.ArrayList; @@ -45,7 +45,7 @@ import io.reactivex.subjects.PublishSubject; import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException; import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException; -import static org.schabi.newpipe.playlist.PlayQueue.DEBUG; +import static org.schabi.newpipe.playqueue.PlayQueue.DEBUG; public class MediaSourceManager { @NonNull private final String TAG = "MediaSourceManager@" + hashCode(); diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java index daf58d5dd..8943688d2 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java @@ -6,7 +6,7 @@ import android.support.annotation.Nullable; import com.google.android.exoplayer2.source.MediaSource; import org.schabi.newpipe.extractor.stream.StreamInfo; -import org.schabi.newpipe.playlist.PlayQueueItem; +import org.schabi.newpipe.playqueue.PlayQueueItem; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java similarity index 99% rename from app/src/main/java/org/schabi/newpipe/playlist/AbstractInfoPlayQueue.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java index 2b31cd340..d7f27a1eb 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/AbstractInfoPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.util.Log; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/ChannelPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java similarity index 97% rename from app/src/main/java/org/schabi/newpipe/playlist/ChannelPlayQueue.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java index d37b84072..500a76b87 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/ChannelPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfo; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java similarity index 96% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueue.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java index 19e6dc63d..5934ae9f5 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -6,15 +6,15 @@ import android.util.Log; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import org.schabi.newpipe.playlist.events.AppendEvent; -import org.schabi.newpipe.playlist.events.ErrorEvent; -import org.schabi.newpipe.playlist.events.InitEvent; -import org.schabi.newpipe.playlist.events.MoveEvent; -import org.schabi.newpipe.playlist.events.PlayQueueEvent; -import org.schabi.newpipe.playlist.events.RecoveryEvent; -import org.schabi.newpipe.playlist.events.RemoveEvent; -import org.schabi.newpipe.playlist.events.ReorderEvent; -import org.schabi.newpipe.playlist.events.SelectEvent; +import org.schabi.newpipe.playqueue.events.AppendEvent; +import org.schabi.newpipe.playqueue.events.ErrorEvent; +import org.schabi.newpipe.playqueue.events.InitEvent; +import org.schabi.newpipe.playqueue.events.MoveEvent; +import org.schabi.newpipe.playqueue.events.PlayQueueEvent; +import org.schabi.newpipe.playqueue.events.RecoveryEvent; +import org.schabi.newpipe.playqueue.events.RemoveEvent; +import org.schabi.newpipe.playqueue.events.ReorderEvent; +import org.schabi.newpipe.playqueue.events.SelectEvent; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueAdapter.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java similarity index 95% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueueAdapter.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java index dd320c2bc..4fdbb9573 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.content.Context; import android.support.v7.widget.RecyclerView; @@ -8,12 +8,12 @@ import android.view.View; import android.view.ViewGroup; import org.schabi.newpipe.R; -import org.schabi.newpipe.playlist.events.AppendEvent; -import org.schabi.newpipe.playlist.events.ErrorEvent; -import org.schabi.newpipe.playlist.events.MoveEvent; -import org.schabi.newpipe.playlist.events.PlayQueueEvent; -import org.schabi.newpipe.playlist.events.RemoveEvent; -import org.schabi.newpipe.playlist.events.SelectEvent; +import org.schabi.newpipe.playqueue.events.AppendEvent; +import org.schabi.newpipe.playqueue.events.ErrorEvent; +import org.schabi.newpipe.playqueue.events.MoveEvent; +import org.schabi.newpipe.playqueue.events.PlayQueueEvent; +import org.schabi.newpipe.playqueue.events.RemoveEvent; +import org.schabi.newpipe.playqueue.events.SelectEvent; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java similarity index 98% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItem.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java index 2d543fb4e..844254cc6 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItem.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemBuilder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java similarity index 98% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemBuilder.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java index 7042bea89..4030509e0 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemBuilder.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemHolder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java similarity index 98% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemHolder.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java index 3837c4046..4884f9115 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemTouchCallback.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java similarity index 98% rename from app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemTouchCallback.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java index 405dba11e..77b1524a2 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItemTouchCallback.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/PlaylistPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java similarity index 97% rename from app/src/main/java/org/schabi/newpipe/playlist/PlaylistPlayQueue.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java index d9e1d2d2b..ec870619d 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/PlaylistPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfo; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/SinglePlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java similarity index 96% rename from app/src/main/java/org/schabi/newpipe/playlist/SinglePlayQueue.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java index 9c4d2fb39..5e6c4a82c 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/SinglePlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java similarity index 99% rename from app/src/main/java/org/schabi/newpipe/playlist/StatisticsPlaylistFragment.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java index 09200aabf..c2cfcaf9c 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/StatisticsPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist; +package org.schabi.newpipe.playqueue; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/AppendEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java similarity index 87% rename from app/src/main/java/org/schabi/newpipe/playlist/events/AppendEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java index b3ba8835a..046118aa8 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/AppendEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class AppendEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/ErrorEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java similarity index 93% rename from app/src/main/java/org/schabi/newpipe/playlist/events/ErrorEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java index 45629feb6..2b369c5be 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/ErrorEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class ErrorEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/InitEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java similarity index 77% rename from app/src/main/java/org/schabi/newpipe/playlist/events/InitEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java index 1c1d01508..adce63ea2 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/InitEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class InitEvent implements PlayQueueEvent { @Override diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/MoveEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java similarity index 91% rename from app/src/main/java/org/schabi/newpipe/playlist/events/MoveEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java index 4370fe328..69c98472c 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/MoveEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class MoveEvent implements PlayQueueEvent { final private int fromIndex; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java similarity index 72% rename from app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java index c56c3fbc0..1f4eaa703 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; import java.io.Serializable; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEventType.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java similarity index 91% rename from app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEventType.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java index 0fc40c098..2971e9e10 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/PlayQueueEventType.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public enum PlayQueueEventType { INIT, diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/RecoveryEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java similarity index 91% rename from app/src/main/java/org/schabi/newpipe/playlist/events/RecoveryEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java index 715cf88c4..461f6c6ad 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/RecoveryEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class RecoveryEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/RemoveEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java similarity index 92% rename from app/src/main/java/org/schabi/newpipe/playlist/events/RemoveEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java index 464dbfa49..eef716384 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/RemoveEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class RemoveEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/ReorderEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java similarity index 92% rename from app/src/main/java/org/schabi/newpipe/playlist/events/ReorderEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java index 19bb632d8..88d5d84ed 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/ReorderEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class ReorderEvent implements PlayQueueEvent { private final int fromSelectedIndex; diff --git a/app/src/main/java/org/schabi/newpipe/playlist/events/SelectEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java similarity index 91% rename from app/src/main/java/org/schabi/newpipe/playlist/events/SelectEvent.java rename to app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java index d1d0b1137..8d8bffff0 100644 --- a/app/src/main/java/org/schabi/newpipe/playlist/events/SelectEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playlist.events; +package org.schabi.newpipe.playqueue.events; public class SelectEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index 2e1f59d25..fd9c11bf6 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -49,7 +49,7 @@ import org.schabi.newpipe.player.PopupVideoPlayer; import org.schabi.newpipe.player.PopupVideoPlayerActivity; import org.schabi.newpipe.player.VideoPlayer; import org.schabi.newpipe.player.old.PlayVideoActivity; -import org.schabi.newpipe.playlist.PlayQueue; +import org.schabi.newpipe.playqueue.PlayQueue; import org.schabi.newpipe.settings.SettingsActivity; import java.util.ArrayList;