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

Fixed shuffle button opacity UI bug #6844

Merged
merged 5 commits into from
Nov 3, 2021
Merged

Fixed shuffle button opacity UI bug #6844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2306b0
Fixed shuffle button opacity bug
0x416c6578 Aug 4, 2021
cf81c37
Removed changes to the intent handler
0x416c6578 Aug 4, 2021
d66f933
Fixing the shuffle button on the UI is enough.
litetex Oct 23, 2021
af936bc
Always create a backup list when shuffling
litetex Oct 23, 2021
ecac897
Fixed typo
litetex Nov 3, 2021
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
2 changes: 2 additions & 0 deletions app/src/main/java/org/schabi/newpipe/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,8 @@ private void initPlayback(@NonNull final PlayQueue queue,
destroyPlayer();
initPlayer(playOnReady);
setRepeatMode(repeatMode);
// #6825 - Ensure that the shuffle-button is in the correct state on the UI
setShuffleButton(binding.shuffleButton, simpleExoPlayer.getShuffleModeEnabled());
setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);

playQueue = queue;
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,14 +436,16 @@ public synchronized void unsetRecovery(final int index) {
* top, so shuffling a size-2 list does nothing)
*/
public synchronized void shuffle() {
// Can't shuffle an list that's empty or only has one element
if (size() <= 2) {
return;
}
// Create a backup if it doesn't already exist
// Note: The backup-list has to be created at all cost (even when size <= 2).
// Otherwise it's not possible to enter shuffle-mode!
if (backup == null) {
backup = new ArrayList<>(streams);
}
// Can't shuffle a list that's empty or only has one element
if (size() <= 2) {
return;
}

final int originalIndex = getIndex();
final PlayQueueItem currentItem = getItem();
Expand Down