From 0ef43e4a0b86dd1ff7474ba2a5916a63a226f664 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Tue, 23 Jan 2024 07:08:14 +0900 Subject: [PATCH] fix(YouTube Music/Replace dismiss queue): use built-in icons --- .../replace/ReplaceDismissQueuePatch.kt | 2 -- .../FlyoutButtonItemResourcePatch.kt | 29 ------------------ .../yt_outline_youtube_logo_icon_black_24.png | Bin 303 -> 0 bytes .../yt_outline_youtube_logo_icon_black_24.png | Bin 216 -> 0 bytes .../yt_outline_youtube_logo_icon_black_24.png | Bin 410 -> 0 bytes .../yt_outline_youtube_logo_icon_black_24.png | Bin 565 -> 0 bytes .../yt_outline_youtube_logo_icon_black_24.png | Bin 749 -> 0 bytes 7 files changed, 31 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patches/music/utils/flyoutbutton/FlyoutButtonItemResourcePatch.kt delete mode 100644 src/main/resources/music/flyout/drawable-hdpi/yt_outline_youtube_logo_icon_black_24.png delete mode 100644 src/main/resources/music/flyout/drawable-mdpi/yt_outline_youtube_logo_icon_black_24.png delete mode 100644 src/main/resources/music/flyout/drawable-xhdpi/yt_outline_youtube_logo_icon_black_24.png delete mode 100644 src/main/resources/music/flyout/drawable-xxhdpi/yt_outline_youtube_logo_icon_black_24.png delete mode 100644 src/main/resources/music/flyout/drawable-xxxhdpi/yt_outline_youtube_logo_icon_black_24.png diff --git a/src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceDismissQueuePatch.kt b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceDismissQueuePatch.kt index 8b07c380c..fbdd0d6c0 100644 --- a/src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceDismissQueuePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceDismissQueuePatch.kt @@ -8,7 +8,6 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.flyoutpanel.utils.EnumUtils.getEnumIndex import app.revanced.patches.music.utils.fingerprints.MenuItemFingerprint -import app.revanced.patches.music.utils.flyoutbutton.FlyoutButtonItemResourcePatch import app.revanced.patches.music.utils.integrations.Constants.FLYOUT import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.SettingsPatch @@ -20,7 +19,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction name = "Replace dismiss queue", description = "Adds an option to replace \"Dismiss queue\" with \"Watch on YouTube\" in the flyout menu.", dependencies = [ - FlyoutButtonItemResourcePatch::class, SettingsPatch::class, VideoInformationPatch::class ], diff --git a/src/main/kotlin/app/revanced/patches/music/utils/flyoutbutton/FlyoutButtonItemResourcePatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/flyoutbutton/FlyoutButtonItemResourcePatch.kt deleted file mode 100644 index d6b78de33..000000000 --- a/src/main/kotlin/app/revanced/patches/music/utils/flyoutbutton/FlyoutButtonItemResourcePatch.kt +++ /dev/null @@ -1,29 +0,0 @@ -package app.revanced.patches.music.utils.flyoutbutton - -import app.revanced.patcher.data.ResourceContext -import app.revanced.patcher.patch.ResourcePatch -import app.revanced.util.ResourceGroup -import app.revanced.util.copyResources - -object FlyoutButtonItemResourcePatch : ResourcePatch() { - override fun execute(context: ResourceContext) { - - fun copyResources(resourceGroups: List) { - resourceGroups.forEach { context.copyResources("music/flyout", it) } - } - - val resourceFileNames = arrayOf( - "yt_outline_youtube_logo_icon_black_24" - ).map { "$it.png" }.toTypedArray() - - fun createGroup(directory: String) = ResourceGroup( - directory, *resourceFileNames - ) - - arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi") - .map { "drawable-$it" } - .map(::createGroup) - .let(::copyResources) - - } -} \ No newline at end of file diff --git a/src/main/resources/music/flyout/drawable-hdpi/yt_outline_youtube_logo_icon_black_24.png b/src/main/resources/music/flyout/drawable-hdpi/yt_outline_youtube_logo_icon_black_24.png deleted file mode 100644 index e0ea1b51a45c50ea1620e2a2c4948d14ee41ba38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)6o#KPFbXRc5nL4f2eN22EUyWJ^~IH8GY`Ak4JPA$#rl>_mcixP#Opp_a!l?$ z?Y)Nw?z#88Flf+AHVa(V`1l0G9~I!^v%zJ7-G;D8DA7HtB*ChKE-22#Z1He$m@%#O zOqt=};;|*>jNa zc7l%NrcshMHfj_n=B=QV(lqYuTR<93Marb{e9zr9Dv}P6M)P3DxOSdU{Rkv>HL+of zJ-^t86k8For4@@2v0xL7+V}9^bcX-BJNyUzp`LmcpbK>#&uahx002ovPDHLkV1f(? Bg)aaA diff --git a/src/main/resources/music/flyout/drawable-mdpi/yt_outline_youtube_logo_icon_black_24.png b/src/main/resources/music/flyout/drawable-mdpi/yt_outline_youtube_logo_icon_black_24.png deleted file mode 100644 index e4b1253496fc530b8939d5e0ffd9f14bbcf5b1ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i`JOJ0Ar_~T6C@5E=t~qkT-Wy7 z;YZ^`d!auJV%7&X2&`ao{aM^*!&c5_%*M(VCej?ysFda~(`Eseif*ywCXQW-+$*^F z_>67{T}j{$VP)r+ObJw(EHT5-z< MUHx3vIVCg!0HmQt9{>OV diff --git a/src/main/resources/music/flyout/drawable-xhdpi/yt_outline_youtube_logo_icon_black_24.png b/src/main/resources/music/flyout/drawable-xhdpi/yt_outline_youtube_logo_icon_black_24.png deleted file mode 100644 index fd2d9b86e14f6786b4dd5aecb54ac9b3d0b85990..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHM)P) zuWLe46vsa>bVEZCthXScV^@bMWjphKN} zc=8f~k?6Z8pmZ#Kkqu&nhf9|>4JwpzaB#>P-r2pSOoaw*y100(5F3hz1p>s73b zP(^qqJw+5k!rpi!9Z8^on40t);e><<@yY|&Cj}hD+@zO?%n1P@UbyEfR3L*`n)Dil zmf&MMc;+s|GmTiA^cInbC?LcWw?{k^i0v;3STB+FOSb+@t$#G@t-^Y`{M(^IsclV%Q9=!Y_h{HM*~hc1K^hY zr(4bdIN@l(E<0>ev&J%ACK!5;=&{cwd0;Ntr^h22ZHhi=i9Sw;qr*rsNK zRhC#}j?RFJ(keOw=2&EjRW_*E=73`^$X%Q_aZ*K}5U!}1q2i%bF+?J>)JwL-wwf<6+$0!83WY+UP$(1%g+ifFC`{%?mMHse&AJzjTBtt#M-;J)Ilpsty~|+HqY8*+a%8%YzwnOMJ>I>FSl zR2ev9RTE}vj;TkfGH}GIa`rubD^&)z>_^5;rWRtB`q2~v1y;3brtUB`AG4I#d%in2 zkY`mpX6m8++g8Vb7svSG)IiuX56#qLrcNg^5EL78W?(vcFh-m+bv&_w7d+82<+Bq5 zMwu+g0!_+=U2E6!-b$m)>ppP@%*nhNp92y8pui#^X zJt^x6PPi@A?bv`9SNMewv9fkYTVqCq%jnJ~81Ui}GcmGuMm@@iXQpPFWFT1Gerqsm zhFd=W2L{ByLgG8I_+eE1hfMrbLi}V-{B&CUf=2w3Qv9M`{I-htjV`l00000NkvXXu0mjfPxe%(