Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: option to autoplay videos in playlist #4829

Merged
merged 7 commits into from
Oct 5, 2023
Merged

feat: option to autoplay videos in playlist #4829

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a329781
fix(playlist): autoplay videos in playlist
FineFindus Sep 21, 2023
c4b319c
feat: add setting for autoplaying playlists
FineFindus Sep 25, 2023
f4f8c67
feat: support onlineplayerservice
FineFindus Sep 25, 2023
7bbbfb2
refactor: apply code suggestion
FineFindus Sep 25, 2023
c1f833d
fix: use suggested summary
FineFindus Oct 3, 2023
2aa11c7
Merge branch 'master' into fix/play-all-playlist
Bnyro Oct 5, 2023
021e287
refactor: disable playlist autoplay by default
Bnyro Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ object PreferenceKeys {
const val ALTERNATIVE_PLAYER_LAYOUT = "alternative_player_layout"
const val USE_HLS_OVER_DASH = "use_hls"
const val QUEUE_AUTO_INSERT_RELATED = "queue_insert_related_videos"
const val AUTOPLAY_PLAYLISTS = "autoplay_playlists"
const val PLAYER_SWIPE_CONTROLS = "player_swipe_controls"
const val PLAYER_PINCH_CONTROL = "player_pinch_control"
const val CAPTIONS_SIZE = "captions_size"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ object PlayerHelper {
true
)

fun shouldPlayNextVideo(isPlaylist: Boolean = false): Boolean {
return autoPlayEnabled || (PreferenceHelper.getBoolean(PreferenceKeys.AUTOPLAY_PLAYLISTS, true) && isPlaylist)
Bnyro marked this conversation as resolved.
Show resolved Hide resolved
}

fun getDefaultResolution(context: Context): String {
val prefKey = if (NetworkHelper.isNetworkMetered(context)) {
PreferenceKeys.DEFAULT_RESOLUTION_MOBILE
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class OnlinePlayerService : LifecycleService() {
override fun onPlaybackStateChanged(state: Int) {
when (state) {
Player.STATE_ENDED -> {
if (PlayerHelper.autoPlayEnabled && !isTransitioning) playNextVideo()
if (PlayerHelper.shouldPlayNextVideo(playlistId != null) && !isTransitioning) playNextVideo()
}

Player.STATE_IDLE -> {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,9 +975,9 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
exoPlayer.setPlaybackSpeed(1f)
}

// check if video has ended, next video is available and autoplay is enabled.
// check if video has ended, next video is available and autoplay is enabled/the video is part of a played playlist.
if (playbackState == Player.STATE_ENDED) {
if (!isTransitioning && PlayerHelper.autoPlayEnabled) {
if (!isTransitioning && PlayerHelper.shouldPlayNextVideo(playlistId != null)) {
isTransitioning = true
if (PlayerHelper.autoPlayCountdown) {
showAutoPlayCountdown()
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@
<string name="bookmark">Bookmark</string>
<string name="clear_bookmarks">Clear bookmarks</string>
<string name="queue_insert_related_videos">Insert related videos</string>
<string name="autoplay_playlists">Autoplay playlists</string>
<string name="autoplay_playlists_summary">Play next video in playlists regardless of autoplay settings</string>
FineFindus marked this conversation as resolved.
Show resolved Hide resolved
<string name="local_playlists">Local playlists</string>
<string name="brightness">Brightness</string>
<string name="volume">Volume</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/xml/player_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@
android:title="@string/queue_insert_related_videos"
app:key="queue_insert_related_videos" />

<SwitchPreferenceCompat
android:defaultValue="true"
Bnyro marked this conversation as resolved.
Show resolved Hide resolved
android:title="@string/autoplay_playlists"
android:summary="@string/autoplay_playlists_summary"
app:key="autoplay_playlists" />

</PreferenceCategory>


Expand Down