From 811fc91fa711f1b0af542f10a45bcf236848fd7b Mon Sep 17 00:00:00 2001 From: advplyr Date: Sun, 5 Sep 2021 10:37:08 -0500 Subject: [PATCH] Update fastforward/rewind icons and show on lock screen, move logout btn, fix fallback cover art --- Server.js | 2 +- android/app/build.gradle | 4 ++-- .../app/PlayerNotificationService.kt | 10 ++------- .../drawable-anydpi/exo_icon_fastforward.xml | 21 ++++++++++++++++++ .../res/drawable-anydpi/exo_icon_rewind.xml | 21 ++++++++++++++++++ .../drawable-hdpi/exo_icon_fastforward.png | Bin 0 -> 462 bytes .../res/drawable-hdpi/exo_icon_rewind.png | Bin 0 -> 444 bytes .../drawable-mdpi/exo_icon_fastforward.png | Bin 0 -> 335 bytes .../res/drawable-mdpi/exo_icon_rewind.png | Bin 0 -> 329 bytes .../drawable-xhdpi/exo_icon_fastforward.png | Bin 0 -> 591 bytes .../res/drawable-xhdpi/exo_icon_rewind.png | Bin 0 -> 598 bytes .../drawable-xxhdpi/exo_icon_fastforward.png | Bin 0 -> 869 bytes .../res/drawable-xxhdpi/exo_icon_rewind.png | Bin 0 -> 843 bytes .../res/drawable/exo_icon_fastforward.xml | 7 ++++++ .../src/main/res/drawable/exo_icon_rewind.xml | 7 ++++++ components/app/Appbar.vue | 15 ++++++++----- components/cards/BookCard.vue | 8 +++---- components/cards/BookCover.vue | 2 +- package-lock.json | 14 ++++++------ package.json | 8 +++---- pages/account.vue | 16 ++++++++++--- pages/connect.vue | 4 ++-- 22 files changed, 101 insertions(+), 38 deletions(-) create mode 100644 android/app/src/main/res/drawable-anydpi/exo_icon_fastforward.xml create mode 100644 android/app/src/main/res/drawable-anydpi/exo_icon_rewind.xml create mode 100644 android/app/src/main/res/drawable-hdpi/exo_icon_fastforward.png create mode 100644 android/app/src/main/res/drawable-hdpi/exo_icon_rewind.png create mode 100644 android/app/src/main/res/drawable-mdpi/exo_icon_fastforward.png create mode 100644 android/app/src/main/res/drawable-mdpi/exo_icon_rewind.png create mode 100644 android/app/src/main/res/drawable-xhdpi/exo_icon_fastforward.png create mode 100644 android/app/src/main/res/drawable-xhdpi/exo_icon_rewind.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/exo_icon_rewind.png create mode 100644 android/app/src/main/res/drawable/exo_icon_fastforward.xml create mode 100644 android/app/src/main/res/drawable/exo_icon_rewind.xml 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 0000000000000000000000000000000000000000..be2f1f7e57d33ed95d52cd1bba85a07ec585ec84 GIT binary patch literal 462 zcmV;<0WtoGP)xXwnh`Pr8;}iPgRnuoL9#*Fpx!_=SCP7ojAddI9{S(ufjcaH zNS17hB9Q<<8?;XQ z=KDd)1e!l&>aa7l|L{;=+@C(6KGgaMpok18>@*peZ+#4qTefqCn?o7vz|GPr;cc^D z<3u=nX;QbskNaVI^)W+~4)8i#F^`}t0VAKSeNAKvFj#9%-Pu~twO6y|PDG~0C;mFd z9KS&Vho6oB(YPkh)x-ij5N&L0z<2V2Fg9>i{A&Y!12XZj_}HS)QUCw|07*qoM6N<$ Eg5IIS=>Px# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..893b7ff5bc73b8c64144feb68451c83945603f10 GIT binary patch literal 444 zcmV;t0Ymi>G z^#|qYYo>0`IXGKSzX?UDOARs*wK9WROD&nkQh}^^F@uMlke0)ilHfXmgWo{C1BfG_ zNngWYBqM-;xDOEboG%OkVZdZSV?iM11H{lxLnx3@ybL!1I=lBRT63zdo8Zm
    wy2>6|f&Yji=lBfs~5?0000Hu`_oYiuvvf&Vl06rqaS>uy hv^Io-*88K#!3&#U!hCi41^fU2002ovPDHLkV1ho;i?#p& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..430fc8da69612acbe5b6e0901a5eb5de8cc151cd GIT binary patch literal 329 zcmV-P0k-~$P)RBsu~(Ku(aB&AlLH6Ozc< zhnC(=ZW39OjO1~oCwfmsLBG@?lEm6Z1XC@zU}F_F73$H;xD;5DVhq)&q6KUGH34b* zG18_rayrEb4Apqzv6R58L01qAwAZEx7W!yO5R7CK4+M?uz2`nE-c;dlMIJQ-;F9gr zznW^9sr7}XxaF#bJEurVH*j28YjWtA7b2H5o`Y|6ss2^qn0sNXos`MXM1W24sWThe bcmEV$?0&*K@#nP=00000NkvXXu0mjfpstF& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb32716cbf8d8638d35563ef148ae3331f9b13bf GIT binary patch literal 591 zcmV-V034#6I z`E#EvTNvUSEK3#Q2P|~~X^Iek!BQ8HmIz@6OI<)3B7_}mOJoaaM`>qi7io9l2DUco zPidV91EVIM1MyfG)RlN=lv?NVK+t zw*~Trfkf>Y$mqxe0W26bo{^ZG{LXM#a}NQu*oOv~lRk!^Ha-`N}Hf zVd5GQkY}j?Ndp>(f5vp0A=`0GuazAs1WeQ8n`OH_v~Rh=87Ve>| zZ`B#lS5Uhg9$ONS!;>Qd81nA53YOI6u3HQNmBT-n0PJ035l~GdIMpGJC7=n7KiD9h zr+|~k7V2UM;K(*AJp}CZ>{UC&y(#b^^PYSJl>a>km;l}5P>$Z`E(K)&3-4&IO*}#s z@`Z#1AvA$>l0Ii--|d@T?;F0d|0Q z*VQ|9a96h?KH9k$vqZtq9ah7&GtE~iS79~k0P;1N*Bw@b0inU-?Haz_c7p&8{0^+l d-gsl1_yXANe3cMA@-_ef002ovPDHLkV1iEj0(JlZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e04679367e3e6449acc5f828169d83246a1c0dc0 GIT binary patch literal 598 zcmV-c0;&CpP)F39fWp8jY-PA@ygg^fE)}ntdJ6XI^Qi zR1nK9MO0!SG7wAi$cY8(G>M)d(QHm)#ab*9eKGR@L;_3hwwQ^GIEMF4+YOI(b`+*f zd!|U2!EZ^EU9)L2Yj0tRr@kGbwZ6@H6uFUjYS1n8{1a^0S^t0C^P^FH_YQm9Zog9# z;0C}q0>+UTjO$X%(_ya*p6npprn)@Ftc^P>I`%j20u_sZE!~1Os|Zj<3TZ7y9|Efr zDIx(LoWzKcX95B>VP}d#;DQ_@7C@jkz6r;y&?5UDeF(6%g9b*xY7fp(2gu??IIi)% z9!F&Ou004a%NED%5LI{#x!=2(WgP&z9MJpResev#_{6wJG;w3_n-TOd*gFo32%aUK zi-~b>iqYnR=O@Je5WB?{F`owEc%BHG;YVjhm|xM@E!h-+9|*5Ya1^Uj2oxDH^B8vn z&uT(HpgZ{Xm|2?+ycLN-#+Tt^uhhoVU$6YnMsoK7;QL&Dv8mxYywBu_0MPqQ kJnoSzEhwwL@|8U0ALOcwPp;$&rvLx|07*qoM6N<$f~+47d;kCd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a48cc427347b6e99033132e0f2f8ea2bd26d960 GIT binary patch literal 869 zcmV-r1DgDaP)yeu<5P&Ix5?lfuoH_^{938|Rm=59&PzQDgb_b>d=m2-1K(b^M21_egy=?8w{y5*A zg+7*jiYyCE#9wK$BuYRD5&}?ygaDKvApj*v2tWxE0#Jg40F)pJoHPkgg0vgZXF?L@ z(!48(!>C`Q{v7oLdK25Ec^4=@rp=7n33_Q_wv=C^4#K`Pv4LrXdpXAd=j6y@mhv36 z2;FKP!jA+Ghk3G^DBx5ZHr0>HM?C`EN%K#KGi~NPJ&Ht$V(@TEgN@Xag%D=a!NVz# zKIe)7V+bgCI5{#}9WB&iVZ(tyl`Lxx{AB9(C&x^4zpbc zMGFUEJ-vm7SyXTejrA~MK=HsqM6Nq=%QY@IaN(*hU`e=6lyDBJ@JszD$JjPKM%}^l z?0-tjYZoy6_%f;KTm!l*0OcFLuY`W}@GANNm}R{;{rxFKK*L`D0~=nOZm<`{u&Pr~ zhX!a@c-Lg$Yk;`)dk(-DM7Tee^saz<@Mo=GaSYnM_ zyOKuR|7kFQG)|u>axMx$F9S@hfEY2LhYLVGW%u&2C_VU2t8ZPmJUU81(gvSv&J{Vr?kESEdz)rPi-LvxJJF$8^9Vtr#`e86 zH*-_u#cqsK`XYj-M^$YV#;5cXcs3 zCn#LDMxlK{eiX;{qc+LK=3Rqi@PawS<>PtJRaL&6BT|%f>f@!kh1dPilpK zX+@|LSO9hQ2q%tn0^mqn$5s>NsgMep3T&0$N7ilwREbP1v2qP+vP$g8D`=bahL*zN vfAj2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a317ede1001e527b60b0717b600240e2de759ac1 GIT binary patch literal 843 zcmV-R1GM~!P)xXw$_Q)_HV7M(4Z;Sn0c=1`PwjCWSTYgDHrAa!N>Z6T zELoPtn}a83ni3mlMdsb8R;6;Fh&!(%-kc8A2G?iLNZ8tzlyo7|<$~Eoz2Z>;BoMD-UO~2et!)7G4B)VJV z4WtcrQv#%?Hz~kIy9oh)?ggY5?B2YHM;N3R?Iu_v>C(P!5fX#l0)Z4e4T-^~KoU!L zX3-KPCYxA1ikyYSXj3(dG8YSNzmOR1sRDN6YBlo8Y_Ipm&2|D_IK7cI04Q-X4#86V zG47Gp@)G#Y9X6Z)d#Z7T(%jIlNoDI3eNYlNdA;Uv4`%|kB4EadYt&F(oNh=vYVBDC z+BQJbAKW57QIk9ErzrU0=9It@UT0#FqI z@c??70JIihI|l%*NzDnUQk`Sj3JCUhYf^Fo$~jYZgMd;anKY8J7drrImt1&O=gA4< zsE&nhoPbm*d$$9iV(IhQ555t$GXrO6c%=Z9FawHa2Y>h3YSa?O$czMN;(!e&AjGYE zO5F&$(9D%O5H}ko)r@HwXoRdnIRLHT`{Koi$?smopw|r+G%vw}>^K({oxx+<59U;v zvyoCOp`#)@5DwO1TbP={SffC4030mt^u|H};bsPtU8ls}?9}uVtB&qrhGg(TxR3G( ze;35Av1X5k0oZmlgz@XcR#(mb!v_Z_SV_N$WA=w15N_yXeZrBC&=@0vH-DZQ1s1!|_sC{W`)yZ~VB`)&haFHau(GXwY2PwYNKh zX}##u08k|(n3A<*Y7r;_uyo(xY2kkoXWlMkj#n{c#(zb$8(h0yf&>W?BuJ1o`2nwF VQ%-rMS9bsa002ovPDHLkV1i)!YmNW_ literal 0 HcmV?d00001 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 +