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!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~<*T7?R=q_WVZP0|q r5!cQ0?%Eb_{QiEc)CCgYhBUjZJ&YT)mWo~mn$O_r>gTe~DWM4f0uw*= 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 zcmV4Tx04UFuk-tkqQ545N+Arxh)X>l%VNDul5VbTYWkEHlLBAG#{tDC{?f3)=)}G>-BC(XR=zr z@3k*1F4>!2X{4Pl+}Og3uFeK0L)08!4_Hip=Q4BgztIwn=?YkE!sCjnWre4NXV$Z- z$-BbcN-`W3J{NXs@<8ExQ;(GR&E!Ohe@xaw0iV>?DQr(vaiofsq?Q(z%5kJqIi>s_ zvy#?WW$9BUG*h*im>u}Xp@S)8Kg zBzsJJT=baC6nV4%fBUM(hdrh2tzKw&F^rFXXxf3owqbl98%E&->Ym{$Q;A;Mme!PtsQ4l(8j7HO67<2Z2OoUtlMf;azKKD65h@k} zwN?U_qC|=i8mkdCsjb2I{Z(rBBOjaHy)(!EWN%FRQrO+=gK&Rvc9@;H!}-rSXXajt zh=_=Yh=_=Y`2WH|+c3tMZZ!L0c8%%tz3(TgqWbOF)zPHLoge(=fjm0!_2YIAOG$n%jPS8Gnz~M>k{ryAm;SdT{>XIpsP}i^$)^&K(f&Z7|#r zDrg(Vb=_}__zPrwcvQV7IhwwplBJ51D$$j;xMArMajIBp8{{!oW|T|~&(_Wo{rY3D zY{N7yfSH$sWK7_MViU_g(;w$-VP56(wAmcncA~YGE8xH4m)pihdLg$N-E`{{M3vjAt;EpXln2}HErSQ~e{pn;IYTbr>vR>zAfU3IG8>j(rCjl_*OMB;{FI2l$cl~x%QQ{P0%Gy_ z42k{$5n$2P=e<4s)2M|D^(btlj>;Bh+WX8jBtOdJD@>lDl3ECsX_}S=5G4xO(RX1u zlg-wy1BZ6T(#x;@n?6AVP`vMSKlJi;(Rwcg<2gN{a=FF&8qL$P0MvnSmES^2{Kc$s zubBILZh7_?XNqgJuyz_{3SW8G^&LgtKc!g5jPZ*&eclU}Xo(Oa01?R>^4Qhmc4tNO zei;}}I+?;7aJ~{l?yGG6aC*m!3EW_JiWo#n#<{)k=iu>{2t`00{!olA<818X<=TMP zQ<`+Li?f_9edczSr`XlI5v(qxS_wz*n>KR6gDnxBfTh*5V$AQTgLWh4iH?q?OOChl zSj;OwnM@Xo!umdpd3bf0bc z$smjLDN5}|6v81q0k)XSE3X-&myzRb+VKwtLwIv_A6H^BaK7ra=_6sKk0rz!uu<6e zC$S(3C{&@ljhSjUm(FZaiXTDhSjNd4`YD(m3ZV+HC?g-h(F)RNm`m|)j=4LKRyQGc zRTZ1$3)L|sFtl{Y*e3`ImlL_|bHL_|bbi2ebLxX_Uv SbL$)c0000 literal 0 HcmV?d00001 diff --git a/src/main/resources/branding/48/ic_launcher.png b/src/main/resources/branding/48/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf74a39a1ba219cf108b8e371afb49b0bd2443e GIT binary patch literal 2661 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 literal 0 HcmV?d00001