diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java index 485a7d8e2..a862384cf 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.playqueue.ChannelPlayQueue; -import org.schabi.newpipe.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.PlaylistPlayQueue; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.ChannelPlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue; +import org.schabi.newpipe.player.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 605834ee6..d6cab1090 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 4d4825faf..3bf7fd3b8 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.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.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 ba5f40c8f..1b231bf90 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.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.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 30fd82600..b0f99f607 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.playqueue.ChannelPlayQueue; -import org.schabi.newpipe.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.ChannelPlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.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 f0a0a2eff..0498c95c5 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.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.PlaylistPlayQueue; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue; +import org.schabi.newpipe.player.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/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java index 6af212c42..f581a3abf 100644 --- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.fragments.local; +package org.schabi.newpipe.local; import android.os.Bundle; import android.support.v4.app.Fragment; diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java index fa3f0b652..f57ef3354 100644 --- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java @@ -19,7 +19,7 @@ import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.playlist.PlaylistLocalItem; import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry; import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity; -import org.schabi.newpipe.fragments.local.BaseLocalListFragment; +import org.schabi.newpipe.local.BaseLocalListFragment; import org.schabi.newpipe.local.playlist.LocalPlaylistManager; import org.schabi.newpipe.local.playlist.RemotePlaylistManager; import org.schabi.newpipe.report.UserAction; 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 01103157a..35d0eb11a 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 50008ebaa..4dc6fd4cd 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 @@ -1,8 +1,8 @@ -package org.schabi.newpipe.fragments.local.history; +package org.schabi.newpipe.local.history; import org.schabi.newpipe.R; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; -import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; +import org.schabi.newpipe.local.history.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 02685acec..cf473089a 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 @@ -1,8 +1,8 @@ -package org.schabi.newpipe.fragments.local.history; +package org.schabi.newpipe.local.history; import org.schabi.newpipe.R; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; -import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; +import org.schabi.newpipe.local.history.StatisticsPlaylistFragment; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java similarity index 98% rename from app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java rename to app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java index c2cfcaf9c..b08b731ea 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.local.history; import android.app.Activity; import android.content.Context; @@ -17,9 +17,10 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; import org.schabi.newpipe.extractor.stream.StreamInfoItem; -import org.schabi.newpipe.fragments.local.BaseLocalListFragment; -import org.schabi.newpipe.local.history.HistoryRecordManager; +import org.schabi.newpipe.local.BaseLocalListFragment; import org.schabi.newpipe.info_list.InfoItemDialog; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; 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 e4f620d8a..e51fa50a4 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 @@ -26,10 +26,10 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.database.LocalItem; 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.local.BaseLocalListFragment; import org.schabi.newpipe.info_list.InfoItemDialog; -import org.schabi.newpipe.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.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 7ee52f5de..f25c20bb2 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 084b74fb5..94e0654e2 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.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.PlayQueueAdapter; -import org.schabi.newpipe.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueueAdapter; +import org.schabi.newpipe.player.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 894b50f4b..8b511f89a 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.playqueue.PlayQueueItem; -import org.schabi.newpipe.playqueue.PlayQueueItemBuilder; -import org.schabi.newpipe.playqueue.PlayQueueItemHolder; -import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback; +import org.schabi.newpipe.player.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder; +import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder; +import org.schabi.newpipe.player.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 fcdb68938..4b76f986e 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.playqueue.PlayQueue; +import org.schabi.newpipe.player.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 3d8da5f02..6e4f09ace 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 39206dcf7..4aa8a1472 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.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.player.playqueue.PlayQueueAdapter; +import org.schabi.newpipe.player.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder; +import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder; +import org.schabi.newpipe.player.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 327356422..f81318880 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 1f81c8b55..4ae8eec2a 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.playqueue.PlayQueue; -import org.schabi.newpipe.playqueue.PlayQueueItem; -import org.schabi.newpipe.playqueue.SinglePlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 885228123..8d498a9bf 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 72ef01c47..1a9cfeb4d 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 0c4476c90..8837e7529 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 4eee3728d..318f9a316 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 00e01511d..6cce4a764 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.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 94e901397..8ab3cba98 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.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.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.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.playqueue.PlayQueue.DEBUG; +import static org.schabi.newpipe.player.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 8943688d2..4dcb30aa3 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.playqueue.PlayQueueItem; +import org.schabi.newpipe.player.playqueue.PlayQueueItem; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java index d7f27a1eb..2c08f4f92 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; import android.util.Log; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java index 500a76b87..5a2e34d31 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java @@ -1,6 +1,6 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; + -import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfo; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java index 5934ae9f5..a21560abd 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.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.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 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 java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java index 4fdbb9573..7aedc22a7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.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.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 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 java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java index 844254cc6..8cbc3ed1c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java index 4030509e0..996d3ace3 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java index 4884f9115..2483e4473 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java index 77b1524a2..6edeff670 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java index ec870619d..fcb7080c5 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java @@ -1,6 +1,5 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.playqueue; -import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfo; import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java index 5e6c4a82c..5993481e2 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue; +package org.schabi.newpipe.player.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/player/playqueue/events/AppendEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java index 046118aa8..6ccd85f82 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class AppendEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java index 2b369c5be..570a8e337 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class ErrorEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java index adce63ea2..559975b35 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class InitEvent implements PlayQueueEvent { @Override diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java index 69c98472c..69468be31 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class MoveEvent implements PlayQueueEvent { final private int fromIndex; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java index 1f4eaa703..431053e7b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; import java.io.Serializable; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java index 2971e9e10..1cc710c7b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public enum PlayQueueEventType { INIT, diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java index 461f6c6ad..58d3fadfc 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class RecoveryEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java index eef716384..bb42ef109 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class RemoveEvent implements PlayQueueEvent { diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java index 88d5d84ed..738a89fcf 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.playqueue.events; public class ReorderEvent implements PlayQueueEvent { private final int fromSelectedIndex; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java index 8d8bffff0..7dcc88794 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.playqueue.events; +package org.schabi.newpipe.player.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 fd9c11bf6..59754c11d 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -37,9 +37,9 @@ import org.schabi.newpipe.local.feed.FeedFragment; import org.schabi.newpipe.fragments.list.kiosk.KioskFragment; import org.schabi.newpipe.fragments.list.playlist.PlaylistFragment; import org.schabi.newpipe.fragments.list.search.SearchFragment; -import org.schabi.newpipe.fragments.local.history.LastPlayedFragment; +import org.schabi.newpipe.local.history.LastPlayedFragment; import org.schabi.newpipe.local.playlist.LocalPlaylistFragment; -import org.schabi.newpipe.fragments.local.history.MostPlayedFragment; +import org.schabi.newpipe.local.history.MostPlayedFragment; import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment; import org.schabi.newpipe.player.BackgroundPlayer; import org.schabi.newpipe.player.BackgroundPlayerActivity; @@ -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.playqueue.PlayQueue; +import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.settings.SettingsActivity; import java.util.ArrayList;