feat: inline search download status and headset transport
- mood detail carries the server's download jobs - search rows show Downloading… / Added / Failed, so the keyboard cannot hide it - headset and Bluetooth next/previous drive the app queue; previous keeps the after-two-seconds restart rule - 'Next batch' now explains what the preview is - version 0.3.1
This commit is contained in:
1 parent
cfab559e5e
commit
957ee3eb4b
12 files changed
+362
-19
No files matched your search
+5
@@ -126,6 +126,11 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
|
||||
withController { it.seekTo((seconds * 1000).toLong().coerceAtLeast(0L)) }
|
||||
}
|
||||
|
||||
override fun setSkipCallbacks(onNext: (() -> Unit)?, onPrevious: (() -> Unit)?) {
|
||||
PlaybackCommands.onNext = onNext
|
||||
PlaybackCommands.onPrevious = onPrevious
|
||||
}
|
||||
|
||||
override fun scheduleSleepTimer(seconds: Long?): Boolean {
|
||||
val args = Bundle().apply { putLong(SLEEP_TIMER_SECONDS, seconds ?: 0L) }
|
||||
val send: (MediaController) -> Boolean = { current ->
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package win.taptap.musicmanager.client
|
||||
|
||||
/**
|
||||
* Bridge between the media session in [PlaybackService] and the queue that
|
||||
* lives in the app's store. Media3 sends headset/Bluetooth next and previous
|
||||
* here instead of seeking the single-item ExoPlayer.
|
||||
*/
|
||||
internal object PlaybackCommands {
|
||||
@Volatile
|
||||
var onNext: (() -> Unit)? = null
|
||||
|
||||
@Volatile
|
||||
var onPrevious: (() -> Unit)? = null
|
||||
|
||||
/** Returns false when no store is attached, so the default handling applies. */
|
||||
fun next(): Boolean {
|
||||
val handler = onNext ?: return false
|
||||
handler()
|
||||
return true
|
||||
}
|
||||
|
||||
fun previous(): Boolean {
|
||||
val handler = onPrevious ?: return false
|
||||
handler()
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,11 @@ import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.view.KeyEvent
|
||||
import androidx.core.content.IntentCompat
|
||||
import androidx.media3.common.AudioAttributes
|
||||
import androidx.media3.common.C
|
||||
import androidx.media3.common.util.UnstableApi
|
||||
import androidx.media3.exoplayer.ExoPlayer
|
||||
import androidx.media3.session.MediaSession
|
||||
import androidx.media3.session.MediaSessionService
|
||||
@@ -73,6 +76,39 @@ class PlaybackService : MediaSessionService() {
|
||||
.build()
|
||||
}
|
||||
|
||||
/**
|
||||
* A headset skip must move the app's queue, not seek the one
|
||||
* item ExoPlayer holds. Returning true consumes the event.
|
||||
*/
|
||||
@OptIn(UnstableApi::class)
|
||||
override fun onMediaButtonEvent(
|
||||
session: MediaSession,
|
||||
controllerInfo: MediaSession.ControllerInfo,
|
||||
intent: Intent,
|
||||
): Boolean {
|
||||
if (intent.action != Intent.ACTION_MEDIA_BUTTON) return false
|
||||
val event = IntentCompat.getParcelableExtra(
|
||||
intent,
|
||||
Intent.EXTRA_KEY_EVENT,
|
||||
KeyEvent::class.java,
|
||||
) ?: return false
|
||||
return when (event.keyCode) {
|
||||
KeyEvent.KEYCODE_MEDIA_NEXT -> when (event.action) {
|
||||
KeyEvent.ACTION_DOWN -> PlaybackCommands.next()
|
||||
KeyEvent.ACTION_UP -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
KeyEvent.KEYCODE_MEDIA_PREVIOUS -> when (event.action) {
|
||||
KeyEvent.ACTION_DOWN -> PlaybackCommands.previous()
|
||||
KeyEvent.ACTION_UP -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCustomCommand(
|
||||
session: MediaSession,
|
||||
controller: MediaSession.ControllerInfo,
|
||||
|
||||
Reference in new issue
Block a user