From 0d39521fa767441a87a71592608a210c974442fb Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:15:44 +0900 Subject: [PATCH] fix(YouTube/Overlay buttons): changed to selectable through `options.json` --- .../general/OverlayButtonsPatch.kt | 82 +++++++++++++----- .../ic_fullscreen_vertical_button.png} | Bin .../{ => default}/drawable-xxhdpi/ic_vr.png | Bin .../quantum_ic_fullscreen_exit_grey600_24.png | Bin 0 -> 214 bytes .../quantum_ic_fullscreen_exit_white_24.png | Bin 0 -> 214 bytes .../quantum_ic_fullscreen_grey600_24.png | Bin 0 -> 207 bytes .../quantum_ic_fullscreen_white_24.png | Bin 0 -> 207 bytes .../drawable-xxhdpi/revanced_copy_icon.png | Bin 0 -> 2013 bytes .../revanced_copy_icon_with_time.png | Bin 0 -> 2502 bytes .../revanced_download_icon.png | Bin 0 -> 1378 bytes .../drawable-xxhdpi/revanced_speed_icon.png | Bin 0 -> 1401 bytes .../yt_fill_arrow_repeat_white_24.png | Bin .../yt_outline_arrow_repeat_1_white_24.png | Bin 0 -> 411 bytes .../yt_outline_arrow_shuffle_1_white_24.png | Bin .../yt_outline_screen_full_exit_white_24.png | Bin 0 -> 214 bytes .../yt_outline_screen_full_white_24.png | Bin 0 -> 207 bytes ...yt_outline_screen_vertical_vd_theme_24.png | Bin 0 -> 547 bytes .../ic_fullscreen_vertical_button.png | Bin .../quantum_ic_fullscreen_exit_grey600_24.png | Bin .../quantum_ic_fullscreen_exit_white_24.png | Bin .../quantum_ic_fullscreen_grey600_24.png | Bin .../quantum_ic_fullscreen_white_24.png | Bin .../drawable-xxhdpi/revanced_copy_icon.png | Bin .../revanced_copy_icon_with_time.png | Bin .../revanced_download_icon.png | Bin .../drawable-xxhdpi/revanced_speed_icon.png | Bin .../yt_fill_arrow_repeat_white_24.png | Bin 0 -> 2316 bytes .../yt_outline_arrow_repeat_1_white_24.png | Bin .../yt_outline_arrow_shuffle_1_white_24.png | Bin 0 -> 719 bytes .../yt_outline_screen_full_exit_white_24.png | Bin .../yt_outline_screen_full_white_24.png | Bin .../drawable/playlist_repeat_button.xml | 0 .../drawable/playlist_shuffle_button.xml | 0 .../drawable/revanced_repeat_icon.xml | 0 .../youtube_controls_bottom_ui_container.xml | 0 .../{ => shared}/host/values/arrays.xml | 0 36 files changed, 59 insertions(+), 23 deletions(-) rename src/main/resources/youtube/overlaybuttons/{drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png => default/drawable-xxhdpi/ic_fullscreen_vertical_button.png} (100%) rename src/main/resources/youtube/overlaybuttons/{ => default}/drawable-xxhdpi/ic_vr.png (100%) create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon_with_time.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png rename src/main/resources/youtube/overlaybuttons/{ => default}/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png (100%) create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png rename src/main/resources/youtube/overlaybuttons/{ => default}/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png (100%) create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png create mode 100644 src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/ic_fullscreen_vertical_button.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/revanced_copy_icon.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/revanced_copy_icon_with_time.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/revanced_download_icon.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/revanced_speed_icon.png (100%) create mode 100644 src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png (100%) create mode 100644 src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => outline}/drawable-xxhdpi/yt_outline_screen_full_white_24.png (100%) rename src/main/resources/youtube/overlaybuttons/{ => shared}/drawable/playlist_repeat_button.xml (100%) rename src/main/resources/youtube/overlaybuttons/{ => shared}/drawable/playlist_shuffle_button.xml (100%) rename src/main/resources/youtube/overlaybuttons/{ => shared}/drawable/revanced_repeat_icon.xml (100%) rename src/main/resources/youtube/overlaybuttons/{ => shared}/host/layout/youtube_controls_bottom_ui_container.xml (100%) rename src/main/resources/youtube/overlaybuttons/{ => shared}/host/values/arrays.xml (100%) diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt index 7cd53b75c..e30773518 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt @@ -5,6 +5,7 @@ import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch +import app.revanced.patcher.patch.options.types.BooleanPatchOption.Companion.booleanPatchOption import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.AlwaysRepeatPatch import app.revanced.patches.youtube.overlaybutton.download.hook.DownloadButtonHookPatch import app.revanced.patches.youtube.overlaybutton.download.pip.DisablePiPPatch @@ -59,6 +60,13 @@ import org.w3c.dom.Element ) @Suppress("unused") object OverlayButtonsPatch : ResourcePatch() { + internal var OutlineIcon by booleanPatchOption( + key = "OutlineIcon", + default = false, + title = "Outline icons", + description = "Apply the outline icon" + ) + override fun execute(context: ResourceContext) { /** @@ -78,8 +86,7 @@ object OverlayButtonsPatch : ResourcePatch() { /** * Copy arrays */ - context.copyXmlNode("youtube/overlaybuttons/host", "values/arrays.xml", "resources") - + context.copyXmlNode("youtube/overlaybuttons/shared/host", "values/arrays.xml", "resources") /** * Copy resources @@ -90,35 +97,64 @@ object OverlayButtonsPatch : ResourcePatch() { "playlist_repeat_button.xml", "playlist_shuffle_button.xml", "revanced_repeat_icon.xml" - ), - ResourceUtils.ResourceGroup( - "drawable-xxhdpi", - "ic_fullscreen_vertical_button.png", - "ic_vr.png", - "quantum_ic_fullscreen_exit_grey600_24.png", - "quantum_ic_fullscreen_exit_white_24.png", - "quantum_ic_fullscreen_grey600_24.png", - "quantum_ic_fullscreen_white_24.png", - "revanced_copy_icon.png", - "revanced_copy_icon_with_time.png", - "revanced_download_icon.png", - "revanced_speed_icon.png", - "yt_fill_arrow_repeat_white_24.png", - "yt_outline_arrow_repeat_1_white_24.png", - "yt_outline_arrow_shuffle_1_white_24.png", - "yt_outline_screen_full_exit_white_24.png", - "yt_outline_screen_full_white_24.png", - "yt_outline_screen_vertical_vd_theme_24.png" ) ).forEach { resourceGroup -> - context.copyResources("youtube/overlaybuttons", resourceGroup) + context.copyResources("youtube/overlaybuttons/shared", resourceGroup) + } + + if (OutlineIcon == true) { + arrayOf( + ResourceUtils.ResourceGroup( + "drawable-xxhdpi", + "ic_fullscreen_vertical_button.png", + "quantum_ic_fullscreen_exit_grey600_24.png", + "quantum_ic_fullscreen_exit_white_24.png", + "quantum_ic_fullscreen_grey600_24.png", + "quantum_ic_fullscreen_white_24.png", + "revanced_copy_icon.png", + "revanced_copy_icon_with_time.png", + "revanced_download_icon.png", + "revanced_speed_icon.png", + "yt_fill_arrow_repeat_white_24.png", + "yt_outline_arrow_repeat_1_white_24.png", + "yt_outline_arrow_shuffle_1_white_24.png", + "yt_outline_screen_full_exit_white_24.png", + "yt_outline_screen_full_white_24.png" + ) + ).forEach { resourceGroup -> + context.copyResources("youtube/overlaybuttons/outline", resourceGroup) + } + } else { + arrayOf( + ResourceUtils.ResourceGroup( + "drawable-xxhdpi", + "ic_fullscreen_vertical_button.png", + "ic_vr.png", + "quantum_ic_fullscreen_exit_grey600_24.png", + "quantum_ic_fullscreen_exit_white_24.png", + "quantum_ic_fullscreen_grey600_24.png", + "quantum_ic_fullscreen_white_24.png", + "revanced_copy_icon.png", + "revanced_copy_icon_with_time.png", + "revanced_download_icon.png", + "revanced_speed_icon.png", + "yt_fill_arrow_repeat_white_24.png", + "yt_outline_arrow_repeat_1_white_24.png", + "yt_outline_arrow_shuffle_1_white_24.png", + "yt_outline_screen_full_exit_white_24.png", + "yt_outline_screen_full_white_24.png", + "yt_outline_screen_vertical_vd_theme_24.png" + ) + ).forEach { resourceGroup -> + context.copyResources("youtube/overlaybuttons/default", resourceGroup) + } } /** * Merge xml nodes from the host to their real xml files */ context.copyXmlNode( - "youtube/overlaybuttons/host", + "youtube/overlaybuttons/shared/host", "layout/youtube_controls_bottom_ui_container.xml", "android.support.constraint.ConstraintLayout" ) diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_fullscreen_vertical_button.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_fullscreen_vertical_button.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_vr.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_vr.png diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png new file mode 100644 index 0000000000000000000000000000000000000000..114ff15e48abdfd7f129be0480d5359ca32b7318 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6bp~hGg7(d&7~d!GOml&^&Ih zZDv*Pj-Xdg0%}Jc|3xpiNbtOzC(Xdnu>H>Frza-rmM>kV7jQl}JnI$H(XSf=fRyhP zDJH=VhwWnDANVei-W%$tyH07sJ+0+p;i4MXSi5e8{?dQFb@dkCzt6VBZ(Pa9@Z;ps zo6ifrO549-GubV8E$>A6ZnnZ=Re?r3j+E~&GQaD*`BuQkz_7rQ!O9~rwSJBKDWF3c NJYD@<);T3K0RWviR*V1u literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..114ff15e48abdfd7f129be0480d5359ca32b7318 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6bp~hGg7(d&7~d!GOml&^&Ih zZDv*Pj-Xdg0%}Jc|3xpiNbtOzC(Xdnu>H>Frza-rmM>kV7jQl}JnI$H(XSf=fRyhP zDJH=VhwWnDANVei-W%$tyH07sJ+0+p;i4MXSi5e8{?dQFb@dkCzt6VBZ(Pa9@Z;ps zo6ifrO549-GubV8E$>A6ZnnZ=Re?r3j+E~&GQaD*`BuQkz_7rQ!O9~rwSJBKDWF3c NJYD@<);T3K0RWviR*V1u literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png new file mode 100644 index 0000000000000000000000000000000000000000..93df7350643a33c3e61ad312eb551b36edf05a56 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrg^$JhGg7(d&7~d!GOml&^+$$ zye)CbF`P{ruFI`X)&Fi`ROOXqV_;}dkuuG^c5jX6;_a(+11@fSv^I-7#6K!LKQvn5 zCiBYp1=;i01TV<8-)bJyw2|XW!h#*eKHm<$+B!Mz&PC&QI&;b_*cliKq8Y3_0#i+%ic0}q$l&Sf=d#Wz Gp$PzM98QM- literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..93df7350643a33c3e61ad312eb551b36edf05a56 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrg^$JhGg7(d&7~d!GOml&^+$$ zye)CbF`P{ruFI`X)&Fi`ROOXqV_;}dkuuG^c5jX6;_a(+11@fSv^I-7#6K!LKQvn5 zCiBYp1=;i01TV<8-)bJyw2|XW!h#*eKHm<$+B!Mz&PC&QI&;b_*cliKq8Y3_0#i+%ic0}q$l&Sf=d#Wz Gp$PzM98QM- literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e10fbe3f2f94a8466831310d8bda072e2bfde3f GIT binary patch literal 2013 zcmbVNe^3-v9AC~u@f;u#0nv0_e}H*+yZ3{`+dSapkh{i%^FSdr$GzP>Sh>5sb{FnI zo8YXJ3eCwZm4ZmfG!yhpjd4U%$3N5=CreOM%9I%=m8h^$n|gb|4K|dMJM;Fveed(W zKR(|dTWib9jg}?LAP9=Km`!#to5c||8oZa>Igkscv0n3wJOquKAdU!VdwmiFMJ6(Z z#X_-l5l*shB|)(cTIqLt0UCnlXZpPaSw;)6gDzn_2IOA*F$88P15%V`#jM_Jx|A_j zadbgdULjdkM(QafGXtLQ$AJJhEfBEZ?eg%r-++YV;$SUqqX-;=2xSJuC@O@Dtu{ED zELv|k|G=g>2SzlHKtafm=;xO6&QwV^te_F4?YM`$5Bq)Zdy2~415`o zQbF+IDC+b1ls=7;Kb@pFbhgPj{IGvP&A}OajT}L>mH0RKL6HAthDKK=O`k(jnIR?}q;d*L0Vr7cC zgPR#1M746TbPDK~2Ujiz4y6lDkYX7a5K@dkO(BEZ%u_QkAl6q(1EK$s7XvV!bqYR$ zqm3nittaLk3XDg^f*tS!{ilnevth+O1P2{MT!woU_y~79+5=h~2YOlVQf4;yeYL*I(|)C;zUbHN=sXU@nmLQ!*P2ZlCZ3JgSEF{R~;N! zmKv3i5D3ha#@9_RX-nL4_y=FQ=HAuHM^lRrFF$<$mHS;Ec5S=Tm3QdMDc9K+A`!b? z{7y$enlQ5!u8ABgH?J~E#>Khv9=$YXUd#%~#)yJuS=`!)yOQ*phP1efxKEScuhGB3 zM=J04UEi}=eiPaxxisO`<$=B0BKJglOrNZ^S(rYm@5`l4TQYWC?kXc9{aMYoBAGx% z@aN~F*Pi*jdD_;RO&y11N2-5o@2pz6IM-JGLV57r*MEF_%G6Yu+-%z&Yp;i#)kjZ$ zv}IQJEG+-y%@x5$%XZ^Ud27nNOUc)3cWEk>v2r1OPUiK(^I{#V|@3s-iFK*r#D_q*%Q0wO6QIC4*>lKBlk*A z$5b9^{x11cT1(B>#sgT z`Wb{)K-b3H>fErT`?+3uy6yJl_3K(27GC`9T2F1qinp}qZpZY#CYgJ7b<~4>zho^A g1$emWa&zzGsW1e1e z55RmzAGH4Z_?xiG1aZq#-tE5+A25eYePF;?Lnj2 zyDMe8$=%Xe7{%2rM2=@*EQ4B0p=q?xaDx^>voVs9fn_Q+0${466JRLi0w6h13Q4t5 zSe7!TK!?3s5GO+mvQfSq2oGa~8eob*jgbh$pjK%J*dPGrcwuU6T?PTh9E8jk01;M! zjNQ@%Mij2Y7(pzEi9%2iBbd*UBN+&qk+Ge@fjDds;(=@)6M|qaALj8G3lBhv)5#TZ zqA+?v7&Q|BStO~2K~S&Pv-DgRuFC}3d_Et9I3S0^q!3IZUqd1WriSocWDsHms#9u7 zC9Yvu8IcS;mlOb$s`ECewM(=bV!=<8$3O$31=%dfYSSE0jxOP}xjNOHa5)NMDol-O zNP@z$m$2F_oWzMN{J&5yZT~_57=h>N zP)w9Zsp)IAMhi#jFoeW)G8|Ve-c-V($_x&N#bX2{D>ZUlPi%SZ04798OaM@~#$`fm zCYvo|b76=La|5?QK`;c(L#4P}smNaz%7xj%zkpIPBS%Q&SHW@=R^U1{LK&=7BbgYe z)no#UB{#xRxC+-%f+_8|udhp@q7rntLaCxQh(vKDLn4X_V)KK7m>d>+PF<-KmS_kP z(V&<_C;%wuu#`$U%;9s;U>?S1a=0OsvBA7RCLiJ>OinO{C^&&3SVqRYxzu?fj^Q?g?Qs-SPXJMpLGUmbsMo?=S2msW2|Ck(D zSXTaK56si*voMPEf5gQ+jKCG79?@YDnUuGFHSR!4dC;1$^LBv$Y2w`8YstL`rz(bZ zxKyjC$x^k$G*pSxQMJrBVS+`Y*(FJY5i&#dWL11gQj*uTa9mMM4*Ewp-ZU4j=GAp; zKlhO2_yg`Q>dN;YSntd68T-=3HAdZ)(snMjwCtd|Ub^;EVf1)pcR-hRbS%JZmh&t7 zs|tJ1_Vl^;O&rtr3TFFmZ0vPpUG13Z=p1Pq(f3YO|EuHCAB6i&gS=S1tpbiv~Pna0jHn|nTyqE5;@Uwm>wX8v>i=Z=-8 zu;v@Lom375mGB9vU`4ZgxlQt|t%@Dc@$OO8c!b(?KdVm}QG7Qs zn`AfUyM&auTz%tq=!4jbBcyFpO+!yZZI!3L^Q&x!u${pl^|++2ZLPz%e07g&*+3rn zQ|X&eTvN^ZuL9^y+u@dPtLcsOlM~akEbj=Xpc7c;f|YA(V68pO&iF( zfDeB@e|vT4Khl%iW@it5JgK{D`3wC6$Kj`!f>`CIP{)o_C22PAHPl>K-|hf*ZQpf8 zJ%xI=|Mg)oS@{giRY`})gKHydInY@8?B*x@<7uqg%j1u>s6KdZ)3YYai&@mxME9_R z->E2I$8Q>Gcj!xH3>@qqH^|x!^d4ypHQp&|H=fLg`r>FKU&AxsBM+~i9iQ$zI`p*w z+9XQutISFi&@Z|AKDGPKrhce0+$L`{Xej@WJKp~cJ><92?Nv#Pxcsa$pyL|DT`LgR z6hHQ3pKK#68jCA>3-$wu?B{B?b-l%J0n>>GTOR>yfc~lcs3ZsAWowx^E7m&-=${;T z8EUt+)LaEjpD2m#zI1Nul(?|btsn)de*?KVsTcqN literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..90f98db8a7627f55794bed34d53c4700e92cbe95 GIT binary patch literal 1378 zcmV-o1)chdP)Px)97#k$RCr$Pn`y{xQy9m84?^a;luSj0Bq>UUGGwOsBJznszFhNk4cB#L%Dr4Z z7&CkjNyzlUT;vOqB5oPVTqxYku19~Kt!+E!?7jAS&wI|ftyORDw5I2`|If45e%3lh zDI*D3;WL^*0o0<90;mAW3nE29ML|VDc?61r^7xe)H0=sC??-cjX!Gh0=!p6X)mz6r1ku-eSt%zHfTt;d=Va`&x(vm+V5KJXUs zfSJ8qO)UkGyB`dk4D12?ti(QWtC@Y-Zfd_8V*}*wYXip$2=MoD4)6!?Bygjd>ExpG zPTJk~2QC1P0oIECq(%XI+RXm!hhTK8aROQZoC@3!Q_$I$#uKFHWvrRK6DnH_3`)6P zDRsE}?!a>3AVA=&zSQ+Oz`FHDZfg>IC5a0TUM_xrd<0 zRW2Wrv|k$PyBpXq;556Ff*vt5&E-EOWxm7UCMn3>w+2oE&WsLk10FQ9&j$_Q?mGe3 z1ILAW>eU44Md0>0G?WtRW3!@#9x_TiB6ljb|9k5oW<;xc%%=uEP{ z$jo#C@xS8kiWR#8*8xX_k#+a@H3Ij>z;2BW-USq6_5{{zxaseTJHR4f<*@kU?n(2_ z0u;;ZRlr$|j#dCynAs1*Wa{qw02c?O%Gj#<>WC>#g-Bs~fQmWw@(b{cpqtt2BgWKr zpx1oseRfumyKfigSEn^5byu8UeKKsa`n$W!O$7I-S_~W2WYGVlxTk;>W~LZ6wB*jW z>No{Zc4EujbwNQ(_0hGZx+^3p?TPvpp#@O(eAWNF0tzK5rf78%q?GbFpk@EHB>Sx6q1>_}N zl~e0~wgJUcR!llKl+;|^v|4E?UtYbIbXCt9p`hB6*6Ow}R<{b0lq0vgrERquvCPlD zf*S62e(bpAUXKFHQr)T!Yo>#A^Qp&F|}Part(TVMhf>Z zK*_jz>6D(S8l)&lSwtn*b&S(2g7gL;H&dc(l0|^zUV9CIqj}vN?{=M%{G9=*XLpxm zubHIvb1=5D0{UD?r;-XtrxZ%2>p*Z8%NIH(GBYLnJC#&Gn**oR&bm4cGDVdx1nxDn zZ@SJY2~fD1Hee^lf!(YqNy?G(A4=WOCIbpcIyF56*a6rQ&_|laa`fBvNe`%}BPV^7 z>MP(Q-~}`LHnqQAfa-&|yH>YNrxeilxku93fKs2xtko}oTAo+|Q~>2Ubx}}JP*G4G kfuf*1ekBGK1?4H|FCP+NXWL;^Bme*a07*qoM6N<$f+ZA}_y7O^ literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2277524eea25bd80886f84ab4d163afeb3efd5e6 GIT binary patch literal 1401 zcmV-<1%~>GP)P3lzGMP*!lbK{#6+wZyl2%AsB59GN zxsql|IxXp}BqWVW`b*L=Nk=3dG_yae(AyD!rNHyR0b1v0;ALP%)%{5VFa_8M>}w+_ zA-)6dsJf3W0T^%}aC8C^)5x7w_qPlJ6JS1YI3h700?QM|odL{?xUL(hWUVJ) z4)9|^VtRqwE7Er(@JJQ01xy9LE=bPnxZ2cdZ8LzEfP<|}V^E#Bsterpy}=gO`ieD)^}yaywYS^b#w!X zyMyj((D65LMJILC3t9x64kTz}2Xz>*sg{gJnl4m<>w#GlCG538a^9JcfPM`NaBC_b z?>4cUkDGb`{iNRD0v7|r9#KQUrAdSN;~TIU7z`w*ALt3#c5&fK|0pR};K0KHVb3KC z5{|tP_&gAQoO_zsUmLJln^NS*o&dwZ>|{YMjA_7Qz&{1a2~Mq=pLxKT$8LKnp)-Mh zJptZG62KqxO3u}cW(*K9#qp28L11bMv8w~(Zf)E7g|Q5H6j$3~h&o=u)h{2nq!9gV z;Fn9f7y~ZHKb1r5A#$f)^X=p56vB6S949^I1n$Sbt_d*&EGQY{7muGEMRqZxV6mrd ze;IKhaP@7wq@9xHlrVk9%#M`|_r0gh*SGVCIdZ+s({?z*t|_(Yu~X8zlBVBEYUKv; zlc%k46vm7o-vaFS2)iQIsC;tHNZM>>tsL(E>S^mKs$)$Pgj;R;ZiNFSgoU`P1)CSm z%r_EZ@M#Y9?|+I$P-r=RDn?NO3rk+#E9r$c;*A8_TOUDkFBAAkv5y%pdHv&NHrhr! z0_~wbN-9W@nIV5iQXCoh?kXX+o7op_#+&JB8!@x7W=1hZ+V{#ysWnJ|wF9%G35+kx@*7j(FNuM%Wc% zW*EiST{Q(~l=o zIKL^dA6k+?dq)741^Q4p6Jn;=A^D5xrqW8Q!*?t)BGJLDyhO zVUvMjN%xjXj?`lD#67HgK+@Hqu5fqNU0467y6@v>H}#+6|Kw8t z{j8+1hR-v#?_+Ws;W4=z$a{%4y_rlVlgVT{)`R)A<~Nyvw1Qf9*@-Awa-KPx`7 zGp|eSmr_b8rGy#Yaod$8Yyhx`$gcpZNCB!N1*k+yFdQjB(<9*s_gHJE{UM>ZyC7ku z-Ol#`)N*G5+TDE8zeaE>K;1-*!3j`_6QB|&Koy(-Rd52dspB*XgbO@ki&q@~b8>yd zO;^??5H9hg?4@hHF+e!Mv)z5Q55!8@YT((WO6>#DE9(cI{Wx%-VlZ3d9!CSuUgL8h zP{JZW0SZun0u-Qw2O4qh2vD!A4^aK-(|))E0DL#FPwg*U0RWZ<1%w;CVK(9$57=Uf z(}MxR8~~e4z`JokfC`)dRd51S#R*UyCqS5Mu;5G$gfo8@pmXiEn&7qFRDD+#q{?76 zEmG!D79)Uy6rB<&KqI&0AXNslgj>907LC+?DW#NB`T<2a8it&H>Frza-rmM>kV7jQl}JnI$H(XSf=fRyhP zDJH=VhwWnDANVei-W%$tyH07sJ+0+p;i4MXSi5e8{?dQFb@dkCzt6VBZ(Pa9@Z;ps zo6ifrO549-GubV8E$>A6ZnnZ=Re?r3j+E~&GQaD*`BuQkz_7rQ!O9~rwSJBKDWF3c NJYD@<);T3K0RWviR*V1u literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..93df7350643a33c3e61ad312eb551b36edf05a56 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrg^$JhGg7(d&7~d!GOml&^+$$ zye)CbF`P{ruFI`X)&Fi`ROOXqV_;}dkuuG^c5jX6;_a(+11@fSv^I-7#6K!LKQvn5 zCiBYp1=;i01TV<8-)bJyw2|XW!h#*eKHm<$+B!Mz&PC&QI&;b_*cliKq8Y3_0#i+%ic0}q$l&Sf=d#Wz Gp$PzM98QM- literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png new file mode 100644 index 0000000000000000000000000000000000000000..b23946dba01ba7700bfd20d878dc68eb9735e0a0 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D%z?|Qm8hE&A8 zo$cs%*g(Mbzm5eLzfM8h~=Wv@rogp%C~Q}jLGPnxIvsM_&& z@Z@>trH-X8jY!+)Riz{OV&mIr7n`YHUjJM(tHDm??o^&HH@+Dwz4QK+nzlXtD$5kr zW|=K-IXwh7S_Oxd+whnfUuSwXGif)|mCYXWTkg(r^mEV-{f*T-vzE*d7HE)R zGOjh`aF`b-(c&oaMDTz@|9!FS3pbcHRm^>w`15^jqGR^a$NvIkZokurOAloUv6U0Q zP;mH-!MV`ciK2|5{l}R?vJ;~J$uXQg!w2-1ssUS~09z%C!HLK2yvQB|nw^n(;pRfM zZ_Vct<1MZn>3bxc1FY+Fz(K80(#rC j#}Vj#IYypOKmIa2F!hUwzn;4Y80!q4u6{1-oD!M<(1_{r literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/ic_fullscreen_vertical_button.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/ic_fullscreen_vertical_button.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon_with_time.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon_with_time.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_download_icon.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_download_icon.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_speed_icon.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_speed_icon.png diff --git a/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..1f47966dff698d30c17e05a74beab158e46323a2 GIT binary patch literal 2316 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 BEyDl+ literal 0 HcmV?d00001 diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_white_24.png similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_white_24.png diff --git a/src/main/resources/youtube/overlaybuttons/drawable/playlist_repeat_button.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_repeat_button.xml similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable/playlist_repeat_button.xml rename to src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_repeat_button.xml diff --git a/src/main/resources/youtube/overlaybuttons/drawable/playlist_shuffle_button.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_shuffle_button.xml similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable/playlist_shuffle_button.xml rename to src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_shuffle_button.xml diff --git a/src/main/resources/youtube/overlaybuttons/drawable/revanced_repeat_icon.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/revanced_repeat_icon.xml similarity index 100% rename from src/main/resources/youtube/overlaybuttons/drawable/revanced_repeat_icon.xml rename to src/main/resources/youtube/overlaybuttons/shared/drawable/revanced_repeat_icon.xml diff --git a/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/youtube/overlaybuttons/shared/host/layout/youtube_controls_bottom_ui_container.xml similarity index 100% rename from src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml rename to src/main/resources/youtube/overlaybuttons/shared/host/layout/youtube_controls_bottom_ui_container.xml diff --git a/src/main/resources/youtube/overlaybuttons/host/values/arrays.xml b/src/main/resources/youtube/overlaybuttons/shared/host/values/arrays.xml similarity index 100% rename from src/main/resources/youtube/overlaybuttons/host/values/arrays.xml rename to src/main/resources/youtube/overlaybuttons/shared/host/values/arrays.xml