Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed shuffle button not shuffling songs

Browse source
This commit is contained in:
Prathamesh More 2022-02-14 23:03:55 +05:30
parent 9f405a271e
commit 74d9d1db39
1 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

64
app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
View file

@ -40,6 +40,7 @@ import android.telephony.PhoneStateListener
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
import android.util.Log import android.util.Log
import android.widget.Toast import android.widget.Toast
import androidx.core.content.edit
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.media.AudioAttributesCompat import androidx.media.AudioAttributesCompat
import androidx.media.AudioAttributesCompat.CONTENT_TYPE_MUSIC import androidx.media.AudioAttributesCompat.CONTENT_TYPE_MUSIC
@ -209,8 +210,19 @@ class MusicService : MediaBrowserServiceCompat(),
private var queueSaveHandlerThread: HandlerThread? = null private var queueSaveHandlerThread: HandlerThread? = null
private var queuesRestored = false private var queuesRestored = false
@JvmField
var repeatMode = 0 var repeatMode = 0
private set(value) {
when (value) {
REPEAT_MODE_NONE, REPEAT_MODE_ALL, REPEAT_MODE_THIS -> {
field = value
PreferenceManager.getDefaultSharedPreferences(this).edit {
putInt(SAVED_REPEAT_MODE, value)
}
prepareNext()
handleAndSendChangeInternal(REPEAT_MODE_CHANGED)
}
}
}
@JvmField @JvmField
var shuffleMode = 0 var shuffleMode = 0
@ -222,7 +234,7 @@ class MusicService : MediaBrowserServiceCompat(),
if (action != null) { if (action != null) {
if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) { if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) {
if (audioManager!!.isBluetoothA2dpOn) { if (audioManager!!.isBluetoothA2dpOn) {
play() play()
} }
} }
} }
@ -432,10 +444,10 @@ class MusicService : MediaBrowserServiceCompat(),
} }
fun cycleRepeatMode() { fun cycleRepeatMode() {
when (getRepeatMode()) { repeatMode = when (repeatMode) {
REPEAT_MODE_NONE -> setRepeatMode(REPEAT_MODE_ALL) REPEAT_MODE_NONE -> REPEAT_MODE_ALL
REPEAT_MODE_ALL -> setRepeatMode(REPEAT_MODE_THIS) REPEAT_MODE_ALL -> REPEAT_MODE_THIS
else -> setRepeatMode(REPEAT_MODE_NONE) else -> REPEAT_MODE_NONE
} }
} }
@ -454,7 +466,7 @@ class MusicService : MediaBrowserServiceCompat(),
private fun getNextPosition(force: Boolean): Int { private fun getNextPosition(force: Boolean): Int {
var position = getPosition() + 1 var position = getPosition() + 1
when (getRepeatMode()) { when (repeatMode) {
REPEAT_MODE_ALL -> if (isLastTrack) { REPEAT_MODE_ALL -> if (isLastTrack) {
position = 0 position = 0
} }
@ -520,24 +532,6 @@ class MusicService : MediaBrowserServiceCompat(),
return duration return duration
} }
fun getRepeatMode(): Int {
return repeatMode
}
private fun setRepeatMode(repeatMode: Int) {
when (repeatMode) {
REPEAT_MODE_NONE, REPEAT_MODE_ALL, REPEAT_MODE_THIS -> {
this.repeatMode = repeatMode
PreferenceManager.getDefaultSharedPreferences(this)
.edit()
.putInt(SAVED_REPEAT_MODE, repeatMode)
.apply()
prepareNext()
handleAndSendChangeInternal(REPEAT_MODE_CHANGED)
}
}
}
private fun getShuffleMode(): Int { private fun getShuffleMode(): Int {
return shuffleMode return shuffleMode
} }
@ -550,7 +544,7 @@ class MusicService : MediaBrowserServiceCompat(),
when (shuffleMode) { when (shuffleMode) {
SHUFFLE_MODE_SHUFFLE -> { SHUFFLE_MODE_SHUFFLE -> {
this.shuffleMode = shuffleMode this.shuffleMode = shuffleMode
makeShuffleList(getPlayingQueue().toMutableList(), getPosition()) makeShuffleList(playingQueue, getPosition())
position = 0 position = 0
} }
SHUFFLE_MODE_NONE -> { SHUFFLE_MODE_NONE -> {
@ -1049,10 +1043,9 @@ class MusicService : MediaBrowserServiceCompat(),
} }
fun savePositionInTrack() { fun savePositionInTrack() {
PreferenceManager.getDefaultSharedPreferences(this) PreferenceManager.getDefaultSharedPreferences(this).edit {
.edit() putInt(SAVED_POSITION_IN_TRACK, songProgressMillis)
.putInt(SAVED_POSITION_IN_TRACK, songProgressMillis) }
.apply()
} }
fun saveQueuesImpl() { fun saveQueuesImpl() {
@ -1376,10 +1369,9 @@ class MusicService : MediaBrowserServiceCompat(),
} }
private fun savePosition() { private fun savePosition() {
PreferenceManager.getDefaultSharedPreferences(this) PreferenceManager.getDefaultSharedPreferences(this).edit {
.edit() putInt(SAVED_POSITION, getPosition())
.putInt(SAVED_POSITION, getPosition()) }
.apply()
} }
private fun saveQueues() { private fun saveQueues() {
@ -1399,9 +1391,9 @@ class MusicService : MediaBrowserServiceCompat(),
private fun setCustomAction(stateBuilder: PlaybackStateCompat.Builder) { private fun setCustomAction(stateBuilder: PlaybackStateCompat.Builder) {
var repeatIcon = R.drawable.ic_repeat // REPEAT_MODE_NONE var repeatIcon = R.drawable.ic_repeat // REPEAT_MODE_NONE
if (getRepeatMode() == REPEAT_MODE_THIS) { if (repeatMode == REPEAT_MODE_THIS) {
repeatIcon = R.drawable.ic_repeat_one repeatIcon = R.drawable.ic_repeat_one
} else if (getRepeatMode() == REPEAT_MODE_ALL) { } else if (repeatMode == REPEAT_MODE_ALL) {
repeatIcon = R.drawable.ic_repeat_white_circle repeatIcon = R.drawable.ic_repeat_white_circle
} }
stateBuilder.addCustomAction( stateBuilder.addCustomAction(