fix: mirror a live service timeline after the UI is recreated
The media service can keep playing after the task is swiped. A new UI now adopts its queue, index and position instead of showing a stale paused state. Notification artwork also uses cached offline covers. Version 0.4.1.
This commit is contained in:
1 parent
8cf77f156d
commit
8e737fae2e
6 files changed
+37
-4
No files matched your search
@@ -208,7 +208,7 @@ Tagged builds (`v*`) publish to internal testing from CI. The Gitea secrets are:
|
|||||||
| `ANDROID_KEY_PASSWORD` | key password |
|
| `ANDROID_KEY_PASSWORD` | key password |
|
||||||
| `PLAY_SERVICE_ACCOUNT_JSON` | contents of the service account JSON |
|
| `PLAY_SERVICE_ACCOUNT_JSON` | contents of the service account JSON |
|
||||||
|
|
||||||
Then `git tag v0.4.0 && git push --tags` builds, signs and uploads the bundle.
|
Then `git tag v0.4.1 && git push --tags` builds, signs and uploads the bundle.
|
||||||
Gradle Play Publisher asks Play for the next free `versionCode`
|
Gradle Play Publisher asks Play for the next free `versionCode`
|
||||||
(`ResolutionStrategy.AUTO`), so only the tag/version name needs to change.
|
(`ResolutionStrategy.AUTO`), so only the tag/version name needs to change.
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ val hasUploadKey = uploadKeyStore?.exists() == true &&
|
|||||||
val appVersionCode = (System.getenv("VERSION_CODE") ?: localProperties.getProperty("VERSION_CODE") ?: "1").toInt()
|
val appVersionCode = (System.getenv("VERSION_CODE") ?: localProperties.getProperty("VERSION_CODE") ?: "1").toInt()
|
||||||
val appVersionName = System.getenv("VERSION_NAME")
|
val appVersionName = System.getenv("VERSION_NAME")
|
||||||
?: localProperties.getProperty("VERSION_NAME")
|
?: localProperties.getProperty("VERSION_NAME")
|
||||||
?: "0.4.0"
|
?: "0.4.1"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
androidTarget {
|
androidTarget {
|
||||||
|
|||||||
+4
-1
@@ -184,7 +184,10 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
|
|||||||
Bundle().apply { putDouble(GAIN_DB_KEY, track.gainDb ?: 0.0) },
|
Bundle().apply { putDouble(GAIN_DB_KEY, track.gainDb ?: 0.0) },
|
||||||
)
|
)
|
||||||
.apply {
|
.apply {
|
||||||
if (!track.artworkUri.isNullOrBlank()) {
|
val bytes = track.artworkBytes
|
||||||
|
if (bytes != null && bytes.isNotEmpty()) {
|
||||||
|
setArtworkData(bytes, MediaMetadata.PICTURE_TYPE_FRONT_COVER)
|
||||||
|
} else if (!track.artworkUri.isNullOrBlank()) {
|
||||||
setArtworkUri(Uri.parse(track.artworkUri))
|
setArtworkUri(Uri.parse(track.artworkUri))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -12,6 +12,8 @@ data class PlaybackTrack(
|
|||||||
val source: String,
|
val source: String,
|
||||||
val local: Boolean,
|
val local: Boolean,
|
||||||
val artworkUri: String? = null,
|
val artworkUri: String? = null,
|
||||||
|
/** Cached cover for offline playback; avoids a network fetch in the notification. */
|
||||||
|
val artworkBytes: ByteArray? = null,
|
||||||
/** Server-measured gain; null leaves the track untouched. */
|
/** Server-measured gain; null leaves the track untouched. */
|
||||||
val gainDb: Double? = null,
|
val gainDb: Double? = null,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -159,6 +159,33 @@ class AppStore(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The media service can outlive the UI (for example after the task
|
||||||
|
// is swiped). If it still owns a timeline, mirror it instead of
|
||||||
|
// showing the last persisted position as paused.
|
||||||
|
scope.launch {
|
||||||
|
repeat(20) {
|
||||||
|
kotlinx.coroutines.delay(250)
|
||||||
|
if (player.queueSize() > 0) {
|
||||||
|
if (timelineSongs.isNotEmpty()) {
|
||||||
|
playbackStarted = true
|
||||||
|
trackIndex = player.currentIndex().coerceIn(timelineSongs.indices)
|
||||||
|
applyTimelineState()
|
||||||
|
_state.update {
|
||||||
|
it.copy(
|
||||||
|
playing = player.isPlaying(),
|
||||||
|
positionSeconds = player.positionSeconds().coerceAtLeast(0.0),
|
||||||
|
durationSeconds = player.durationSeconds()
|
||||||
|
.takeIf { value -> value > 0 }
|
||||||
|
?: it.durationSeconds,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
startPolling()
|
||||||
|
}
|
||||||
|
return@launch
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (session == null) return@launch
|
if (session == null) return@launch
|
||||||
|
|
||||||
api.restore(session.serverUrl, session.token)
|
api.restore(session.serverUrl, session.token)
|
||||||
@@ -1368,6 +1395,7 @@ class AppStore(
|
|||||||
source = local ?: api.streamUrl(song.id),
|
source = local ?: api.streamUrl(song.id),
|
||||||
local = local != null,
|
local = local != null,
|
||||||
artworkUri = api.coverUrl(song.id),
|
artworkUri = api.coverUrl(song.id),
|
||||||
|
artworkBytes = storage.artworkBytes(song.id),
|
||||||
gainDb = if (_state.value.normalizationEnabled) song.gainDb else null,
|
gainDb = if (_state.value.normalizationEnabled) song.gainDb else null,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -193,7 +193,7 @@ fun SettingsScreen(state: AppState, store: AppStore) {
|
|||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||||
Text("About", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
|
Text("About", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
|
||||||
Text(
|
Text(
|
||||||
"AudioManager 0.4.0 · $platformName",
|
"AudioManager 0.4.1 · $platformName",
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in new issue
Block a user