From 7d499ffba1dd14b7c9610527a8f23e48d9b7fd2b Mon Sep 17 00:00:00 2001 From: wb9688 Date: Thu, 14 May 2020 17:05:09 +0200 Subject: [PATCH] Use vector drawables for close and replay --- .../schabi/newpipe/player/NotificationUtil.java | 16 ++++++++-------- .../res/drawable-hdpi/ic_close_white_24dp.png | Bin 221 -> 0 bytes .../res/drawable-hdpi/ic_close_white_32dp.png | Bin 257 -> 0 bytes .../res/drawable-hdpi/ic_replay_white_24dp.png | Bin 675 -> 0 bytes .../res/drawable-hdpi/ic_replay_white_32dp.png | Bin 804 -> 0 bytes .../res/drawable-mdpi/ic_close_white_24dp.png | Bin 175 -> 0 bytes .../res/drawable-mdpi/ic_close_white_32dp.png | Bin 542 -> 0 bytes .../res/drawable-mdpi/ic_replay_white_24dp.png | Bin 457 -> 0 bytes .../res/drawable-mdpi/ic_replay_white_32dp.png | Bin 583 -> 0 bytes .../res/drawable-xhdpi/ic_close_white_24dp.png | Bin 257 -> 0 bytes .../res/drawable-xhdpi/ic_close_white_32dp.png | Bin 666 -> 0 bytes .../res/drawable-xhdpi/ic_replay_white_24dp.png | Bin 908 -> 0 bytes .../res/drawable-xhdpi/ic_replay_white_32dp.png | Bin 1168 -> 0 bytes .../res/drawable-xxhdpi/ic_close_white_24dp.png | Bin 347 -> 0 bytes .../res/drawable-xxhdpi/ic_close_white_32dp.png | Bin 436 -> 0 bytes .../drawable-xxhdpi/ic_replay_white_24dp.png | Bin 1390 -> 0 bytes .../drawable-xxhdpi/ic_replay_white_32dp.png | Bin 908 -> 0 bytes .../drawable-xxxhdpi/ic_close_white_24dp.png | Bin 436 -> 0 bytes .../drawable-xxxhdpi/ic_close_white_32dp.png | Bin 1852 -> 0 bytes .../drawable-xxxhdpi/ic_replay_white_24dp.png | Bin 1885 -> 0 bytes .../drawable-xxxhdpi/ic_replay_white_32dp.png | Bin 2580 -> 0 bytes .../main/res/drawable/ic_close_white_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_replay_white_24dp.xml | 9 +++++++++ .../layout-large-land/activity_main_player.xml | 10 +++++----- .../main/res/layout/activity_main_player.xml | 12 ++++++------ .../layout/player_background_notification.xml | 12 ++++++------ .../player_background_notification_expanded.xml | 6 +++--- .../res/layout/player_popup_close_overlay.xml | 9 ++++----- .../res/layout/player_popup_notification.xml | 6 +++--- .../main/res/layout/toolbar_search_layout.xml | 4 ++-- 30 files changed, 55 insertions(+), 38 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_white_32dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_replay_white_32dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_close_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_close_white_32dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_replay_white_32dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_replay_white_32dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_white_32dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_white_32dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png create mode 100644 app/src/main/res/drawable/ic_close_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_replay_white_24dp.xml diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java index 68648a8ad..62f25810b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java +++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java @@ -356,7 +356,7 @@ public final class NotificationUtil { } break; case "close": - builder.addAction(R.drawable.ic_close_white_32dp, "Close", + builder.addAction(R.drawable.ic_close_white_24dp, "Close", PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND, new Intent(BackgroundPlayer.ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT)); @@ -450,7 +450,7 @@ public final class NotificationUtil { notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download); } else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) { notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_replay_white_32dp, + new NotificationCompat.Action(R.drawable.ic_replay_white_24dp, "Completed", PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND, new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE), @@ -486,7 +486,7 @@ public final class NotificationUtil { PendingIntent.FLAG_UPDATE_CURRENT))); } else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) { notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_replay_white_32dp, + new NotificationCompat.Action(R.drawable.ic_replay_white_24dp, "Completed", PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND, new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE), @@ -611,7 +611,7 @@ public final class NotificationUtil { break; case "close": notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close", + new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close", PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND, new Intent(BackgroundPlayer.ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT))); @@ -840,7 +840,7 @@ public final class NotificationUtil { } break; case "close": - builder.addAction(R.drawable.ic_close_white_32dp, "Close", + builder.addAction(R.drawable.ic_close_white_24dp, "Close", PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP, new Intent(PopupVideoPlayer.ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT)); @@ -927,7 +927,7 @@ public final class NotificationUtil { notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download); } else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) { notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_replay_white_32dp, + new NotificationCompat.Action(R.drawable.ic_replay_white_24dp, "Completed", PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP, new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE), @@ -963,7 +963,7 @@ public final class NotificationUtil { PendingIntent.FLAG_UPDATE_CURRENT))); } else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) { notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_replay_white_32dp, + new NotificationCompat.Action(R.drawable.ic_replay_white_24dp, "Completed", PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP, new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE), @@ -1090,7 +1090,7 @@ public final class NotificationUtil { break; case "close": notificationBuilder.mActions.set(slotNumber, - new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close", + new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close", PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP, new Intent(PopupVideoPlayer.ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT))); diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png deleted file mode 100644 index ceb1a1eebf2b2cc9a008f42010e144f4dab968de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmV<303!d1P)og+*{ z>6z1@lfD*AYSPav7 zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png deleted file mode 100644 index fcddcf02ddb58ee1680889e7315757d76419b4b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 zcmV;U0$lxxP)i^4O#T$_9m82|5VvpF*wP4OP zM$UZi@^>7mIp;Yu=T~<=&tBi0Ip_J;@t6l6eCkO56W1~dg3&=h1q zQ;-2oK?XDh8PF7DKvR$bO+kjAeDJ~pr|dFMzEwenMqRT?w%I|3a4PK3rz1$XY>?9M z$o%dYv=53msmx64U;8dHjIzKUk9_ChB>7>S;1G`>C)ufEh%>(Om`-|fb*SR^#z4}` zk1=8_ANv5(l+5L85*Xb37G?llB;BT5>A(ui94pbtcshM*TjCYGR_ z-6MNIjB5B%pCT4Cy!N|@y;y<{>^_Y1h{sr_j%UPd_@F#~6P7u_$u$?{J9LdWv<^B( zTt-`dtRg&yta3*15X;emvQ!XfRzVjCmrT?J+75nB>W0d9%nhW=(93#VAeC5$p_bT;=ksFy7&G{R+*d}}W7vaE1LouAaX zWSLB>FM)fQW1AE1DN&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=Y>Ua!!*MzB~-b zcPe>dSN|c`ndF7t{f0bqlNT=1U&ygAdEsLHg#6|vZ+@fC=nZ;~4$-zlEDw?>lY9~1 z(FxjhxXN6x?V3yIA$m_Ej?iX&wQH!j&RfW$hU_?Ow@~q-My#W2=pK5EKA=3#(4NC~ z3l$eO!bMWJw1)Q4sr&(IM8DpI-810YLNDS%)2KW3XH3|Y3+@O#jSEh5D)|Lordfoj9<&It1B9TGq4d+uaz%JeY(|X>Kb)ARWN7 z=t*taT^q$h9~C&mvEB6{*e?1Nhy91Pz_r&A#Xv6=FoU+!&7RB%sILbhI*e3qgziPT zab2W22)c=M+zZj0ICpo_Jt%zg;vLdwm*yex4${FpL}Nnx`GvES${-Ecu+NK6=!T27 z0~PF{yhaF3vDy;fN7|TeSo*DN^5uPv5Z!%Np(4GByzW#Lb(?mdd(AdV#S~tjs60{lf39H8_eGT0000& diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png deleted file mode 100644 index af7f8288da6854204dcc4e6678b9053cd72032c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!B5R21KC-3Avpdi4K$<+1X zay^SH!@6{thMdKZi+L1hS^BMZUAdKCT}(HRw{NeWg~AlBHtr3jj>2B5kK^|J))MUC zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_32dp.png deleted file mode 100644 index 20b61eaeec893baf305a701f78fc9c18eee0217d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 542 zcmV+(0^$9MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kcU&K~z{r?UqYU z0zni-(V?J2*o-c~&pJf+060|H7;Zoqh$HzVO3FzR68}UcLM3 z)Ag!L1qu{M!fZA>fJd4-emjh9!LfZi(y}={aMTvo;Shm{vJab7_dH|;*vs$=KH5hUmqyJ)vH?d4 zHeug_11Q0jZ-PEe_yUeR_5o_bsgEue5`tkTCQy?o+Z-mU;1iE|f(@JV!vPdD1kl#D zY?fVT9#;NLaZWj(;8uWO6>61XC%W(!wqehG0|(E1ZBqeZ?SxjV;2-dnfNzxV@E$g3 z$9|++1A*EK48K8pN^xUzChWTW8(^j3p7)@RU}~zaBS_2>xq$fcJy*bMZ9QezeX)5W z7Z6Om=hPST#0&h9CvpMJklSPLx$1B^Po#P~5`k6)p~c)Dd(YJeHHpQyqeXSIRE%>t z^RWe$+Y|4(Y>d%vg|}k_rIGzH!hiWWPLFTt0oJ-PWqJo#>PDsS z`vtg-Yj!6pzPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0o+MMK~z{r?Up@D z!%!548!hOdv<0i9j_RP`p!f%L7VYNl>gJ$>n}a{YNjEzRx;O|fej#-eoI6y74t@~d z_vTGWNMq9W8W8%x!%fb)=bUS;iMfA`>$=Oj%pMMhue!|^e>ij%%8uZ0qHs1~UT8Q` z>hHm<$Z)X+nH$ws`)EMB;Xyv(Ijq0|mD&Lf(;OhkHJnws9ndiD5SwrhUche##5-J3 zxgF3jatNgixSfV)CgIV9OG?`T4MT@exCKHEJTyss?9ni3K2!%p043C%>`%2jZ zP0b;68v(fztV68~#%@@`7899Q#cuHrnjcdb-&<(QmJ8$Y6*KOlM)ncm{N}#EGd-;_o~KcU8(e-h*nLx z#|@lRIu`EHUY}E_Y=@w*2p`x*@cF+B$F-#eViSTtVCW^hrT3_XEl~ V_uUT1{e}Pl002ovPDHLkV1lm9{aOG3 diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png deleted file mode 100644 index b7c7ffd0e795ba76ed3a062566c9016448795f7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP) zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png deleted file mode 100644 index cc13347341479e29fc567f6af466875e91e4048c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmV;L0%iS)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0xwBKK~#8N?V4du z0x=MU(H~w16Yv6_0Zy%_&_u7GzwmozAY|O_E^D{6?0m^fgmydAz6TQ6RS*P05ClOG z1VJ!?!{P9Vp6y{VR1>Z3VRpSaWP{-OhVxDoYYH$L4lXpYtA?o0J4SXJc(S@1e;_ zNzijP)`c=ejLr> zyoWW1l2Go)QHrgRev)sbHb5XocB<}CqX@IY`7d0)h#kQ zglpd-vq5(@Tpo%q^Cqbv2!bF8f*=Tjc3G`{0C;dH`T`V^N&o-=07*qoM6N<$f@YH? A5dZ)H diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 1573fb111b535e5e0df9371ff7f804ce2c40a0fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 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 diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png deleted file mode 100644 index 1573fb111b535e5e0df9371ff7f804ce2c40a0fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 zcmV;719SX|P)7!(!0)U7tJ0c*i|=W=`GD{Rhrh*S+VSbLJ}_yb|Y} z2=nyPP+9@g9^_WikSR{kYsy-hy zEku#&*XNV6oCC6@Y0~GT-ej9>Czv`dtH=_DbXwRliC~qaN~fj83SwBz>9x4qN(Rvr ze!Z60m#~`DYlFi_98nBIuPvr=tUC1CrC;Y$3W(^FgzQC`p+k!}pOw6jBq=iPfkh0TWmS)dUz^Bf7(L-mV&-4}J$XOF7sBlc6Scm>hhDc(^Uj{LXd-%JWIiC2AM`rMs#_tFGOcEm> zQ6{J?t)HM6bg;rDU%4Peu#|sCR!~qE~FTC?knj22pV}>5;)E~ds^l}5-05`x5 ia0A=`H^2>0aQz3T@7w=K#~w`p000032ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@ilV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM zYYDFOvk5~8{Z*t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq eA%qY@zJ@mriVM?qfwL0;0000Rol24V(Ul{cf{Ft-O^TClm@M})Kx4+>gFppf_Al9 z#ZupGE6zrcR@~QaqeT$ZRuoaI`|%I#4>R+;&olGR%=^sqOcse~F9%hJfcj#!iW);ZTYO z>T=`0X?%9WrcrsC_4A<7*sb<(ZqAXCz$&?zvtCH)DOTz*!{g)CUw2Q0|C}824PDMP z{$6;es_Q`y_y6;2&Fj*OPLzVPYLCjEjk4Z}J3<9+DeG=LyRliiHMy^7kYa3n-Q4^r z=Je=Wh=B)$5psZ;8FFDrR_u@>qb1o1CW4Lrhu0eYPa_i2OYrb(DZ%v))2sppo^;_8 zwb0{z5aLC)COh6l@b#o`w)J1gE$qmZkTWeSW5#}~Xiul~Dxm4=GI?L5oo$KYsh#st zwF=q4KstT`?fKPzz&H~P!{@!{OvE10md89lIPwS=WZaj)>KZoRD~V{@46XE6=K{7Z z#TJUPzMa;tA4a)CC9urOT$T|k$R(Y8;K}A59pxC00f8W^h%BO>TYr4?7hHASPMEOW+xq zFH~-%I>LxXKFc)6rpyej6+LE67n2X3+)vBbZ6Xq*vPwnFK{koOF-)46tJkHbt`_CC z4~~`Y+2)BOl531IJ#YOAt5e85f)%tuz@ip4c$?e*j<+^{78Qn(p*6SlH~cb_wYzPx5QLsf0a_{(8oi)_v$2D9_qHUS znS#W~8YucFs*MdqD!%#701|5{e;~DD{uS=EI3H9Ap~GU1M3Z)YNZ>Qi;Aq{#ZVJO8 zkZ_a8!%)rgo*_inYCPk%r?6Rz^*@$I=u1TC@(p8%JXJG5{>i&cGGi$W`=ovkX|n{5 zNG@FM-Se{a0r>_AZlQ{kc z;$*=H;?31f0JTDAa&-*Rz&Xkz)X+*{FX!Np=|rriNJQduu(;8=`;?G7n!pV{ro*%j z_jT!190rJ5o*7(4HhNQ2yAMaBe-ptSN=qc-eHQ7-`1QRE+kgk0Q#7_{655_0V@?mq2q203()6r6+x2FiJqPX|2^x7}2$3tNsI zn?0;zlfo9k4wg=6!``}M%V9A>27v)~tEs` zOZ=Us)a$C+p_WVFS6eBx_1}#`02qtJ`c5=Krxav*hS1(&vwD7grZ4tZ2tFCF>Aj|m8d`?t9S6@!6^#L z@*k^9m(K|S&7>;w1mNb_%*kx=#$CN0sd;;|kmG+5c6jPe+dYcY8C$$ZUy9mJ|3DMF z>mba?#m=aIh>>CEH8;}79hKz&_TG~AZEG(6?{C6Z^GyBYk0go2y13oxb;^&x#{)Uq L5p5grL8<=&`?GV8 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 04cbde9af1926410c77e666492a8c5407d938f2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1885 zcmV-j2cr0iP)G0000LhNkl?*|(>Q-}x=BZLQ4&YpE&mJ&MS+o(x;tb+l&fx65xW;&^oP6*;;qZ`277j0&B;g2y13QyVxcB2x=EDkM`q92JwP7LF>&R0l^@ zWU7IqT37j=K`wEM_jsFaJi{v5DanN4NXjtpvz;}}lo=0>dN|9gbkZzyEgbbU#4aA8 zQRXK&((omlnJeIN0diU~(n^z$bb4~{H3$n7c`99eROtxQ(2;K-J9 ztWdGw$ePz^QIX)tno}%Rk>JRh5uQ|$;K-g=Xi#zB$etcrRU9~~)5H{JvygjP&5P`! zk0Gk{A=6bHII5uQP@;q9+0P)AJIgE;2abwqTr_YWuQNbpF3_&xz)>Lu(9CLjC==fW zW~n%ER78=mfZdD{*IA~kIB--zkujGyxI#Srw5m98#HLv2;281r(4gYL5tCw~#8Z4l z99=3B9I>bZ+{!z|u}(#TBL-E7XBj1`5f-UPa73nxaTn)^>JwU2Bsd~c6_`pNQEgYT z;D|(3p_Ri#Q|2KR3yug>B^v1_n$Ngd#eyS9Rii{V(fmV2gCjsSKqH5V;xfNi(cth> zP0&goQ5;b5;P6n5(8hV9SgGQ{F)q~%cQZ=Z2^A5Jaj1rPo+utw5#hKY)fD>(>sK-1 zxB=A^Q}~*&2UScsuA>^`X~KF{R5*S^HAad55K?BIiVDXyRC9DNM#xJlE*!t21h9jU zFPNm_!to0wfVqqj^00~w$Ip}qx(Rtp#fIZYN(2ij<2OK)iVepPln{CeS*fDKffB+R zLb_ydN(e0s;&(s}pO7bHl0ySS_;tx7i39i@lSvXU;5R6fB<>_+woGy; zF^pfQOp@rwZ@o;C=*Dl0Op@4$-(Hy{u@=80GD%`7ekWy;Lqo1 zGD)HtzcHnatN1l3$7sfHOljkL{H7?!Xv1$rX=4z-*~&5I;P;2zgmqK_?+S${7w4vO-xwGeh{5S)d$Y5oP=aXi|2ti;#aRN7zHiPGt#?5Hd!) za)S9>C8SeXLL*-i@`iGPorGLslCp)(gj`{RC89@{O zCW=w!Df`$;G`lG&11PbFXf`Pin9Mn%*-fKTMiYC8=2Kdf53C@n!?Y?z+`_+zrpyD% z4_+gxKH8KLrttw$btzA1;WSa5=WeBdd-$BFKBigu!eT~ zNgVr_qB>zJ?-Ivqp|mlQH7yW3uv%>6|65F}hix8e$Q97$dI#F-`f$EG`gVnO@e=qAJnCIu24M zzVpn~#6UY2sLUWcxSs}9fJrRlO$MpVdFE*1U>0Yo+zyvz!kWGch&c!DmDF+?1L9Az7iGef3Um`x|^ z*}`6qaFUA*Fv1vPjPNZNImr?BvW4|@a+{1X#u#IaF~%5Uj4{R-V~jDz7-NhvCN=*D X>#M$jzV5xv00000NkvXXu0mjfXY*@a diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png deleted file mode 100644 index b51ecf755901c5f87d42a5ac6383f09cf93849e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2580 zcmZvec{mhm8^*`J?;1koxN0f2g<2pi4E*@Z&v+`|9>@$O&EMG3C_lfzzJ zvxd4v-P$O^^eNjYC&n~aVoTJx94#c5%dl8gZ9+k=B<`k-+NqReUI(_tGS5SXv}G6l zW0ZZ`Rm(wwVtR?Ru{@$o|0=;GRN&cdVVs4CEJ_>kVs7$h7WdY)(Ods->$J_E*NWGR zskGwv>xHwElX-kkmM;7%BW;u5FKjd_;xT_-9Pr2VEmJE?+qUy6zfYrR2-SWHM|)39 z(7(F|Z?5DRHoG`xc*?_}m>m0L0fchz? zD6!QvwO4uu!@g=NyJ^qjzSptG5;c$iezklsRWHU~iVxf8x;6U(z1AmJ#rI7YKwP@s zs+{XAzw1t3dC2uCYMJsz3MpCJ+rD_tMa*$`&WTH6Kvc1+> z({1pokhkX8q6E`zrt{GwaQGX3RnUj17zCtJ^lNO{{&>3Zt8E&+U<;B+gFxDc259D^(kM!xJrMBTd%qO!TYymj+YOB2S zxM4SzfT^((ELg|Bu<`n4mI|B1x|THc8pjjton+iX2J2Rfo8`x~3m?Cx7!96I%eUx) zdC9mT(m_eH%+QBU3lIxe0TKNRT0rUGs{9UIo-l4wyuVZ6lpoJ#*R0+zPQDNGfojCh z?{|D>MkgqLhE!4!Bq5Dk<@p^ZH~68O>8?Z`qLo&*oQEM?#;#+9gJHs*_waMw^mjzT zktU0D1l-xKqmskz#i3h|ubkP^c(S!rpeN5s@d<(X6#N-K-$e0V)ZEa`ATh##gkf1} zaHVD)*&pwvglkHV1kzxQ?~TMXmV5F$+VW352$TKTC==zMC7Y3fsu5bpOrl+L(S6>X z28c-Qq5u$x&Vjld7zk$XMUl`ep7Wy9GkHMiFj{_xIqk`V1g-KTk;mIS(=*q&gpOJ` zFkfMPyDG3By5g7FBwj(_jYYzIg8M}uL@WM?Y~3-WHNuKqGAhXzlQnm`Ws@)(WkEbwIbj=tA5qJ<>9L1wy0pj8jh5_L<%CT|XH{jRB$jv&sR+iZykk zd0menD?JgT)yb7dS6V$_!~Wik zSI}ycDJ^sG+*nN0l`HDs9MJk*Du@Hhgf03IuM($1lX`m0sEoJog)JOz6r5b_tRG$Q zx&I_u(j`*j>Cv-DLa{s$#I_|>Q*;NnoM_`3n`kBS(4z#=n;71U3dAW*QSDA_m~qNVwI~DwVjax~v5b&mMRl zo~G%~HQ;OS(DZ#rXLak%-WN+H2#uLrm$G9sQ#{v|))$A)G z=_wfPc91?bNW1hM=G|)nLs>KahVr{#E+tLFS&=rz8OMhH`bB#NCAEAxNHT8V??HNU z_+FK*TOknbpc1#og;2~9k-EaYMM1c%K}_Pvs&I-=kZBJaX{?43^O?anxl}_dk9T@U z1IdWO+nU59o-e2xp!nHCz{njruqUDSMrFx`63xUUX!l3IXvvq5q=BLPBVEygZz0$| z;l&W)+M5Km<{^_U3F|e())=LKLeBJd*Eb8D+AVOTU-{W7zu6Ncfp6r`94Zma57Wvi zVEzMi05b|Cdaj(~&h$)~b~ik+l68WUUA+3>2$+O2JV~&tieTunq(8n9hd}HdBG>Xdf~OQ9$s@z^)Kr#l zVXtrWv81EeGoVq>TFxCoB<#~n9(ZpLg^;mcX@V?xD2*XPtlf6L|Af~ECryp?caLo< z*9A9h#7RYb`;vW{F$-J{Q5|y9vR`8iWcxF0qq6xf8BNd!D;1y>d6%8&mZt9;5CVdk ze%fu7;oO6P?2(}6Q}Z#?iy zQ2mkeLDwr0T$javy!&D<6ZsPX9^vPY9Yr@}o~P41U7yMa?w^=cD9Sp15z}=50AgrICBg2dTv}+(H$=ZfD06-aj-^Yr;qW={h#y69>C;d8BXbY{rV%AK4?G zwew0e-nlSrc{?yi!Yl5^FeB^qiAjTP_>T%?W=5T&%c{u4vU$wCkzlkG5VC@#Z;|^2 zgih`Q>17{>;gyx?!gATCK+?pdkJ(nLxx%e-&4)befY9Y9*O zBk?X-W9RobdRb*69XSYjS-DvxDv46slDUzr82d6{qokY-9`TVoSgK*^dcrCW7RBMg z!oO~gydfnTA_2yLgrg;uq`)tuF~L^p|5Rt1CV23UFL}85RZqGp)aG2OA + + diff --git a/app/src/main/res/drawable/ic_replay_white_24dp.xml b/app/src/main/res/drawable/ic_replay_white_24dp.xml new file mode 100644 index 000000000..8e84c195b --- /dev/null +++ b/app/src/main/res/drawable/ic_replay_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml index 16dcff639..8f683ccdf 100644 --- a/app/src/main/res/layout-large-land/activity_main_player.xml +++ b/app/src/main/res/layout-large-land/activity_main_player.xml @@ -65,18 +65,18 @@ android:id="@+id/playQueueClose" android:layout_width="50dp" android:layout_height="50dp" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:layout_marginRight="40dp" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" android:layout_marginEnd="40dp" - android:padding="10dp" + android:layout_marginRight="40dp" + android:background="?android:selectableItemBackground" android:clickable="true" android:focusable="true" + android:padding="10dp" android:scaleType="fitXY" android:tint="?attr/colorAccent" app:srcCompat="@drawable/ic_close_white_24dp" - android:background="?android:selectableItemBackground" tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> + android:layout_height="64dp" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:srcCompat="@drawable/ic_close_white_24dp" + tools:ignore="ContentDescription,RtlHardcoded" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/player_background_notification_expanded.xml b/app/src/main/res/layout/player_background_notification_expanded.xml index e5a9b632b..80bc22627 100644 --- a/app/src/main/res/layout/player_background_notification_expanded.xml +++ b/app/src/main/res/layout/player_background_notification_expanded.xml @@ -29,8 +29,8 @@ android:focusable="true" android:padding="8dp" android:scaleType="fitCenter" - android:src="@drawable/ic_close_white_24dp" - tools:ignore="ContentDescription,RtlHardcoded"/> + app:srcCompat="@drawable/ic_close_white_24dp" + tools:ignore="ContentDescription,RtlHardcoded" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/player_popup_close_overlay.xml b/app/src/main/res/layout/player_popup_close_overlay.xml index cba06874e..e7607edaf 100644 --- a/app/src/main/res/layout/player_popup_close_overlay.xml +++ b/app/src/main/res/layout/player_popup_close_overlay.xml @@ -1,6 +1,5 @@ - @@ -11,8 +10,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="24dp" - app:srcCompat="@drawable/ic_close_white_24dp" app:backgroundTint="@color/light_youtube_primary_color" app:borderWidth="0dp" - app:fabSize="normal"/> - \ No newline at end of file + app:fabSize="normal" + app:srcCompat="@drawable/ic_close_white_24dp" /> + diff --git a/app/src/main/res/layout/player_popup_notification.xml b/app/src/main/res/layout/player_popup_notification.xml index e8b077ecc..1aa767c58 100644 --- a/app/src/main/res/layout/player_popup_notification.xml +++ b/app/src/main/res/layout/player_popup_notification.xml @@ -83,6 +83,6 @@ android:focusable="true" android:padding="5dp" android:scaleType="fitCenter" - android:src="@drawable/ic_close_white_24dp" - tools:ignore="ContentDescription,RtlHardcoded"/> - \ No newline at end of file + app:srcCompat="@drawable/ic_close_white_24dp" + tools:ignore="ContentDescription,RtlHardcoded" /> + diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml index 9a7d56a6e..74647e2e0 100644 --- a/app/src/main/res/layout/toolbar_search_layout.xml +++ b/app/src/main/res/layout/toolbar_search_layout.xml @@ -47,7 +47,7 @@ android:contentDescription="@string/search" android:scaleType="fitCenter" app:srcCompat="?attr/ic_close" - tools:ignore="RtlHardcoded"/> + tools:ignore="RtlHardcoded" /> - \ No newline at end of file +