From 39a3f03e7952de40bbac8719d97dc47721401a65 Mon Sep 17 00:00:00 2001 From: Fynn Godau Date: Thu, 4 Jun 2020 11:05:41 +0200 Subject: [PATCH 1/5] Bandcamp support --- app/src/main/AndroidManifest.xml | 16 +++++++++++++++ .../schabi/newpipe/util/KioskTranslator.java | 8 ++++++++ .../schabi/newpipe/util/ServiceHelper.java | 2 ++ .../drawable-nodpi/place_holder_bandcamp.png | Bin 0 -> 6893 bytes app/src/main/res/values/colors_services.xml | 9 +++++++++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/values/styles_services.xml | 19 ++++++++++++++++++ 7 files changed, 56 insertions(+) create mode 100644 app/src/main/res/drawable-nodpi/place_holder_bandcamp.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e7fa95759ea..23128117a67 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -317,6 +317,22 @@ + + + + + + + + + + + + + + + + `o9OEtw?*?6qEcs*h-}o8KOPf##3H;@puWD61JMWOfx217-_RkrS_4K zm|nKjLz0eU#%5@xsc>q-6oYnWD?>xm(d7Nyw|0M@c02#U@%i}Ret53?zOL{0`hKrl z`UW57w9n>z1^}3bd#>38fDZgt2N>$ZFaO^6WC(tl9P1gh7XYI>=#y3-b9o0`oX!0@ zkh?i1lFQ%5i2!^)fAP-f-Fw5g#YQZS;Y8)BUFQHW=UaTuSAP4>yjJvFyT(g+`KGB( zpSE$$Z)bxiZ`pJ8SKU3{HYVFVQ|Dd$lK4tRJ42n@QqGG!dTh_G{L>lN;|@nIzwo`| zF@xg!J5$g3t&7#O(mmIFc17-$Fc3HBr_shCobx)UbT^N9!z$C|=`$JgHRm-Kem#kQ_ z*K!wN+^i_XDs81#K5sHORoh22GYhR)n~zNe_+!PAb)2Xf*@q;N&$5*>i2)~>Wof!i z1|TtF;3}3K@g`wLW&PKA&w*rJOey!GeF(slcR5nQ7#CLa>hT<8*XxiFdU(PlnF@mAj(y$4Z?=saF z5f|D&*8K(RXA`_ct)AtTCJ_axX!CGtmoMp_3wPwY^hnP^-!m|9*%O!!cId2;LF`&y zH0^HtY2^s@Z7h6Q&EptAT7=CSIfZGxVEjg0^HOF~y4ZiaZtQA)U*mQ|`6`9Z(aI{S z6-5KBbV^BS77z- z`$q#$k{a?N7hZzdfQ7#k*jkG10lZ|sSDn%%H+vV6R;gtCC^ zWx;UWqsrlkmL_Q6t|gEAG9?QFiy)P_T3Okx#qV=vizGRnR~MuL*MsF|h%L$1M~JRp zA8rl_=o1^2E;F{;%My!XM z$@V9TdYHjwTOL>mbP<`Iu!K796#GbDG9aLNtb2N(&2BNxle`-C-U%CQgil`7V&e%6 zol^~4VkVdz@g_o&erLYqsE_6_HB<|O964r+w$|jO;p20iV6JYtOM?hr6MU3f?uIfV zvXbsc1%W(1C+4I0@*IR7)ddJlh@RfYU*1YCz~nw#I}HSPWGQ#cOe8tk*r1ZD=hb$L z2Ki)D`K8qO5~No)Pb-ELetfq|?|r6d_&fae56W8z9=EY;#Z(@AN$uS|2(&S_mCMr~ ze8qBjy-xF;dJMALep|SK0J}oAOr)*C0OMS2#>eT*vo+C z+wjSJv!7r#C>2(nuk3(P9#-OR%jqQ;bkT4(uEsS-QI6Uu)%|Y6m45ny)F+B1J{%?){sFOPf{8FlM~~-*UGs?M zpYWup5A@wF8lH8@qicgHn43xsvCmAZwfTSH*;i~%b6u-QTtlwH7w5o+5+YQdr=Gdf zbqpTpcP)K3^j&fy**8JmEaj-oq(4v&%+ITn;=d3Yh%i0J&9(`lL}DD={b5>{{VVle zvi*$m9sqRm9Iks#1#M@=VJDT1*y714 z4gXvsT}Y{7;6b0S)RF7|H<6i}L1X3lHS_Q>Hq6Z1lb91vn+g9QDo(HTm`F?>SSqbU zMGq!JHW0(`!8ta#x$zT;@hzjtVZSN1E1BZ9bLFI*M|ejd5de8d(-+VmE26N zeC;qEEzAISt5!<0WF{;i-$s->Nx#N#yQ2>NPjROMy(aSQjII;vq$E;Inxkd8P+3b2 z-RBzSN%dKtMB)-C8CobrRvDfg9>1E!IMlEMnEDa>$q^~n!2U%#9^I?{ywF4LngI^) z`BYI3HEh$hXZMJ@pyEcMrtU+!3o}?ZvfXO&~&7z|GhLyC2j^_!oRV zbEGozJY@tiFwi}{MQA0k-b8eIaRyP)%UGC7y}8gMFj-$y8VIYZQSV?EXh{k4unU58|C}I?1MN$Rj=0>kk zIe_9E^;njjf6DO*jrZ1QC{ZHgQ1c5zR-Iq7JC?8+GKQA-@-o)S)$YCI5x7TRFw>7{ z#RmIPV&>z~D)p~0F`*g2-;ZzcgYqzT4e_xT*QgL5YgN~2fg6LX`(r#c`6xBt;coWy znq6hIz&OQdFUGfZj)V1pSlmE__jLa>E5V8l z1RqOiLV@L&6IZK7%QTj^Uo$f^#92W*`ZT}pWeU?bt#r;*(DPd;e%p~wJDPx#zCKK} zv>R&rUnC-6Nb!=Al8j12H^Zjf2p!78orBRYLJJ7;94LOYnH+^ZN} zj~?hsPE&vA#akuj6tA5Omu;C~cd>Y(bQT%13>I&27x}hm7jys*>hxL12*P&oHKs+m zZ}irj>oz=fe40f6m3l(al_)X6MJk!h#Lie(a`?Y##i>*)!L*G;r>Ev7g1}O|q)#2? zlU8az6_`P*w?JBt8j|mNX!R^$+FhBz?2?#oT{&NR4cR&<_Rp@)`tIolM_?A&v-zx( z&0ryl`ZYerVjK*DtCTp|8G5~fazqoxuEm!ot`pWiH*G8RI%qOj5HIa`TUE9te3*J<+D;22u9 z^^rWClm>1*IqpcWX)J?+4{_`|I#00${Birh<_`e)UQz9nZ)|y5-G@CKC5B z4!wS9D6lA^_GgYXe&8iUMA+yc2#dUou7Ax2E5B5Xp2zq$akwG-lEIDlO(_-LX|dm!(_%MJ zs$jh1WZlcJBrlwoNwY=6l`!ZWU0`sPD)H7tp`g&@UJ(nI(`&rSsLTv;g_W(e zmQEtdV;F~0qjV+VWjy!yd716Vo;fd(8WdXXW3$0Z42lFI=Eout8#@)4m#N*XqTBu2KqIJ*$lo%+3CjLakbZFmaYta zU{v_08KmpcQV=WmYwo~iSr3jO-}G3W)Wp?u7iI(JUeWL%u3pC(LEKCxrxd9c!k4(3 z0V6Rrw3U2N_TCDx3#`Zxg<=Ve`g}H!e?gSnN)0CH;Kd2$yC*OX2^&m6TO?G4CffuB ziqL|*T&m1+WVa(==UweN*hwl25FwoLu>*{Q!bn}o%^tNPXev#N8h3U;Ga)k>nW76^ z&WppyIy#MsH0qsALJ*M%`{g7i=>47=iXE<;1OVsVt%0yHT+a1ur;WEp-d-?*{asM)HuxFToQ#CF( z_E`YA7jyvIVLUk~{hMfbXHdwjk%uTFZAB{RXYy)+7%O;!C zN|#frzRarmN19Rv4RG>;*3B7)lmN-5E7WfCz(kLj@GWm-mOYIoU_Bg2Jvkm^03!W6 zEP+S778(TwI0C!;KMffcIT?XbaP=y*ZlpN#%u0yVSJ<^{RCR$-5K|wVg5=3pp2C=r zJXUI7G#ES3%c9|qo=~cr*mxW=E^KIA_G`KKL`y;Gzdso-TGD9(;!Oz_mWP}RCbccJ zLQ7d2i2a!%CzS@MKRgf(D`X};wd)1NC)G*Y$QaBSiPLrH-HKE%x=#?0OzW;p3>PI+ z4ttj`l)i-Kwa~*qAHHZa(P}#=LrpvL2K0i5;IF?h6l6V7WGScMi*un^j_e^jFH?y! z%OY5$EI%S&S&`Z90*{)IKpJ~9ix-#ye|XSS2m+|9c5ESp1sQ=W^nw3Ye)V!l$&eX3 zdEF^kwLii4PAi_l1jSX<&|0zrO`I7xCz0>Im$4(u6a-Eo1_E$5N2rwvTgX+4(f4pS z&kY6Tj}*+vH$vT}0=S(6&Qj~(C7-=DWP?C6Vt_@q{w@}ENG!I`gaC;b4QFSzXDM-* zo$p8Sq#IQ9X``S>eb54d|A|`c2y)h8E&50;kYuLIEFaw07nGOtLi=BmRY}N|1(R=Y zc9{HP2?GcJSu7az>qp`0e#Pj&F)fyG7x7~c!TXK-^DnJnqXq!V)u#p z`oPhjFU*9j`~#COTGrQ^)x*6MeKJnim;(7XpG*@j4FE|0Boy+U9W(*FURZ}N9vBE1 z0YoC3vAxg~u-5adzm(>GKtPS%*xs%^GE0{l6TpUewEn}s-9rZUrB7O~o-S}*Lxkoj zt0xXmDle&%9&_)-@6`kD=RTE*9b!3<_{v2VBMrD3UEG|>R;J2K+NAnm?pnV4La74x znd3u?<*XxMLjPtnX#BBEIJZv){d@hI$M5NP%+Mc^ z%QAbr)!~I6Mz(OHjOuLVyKY0)!z0k%(c@Om23;F3Q$OL0*J(ykXS%2uE$IIKPThI| z8Z|$aiM0DrYyJ*r3TZ^phzW3P`s1R?e1R@7|B-r@snnh5kv5ejVxcRY^QAdW5?%@c z*^DRcMi|%)J)Ekh`$T;$JaB4S$gBfR2zh5Pi-L@O#ca?u9lB7v!ve)bmnc$E-QTB1 z0D%XbaHYRw2rm47CsRz_cB6Cb;oB`gy`VCHx94eJ5s5a^FjNyCoD8= zBl2)drGx1GyE8+o2F~|yx%&M2Q(!TZu>el%Z3-xq}r3G{bgd3{lC3v-MxDrd-XY>srFoDFE#Xt zdk+qfg4Y9$b{z)5Q8pVd$;o&h#0IQ9-beRR6#>ogmUZrZ09?+BlUG0kH+N#n%TxYF z@P@hfXc>TI;Md$~JE#phFjtRVaDhBfDHb}=IRYApzt`eavvByDM~cV0CuqurYLRXQ zkta=lx3#L-kc!BahYT0T#H)Gdt3oY0{kkGeI zQ;yKsjk{IKj8_0jDfKK*c^-40xPWL;^mRxLzMVY%)Ea)Zz0`>`N483yt;`~LZ+%=J zLa|yyB)Uj1#)aCmsZiXlRZ)HGb7Kb}nSm~!M!Jzpl0wxzP#f=l&ji@zs!Oosd}TQ* zeYLm74B9sFT$V0ae~Dro88_e87yFt0%inOff94y*b6dkJZB%*GjdCjdn+q#`H82CL ybe=XB?{G)`ex5X#QjPnh{jdJ-1D(6Kblmuz#Qcl98A~>xpYgAK)|C96b?`rak{Pl9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors_services.xml b/app/src/main/res/values/colors_services.xml index 2ff59e8dd3f..45a816924b2 100644 --- a/app/src/main/res/values/colors_services.xml +++ b/app/src/main/res/values/colors_services.xml @@ -44,4 +44,13 @@ #FFFFFF #9e9e9e + + #17a0c4 + #000000 + #17a0c4 + + #17a0c4 + #FFFFFF + #17a0c4 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 25e7f6210d1..9fb15e4638f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -707,4 +707,6 @@ This content is private, so it cannot be streamed or downloaded by NewPipe. This video is available only to YouTube Music Premium members, so it cannot be streamed or downloaded by NewPipe. This content is only available to users who have paid, so it cannot be streamed or downloaded by NewPipe. + Featured + Radio diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml index ad8b3589984..89d04e49fd9 100644 --- a/app/src/main/res/values/styles_services.xml +++ b/app/src/main/res/values/styles_services.xml @@ -70,4 +70,23 @@ @color/dark_media_ccc_accent_color + + + + + + + From 292e1030735e6860ba4599136f85337784c193ab Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sun, 14 Mar 2021 17:51:47 +0100 Subject: [PATCH 2/5] Ignore ContentNotSupportedException caused by Bandcamp fan pages --- .../fragments/detail/VideoDetailFragment.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index 08ec9a5fc8b..5581cf87576 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -62,6 +62,7 @@ import org.schabi.newpipe.error.UserAction; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.NewPipe; +import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException; import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.Stream; @@ -1547,8 +1548,19 @@ public void handleResult(@NonNull final StreamInfo info) { } if (!info.getErrors().isEmpty()) { - showSnackBarError(new ErrorInfo(info.getErrors(), - UserAction.REQUESTED_STREAM, info.getUrl(), info)); + // Bandcamp fan pages are not yet supported and thus a ContentNotAvailableException is + // thrown. This is not an error and thus should not be shown to the user. + for (final Throwable throwable : info.getErrors()) { + if (throwable instanceof ContentNotSupportedException + && "Fan pages are not supported".equals(throwable.getMessage())) { + info.getErrors().remove(throwable); + } + } + + if (!info.getErrors().isEmpty()) { + showSnackBarError(new ErrorInfo(info.getErrors(), + UserAction.REQUESTED_STREAM, info.getUrl(), info)); + } } binding.detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM From a28aa6a8c438448952b42e6b3ec4bd35546f1794 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Fri, 5 Mar 2021 21:53:13 +0100 Subject: [PATCH 3/5] Add Bandcamp to supported services section in README --- README.ja.md | 1 + README.ko.md | 1 + README.md | 1 + README.pt_BR.md | 1 + README.ro.md | 1 + README.so.md | 1 + 6 files changed, 6 insertions(+) diff --git a/README.ja.md b/README.ja.md index c101f385109..c451586560e 100644 --- a/README.ja.md +++ b/README.ja.md @@ -84,6 +84,7 @@ NewPipe は複数のサービスに対応しています。[ドキュメント]( * SoundCloud \[ベータ\] * media.ccc.de \[ベータ\] * PeerTube インスタンス \[ベータ\] +* Bandcamp \[ベータ\] diff --git a/README.ko.md b/README.ko.md index af5b209be98..34b117bb6c5 100644 --- a/README.ko.md +++ b/README.ko.md @@ -79,6 +79,7 @@ NewPipe는 여러가지 서비스를 지원합니다. 우리의 [문서](https:/ * SoundCloud \[beta\] * media.ccc.de \[beta\] * PeerTube instances \[beta\] +* Bandcamp \[beta\] ## Updates NewPipe 코드의 변경이 있을 때(기능 추가 또는 버그 수정으로 인해), 결국 릴리즈가 발생할 것입니다. 이것들의 형식은 x.xx.x 입니다. diff --git a/README.md b/README.md index f1791de4cc9..4dc88991065 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc * SoundCloud \[beta\] * media.ccc.de \[beta\] * PeerTube instances \[beta\] +* Bandcamp \[beta\] diff --git a/README.pt_BR.md b/README.pt_BR.md index dedb64a7cf6..28e565c9956 100644 --- a/README.pt_BR.md +++ b/README.pt_BR.md @@ -79,6 +79,7 @@ O NewPipe suporta vários serviços. Nosso [documentação](https://teamnewpipe. * SoundCloud \[beta\] * media.ccc.de \[beta\] * PeerTube instances \[beta\] +* Bandcamp \[beta\] ## Atualizações Quando uma alteração no código NewPipe (devido à adição de recursos ou fixação de bugs), eventualmente ocorrerá uma versão. Estes estão no formato x.xx.x . A fim de obter esta nova versão, você pode: diff --git a/README.ro.md b/README.ro.md index 75e3bd5b052..df88694991e 100644 --- a/README.ro.md +++ b/README.ro.md @@ -81,6 +81,7 @@ NewPipe suportă servicii multiple. [Documentele](https://teamnewpipe.github.io/ * SoundCloud \[beta\] * media.ccc.de \[beta\] * Instanţe PeerTube \[beta\] +* Bandcamp \[beta\] diff --git a/README.so.md b/README.so.md index f8bc51e5939..19f995363ee 100644 --- a/README.so.md +++ b/README.so.md @@ -79,6 +79,7 @@ NewPipe wuxuu taageeraa adeegyo badan. [warqadan](https://teamnewpipe.github.io/ * SoundCloud \[tijaabo\] * media.ccc.de \[tijaabo\] * PeerTube instances \[tijaabo\] +* Bandcamp \[tijaabo\] ## Kushubida iyo cusboonaysiinta Marka koodhka NewPipe isbadal ku dhaco (wax cusub oo lagusoo kordhiyay ama cilad bixin), ugu dambayn waxaa lasii daayaa mid cusub (Siidayn). Siidaynta qaabkeedu waa x.xx.x . Si aad midka cusub u hesho, waxaad samayn kartaa: From 71d3227791702901d6c898d4e9a85f0d0eb3cb8c Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sun, 14 Mar 2021 12:50:56 +0100 Subject: [PATCH 4/5] Fix bottom controls being out of the screen This was caused by too large end screen thumbnails enlarging the whole palyer. Fixed by scaling the thumbnail. Ensure that the player does not use the whole screen height in detail fragment to keep the additional content like title, comments, etc. available. --- .../org/schabi/newpipe/player/Player.java | 96 +++++++++++++++++-- .../org/schabi/newpipe/util/DeviceUtils.java | 18 ++++ 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java index 42477592867..ab93d8742df 100644 --- a/app/src/main/java/org/schabi/newpipe/player/Player.java +++ b/app/src/main/java/org/schabi/newpipe/player/Player.java @@ -1129,6 +1129,12 @@ private void onBroadcastReceived(final Intent intent) { // Close it because when changing orientation from portrait // (in fullscreen mode) the size of queue layout can be larger than the screen size closeItemsList(); + // When the orientation changed, the screen height might be smaller. + // If the end screen thumbnail is not re-scaled, + // it can be larger than the current screen height + // and thus enlarging the whole player. + // This causes the seekbar to be ouf the visible area. + updateEndScreenThumbnail(); break; case Intent.ACTION_SCREEN_ON: // Interrupt playback only when screen turns on @@ -1187,6 +1193,78 @@ private void initThumbnail(final String url) { .loadImage(url, ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, this); } + /** + * Scale the player audio / end screen thumbnail down if necessary. + *

+ * This is necessary when the thumbnail's height is larger than the device's height + * and thus is enlarging the player's height + * causing the bottom playback controls to be out of the visible screen. + *

+ */ + public void updateEndScreenThumbnail() { + if (currentThumbnail == null) { + return; + } + + final float endScreenHeight = calculateMaxEndScreenThumbnailHeight(); + + final Bitmap endScreenBitmap = Bitmap.createScaledBitmap( + currentThumbnail, + (int) (currentThumbnail.getWidth() + / (currentThumbnail.getHeight() / endScreenHeight)), + (int) endScreenHeight, + true); + + if (DEBUG) { + Log.d(TAG, "Thumbnail - updateEndScreenThumbnail() called with: " + + "currentThumbnail = [" + currentThumbnail + "], " + + currentThumbnail.getWidth() + "x" + currentThumbnail.getHeight() + + ", scaled end screen height = " + endScreenHeight + + ", scaled end screen width = " + endScreenBitmap.getWidth()); + } + + binding.endScreen.setImageBitmap(endScreenBitmap); + } + + /** + * Calculate the maximum allowed height for the {@link R.id.endScreen} + * to prevent it from enlarging the player. + *

+ * The calculating follows these rules: + *

    + *
  • + * Show at least stream title and content creator on TVs and tablets + * when in landscape (always the case for TVs) and not in fullscreen mode. + * This requires to have at least 85dp free space for {@link R.id.detail_root} + * and additional space for the stream title text size + * ({@link R.id.detail_title_root_layout}). + * The text size is 15sp on tablets and 16sp on TVs, + * see {@link R.id.titleTextView}. + *
    • + *
  • + * Otherwise, the max thumbnail height is the screen height. + *
    • + *
+ * + * @return the maximum height for the end screen thumbnail + */ + private float calculateMaxEndScreenThumbnailHeight() { + // ensure that screenHeight is initialized and thus not 0 + updateScreenSize(); + + if (DeviceUtils.isTv(context) && !isFullscreen) { + final int videoInfoHeight = + DeviceUtils.dpToPx(85, context) + DeviceUtils.spToPx(16, context); + return Math.min(currentThumbnail.getHeight(), screenHeight - videoInfoHeight); + } else if (DeviceUtils.isTablet(context) && service.isLandscape() && !isFullscreen) { + final int videoInfoHeight = + DeviceUtils.dpToPx(85, context) + DeviceUtils.spToPx(15, context); + return Math.min(currentThumbnail.getHeight(), screenHeight - videoInfoHeight); + } else { // fullscreen player: max height is the device height + return Math.min(currentThumbnail.getHeight(), screenHeight); + } + } + @Override public void onLoadingStarted(final String imageUri, final View view) { if (DEBUG) { @@ -1207,23 +1285,29 @@ public void onLoadingFailed(final String imageUri, final View view, @Override public void onLoadingComplete(final String imageUri, final View view, final Bitmap loadedImage) { - final float width = Math.min( + // scale down the notification thumbnail for performance + final float notificationThumbnailWidth = Math.min( context.getResources().getDimension(R.dimen.player_notification_thumbnail_width), loadedImage.getWidth()); + currentThumbnail = Bitmap.createScaledBitmap( + loadedImage, + (int) notificationThumbnailWidth, + (int) (loadedImage.getHeight() + / (loadedImage.getWidth() / notificationThumbnailWidth)), + true); if (DEBUG) { Log.d(TAG, "Thumbnail - onLoadingComplete() called with: " + "imageUri = [" + imageUri + "], view = [" + view + "], " + "loadedImage = [" + loadedImage + "], " + loadedImage.getWidth() + "x" + loadedImage.getHeight() - + ", scaled width = " + width); + + ", scaled notification width = " + notificationThumbnailWidth); } - currentThumbnail = Bitmap.createScaledBitmap(loadedImage, - (int) width, - (int) (loadedImage.getHeight() / (loadedImage.getWidth() / width)), true); - binding.endScreen.setImageBitmap(loadedImage); NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false); + + // there is a new thumbnail, thus the end screen thumbnail needs to be changed, too. + updateEndScreenThumbnail(); } @Override diff --git a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java index 1afedcaef31..52069fd0e7d 100644 --- a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java +++ b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java @@ -6,8 +6,10 @@ import android.content.res.Configuration; import android.os.BatteryManager; import android.os.Build; +import android.util.TypedValue; import android.view.KeyEvent; +import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; @@ -70,4 +72,20 @@ public static boolean isConfirmKey(final int keyCode) { return false; } } + + public static int dpToPx(@Dimension(unit = Dimension.DP) final int dp, + @NonNull final Context context) { + return (int) TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, + dp, + context.getResources().getDisplayMetrics()); + } + + public static int spToPx(@Dimension(unit = Dimension.SP) final int sp, + @NonNull final Context context) { + return (int) TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, + sp, + context.getResources().getDisplayMetrics()); + } } From bdaee25e6116e86ce34ebcfd1444a812aaa175af Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sun, 14 Mar 2021 12:58:25 +0100 Subject: [PATCH 5/5] Use latest extractor version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7c504e96895..0b8de4d4158 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -180,7 +180,7 @@ dependencies { // NewPipe dependencies // You can use a local version by uncommenting a few lines in settings.gradle - implementation "com.github.TeamNewPipe:NewPipeExtractor:7e6f464407fc1a2c8fb0886d294093526a6ef0f1" + implementation 'com.github.TeamNewPipe:NewPipeExtractor:def745b801b2ef35c1a0fee1be950331ca6a0cd2' implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" implementation "org.jsoup:jsoup:1.13.1"