From d17745a4ea8e97e5a9dc3ecdde4df52370a82ebd Mon Sep 17 00:00:00 2001 From: polymorphicshade Date: Fri, 15 May 2020 09:57:15 -0600 Subject: [PATCH] SponsorBlock: Now using XML drawable SponsorBlock icon --- .../org/schabi/newpipe/player/BasePlayer.java | 2 +- .../main/res/drawable-hdpi/ic_sponsor_block.png | Bin 911 -> 0 bytes .../main/res/drawable-mdpi/ic_sponsor_block.png | Bin 548 -> 0 bytes .../main/res/drawable-xhdpi/ic_sponsor_block.png | Bin 1326 -> 0 bytes .../res/drawable-xxhdpi/ic_sponsor_block.png | Bin 2146 -> 0 bytes .../res/drawable-xxxhdpi/ic_sponsor_block.png | Bin 3007 -> 0 bytes .../res/drawable/ic_sponsor_block_white_96dp.xml | 10 ++++++++++ 7 files changed, 11 insertions(+), 1 deletion(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_sponsor_block.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_sponsor_block.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_sponsor_block.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_sponsor_block.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sponsor_block.png create mode 100644 app/src/main/res/drawable/ic_sponsor_block_white_96dp.xml diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java index e384ff816..5f30b1e94 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java @@ -681,7 +681,7 @@ public abstract class BasePlayer implements NotificationCompat.Builder notificationBuilder = new NotificationCompat .Builder(context, context.getString(R.string.notification_channel_id)) .setOngoing(false) - .setSmallIcon(R.drawable.ic_sponsor_block) + .setSmallIcon(R.drawable.ic_sponsor_block_white_96dp) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setContentTitle(context.getString(R.string.settings_category_sponsorblock)) .setContentText(context.getString(R.string.sponsorblock_skipped_sponsor) diff --git a/app/src/main/res/drawable-hdpi/ic_sponsor_block.png b/app/src/main/res/drawable-hdpi/ic_sponsor_block.png deleted file mode 100644 index 1b7227c449982d9900cbeef1fbac33c6bcd91f48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 zcmV;A191F_P)SKP5n*q~xC~!w@su^>*jw`2O_$<2v1Y?(^Jpc9lH!>2}Y(&+qx3=ltHDla}^>I5Z5y z=nV=$DL4gggH{kR{u~irm)}o=?O-NwIU%AySPia#PVfVSKphBz09XtbfZ6<%?DeOHMYZi1J+yQ;TdOrJ}9M8B@*`NtDm<4^}bM_ml9b3Rk@YO8nCnID}iUl3y zx`tU$JAI~1(U9!u0|x|^gC%0mEJ%E28}KO_dJB3n5?|X8AW)!xMW8V?Pby@-&xqGWfhQGH_L1w3w!_@6myZKpeVb8SQldrDZ;B*+g!0G z*O9^Cn_WTjyT#*^GBOm@NR^0ZK-7L@)ZDQ7$nsc@;yJj~$bPK;KCAwxlUrGoj38Va z$n+6OFn<}?NI^MP+g!~p7N>loDv1Bzte7N2^x6C1WFjZb=kqOMcc+pV=W3P_KkJvQ zGeMa_ee&-wRkk}ui(^m)C z0l3*BI5Dai>ax3)x{baIJZAXIqq}QUOf$RDYYdj`WR5{oS;2R)L4T2?m^PNAa@w0= z=WG^WG)PoT1|6DWq#R8Hh4i~JyNAVep0}h!oI@w?&=6BVWd1Rg`lljFT7+|4U>=wR zo+l9V5=>!K$-IkV$H}w3h&l_tu=jTJ{2psGv8`Cj)No$f-JW>iAfhUnPxdhq_kwN; z>1Mi+>$~ZDRgUgV9AQ5Cg!JK~=?X)cpRVjH{Ka# l@%>LIs*3NF>;KG)v0vWa^t>M1cIE&8002ovPDHLkV1jP6vq}H} diff --git a/app/src/main/res/drawable-mdpi/ic_sponsor_block.png b/app/src/main/res/drawable-mdpi/ic_sponsor_block.png deleted file mode 100644 index 45ce1f618abcb6a8b76fce3ccb039b178914acfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 548 zcmV+<0^9wGP)@9iHj+x*iE_igv7MLo#U6ge+ z6J&JW^R;`jcv$h7;Iy4!700|1Xxsr@!ghfKGFIA5FpfCBcqK66L%4yTF0o&AJtxc# zvhu@t>?eWIuLcjT*eAOAuA6~Xc!iE46Exz572Bn+YqcG`q#d$8rsxQs;;$9=LwESH z+ug|GJ;H#;B3I%Te&u=6+qf@J;g%qXH>krmtD|(ff?ba{=Q~d57{PqSPKww(u34Rb z`*`=I2+pFjP(_`QHvm&b?A)YQ)j2;UJFK<79&0`Zf2pxjZVvlBa2oJV=k&eD;BxJ_ z#>R?0)#7>{NRsC+gQxVGJV9HjM`x=(db1utIW>kedhOi5p3k+qGjHl9is@dFJCBs> mPe28R^kDj=b*nP4AKD&2VQfa62sX^qZ9-|U!hKzB|IXm6FwE%gs$M<)Wy5c_}2Q|Ae?EuiY4?&VZN|lXcv-> zfZf7AVVCfhuvu6OHuKCB{E2TMNL2+x?Ahdmaq~QiVub+Ip1=pb6ZVEFu!-3l$Zi`;0f(O*6+ZN+ zzydZ=3#IReDX@YMPZKW5R{?mIv!}FqP~ZyT6n?J`Q{XOMUL_3kp@74?T6j25|EOgj zFlr1N38^lj=WAI9`4I$VG=7fgXP|9CPB-!sS`jF$Jr zY$_iuWvO=-QUS)emYgFK?dH2Bw6E!jVHIccJ#=a)pb4F8=bN;=I*cAbmR)3M)!7)Y zhUxjjC?_-X<;25DExRJ{OAxv0k!fv|nVC%I7aY&eTLHZrfHUTj(KXZeS=v*gC}7^c zm+b5$VPb@3&Zq#(KP^U9mt-;rQCKiP=^xcTZ%wnmtuc=hXHgG|L)#epe%g2E8rs@% z=)w3yBB}!Vdm<&7BQb^VCb1uk$^B+4k!yTTrInA-UK3&9ONHAQFds_oybsZCh*Q|A z!tTr$#&MYH%rfvk52wxp6wVBXgdb7`usBN0faxaeac&V($2%FTnfB~_%8SP6O&Hxo z`}G0}{{|W1Y@*QH8P7dAmKr-*+B!mOTLFZ(ban_ER|n&b@l~O|kr~-R%2`jD&lery z09i>IYGcjuSzwv}PcVSZ#pprDsq?8mBq$&luf;sG zRjw-34b91vylsgW@@!tjgITEX4v!?hHN4Q*Ok>H6On}>&z3JF-RQk)R&G4HKFLUC$ zV%?S1QOQd>=5!&?qC}fX@VO7+Ev-De*te8p$xj0=J}Rinwe%o-E47^prw(OiGp@I; zT8DDYWb_gDT;*I39ZtJSYD92Ll0I-8c4Tkg7Y`)-B{{^+z@)|#4qxF|UB;DFyHg0R zE|p8~R7gF5B34rx<-8xkeQ`I{xm&!)c~6Sisr6ka(wM2d=R_#mN5+@>zaXRvy4#5` k34YrO^*jDg8vi%?8|@c^GO3(MdH?_b07*qoM6N<$f`nRl?EnA( diff --git a/app/src/main/res/drawable-xxhdpi/ic_sponsor_block.png b/app/src/main/res/drawable-xxhdpi/ic_sponsor_block.png deleted file mode 100644 index 8f70b6550b00ed5a0dc612178ffa4b4da842873b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2146 zcmV-o2%YzdP)P7L-UfLM{gKv&R zDf@51X2EE|U4l}HA|*|5hhU6g_eEyNIdp2C;5k7XL3KffAYIFdvrhe{EXrtuGUp1m z3I4js^4u?&AZV=L2SH3lK@W`nd6x$5f}Y3}TodGHPos4 zZKunCoyY9%EvV!NF;`>iA9bmCi(sgrp-l*8S{XqtK}SJ{hgCvrE~>1g{I~dO=JT!Bi+(mg9oA1qK}HQ_#+DHT~My6fF?0i26vJAEPK6xFZ$)~hZ9Ahyn5<$a} zNnM#$kT%&*g2?P|K}$R+nNG*2<4BtliJ$@WaXq9x={G@^7omHA`ssO^#f}V)M9}?| z@lm9;4vHYlb2%meFTum8?*U57jMT6?bXXlk-o(5h38MBiP(4BRnb%Ss_4FkZq+v8i znKNn&C~a>d2qOK|8a`#OT_B~cE&hy&7Hc!%pq@&$<7kqbR7e+cq$LGG)J_dO ze^Chi*wm%JkHu1PRT`aHNW0X-t=AKR$VIGi`XA$LgPu9dpp5ZIJLjyJSSoeQZjDKm zLi(I!BZ%6pUe6J6v|%Ax&|8tFF|-n~Ryc(GC5@2QE*S|j;lN}s6TSr!t8~P-H<^(!kG%pB2O2&E=@~6SI5&8R6fM+pnLo0IR6;__1!>|*r(GXY3 zg06RVb-aYMa)JYX6C`=ASA9`HJ>w>Skc0klO7B~kouWK#pV_3WhxtViMt7(Wu8z^P z`#EPXy@^t>u-oY{m!n73LTvf21fk(wd~%lQ?5T!&I#K#WFAT97CO>$%(^;=3eAmV+ zm#ey4*Z3F?8cA1@w^2;2wpZ5bM5?SS1r@UkLl7Kv@A~KvGw@|qaG5<*ygcjhEIL3t zTKfWw`gS<^&E!KdIpcjI=^l!JoF@OZn)DwANX}OjCB5B*??bET+qJfdeo)tk zmefJVLdB_kWdP)?AViDaPThR9{&4u@bRwnJTia?UST%1dt&{^{|%>aD| zGT%i1&kK45uL{jTJ$&*raD7!+E>si+yW4Pz^J|A^k%CP}2sV*yR3bDN z(chAxqAYNcbg;rWdex+{<M$dUgDn@jscPu|D!2xxMC~DB_8_fgs91`nSW;R3 Y1=;jlrk}>3r2qf`07*qoM6N<$f|m~hc>n+a diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sponsor_block.png b/app/src/main/res/drawable-xxxhdpi/ic_sponsor_block.png deleted file mode 100644 index 9840dbc91a023ae85738476a56e2f9ddfb5188bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3007 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 Bz)=7I diff --git a/app/src/main/res/drawable/ic_sponsor_block_white_96dp.xml b/app/src/main/res/drawable/ic_sponsor_block_white_96dp.xml new file mode 100644 index 000000000..45e2337c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_sponsor_block_white_96dp.xml @@ -0,0 +1,10 @@ + + +