diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt b/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt index bf3408e3..0473a1ea 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt @@ -107,7 +107,7 @@ data class PlayItemRequestPayload( data class DeviceSettings( var disableAutoRewind:Boolean, var enableAltView:Boolean, - var allowSeekingOnWidget:Boolean, + var allowSeekingOnMediaControls:Boolean, var jumpBackwardsTime:Int, var jumpForwardTime:Int, var enableMp3IndexSeeking:Boolean, @@ -131,7 +131,7 @@ data class DeviceSettings( return DeviceSettings( disableAutoRewind = false, enableAltView = true, - allowSeekingOnWidget = false, + allowSeekingOnMediaControls = false, jumpBackwardsTime = 10, jumpForwardTime = 10, enableMp3IndexSeeking = false, diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt index 240be8d3..17416663 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt @@ -512,7 +512,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { PlaybackStateCompat.ACTION_REWIND or PlaybackStateCompat.ACTION_STOP - if (deviceSettings.allowSeekingOnWidget) { + if (deviceSettings.allowSeekingOnMediaControls) { playbackActions = playbackActions or PlaybackStateCompat.ACTION_SEEK_TO } mediaSessionConnector.setEnabledPlaybackActions(playbackActions) diff --git a/ios/App/App/plugins/AbsDatabase.swift b/ios/App/App/plugins/AbsDatabase.swift index 56c8cc2d..d8ea42e9 100644 --- a/ios/App/App/plugins/AbsDatabase.swift +++ b/ios/App/App/plugins/AbsDatabase.swift @@ -238,7 +238,7 @@ public class AbsDatabase: CAPPlugin { @objc func updateDeviceSettings(_ call: CAPPluginCall) { let disableAutoRewind = call.getBool("disableAutoRewind") ?? false let enableAltView = call.getBool("enableAltView") ?? false - let allowSeekingOnWidget = call.getBool("allowSeekingOnWidget") ?? false + let allowSeekingOnMediaControls = call.getBool("allowSeekingOnMediaControls") ?? false let jumpBackwardsTime = call.getInt("jumpBackwardsTime") ?? 10 let jumpForwardTime = call.getInt("jumpForwardTime") ?? 10 let lockOrientation = call.getString("lockOrientation") ?? "NONE" @@ -247,7 +247,7 @@ public class AbsDatabase: CAPPlugin { let settings = DeviceSettings() settings.disableAutoRewind = disableAutoRewind settings.enableAltView = enableAltView - settings.allowSeekingOnWidget = allowSeekingOnWidget + settings.allowSeekingOnMediaControls = allowSeekingOnMediaControls settings.jumpBackwardsTime = jumpBackwardsTime settings.jumpForwardTime = jumpForwardTime settings.lockOrientation = lockOrientation diff --git a/ios/App/Shared/models/DeviceSettings.swift b/ios/App/Shared/models/DeviceSettings.swift index 7599783a..c42a35bb 100644 --- a/ios/App/Shared/models/DeviceSettings.swift +++ b/ios/App/Shared/models/DeviceSettings.swift @@ -11,7 +11,7 @@ import RealmSwift class DeviceSettings: Object { @Persisted var disableAutoRewind: Bool = false @Persisted var enableAltView: Bool = true - @Persisted var allowSeekingOnWidget: Bool = false + @Persisted var allowSeekingOnMediaControls: Bool = false @Persisted var jumpBackwardsTime: Int = 10 @Persisted var jumpForwardTime: Int = 10 @Persisted var lockOrientation: String = "NONE" @@ -27,7 +27,7 @@ func deviceSettingsToJSON(settings: DeviceSettings) -> Dictionary { return [ "disableAutoRewind": settings.disableAutoRewind, "enableAltView": settings.enableAltView, - "allowSeekingOnWidget": settings.allowSeekingOnWidget, + "allowSeekingOnMediaControls": settings.allowSeekingOnMediaControls, "jumpBackwardsTime": settings.jumpBackwardsTime, "jumpForwardTime": settings.jumpForwardTime, "lockOrientation": settings.lockOrientation, diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 1f1dc2f2..ab41797c 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -672,7 +672,7 @@ class AudioPlayer: NSObject { return .success } - commandCenter.changePlaybackPositionCommand.isEnabled = deviceSettings.allowSeekingOnWidget + commandCenter.changePlaybackPositionCommand.isEnabled = deviceSettings.allowSeekingOnMediaControls commandCenter.changePlaybackPositionCommand.addTarget { [weak self] event in guard let event = event as? MPChangePlaybackPositionCommandEvent else { return .noSuchContent diff --git a/pages/settings.vue b/pages/settings.vue index 54da9a0e..fd0e82d0 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -62,11 +62,10 @@ info
-
- +
+
-

{{ $strings.LabelAllowSeekingOnWidget }}

- info +

{{ $strings.LabelAllowSeekingOnMediaControls }}

@@ -161,7 +160,7 @@ export default { settings: { disableAutoRewind: false, enableAltView: true, - allowSeekingOnWidget: false, + allowSeekingOnMediaControls: false, jumpForwardTime: 10, jumpBackwardsTime: 10, enableMp3IndexSeeking: false, @@ -186,10 +185,6 @@ export default { name: this.$strings.LabelDisableShakeToReset, message: this.$strings.LabelDisableShakeToResetHelp }, - allowSeekingOnWidget: { - name: this.$strings.LabelAllowSeekingOnWidget, - message: this.$strings.LabelAllowSeekingOnWidgetHelp - }, autoSleepTimer: { name: this.$strings.LabelAutoSleepTimer, message: this.$strings.LabelAutoSleepTimerHelp @@ -441,8 +436,8 @@ export default { this.settings.enableAltView = !this.settings.enableAltView this.saveSettings() }, - toggleAllowSeekingOnWidget() { - this.settings.allowSeekingOnWidget = !this.settings.allowSeekingOnWidget + toggleAllowSeekingOnMediaControls() { + this.settings.allowSeekingOnMediaControls = !this.settings.allowSeekingOnMediaControls this.saveSettings() }, getCurrentOrientation() { @@ -487,7 +482,7 @@ export default { const deviceSettings = this.deviceData.deviceSettings || {} this.settings.disableAutoRewind = !!deviceSettings.disableAutoRewind this.settings.enableAltView = !!deviceSettings.enableAltView - this.settings.allowSeekingOnWidget = !!deviceSettings.allowSeekingOnWidget + this.settings.allowSeekingOnMediaControls = !!deviceSettings.allowSeekingOnMediaControls this.settings.jumpForwardTime = deviceSettings.jumpForwardTime || 10 this.settings.jumpBackwardsTime = deviceSettings.jumpBackwardsTime || 10 this.settings.enableMp3IndexSeeking = !!deviceSettings.enableMp3IndexSeeking diff --git a/strings/cs.json b/strings/cs.json index 380890c2..31e72bdf 100644 --- a/strings/cs.json +++ b/strings/cs.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Přidáno v", "LabelAddToPlaylist": "Přidat do seznamu skladeb", "LabelAll": "Vše", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Autor (jméno a příjmení)", "LabelAuthorLastFirst": "Autor (příjmení a jméno)", @@ -289,4 +290,4 @@ "ToastPodcastCreateSuccess": "Podcast byl úspěšně vytvořen", "ToastRSSFeedCloseFailed": "Nepodařilo se zavřít RSS kanál", "ToastRSSFeedCloseSuccess": "RSS kanál uzavřen" -} +} \ No newline at end of file diff --git a/strings/da.json b/strings/da.json index 15b5ebfb..8a314f2f 100644 --- a/strings/da.json +++ b/strings/da.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Tilføjet Kl.", "LabelAddToPlaylist": "Tilføj til Afspilningsliste", "LabelAll": "Alle", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Forfatter", "LabelAuthorFirstLast": "Forfatter (Fornavn Efternavn)", "LabelAuthorLastFirst": "Forfatter (Efternavn, Fornavn)", diff --git a/strings/de.json b/strings/de.json index f242ee06..8420b090 100644 --- a/strings/de.json +++ b/strings/de.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Hinzugefügt am", "LabelAddToPlaylist": "Zur Wiedergabeliste hinzufügen", "LabelAll": "Alle", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Autor (Vorname Nachname)", "LabelAuthorLastFirst": "Autor (Nachname, Vorname)", @@ -228,8 +229,6 @@ "LabelType": "Typ", "LabelUnlockPlayer": "Mediaplayer entsperren", "LabelUseBookshelfView": "Benutze Bücherregalansicht", - "LabelAllowSeekingOnWidget": "Erlaube Vor- oder Zurückspulen auf dem 'Jetzt Läuft' Widget", - "LabelAllowSeekingOnWidgetHelp": "Erst nach einem Neustart der App wird diese Einstellung wirksam.", "LabelUser": "Benutzer", "LabelUsername": "Benutzername", "LabelVeryHigh": "Sehr hoch", diff --git a/strings/en-us.json b/strings/en-us.json index 82327326..eeab4b7b 100644 --- a/strings/en-us.json +++ b/strings/en-us.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Added At", "LabelAddToPlaylist": "Add to Playlist", "LabelAll": "All", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Author", "LabelAuthorFirstLast": "Author (First Last)", "LabelAuthorLastFirst": "Author (Last, First)", @@ -228,8 +229,6 @@ "LabelType": "Type", "LabelUnlockPlayer": "Unlock Player", "LabelUseBookshelfView": "Use bookshelf view", - "LabelAllowSeekingOnWidget": "Allow position seeking on the 'Now Playing' widget", - "LabelAllowSeekingOnWidgetHelp": "This setting will take effect ater a full app restart.", "LabelUser": "User", "LabelUsername": "Username", "LabelVeryHigh": "Very High", diff --git a/strings/es.json b/strings/es.json index 21cae895..e22cc00f 100644 --- a/strings/es.json +++ b/strings/es.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Añadido", "LabelAddToPlaylist": "Añadido a la Lista de Reproducción", "LabelAll": "Todos", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Autor (Nombre Apellido)", "LabelAuthorLastFirst": "Autor (Apellido, Nombre)", diff --git a/strings/fr.json b/strings/fr.json index 2c2e4e28..512c387f 100644 --- a/strings/fr.json +++ b/strings/fr.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Date d’ajout", "LabelAddToPlaylist": "Ajouter à la liste de lecture", "LabelAll": "Tout", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Auteur", "LabelAuthorFirstLast": "Auteur (Prénom Nom)", "LabelAuthorLastFirst": "Auteur (Nom, Prénom)", diff --git a/strings/gu.json b/strings/gu.json index 6802d2ca..965bc350 100644 --- a/strings/gu.json +++ b/strings/gu.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Added At", "LabelAddToPlaylist": "Add to Playlist", "LabelAll": "All", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Author", "LabelAuthorFirstLast": "Author (First Last)", "LabelAuthorLastFirst": "Author (Last, First)", diff --git a/strings/hi.json b/strings/hi.json index 00651ceb..11ceb47d 100644 --- a/strings/hi.json +++ b/strings/hi.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Added At", "LabelAddToPlaylist": "Add to Playlist", "LabelAll": "All", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Author", "LabelAuthorFirstLast": "Author (First Last)", "LabelAuthorLastFirst": "Author (Last, First)", diff --git a/strings/hr.json b/strings/hr.json index 047ca4e8..a5145122 100644 --- a/strings/hr.json +++ b/strings/hr.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Added At", "LabelAddToPlaylist": "Add to Playlist", "LabelAll": "All", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Author (First Last)", "LabelAuthorLastFirst": "Author (Last, First)", diff --git a/strings/it.json b/strings/it.json index f5344fef..87ea31b3 100644 --- a/strings/it.json +++ b/strings/it.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Aggiunto il", "LabelAddToPlaylist": "aggiungi alla Playlist", "LabelAll": "Tutti", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autore", "LabelAuthorFirstLast": "Autore (Per Nome)", "LabelAuthorLastFirst": "Autori (Per Cognome)", @@ -289,4 +290,4 @@ "ToastPodcastCreateSuccess": "Podcast creato Correttamente", "ToastRSSFeedCloseFailed": "Errore chiusura RSS feed", "ToastRSSFeedCloseSuccess": "RSS feed chiuso" -} +} \ No newline at end of file diff --git a/strings/lt.json b/strings/lt.json index b3ae845c..1adce67a 100644 --- a/strings/lt.json +++ b/strings/lt.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Pridėta {0}", "LabelAddToPlaylist": "Pridėti į grojaraštį", "LabelAll": "Visi", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autorius", "LabelAuthorFirstLast": "Autorius (Vardas Pavardė)", "LabelAuthorLastFirst": "Autorius (Pavardė, Vardas)", diff --git a/strings/nl.json b/strings/nl.json index 8d91fe2d..d8de3f5b 100644 --- a/strings/nl.json +++ b/strings/nl.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Toegevoegd op", "LabelAddToPlaylist": "Toevoegen aan afspeellijst", "LabelAll": "Alle", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Auteur", "LabelAuthorFirstLast": "Auteur (Voornaam Achternaam)", "LabelAuthorLastFirst": "Auteur (Achternaam, Voornaam)", diff --git a/strings/no.json b/strings/no.json index f4b44a82..0e5deac7 100644 --- a/strings/no.json +++ b/strings/no.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Dato lagt til ", "LabelAddToPlaylist": "Legg til i spilleliste", "LabelAll": "Alle", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Forfatter", "LabelAuthorFirstLast": "Forfatter (Fornavn Etternavn)", "LabelAuthorLastFirst": "Forfatter (Etternavn Fornavn)", diff --git a/strings/pl.json b/strings/pl.json index 08880fa2..1bbe746b 100644 --- a/strings/pl.json +++ b/strings/pl.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Dodano w", "LabelAddToPlaylist": "Dodaj do playlisty", "LabelAll": "Wszystkie", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Autor (Rosnąco)", "LabelAuthorLastFirst": "Author (Malejąco)", diff --git a/strings/pt-br.json b/strings/pt-br.json index 7098422d..1978bab3 100644 --- a/strings/pt-br.json +++ b/strings/pt-br.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Acrescentado Em", "LabelAddToPlaylist": "Adicionar à Lista de Reprodução", "LabelAll": "Todos", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Autor", "LabelAuthorFirstLast": "Autor (Nome Sobrenome)", "LabelAuthorLastFirst": "Autor (Sobrenome, Nome)", @@ -289,4 +290,4 @@ "ToastPodcastCreateSuccess": "Podcast criado", "ToastRSSFeedCloseFailed": "Falha ao fechar feed RSS", "ToastRSSFeedCloseSuccess": "Feed RSS fechado" -} +} \ No newline at end of file diff --git a/strings/ru.json b/strings/ru.json index fb3334e9..d1ffabc0 100644 --- a/strings/ru.json +++ b/strings/ru.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Дата добавления", "LabelAddToPlaylist": "Добавить в плейлист", "LabelAll": "Все", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Автор", "LabelAuthorFirstLast": "Автор (Имя Фамилия)", "LabelAuthorLastFirst": "Автор (Фамилия, Имя)", diff --git a/strings/sv.json b/strings/sv.json index abbaf278..f5b44b1d 100644 --- a/strings/sv.json +++ b/strings/sv.json @@ -85,6 +85,7 @@ "LabelAddedAt": "Tillagd vid", "LabelAddToPlaylist": "Lägg till i Spellista", "LabelAll": "Alla", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "Författare", "LabelAuthorFirstLast": "Författare (Förnamn Efternamn)", "LabelAuthorLastFirst": "Författare (Efternamn, Förnamn)", diff --git a/strings/zh-cn.json b/strings/zh-cn.json index c44d8f47..c3b30aa5 100644 --- a/strings/zh-cn.json +++ b/strings/zh-cn.json @@ -85,6 +85,7 @@ "LabelAddedAt": "添加于", "LabelAddToPlaylist": "添加到播放列表", "LabelAll": "全部", + "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls", "LabelAuthor": "作者", "LabelAuthorFirstLast": "作者 (姓 名)", "LabelAuthorLastFirst": "作者 (名, 姓)",