From f81872b8e41da215517fdb59364130d8ce681607 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 15 Jun 2022 11:52:51 +0200 Subject: [PATCH] fix: add size `48px` for `custom-branding` patch --- .../annotations/CustomBrandingCompatibility.kt | 2 +- .../{ => icon}/patch/CustomBrandingPatch.kt | 16 ++++++++-------- ...tiveproduct_youtube_background_color_108.png | Bin 0 -> 191 bytes ...tiveproduct_youtube_foreground_color_108.png | Bin 0 -> 1516 bytes src/main/resources/branding/48/ic_launcher.png | Bin 0 -> 2661 bytes .../resources/branding/48/ic_launcher_round.png | Bin 0 -> 2421 bytes 6 files changed, 9 insertions(+), 9 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/layout/branding/{ => icon}/annotations/CustomBrandingCompatibility.kt (81%) rename src/main/kotlin/app/revanced/patches/youtube/layout/branding/{ => icon}/patch/CustomBrandingPatch.kt (80%) create mode 100644 src/main/resources/branding/48/adaptiveproduct_youtube_background_color_108.png create mode 100644 src/main/resources/branding/48/adaptiveproduct_youtube_foreground_color_108.png create mode 100644 src/main/resources/branding/48/ic_launcher.png create mode 100644 src/main/resources/branding/48/ic_launcher_round.png diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/annotations/CustomBrandingCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt similarity index 81% rename from src/main/kotlin/app/revanced/patches/youtube/layout/branding/annotations/CustomBrandingCompatibility.kt rename to src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt index bc427cbb7..7c276f0a9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/annotations/CustomBrandingCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.layout.branding.annotations +package app.revanced.patches.youtube.layout.branding.icon.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/patch/CustomBrandingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt similarity index 80% rename from src/main/kotlin/app/revanced/patches/youtube/layout/branding/patch/CustomBrandingPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt index 33ae280d0..65392ad8c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/patch/CustomBrandingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.layout.branding.patch +package app.revanced.patches.youtube.layout.branding.icon.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -10,7 +10,7 @@ import app.revanced.patcher.patch.implementation.ResourcePatch import app.revanced.patcher.patch.implementation.misc.PatchResult import app.revanced.patcher.patch.implementation.misc.PatchResultError import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess -import app.revanced.patches.youtube.layout.branding.annotations.CustomBrandingCompatibility +import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch import java.nio.file.Files @@ -35,18 +35,18 @@ class CustomBrandingPatch : ResourcePatch() { ) mapOf( - "mipmap-xxxhdpi" to 192, - "mipmap-xxhdpi" to 144, - "mipmap-xhdpi" to 96, - "mipmap-hdpi" to 72, - "mipmap-mdpi" to 48 + "xxxhdpi" to 192, + "xxhdpi" to 144, + "xhdpi" to 96, + "hdpi" to 72, + "mdpi" to 48 ).forEach { (iconDirectory, size) -> iconNames.forEach iconLoop@{ iconName -> val iconFile = this.javaClass.classLoader.getResourceAsStream("branding/$size/$iconName.png") ?: return PatchResultError("The icon $iconName can not be found.") Files.write( - resDirectory.resolve(iconDirectory).resolve("$iconName.png").toPath(), iconFile.readAllBytes() + resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(), iconFile.readAllBytes() ) } } diff --git a/src/main/resources/branding/48/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/branding/48/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 0000000000000000000000000000000000000000..2a60fcbf23ea1586916bd57d85872aac215eedf9 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FU|>mi z^mSxl*x1kgCy|wbfq}EYBeIx*f$tCqGm2_>H83zRgm}6*hGaOuJ-?CnfC0||gYEf0 z{###OYA?We#C7w$ySBv}zrWuqb%6x9A literal 0 HcmV?d00001 diff --git a/src/main/resources/branding/48/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/branding/48/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 0000000000000000000000000000000000000000..18abb25b4c171fb3f90f3e79dabe7887b6806596 GIT binary patch literal 1516 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/branding/48/ic_launcher_round.png b/src/main/resources/branding/48/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ae5bb4346cadb7369ba0a80ca9d4860b6d6d15 GIT binary patch literal 2421 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F3vjYUS ze#u_3f5Ei{mKy@a&W_7mGFR`;jYD1Q&atUGUy+IDkMOB~ZdCkn|3#tRms}A!haPvWN^M=8TsrH0t~oKzzj948$3LWSN!QdR)5NBoDqIq5 zx%7|R=1JEg((E+$`G@ISG5)F8XndB%&P^i8=M9IR4bQ1QsgLiH{>Wqtt?mdtxp<>j zlS<^AMbA{KeQIL9%s3-bx%q$n?^Va!ZI`}T8<$aG*wbH^ajWsrw!|8FX}5A5tKPu==Rx8ERw1r0tw}~szRX?%OM5SAWCbqmsB>90 zDgKk-60g8d6Z`)xdCRWKq3*kC+r$cqJ3EdDI3>-Nc*DS(z!QAz@xr>ET$_0xZETDq zj~Bl=w(s+f@;4uX^)p}FyxaTy-PZH>p1&#H(Bb-L{$YjFm4}}e&CI*MFLsWHip-MIWlzb@+`yRM0=w#8f z){q;Ac6shO{7dDv;55fm4Hq-^cr4=m{_gJYIsMOFRpOc2UcJhC{^ZG%%ON@TsocMp zO}WY?)VV3+`Sx~?Wt}O17FEAm$oItAVda`Ncf7U#&HGwVb&Aioi{okLM`aQ5*~dcOZ)Zxpu(hYty{o(XJUdh4#*p%~Cn^ee zpE0kj+2^>P{m;}y-q=;gvbLJFIw=Y&OHMpJ>q@NUfuJ2{n*-{k9>rJdh@E~Pk!D(C zwv=bfKm8q6d%U}KG7e<1rYoMQx4(S-dU;gY$_W!0uK!H^Sg~g&bIycVEejdGoI5)T zSKYf?%G@_mDUa>uUZZ2Rr*l6he%_{QASHTdPo;27>66P_EQ}2eKc4yUq2N}<36BFW zOa4te^?%}|!nyH#t4#e&=doO7uK987_X?{l2gNm?UYex6_kGOq@Ug6I#Z&(ETQ+BG|Rw~VT~$g#(M)3jDlbO%sSbyv#;;8goMPT#ZTD65Bv6<-pRO3P2p4Ju6~bB zQ$?xnhv(n_VV!)@;M%pT3kqCKcRh~Vb?(FeBbH6sg8E7P;tT&BkDlOjq+r*}_yjX; z_mjM@LQY3&OgbyMg2Uj|^i3K*TemFS`d4UO%x|u?6q)|_D~>NL<9FC^?zKNW!oKow z`}28syH(AMtE%2TxU+m__`H$@ajC4Vto$dR@r1CP*wUgOof0gZAt_`3Q}8rL-G)l$ zDtF(EmkXsYzHi;~ldWL!eV*&z)^4d{d2jM(?m_8^@!8B@qn!4JNM~6wnRUIB+5a|4 z{oVcj{h`{^lU?5y&B@?Z2zukbB158GnmHnPyU^*md_26r3jb~H{-phO!Kbuc+at}= z7brQruoLCH^Rr+4dj6LM7t#*Ci`9$S%~|u3bKzq3jy&^#{kfl~{H`hd$@T7Uc|e_M z{gQ6RLWb*du|mSai88hSEwVZPyt)~?VMcf1hX+D?{v8uKlBD+L?%w9xbxgiz=POC| zF15SVt`V+uwf!YW$8F|XKCO=zXPz&7Jx!WlG-~7P&f_oixY&M+zNtLr`hDZ!%deeJ ztN*&|uH?d`7&+f@mxP2$=YpJ9O&rgXmq%r^Sj2pdPS`jjajV#a>DBdzmKrx6<~?p8 z7xHoe=atj)oi4{xi`lf89^GqWVM_@%*V|Itxp5dlJ`{UDs^)X{aU_bm+kfY_ve>2tZDzXYSpT_J?;A^xpcm% zz98`Y!TgUFm3mi0lwWh!k_YTw-r8gt6o}OzW(I< z@2kz$?L6V>(2!XaaVNAWD*MJ7WkKKjFIx+w`)Wfp&e!*ydbj4nnvNYAqUBT7CTkv% zzxvsI*LfaG1GSoY$IqB=ji{5_rK71A<+)_)=EBaiTtbDDI$lj!D9qTWJni*#mji6g zj#j)e?lwreaha>mj}hyytcEc73SW#NaE<;-W|ULwzG%a zb4y*$F(INyNa*JtkIvMvnb$9t3U)^vF=wpd<(+Mk#eX2Vj)8%J!PC{xWt~$(697ZY BoiqRd literal 0 HcmV?d00001