Added Auto Rewind on Sleep Timer setting

android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt

@@ -103,6 +103,8 @@ data class DeviceSettings(
   var autoSleepTimer: Boolean,
   var autoSleepTimerStartTime: String,
   var autoSleepTimerEndTime: String,
+  var autoSleepTimerAutoRewind: Boolean,
+  var autoSleepTimerAutoRewindTime: Long, //Time in milliseconds
   var sleepTimerLength: Long, // Time in milliseconds
   var disableSleepTimerFadeOut: Boolean,
   var disableSleepTimerResetFeedback: Boolean
@@ -123,6 +125,8 @@ data class DeviceSettings(
         autoSleepTimerStartTime = "22:00",
         autoSleepTimerEndTime = "06:00",
         sleepTimerLength = 900000L, // 15 minutes
+        autoSleepTimerAutoRewind = false,
+        autoSleepTimerAutoRewindTime = 300000L,
         disableSleepTimerFadeOut = false,
         disableSleepTimerResetFeedback = false
       )
@@ -142,6 +146,7 @@ data class DeviceSettings(
   @get:JsonIgnore
   val autoSleepTimerEndMinute get() = autoSleepTimerEndTime.split(":")[1].toInt()
 
+
   @JsonIgnore
   fun getShakeThresholdGravity() : Float { // Used in ShakeDetector
     return if (shakeSensitivity == ShakeSensitivitySetting.VERY_HIGH) 1.2f

android/app/src/main/java/com/audiobookshelf/app/managers/SleepTimerManager.kt

@@ -1,6 +1,7 @@
 package com.audiobookshelf.app.managers
 
 import android.content.Context
+import android.media.metrics.PlaybackSession
 import android.os.*
 import android.util.Log
 import com.audiobookshelf.app.device.DeviceManager
@@ -343,6 +344,10 @@ class SleepTimerManager constructor(private val playerNotificationService: Playe
       if (currentCalendar.after(startCalendar) && currentCalendar.before(endCalendar)) {
         Log.i(tag, "Current hour $currentHour is between ${deviceSettings.autoSleepTimerStartTime} and ${deviceSettings.autoSleepTimerEndTime} - starting sleep timer")
 
+        // Automatically Rewind in the book if settings is enabled
+        if (deviceSettings.autoSleepTimerAutoRewind) {
+          playerNotificationService.seekBackward(deviceSettings.autoSleepTimerAutoRewindTime)
+        }
         // Set sleep timer
         //   When sleepTimerLength is 0 then use end of chapter/track time
         if (deviceSettings.sleepTimerLength == 0L) {

components/modals/AutoSleepTimerRewindLengthModal.vue

@@ -0,0 +1,95 @@
+<template>
+  <modals-modal v-model="show" :width="200" height="100%">
+    <template #outer>
+      <div class="absolute top-8 left-4 z-40">
+        <p class="text-white text-2xl truncate">Auto Rewind Time</p>
+      </div>
+    </template>
+
+    <div
+      class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center"
+      @click="
+        show = false
+        manualTimerModal = false
+      "
+    >
+      <div class="w-full overflow-x-hidden overflow-y-auto bg-primary rounded-lg border border-white border-opacity-20" style="max-height: 75%" @click.stop>
+        <div v-if="manualTimerModal" class="p-4">
+          <div class="flex mb-4" @click="manualTimerModal = false">
+            <span class="material-icons text-3xl">arrow_back</span>
+          </div>
+          <div class="flex my-2 justify-between">
+            <ui-btn @click="decreaseManualTimeout" class="w-9 h-9" :padding-x="0" small style="max-width: 36px"><span class="material-icons">remove</span></ui-btn>
+            <p class="text-2xl font-mono text-center">{{ manualTimeoutMin }} min</p>
+            <ui-btn @click="increaseManualTimeout" class="w-9 h-9" :padding-x="0" small style="max-width: 36px"><span class="material-icons">add</span></ui-btn>
+          </div>
+          <ui-btn @click="clickedOption(manualTimeoutMin)" class="w-full">Set Timer</ui-btn>
+        </div>
+        <ul v-else class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
+          <template v-for="timeout in timeouts">
+            <li :key="timeout" class="text-gray-50 select-none relative py-4 cursor-pointer hover:bg-black-400" role="option" @click="clickedOption(timeout)">
+              <div class="flex items-center justify-center">
+                <span class="font-normal block truncate text-lg">{{ timeout }} min</span>
+              </div>
+            </li>
+          </template>
+          <li class="text-gray-50 select-none relative py-4 cursor-pointer hover:bg-black-400" role="option" @click="manualTimerModal = true">
+            <div class="flex items-center justify-center">
+              <span class="font-normal block truncate text-lg text-center">Custom time</span>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean
+  },
+  data() {
+    return {
+      manualTimerModal: null,
+      manualTimeoutMin: 1
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    },
+    timeouts() {
+      return [5, 10, 15, 30, 45, 60, 90]
+    }
+  },
+  methods: {
+    async clickedChapterOption() {
+      await this.$hapticsImpact()
+      this.show = false
+      this.$nextTick(() => this.$emit('change', 0))
+    },
+    async clickedOption(timeoutMin) {
+      await this.$hapticsImpact()
+      const timeout = timeoutMin * 1000 * 60
+      this.show = false
+      this.manualTimerModal = false
+      this.$nextTick(() => this.$emit('change', timeout))
+    },
+    async increaseManualTimeout() {
+      await this.$hapticsImpact()
+      this.manualTimeoutMin++
+    },
+    async decreaseManualTimeout() {
+      await this.$hapticsImpact()
+      if (this.manualTimeoutMin > 1) this.manualTimeoutMin--
+    }
+  },
+  mounted() {}
+}
+</script>

pages/settings.vue

@@ -95,9 +95,23 @@
         <ui-text-input :value="sleepTimerLengthOption" readonly append-icon="expand_more" style="width: 145px; max-width: 145px" />
       </div>
     </div>
+    <div  v-if="settings.autoSleepTimer" class="flex items-center py-3" @click="toggleAutoSleepTimerAutoRewind">
+        <div class="w-10 flex justify-center">
+          <ui-toggle-switch v-model="settings.autoSleepTimerAutoRewind" @input="saveSettings" />
+        </div>
+        <p class="pl-4">Auto Sleep Timer Auto Rewind</p>
+      <span class="material-icons-outlined ml-2" @click.stop="showInfo('autoSleepTimerAutoRewind')">info</span>
+    </div>
+    <div v-if="settings.autoSleepTimerAutoRewind" class="py-3 flex items-center">
+      <p class="pr-4 w-36">Auto Rewind Time</p>
+      <div @click.stop="showAutoSleepTimerRewindOptions">
+        <ui-text-input :value="autoSleepTimerRewindLengthOption" readonly append-icon="expand_more" style="width: 145px; max-width: 145px" />
+      </div>
+    </div>
 
     <modals-dialog v-model="showMoreMenuDialog" :items="moreMenuItems" @action="clickMenuAction" />
     <modals-sleep-timer-length-modal v-model="showSleepTimerLengthModal" @change="sleepTimerLengthModalSelection" />
+    <modals-auto-sleep-timer-rewind-length-modal v-model="showAutoSleepTimerRewindLengthModal" @change="showAutoSleepTimerRewindLengthModalSelection" />
   </div>
 </template>
 
@@ -110,6 +124,7 @@ export default {
       deviceData: null,
       showMoreMenuDialog: false,
       showSleepTimerLengthModal: false,
+      showAutoSleepTimerRewindLengthModal: false,
       moreMenuSetting: '',
       settings: {
         disableAutoRewind: false,
@@ -125,7 +140,9 @@ export default {
         autoSleepTimerEndTime: '06:00',
         sleepTimerLength: 900000, // 15 minutes
         disableSleepTimerFadeOut: false,
-        disableSleepTimerResetFeedback: false
+        disableSleepTimerResetFeedback: false,
+        autoSleepTimerAutoRewind: false,
+        autoSleepTimerAutoRewindTime: 300000, // 5 minutes
       },
       lockCurrentOrientation: false,
       settingInfo: {
@@ -144,6 +161,10 @@ export default {
         disableSleepTimerResetFeedback: {
           name: 'Disable vibrate on reset',
           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. "
         }
       },
       hapticFeedbackItems: [
@@ -234,6 +255,10 @@ export default {
       const minutes = Number(this.settings.sleepTimerLength) / 1000 / 60
       return `${minutes} min`
     },
+    autoSleepTimerRewindLengthOption() {
+      const minutes = Number(this.settings.autoSleepTimerAutoRewindTime) / 1000 / 60
+      return `${minutes} min`
+    },
     moreMenuItems() {
       if (this.moreMenuSetting === 'shakeSensitivity') return this.shakeSensitivityItems
       else if (this.moreMenuSetting === 'hapticFeedback') return this.hapticFeedbackItems
@@ -245,9 +270,16 @@ export default {
       this.settings.sleepTimerLength = value
       this.saveSettings()
     },
+    showAutoSleepTimerRewindLengthModalSelection(value) {
+      this.settings.autoSleepTimerAutoRewindTime = value
+      this.saveSettings()
+    },
     showSleepTimerOptions() {
       this.showSleepTimerLengthModal = true
     },
+    showAutoSleepTimerRewindOptions() {
+      this.showAutoSleepTimerRewindLengthModal = true
+    },
     showHapticFeedbackOptions() {
       this.moreMenuSetting = 'hapticFeedback'
       this.showMoreMenuDialog = true
@@ -287,6 +319,10 @@ export default {
       this.settings.autoSleepTimer = !this.settings.autoSleepTimer
       this.saveSettings()
     },
+    toggleAutoSleepTimerAutoRewind() {
+      this.settings.autoSleepTimerAutoRewind = !this.settings.autoSleepTimerAutoRewind
+      this.saveSettings
+    },
     toggleDisableSleepTimerFadeOut() {
       this.settings.disableSleepTimerFadeOut = !this.settings.disableSleepTimerFadeOut
       this.saveSettings()
@@ -364,6 +400,9 @@ export default {
       this.settings.sleepTimerLength = !isNaN(deviceSettings.sleepTimerLength) ? deviceSettings.sleepTimerLength : 900000 // 15 minutes
       this.settings.disableSleepTimerFadeOut = !!deviceSettings.disableSleepTimerFadeOut
       this.settings.disableSleepTimerResetFeedback = !!deviceSettings.disableSleepTimerResetFeedback
+
+      this.settings.autoSleepTimerAutoRewind = !!deviceSettings.autoSleepTimerAutoRewind
+      this.settings.autoSleepTimerAutoRewindTime  = !isNaN(deviceSettings.autoSleepTimerAutoRewindTime) ? deviceSettings.autoSleepTimerAutoRewindTime : 600000 // 10 minutes
     }
   },
   mounted() {