Resolved issue #41

This commit is contained in:
amazing-username
2019-04-02 21:52:31 -04:00
parent 4bb4450e11
commit c9665f9b5b
2 changed files with 8 additions and 1 deletions
@@ -21,9 +21,11 @@ class SettingsActivity : AppCompatActivity() {
setContentView(R.layout.activity_settings) setContentView(R.layout.activity_settings)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
/**
RefreshLibrary.setOnClickListener { RefreshLibrary.setOnClickListener {
updateLibrary() updateLibrary()
} }
*/
initialize() initialize()
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -22,10 +22,14 @@ import com.example.mear.repositories.TrackRepository
class MusicService: Service() { class MusicService: Service() {
companion object {
//fun curSongIndex(): Int = currentSongIndex
}
private var trackPlayer: MediaPlayer? = null private var trackPlayer: MediaPlayer? = null
private var currentSongIndex: Int? = null private var currentSongIndex: Int? = null
private var shuffleOn: Boolean? = null private var shuffleOn: Boolean? = null
private var repeatOn: Boolean? = false private var repeatOn: Boolean? = null
private val mBinder = LocalBinder() private val mBinder = LocalBinder()
private val seconds = 4 private val seconds = 4
@@ -66,6 +70,7 @@ class MusicService: Service() {
} }
fun playTrack(id: Int) { fun playTrack(id: Int) {
currentSongIndex = id
trackPlayer!!.reset() trackPlayer!!.reset()
trackPlayer!!.setDataSource(TrackRepository(this).getTrack(id).songPath) trackPlayer!!.setDataSource(TrackRepository(this).getTrack(id).songPath)
trackPlayer!!.prepare() trackPlayer!!.prepare()