diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index a035cf07..c12243cc 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -9,6 +9,7 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { + implementation project(':byteowls-capacitor-filesharer') implementation project(':capacitor-app') implementation project(':capacitor-browser') implementation project(':capacitor-clipboard') diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 91ba9d08..a2f6b93a 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -1,4 +1,8 @@ [ + { + "pkg": "@byteowls/capacitor-filesharer", + "classpath": "com.byteowls.capacitor.filesharer.FileSharerPlugin" + }, { "pkg": "@capacitor/app", "classpath": "com.capacitorjs.plugins.app.AppPlugin" diff --git a/android/app/src/main/java/com/audiobookshelf/app/MainActivity.kt b/android/app/src/main/java/com/audiobookshelf/app/MainActivity.kt index 94698d15..339954ee 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/MainActivity.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/MainActivity.kt @@ -116,6 +116,7 @@ class MainActivity : BridgeActivity() { override fun onSaveInstanceState(outState: Bundle) { storageHelper.onSaveInstanceState(outState) super.onSaveInstanceState(outState) + outState.clear() } override fun onRestoreInstanceState(savedInstanceState: Bundle) { diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 4d93d79d..e38371ae 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -2,6 +2,9 @@ include ':capacitor-android' project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') +include ':byteowls-capacitor-filesharer' +project(':byteowls-capacitor-filesharer').projectDir = new File('../node_modules/@byteowls/capacitor-filesharer/android') + include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') diff --git a/components/app/AudioPlayer.vue b/components/app/AudioPlayer.vue index 85d54b4d..14441c1e 100644 --- a/components/app/AudioPlayer.vue +++ b/components/app/AudioPlayer.vue @@ -696,8 +696,8 @@ export default { this.updateTimestamp() this.updateTrack() this.updateReadyTrack() + this.updateUseChapterTrack() this.$localStore.setUseTotalTrack(this.useTotalTrack) - this.$localStore.setUseChapterTrack(this.useChapterTrack) } else if (action === 'total_track') { this.useTotalTrack = !this.useTotalTrack this.useChapterTrack = !this.useTotalTrack || this.useChapterTrack @@ -705,13 +705,20 @@ export default { this.updateTimestamp() this.updateTrack() this.updateReadyTrack() + this.updateUseChapterTrack() this.$localStore.setUseTotalTrack(this.useTotalTrack) - this.$localStore.setUseChapterTrack(this.useChapterTrack) } else if (action === 'close') { this.closePlayback() } }) }, + updateUseChapterTrack() { + this.$localStore.setUseChapterTrack(this.useChapterTrack) + // Chapter track in NowPlaying only supported on iOS for now + if (this.$platform === 'ios') { + AbsAudioPlayer.setChapterTrack({ enabled: this.useChapterTrack }) + } + }, forceCloseDropdownMenu() { if (this.$refs.dropdownMenu && this.$refs.dropdownMenu.closeMenu) { this.$refs.dropdownMenu.closeMenu() diff --git a/components/cards/LazyListBookCard.vue b/components/cards/LazyListBookCard.vue index 3b46b9a4..9aebb8df 100644 --- a/components/cards/LazyListBookCard.vue +++ b/components/cards/LazyListBookCard.vue @@ -15,7 +15,7 @@
-

+

#{{ seriesSequence }} {{ displayTitle }}

{{ displayAuthor }}

diff --git a/components/modals/FilterModal.vue b/components/modals/FilterModal.vue index ae15f882..e104dd9c 100644 --- a/components/modals/FilterModal.vue +++ b/components/modals/FilterModal.vue @@ -1,12 +1,12 @@