diff --git a/Server.js b/Server.js index 3e689f88..ec9408df 100644 --- a/Server.js +++ b/Server.js @@ -33,8 +33,8 @@ class Server extends EventEmitter { setUser(user) { this.user = user this.store.commit('user/setUser', user) - this.store.commit('user/setSettings', user.settings) if (user) { + this.store.commit('user/setSettings', user.settings) localStorage.setItem('userToken', user.token) } else { localStorage.removeItem('userToken') diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d53a4a3..2a894c15 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.audiobookshelf.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4 - versionName "0.2.0-beta" + versionCode 5 + versionName "0.2.1-beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt index 9ea2020e..1dfbd2a9 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt @@ -191,6 +191,8 @@ class PlayerNotificationService : Service() { playerNotificationManager.setUseChronometer(false) playerNotificationManager.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) playerNotificationManager.setPriority(NotificationCompat.PRIORITY_MAX) + playerNotificationManager.setUseFastForwardActionInCompactView(true) + playerNotificationManager.setUseRewindActionInCompactView(true) // Unknown action playerNotificationManager.setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE) @@ -276,14 +278,6 @@ class PlayerNotificationService : Service() { } override fun onEvents(player: Player, events: Player.Events) { - if (events.contains(Player.EVENT_TRACKS_CHANGED)) { - Log.d(tag, "EVENT_TRACKS_CHANGED") - } - - if (events.contains(Player.EVENT_TIMELINE_CHANGED)) { - Log.d(tag, "EVENT_TIMELINE_CHANGED") - } - if (events.contains(Player.EVENT_POSITION_DISCONTINUITY)) { Log.d(tag, "EVENT_POSITION_DISCONTINUITY") } diff --git a/android/app/src/main/res/drawable-anydpi/exo_icon_fastforward.xml b/android/app/src/main/res/drawable-anydpi/exo_icon_fastforward.xml new file mode 100644 index 00000000..5076abdb --- /dev/null +++ b/android/app/src/main/res/drawable-anydpi/exo_icon_fastforward.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/android/app/src/main/res/drawable-anydpi/exo_icon_rewind.xml b/android/app/src/main/res/drawable-anydpi/exo_icon_rewind.xml new file mode 100644 index 00000000..2b854c66 --- /dev/null +++ b/android/app/src/main/res/drawable-anydpi/exo_icon_rewind.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/android/app/src/main/res/drawable-hdpi/exo_icon_fastforward.png b/android/app/src/main/res/drawable-hdpi/exo_icon_fastforward.png new file mode 100644 index 00000000..be2f1f7e Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/exo_icon_fastforward.png differ diff --git a/android/app/src/main/res/drawable-hdpi/exo_icon_rewind.png b/android/app/src/main/res/drawable-hdpi/exo_icon_rewind.png new file mode 100644 index 00000000..893b7ff5 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/exo_icon_rewind.png differ diff --git a/android/app/src/main/res/drawable-mdpi/exo_icon_fastforward.png b/android/app/src/main/res/drawable-mdpi/exo_icon_fastforward.png new file mode 100644 index 00000000..01d49079 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/exo_icon_fastforward.png differ diff --git a/android/app/src/main/res/drawable-mdpi/exo_icon_rewind.png b/android/app/src/main/res/drawable-mdpi/exo_icon_rewind.png new file mode 100644 index 00000000..430fc8da Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/exo_icon_rewind.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/exo_icon_fastforward.png b/android/app/src/main/res/drawable-xhdpi/exo_icon_fastforward.png new file mode 100644 index 00000000..eb32716c Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/exo_icon_fastforward.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/exo_icon_rewind.png b/android/app/src/main/res/drawable-xhdpi/exo_icon_rewind.png new file mode 100644 index 00000000..e0467936 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/exo_icon_rewind.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png b/android/app/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png new file mode 100644 index 00000000..4a48cc42 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/exo_icon_rewind.png b/android/app/src/main/res/drawable-xxhdpi/exo_icon_rewind.png new file mode 100644 index 00000000..a317ede1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/exo_icon_rewind.png differ diff --git a/android/app/src/main/res/drawable/exo_icon_fastforward.xml b/android/app/src/main/res/drawable/exo_icon_fastforward.xml new file mode 100644 index 00000000..f6a6c064 --- /dev/null +++ b/android/app/src/main/res/drawable/exo_icon_fastforward.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/android/app/src/main/res/drawable/exo_icon_rewind.xml b/android/app/src/main/res/drawable/exo_icon_rewind.xml new file mode 100644 index 00000000..06db412b --- /dev/null +++ b/android/app/src/main/res/drawable/exo_icon_rewind.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/components/app/Appbar.vue b/components/app/Appbar.vue index 9bf13c67..1514c9ba 100644 --- a/components/app/Appbar.vue +++ b/components/app/Appbar.vue @@ -9,10 +9,18 @@

AudioBookshelf

-
- + + + + + {{ username }} + + + person + +
@@ -44,9 +52,6 @@ export default { username() { return this.user ? this.user.username : 'err' }, - // hasUpdate() { - // return this.$store.state.hasUpdate - // }, appListingUrl() { if (this.$platform === 'android') { return process.env.ANDROID_APP_URL diff --git a/components/cards/BookCard.vue b/components/cards/BookCard.vue index b3ae8183..1a143872 100644 --- a/components/cards/BookCard.vue +++ b/components/cards/BookCard.vue @@ -15,11 +15,9 @@
- -
- priority_high -
- +
+ priority_high +
diff --git a/components/cards/BookCover.vue b/components/cards/BookCover.vue index 40bb1c81..76e2fca4 100644 --- a/components/cards/BookCover.vue +++ b/components/cards/BookCover.vue @@ -9,7 +9,7 @@
- +

Invalid Cover

diff --git a/package-lock.json b/package-lock.json index f07e8e7c..3d1a69b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf-app", - "version": "v0.1.0-beta", + "version": "v0.2.1-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1001,9 +1001,9 @@ } }, "@capacitor/android": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.1.2.tgz", - "integrity": "sha512-WF2E2jWxO3EBl8Y3aTAa8PHwMZGiAl9pdqvJaEUUhbbovXe0UxAuG4n0mfci4ZI6dD8gannQ2peoZ74vJ0Gr3Q==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.2.2.tgz", + "integrity": "sha512-+/qbSZIHPP1VndRUe5c6dgheLV0MgX9CXeUo7el8ODHgVrC2DXKhczgvs+EpTAmvS2VZFxzDeld7AMUmHybTcg==" }, "@capacitor/cli": { "version": "3.1.2", @@ -1044,9 +1044,9 @@ } }, "@capacitor/core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.1.2.tgz", - "integrity": "sha512-cMqDY4JTNtyonqVPYxHqbmN3M3jlEBnQxecptlR+6yk/ZuhUwOJTHT1ActXRLyrQ8XIc74+9Yd37fwjWckSwFg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.2.2.tgz", + "integrity": "sha512-xY3VyLbF0vSxQmQto6cI1PqP8idbwmfEAeaj248uuSrIYHeMc1L3RS6UN/yNBDPYPeAfNUwBhVqSTCtuZkEIcg==", "requires": { "tslib": "^2.1.0" } diff --git a/package.json b/package.json index 8858e227..aca5e396 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf-app", - "version": "v0.2.0-beta", + "version": "v0.2.1-beta", "author": "advplyr", "scripts": { "dev": "nuxt --hostname localhost --port 1337", @@ -10,9 +10,9 @@ "icons-android": "cordova-res android --skip-config --copy" }, "dependencies": { - "@capacitor/android": "^3.1.2", + "@capacitor/android": "^3.2.2", "@capacitor/cli": "^3.1.2", - "@capacitor/core": "^3.1.2", + "@capacitor/core": "^3.2.2", "@capacitor/dialog": "^1.0.3", "@capacitor/ios": "^3.2.2", "@nuxtjs/axios": "^5.13.6", @@ -30,4 +30,4 @@ "@nuxtjs/tailwindcss": "^4.2.0", "postcss": "^8.3.5" } -} \ No newline at end of file +} diff --git a/pages/account.vue b/pages/account.vue index ef74a416..82fbbe58 100644 --- a/pages/account.vue +++ b/pages/account.vue @@ -4,12 +4,14 @@ + + Logoutlogout -
+
-

Report bugs, request features, provide feedback, and contribute on github.

- +

Report bugs, request features, provide feedback, and contribute on github.

+
+

{{ $config.version }}

Version {{ availableVersion }} is available! {{ immediateUpdateAllowed ? 'Update now' : 'Get update from app store' }} @@ -57,6 +60,13 @@ export default { } }, methods: { + logout() { + this.$axios.$post('/logout').catch((error) => { + console.error(error) + }) + this.$server.logout() + this.$router.push('/connect') + }, async clickUpdate() { if (this.immediateUpdateAllowed) { await AppUpdate.performImmediateUpdate() diff --git a/pages/connect.vue b/pages/connect.vue index 48eb2da1..435575e1 100644 --- a/pages/connect.vue +++ b/pages/connect.vue @@ -51,8 +51,8 @@
- Follow the project on Github - Follow the project on Github +