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 22362ad5..dd2b7804 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 @@ -122,8 +122,7 @@ data class DeviceSettings( var sleepTimerLength: Long, // Time in milliseconds var disableSleepTimerFadeOut: Boolean, var disableSleepTimerResetFeedback: Boolean, - var languageCode: String, - var enableLowFeedbackMode: Boolean + var languageCode: String ) { companion object { // Static method to get default device settings @@ -145,8 +144,7 @@ data class DeviceSettings( autoSleepTimerAutoRewind = false, autoSleepTimerAutoRewindTime = 300000L, // 5 minutes disableSleepTimerFadeOut = false, - disableSleepTimerResetFeedback = false, - enableLowFeedbackMode = false + disableSleepTimerResetFeedback = false ) } } diff --git a/components/tables/podcast/EpisodeRow.vue b/components/tables/podcast/EpisodeRow.vue index 44b6e84e..fa688fba 100644 --- a/components/tables/podcast/EpisodeRow.vue +++ b/components/tables/podcast/EpisodeRow.vue @@ -152,9 +152,6 @@ export default { }, localEpisodeId() { return this.localEpisode?.id || null - }, - isLowFeedback() { - return this.$store.state.deviceData.deviceSettings.enableLowFeedbackMode } }, methods: { @@ -213,19 +210,14 @@ export default { console.log('Local folder', JSON.stringify(localFolder)) - if (this.isLowFeedback) { + var startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` + const { value } = await Dialog.confirm({ + title: 'Confirm', + message: startDownloadMessage + }) + if (value) { this.startDownload(localFolder) - } else { - var startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` - const { value } = await Dialog.confirm({ - title: 'Confirm', - message: startDownloadMessage - }) - if (value) { - this.startDownload(localFolder) - } } - }, async startDownload(localFolder) { var payload = { diff --git a/components/tables/podcast/LatestEpisodeRow.vue b/components/tables/podcast/LatestEpisodeRow.vue index 140426c4..682b046d 100644 --- a/components/tables/podcast/LatestEpisodeRow.vue +++ b/components/tables/podcast/LatestEpisodeRow.vue @@ -158,9 +158,6 @@ export default { }, podcast() { return this.episode.podcast || {} - }, - isLowFeedback() { - return this.$store.state.deviceData.deviceSettings.enableLowFeedbackMode } }, methods: { @@ -219,18 +216,14 @@ export default { console.log('Local folder', JSON.stringify(localFolder)) - if (this.isLowFeedback) { + var startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` + const { value } = await Dialog.confirm({ + title: 'Confirm', + message: startDownloadMessage + }) + if (value) { this.startDownload(localFolder) - } else { - var startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` - const { value } = await Dialog.confirm({ - title: 'Confirm', - message: startDownloadMessage - }) - if (value) { - this.startDownload(localFolder) - } - } + } }, async startDownload(localFolder) { var payload = { diff --git a/components/widgets/DownloadProgressIndicator.vue b/components/widgets/DownloadProgressIndicator.vue index 4018aa03..130007c7 100644 --- a/components/widgets/DownloadProgressIndicator.vue +++ b/components/widgets/DownloadProgressIndicator.vue @@ -40,10 +40,6 @@ export default { }, isIos() { return this.$platform === 'ios' - }, - isLowFeedback() { - console.log('isLowFeedback', this.$store.state.deviceData.deviceSettings.enableLowFeedbackMode) - return this.$store.state.deviceData.deviceSettings.enableLowFeedbackMode } }, methods: { @@ -60,9 +56,7 @@ export default { if (!data.localLibraryItem) { this.$toast.error(this.$strings.MessageItemDownloadCompleteFailedToCreate) } else { - if (!this.isLowFeedback) { - this.$toast.success(`Item "${data.localLibraryItem.media.metadata.title}" download finished`) - } + this.$toast.success(`Item "${data.localLibraryItem.media.metadata.title}" download finished`) this.$eventBus.$emit('new-local-library-item', data.localLibraryItem) } diff --git a/pages/item/_id/_episode/index.vue b/pages/item/_id/_episode/index.vue index 82029af9..9baa81f3 100644 --- a/pages/item/_id/_episode/index.vue +++ b/pages/item/_id/_episode/index.vue @@ -398,17 +398,13 @@ export default { console.log('Local folder', JSON.stringify(localFolder)) - if (this.isLowFeedback) { + const startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` + const { value } = await Dialog.confirm({ + title: 'Confirm', + message: startDownloadMessage + }) + if (value) { this.startDownload(localFolder) - } else { - const startDownloadMessage = `Start download for "${this.title}" to folder ${localFolder.name}?` - const { value } = await Dialog.confirm({ - title: 'Confirm', - message: startDownloadMessage - }) - if (value) { - this.startDownload(localFolder) - } } }, async selectFolder() { diff --git a/pages/item/_id/index.vue b/pages/item/_id/index.vue index 515f6b1b..05819ed9 100644 --- a/pages/item/_id/index.vue +++ b/pages/item/_id/index.vue @@ -27,7 +27,7 @@

{{ subtitle }}

-
+

{{ $strings.MessageMediaNotLinkedToServer }}

@@ -454,9 +454,6 @@ export default { if (width * this.bookCoverAspectRatio > 325) width = 325 / this.bookCoverAspectRatio return width - }, - isLowFeedback() { - return this.$store.state.deviceData.deviceSettings.enableLowFeedbackMode } }, methods: { @@ -618,24 +615,20 @@ export default { } console.log('Local folder', JSON.stringify(localFolder)) - if (this.isLowFeedback) { + let startDownloadMessage = `Start download for "${this.title}" with ${this.numTracks} audio track${this.numTracks == 1 ? '' : 's'} to folder ${localFolder.name}?` + if (!this.isIos && this.showRead) { + if (this.numTracks > 0) { + startDownloadMessage = `Start download for "${this.title}" with ${this.numTracks} audio track${this.numTracks == 1 ? '' : 's'} and ebook file to folder ${localFolder.name}?` + } else { + startDownloadMessage = `Start download for "${this.title}" with ebook file to folder ${localFolder.name}?` + } + } + const { value } = await Dialog.confirm({ + title: 'Confirm', + message: startDownloadMessage + }) + if (value) { this.startDownload(localFolder) - } else { - let startDownloadMessage = `Start download for "${this.title}" with ${this.numTracks} audio track${this.numTracks == 1 ? '' : 's'} to folder ${localFolder.name}?` - if (!this.isIos && this.showRead) { - if (this.numTracks > 0) { - startDownloadMessage = `Start download for "${this.title}" with ${this.numTracks} audio track${this.numTracks == 1 ? '' : 's'} and ebook file to folder ${localFolder.name}?` - } else { - startDownloadMessage = `Start download for "${this.title}" with ebook file to folder ${localFolder.name}?` - } - } - const { value } = await Dialog.confirm({ - title: 'Confirm', - message: startDownloadMessage - }) - if (value) { - this.startDownload(localFolder) - } } }, async startDownload(localFolder = null) { diff --git a/pages/settings.vue b/pages/settings.vue index bb08087c..b5d40094 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -15,12 +15,6 @@

{{ $strings.LabelLockOrientation }}

-
-
- -
-

Low Feedback Mode

-

{{ $strings.LabelHapticFeedback }}

@@ -164,8 +158,7 @@ export default { disableSleepTimerResetFeedback: false, autoSleepTimerAutoRewind: false, autoSleepTimerAutoRewindTime: 300000, // 5 minutes - languageCode: 'en-us', // 5 minutes - enableLowFeedbackMode: false + languageCode: 'en-us' // 5 minutes }, lockCurrentOrientation: false, settingInfo: { @@ -194,10 +187,6 @@ export default { message: this.$strings.LabelEnableMp3IndexSeekingHelp name: 'Enable mp3 index seeking', message: 'This setting should only be enabled if you have mp3 files that are not seeking correctly. Inaccurate seeking is most likely due to Variable birate (VBR) MP3 files. This setting will force index seeking, in which a time-to-byte mapping is built as the file is read. In some cases with large MP3 files there will be a delay when seeking towards the end of the file.' - }, - enableLowFeedbackMode: { - name: 'Low feedback mode', - message: 'Danger. This setting will hide confirmation messages, error messages, notifications and feedback within the apps interface. With low feedback enabled, you WILL miss important messages. You WILL experience unexpected behavior. Proceed with caution.' } }, hapticFeedbackItems: [ @@ -436,10 +425,6 @@ export default { this.settings.jumpBackwardsTime = this.jumpBackwardsItems[next].value this.saveSettings() }, - toggleLowFeedbackMode() { - this.settings.enableLowFeedbackMode = !this.settings.enableLowFeedbackMode - this.saveSettings() - }, async saveSettings() { await this.$hapticsImpact() const updatedDeviceData = await this.$db.updateDeviceSettings({ ...this.settings }) @@ -476,8 +461,6 @@ export default { this.settings.autoSleepTimerAutoRewindTime = !isNaN(deviceSettings.autoSleepTimerAutoRewindTime) ? deviceSettings.autoSleepTimerAutoRewindTime : 300000 // 5 minutes this.settings.languageCode = deviceSettings.languageCode || 'en-us' - - this.settings.enableLowFeedbackMode = !!deviceSettings.enableLowFeedbackMode } }, mounted() { diff --git a/store/index.js b/store/index.js index 1d1a59ff..847c23f2 100644 --- a/store/index.js +++ b/store/index.js @@ -75,9 +75,6 @@ export const getters = { }, getOrientationLockSetting: state => { return state.deviceData?.deviceSettings?.lockOrientation - }, - getLowFeedbackModeSetting: state => { - return state.deviceData?.deviceSettings?.enableLowFeebackMode } }