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

Changed the shuffle behavior for online playlists #442

Closed
wants to merge 8 commits into from
Closed

Changed the shuffle behavior for online playlists #442

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2d82c2
Changed the shuffle behavior for online playlists
Iliano101 Jul 11, 2024
0293120
Update the min to the latest
Iliano101 Jul 21, 2024
0cb86ce
Updated the PR to fit with the latest commit
Iliano101 Jul 21, 2024
3d57ba2
Removed temp file
Iliano101 Jul 21, 2024
ce4f05a
Update PR to the latest commit
Iliano101 Jul 29, 2024
2d0f309
Update to latest commit
Iliano101 Jul 30, 2024
ed08616
Merge remote-tracking branch 'maxrave-dev/jetpack_compose' into minimal
Iliano101 Jul 31, 2024
90d7003
Update to latest commit
Iliano101 Aug 11, 2024
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
95 changes: 38 additions & 57 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/other/PlaylistFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import java.time.LocalDateTime
import kotlin.math.abs
import kotlin.random.Random

@AndroidEntryPoint
class PlaylistFragment : Fragment() {
private val TAG = "PlaylistFragment"

private val viewModel by activityViewModels<PlaylistViewModel>()
private val sharedViewModel by activityViewModels<SharedViewModel>()
private var _binding: FragmentPlaylistBinding? = null
Expand Down Expand Up @@ -150,20 +149,17 @@ class PlaylistFragment : Fragment() {
if (radioId != null ||
id?.startsWith("RDEM") == true ||
id?.startsWith("RDAMVM") == true
) {
) {
viewModel.updateIsRadio(true)
if (radioId != null) {
fetchDataWithRadio(radioId, videoId, channelId)
}
else if (id != null) {
} else if (id != null) {
fetchDataWithRadio(id)
}
}
else if (id != null && id.startsWith("RDAT")) {
} else if (id != null && id.startsWith("RDAT")) {
viewModel.updateIsRadio(true)
fetchRDATRadio(id)
}
else if (id != null) {
} else if (id != null) {
viewModel.updateIsRadio(false)
if (!requireArguments().getBoolean("youtube")) {
viewModel.checkSuccess()
Expand Down Expand Up @@ -574,7 +570,7 @@ class PlaylistFragment : Fragment() {
if (it.first == viewModel.playlistBrowse.value?.id) it.second else null
},

)
)
)
viewModel.listTrack.value.getOrNull(position)?.let {
Log.w(TAG, "track: $it")
Expand Down Expand Up @@ -822,25 +818,21 @@ class PlaylistFragment : Fragment() {
}
binding.btShuffle.setOnClickListener {
if (viewModel.playlistBrowse.value != null) {
val index =
Random.nextInt(
0,
viewModel.playlistBrowse.value
!!
.tracks.size - 1,
)
val shuffleList: ArrayList<Track> = arrayListOf()
val shuffledList: ArrayList<Track> = arrayListOf()
viewModel.playlistBrowse.value?.tracks?.let {
shuffleList.addAll(it)
shuffledList.addAll(it)
}
shuffleList.shuffle()
val afterShuffleIndex = shuffleList.indexOf(viewModel.playlistBrowse.value?.tracks?.get(index))
shuffledList.shuffle()

val indexInQueue = 0
val indexInPlaylist = viewModel.playlistBrowse.value?.tracks?.indexOf(shuffledList.first()) ?: 0

sharedViewModel.simpleMediaServiceHandler?.setQueueData(
QueueData(
listTracks = shuffleList,
listTracks = shuffledList,
firstPlayedTrack = viewModel.playlistBrowse.value
?.tracks
?.get(index),
?.get(indexInPlaylist),
playlistId = viewModel.playlistBrowse.value
?.id
?.replaceFirst("VL", "") ?: "",
Expand All @@ -849,36 +841,29 @@ class PlaylistFragment : Fragment() {
continuation = null,
)
)
viewModel.playlistBrowse.value?.tracks?.get(index)?.let {
viewModel.playlistBrowse.value?.tracks?.get(indexInPlaylist)?.let {
sharedViewModel.loadMediaItemFromTrack(
it,
type = Config.PLAYLIST_CLICK,
index = afterShuffleIndex
index = indexInQueue
)
}
} else if (viewModel.playlistEntity.value != null && viewModel.playlistEntity.value?.downloadState == DownloadState.STATE_DOWNLOADED) {
val index =
Random.nextInt(
0,
viewModel.playlistEntity.value
?.tracks
?.size
?.minus(1) ?: 0,
)
val shuffleList: ArrayList<Track> = arrayListOf()
val shuffledList: ArrayList<Track> = arrayListOf()
viewModel.listTrack.value
.toArrayListTrack()
.let { it1 -> shuffleList.addAll(it1) }
viewModel.listTrack.value
.getOrNull(index)
?.let { shuffleList.remove(it.toTrack()) }
shuffleList.shuffle()
val afterShuffleIndex = shuffleList.indexOf(viewModel.listTrack.value.getOrNull(index)?.toTrack())
.let { it1 -> shuffledList.addAll(it1) }
shuffledList.shuffle()
shuffledList.remove(shuffledList.first())

val indexInQueue = 0
val indexInPlaylist = viewModel.listTrack.value.toArrayListTrack().indexOf(shuffledList.first())

sharedViewModel.simpleMediaServiceHandler?.setQueueData(
QueueData(
listTracks = shuffleList,
listTracks = shuffledList,
firstPlayedTrack = viewModel.listTrack.value
.getOrNull(index)
.getOrNull(indexInPlaylist)
?.toTrack(),
playlistId = viewModel.playlistEntity.value
?.id
Expand All @@ -889,12 +874,12 @@ class PlaylistFragment : Fragment() {
)
)
viewModel.listTrack.value
.getOrNull(index)
.getOrNull(indexInPlaylist)
?.let {
sharedViewModel.loadMediaItemFromTrack(
it.toTrack(),
type = Config.PLAYLIST_CLICK,
index = afterShuffleIndex
index = indexInQueue
)
}
} else {
Expand Down Expand Up @@ -998,8 +983,7 @@ class PlaylistFragment : Fragment() {
binding.btDownload.visibility = View.GONE
binding.animationDownloading.visibility = View.GONE
}
}
else {
} else {
binding.btDownload.visibility = View.GONE
binding.animationDownloading.visibility = View.GONE
}
Expand Down Expand Up @@ -1241,23 +1225,20 @@ class PlaylistFragment : Fragment() {
DownloadState.STATE_DOWNLOADED,
)
Log.w(TAG, "All downloaded")
}
else if (viewModel.downloadUtils.downloadingVideoIds.value.containsAll(temp) && temp.isNotEmpty()) {
} else if (viewModel.downloadUtils.downloadingVideoIds.value.containsAll(temp) && temp.isNotEmpty()) {
viewModel.updatePlaylistDownloadState(
viewModel.id.value!!,
DownloadState.STATE_DOWNLOADING,
)
Log.w(TAG, "Downloading")
}
else {
} else {
viewModel.updatePlaylistDownloadState(
viewModel.id.value!!,
DownloadState.STATE_NOT_DOWNLOADED,
)
Log.w(TAG, "Not downloaded")
}
}
else {
} else {
viewModel.updatePlaylistDownloadState(
viewModel.id.value!!,
DownloadState.STATE_NOT_DOWNLOADED,
Expand Down Expand Up @@ -1320,9 +1301,8 @@ class PlaylistFragment : Fragment() {
list.addAll(playlistBrowse.tracks)
playlistItemAdapter.updateList(list)
}
}
else if (playlistBrowse == null && playlistEntity != null) {
with (binding) {
} else if (playlistBrowse == null && playlistEntity != null) {
with(binding) {
collapsingToolbarLayout.title = playlistEntity.title
tvTitle.text = playlistEntity.title
tvTitle.isSelected = true
Expand Down Expand Up @@ -1351,8 +1331,8 @@ class PlaylistFragment : Fragment() {
}
}
val job2 = launch {
combine(viewModel.playlistBrowse, viewModel.listTrack) {
playlistBrowse, listTrack -> Pair(playlistBrowse, listTrack)
combine(viewModel.playlistBrowse, viewModel.listTrack) { playlistBrowse, listTrack ->
Pair(playlistBrowse, listTrack)
}.collectLatest { pair ->
val playlistBrowse = pair.first
val listTrack = pair.second
Expand All @@ -1373,6 +1353,7 @@ class PlaylistFragment : Fragment() {
}
}
}

private fun fetchRDATRadio(radioId: String) {
viewModel.clearPlaylistBrowse()
viewModel.clearPlaylistEntity()
Expand Down