From cb9e317e74d793942165335a1e3c901701b42638 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sat, 20 May 2023 11:56:36 -0500 Subject: [PATCH] Initialize auto rewind time and update description --- .../audiobookshelf/app/data/DeviceClasses.kt | 2 +- .../audiobookshelf/app/device/DeviceManager.kt | 4 ++++ pages/settings.vue | 18 +++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) 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 6bda6d1b..a85a84a2 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 @@ -126,7 +126,7 @@ data class DeviceSettings( autoSleepTimerEndTime = "06:00", sleepTimerLength = 900000L, // 15 minutes autoSleepTimerAutoRewind = false, - autoSleepTimerAutoRewindTime = 300000L, + autoSleepTimerAutoRewindTime = 300000L, // 5 minutes disableSleepTimerFadeOut = false, disableSleepTimerResetFeedback = false ) diff --git a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt index 57245e19..77391ae2 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt @@ -39,6 +39,10 @@ object DeviceManager { if (deviceData.deviceSettings?.shakeSensitivity == null) { deviceData.deviceSettings?.shakeSensitivity = ShakeSensitivitySetting.MEDIUM } + // Initialize auto sleep timer auto rewind added in v0.9.64 + if (deviceData.deviceSettings?.autoSleepTimerAutoRewindTime == null) { + deviceData.deviceSettings?.autoSleepTimerAutoRewindTime = 300000L // 5 minutes + } } fun getBase64Id(id:String):String { diff --git a/pages/settings.vue b/pages/settings.vue index ce7c3ff7..746b5319 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -95,11 +95,11 @@ -
-
- -
-

Auto Sleep Timer Auto Rewind

+
+
+ +
+

Auto Sleep Timer Auto Rewind

info
@@ -142,7 +142,7 @@ export default { disableSleepTimerFadeOut: false, disableSleepTimerResetFeedback: false, autoSleepTimerAutoRewind: false, - autoSleepTimerAutoRewindTime: 300000, // 5 minutes + autoSleepTimerAutoRewindTime: 300000 // 5 minutes }, lockCurrentOrientation: false, settingInfo: { @@ -163,8 +163,8 @@ export default { message: 'When the sleep timer gets reset your device will vibrate. Enable this setting to not vibrate when the sleep timer resets.' }, autoSleepTimerAutoRewind: { - name: "Enable sleep timer auto rewind", - message: "When the Auto Sleep Timer plays, automatically rewind your position in the book. " + name: 'Enable sleep timer auto rewind', + message: 'When the auto sleep timer finishes, playing the item again will automatically rewind your position.' } }, hapticFeedbackItems: [ @@ -402,7 +402,7 @@ export default { this.settings.disableSleepTimerResetFeedback = !!deviceSettings.disableSleepTimerResetFeedback this.settings.autoSleepTimerAutoRewind = !!deviceSettings.autoSleepTimerAutoRewind - this.settings.autoSleepTimerAutoRewindTime = !isNaN(deviceSettings.autoSleepTimerAutoRewindTime) ? deviceSettings.autoSleepTimerAutoRewindTime : 600000 // 10 minutes + this.settings.autoSleepTimerAutoRewindTime = !isNaN(deviceSettings.autoSleepTimerAutoRewindTime) ? deviceSettings.autoSleepTimerAutoRewindTime : 300000 // 5 minutes } }, mounted() {