wbrawner/Simple-Voice-Recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #37, do not autoplay recording after deletion, if it isnt wanted

Browse source
This commit is contained in:
tibbi 2020-12-30 10:44:31 +01:00
parent ee86884ca0
commit d3e58a4acd
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
View file

@ -159,7 +159,7 @@ class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Reco
if (recordingsToRemove.map { it.id }.contains(currRecordingId)) {
val newRecordingIndex = Math.min(oldRecordingIndex, recordings.size - 1)
val newRecording = recordings[newRecordingIndex]
refreshListener.playRecording(newRecording)
refreshListener.playRecording(newRecording, false)
}
}
}

21
app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
View file

@ -39,6 +39,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
private var playedRecordingIDs = Stack<Int>()
private var bus: EventBus? = null
private var prevSavePath = ""
private var playOnPreparation = true
override fun onResume() {
setupColors()
@ -109,7 +110,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
val prevRecordingIndex = adapter.recordings.indexOfFirst { it.id == wantedRecordingID }
val prevRecording = adapter.recordings.getOrNull(prevRecordingIndex) ?: return@setOnClickListener
playRecording(prevRecording)
playRecording(prevRecording, true)
}
next_btn.setOnClickListener {
@ -121,7 +122,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
val oldRecordingIndex = adapter.recordings.indexOfFirst { it.id == adapter.currRecordingId }
val newRecordingIndex = (oldRecordingIndex + 1) % adapter.recordings.size
val newRecording = adapter.recordings.getOrNull(newRecordingIndex) ?: return@setOnClickListener
playRecording(newRecording)
playRecording(newRecording, true)
playedRecordingIDs.push(newRecording.id)
}
}
@ -144,7 +145,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
val adapter = getRecordingsAdapter()
if (adapter == null) {
RecordingsAdapter(context as SimpleActivity, recordings, this, recordings_list, recordings_fastscroller) {
playRecording(it as Recording)
playRecording(it as Recording, true)
if (playedRecordingIDs.isEmpty() || playedRecordingIDs.peek() != it.id) {
playedRecordingIDs.push(it.id)
}
@ -184,7 +185,6 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
context.queryCursor(uri, projection, selection, selectionArgs, sortOrder, true) { cursor ->
val id = cursor.getIntValue(Media._ID)
val title = cursor.getStringValue(Media.DISPLAY_NAME)
val path = ""
val timestamp = cursor.getIntValue(Media.DATE_ADDED)
var duration = cursor.getLongValue(Media.DURATION) / 1000
var size = cursor.getIntValue(Media.SIZE)
@ -256,15 +256,20 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
}
setOnPreparedListener {
setupProgressTimer()
player?.start()
if (playOnPreparation) {
setupProgressTimer()
player?.start()
}
playOnPreparation = true
}
}
}
override fun playRecording(recording: Recording) {
override fun playRecording(recording: Recording, playOnPrepared: Boolean) {
resetProgress(recording)
(recordings_list.adapter as RecordingsAdapter).updateCurrentRecording(recording.id)
playOnPreparation = playOnPrepared || getIsPlaying()
player!!.apply {
reset()
@ -288,7 +293,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
}
}
play_pause_btn.setImageDrawable(getToggleButtonIcon(true))
play_pause_btn.setImageDrawable(getToggleButtonIcon(playOnPreparation))
player_progressbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
if (fromUser && !playedRecordingIDs.isEmpty()) {

2
app/src/main/kotlin/com/simplemobiletools/voicerecorder/interfaces/RefreshRecordingsListener.kt
View file

@ -5,5 +5,5 @@ import com.simplemobiletools.voicerecorder.models.Recording
interface RefreshRecordingsListener {
fun refreshRecordings()
fun playRecording(recording: Recording)
fun playRecording(recording: Recording, playOnPrepared: Boolean)
}