From 684939314be3d0d43482f229b2adb033e7aa492a Mon Sep 17 00:00:00 2001 From: MarcaD <152095496+MarcaDian@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:01:47 +0300 Subject: [PATCH] feat(YouTube): Match overlay icons style to YouTube (#3023) --- .../sponsorblock/SponsorBlockResourcePatch.kt | 2 + .../drawable/revanced_yt_copy.xml | 36 ++++++++++++++---- .../drawable/revanced_yt_copy_timestamp.xml | 38 ++++++++++++++----- .../drawable/revanced_yt_download_button.xml | 32 ++++++++++++++-- .../drawable/revanced_sb_adjust.xml | 34 +++++++++++++---- .../drawable/revanced_sb_backward.xml | 30 +++++++++++++++ .../drawable/revanced_sb_compare.xml | 34 +++++++++++++---- .../drawable/revanced_sb_edit.xml | 34 +++++++++++++---- .../drawable/revanced_sb_forward.xml | 30 +++++++++++++++ .../drawable/revanced_sb_logo.xml | 32 ++++++++-------- .../drawable/revanced_sb_publish.xml | 34 +++++++++++++---- .../drawable/revanced_sb_voting.xml | 34 +++++++++++++---- .../layout/revanced_sb_new_segment.xml | 4 +- .../revanced_ic_sc_brightness_auto.xml | 33 ++++++++++++++-- .../revanced_ic_sc_brightness_manual.xml | 33 ++++++++++++++-- .../drawable/revanced_ic_sc_volume_mute.xml | 33 ++++++++++++++-- .../drawable/revanced_ic_sc_volume_normal.xml | 33 ++++++++++++++-- 17 files changed, 417 insertions(+), 89 deletions(-) create mode 100644 src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml create mode 100644 src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt index 6484216c..459e7d9d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt @@ -43,8 +43,10 @@ internal object SponsorBlockResourcePatch : ResourcePatch() { // required resource for back button, because when the base APK is used, this resource will not exist "drawable", "revanced_sb_adjust.xml", + "revanced_sb_backward.xml", "revanced_sb_compare.xml", "revanced_sb_edit.xml", + "revanced_sb_forward.xml", "revanced_sb_logo.xml", "revanced_sb_publish.xml", "revanced_sb_voting.xml", diff --git a/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml b/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml index e97458c2..008393c3 100644 --- a/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml +++ b/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml @@ -1,10 +1,30 @@ - + + + + android:fillColor="@android:color/white" + android:pathData="m 9.7348145,16.94238 q -0.5966913,0 -1.0062178,-0.39988 Q 8.319101,16.14259 8.319101,15.5599 V 5.88248 q 0,-0.58269 0.4094957,-0.9826 Q 9.1381232,4.5 9.7348145,4.5 h 7.1494615 q 0.596701,0 1.006218,0.39988 Q 18.3,5.29979 18.3,5.88248 v 9.67742 q 0,0.58269 -0.409506,0.9826 -0.409517,0.39988 -1.006218,0.39988 z m 0,-0.82949 h 7.1494615 q 0.212367,0 0.389322,-0.1728 0.176965,-0.17283 0.176965,-0.38019 V 5.88248 q 0,-0.20738 -0.176965,-0.38019 -0.176955,-0.1728 -0.389322,-0.1728 H 9.7348145 q -0.212336,0 -0.389322,0.1728 Q 9.1685373,5.6751 9.1685373,5.88248 v 9.67742 q 0,0.20736 0.1769552,0.38019 0.176986,0.1728 0.389322,0.1728 z M 7.1157237,19.5 Q 6.519022,19.5 6.1094957,19.10009 5.7,18.70021 5.7,18.1175 V 7.61058 H 6.5494363 V 18.1175 q 0,0.20738 0.1769552,0.38018 0.1769655,0.17281 0.3893322,0.17281 H 15.114611 V 19.5 Z M 9.1685373,16.11289 V 5.32949 Z"/> diff --git a/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml b/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml index f1c2e819..841038b3 100644 --- a/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml +++ b/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml @@ -1,11 +1,31 @@ - + + + + android:fillColor="@android:color/white" + android:pathData="M 9.734375 4.5 C 9.3365813 4.5 9.0015328 4.6338045 8.7285156 4.9003906 C 8.4555191 5.1669968 8.3183594 5.4943533 8.3183594 5.8828125 L 8.3183594 15.560547 C 8.3183594 15.949005 8.4555191 16.276362 8.7285156 16.542969 C 9.0015328 16.809554 9.3365813 16.941406 9.734375 16.941406 L 11.259766 16.941406 C 11.220306 16.699026 11.199219 16.450296 11.199219 16.195312 C 11.199219 16.167903 11.200672 16.140551 11.201172 16.113281 L 9.734375 16.113281 C 9.5928176 16.113281 9.4636936 16.054651 9.3457031 15.939453 C 9.2277332 15.824233 9.1679687 15.698787 9.1679688 15.560547 L 9.1679688 5.8828125 C 9.1679688 5.7445594 9.2277329 5.6171596 9.3457031 5.5019531 C 9.4636936 5.3867533 9.5928176 5.3300781 9.734375 5.3300781 L 16.884766 5.3300781 C 17.026342 5.3300781 17.155468 5.3867532 17.273438 5.5019531 C 17.391413 5.6171596 17.451172 5.7445594 17.451172 5.8828125 L 17.451172 12.052734 C 17.453072 12.053553 17.455131 12.053788 17.457031 12.054688 C 17.760014 12.185563 18.041487 12.342729 18.300781 12.525391 L 18.300781 5.8828125 C 18.300781 5.4943533 18.163629 5.1669968 17.890625 4.9003906 C 17.617573 4.6338045 17.282565 4.5 16.884766 4.5 L 9.734375 4.5 z M 5.6992188 7.6113281 L 5.6992188 18.117188 C 5.6992188 18.505659 5.8363784 18.833024 6.109375 19.099609 C 6.382392 19.366216 6.717434 19.5 7.1152344 19.5 L 12.642578 19.5 C 12.600698 19.46116 12.558138 19.42142 12.517578 19.380859 C 12.299781 19.163062 12.107686 18.926178 11.939453 18.669922 L 7.1152344 18.669922 C 6.9736568 18.669922 6.8445393 18.613252 6.7265625 18.498047 C 6.6085926 18.382847 6.5488281 18.25544 6.5488281 18.117188 L 6.5488281 7.6113281 L 5.6992188 7.6113281 z M 15.75 12.5 C 15.231251 12.5 14.743359 12.598047 14.287109 12.794922 C 13.83086 12.991797 13.435156 13.260157 13.097656 13.597656 C 12.760157 13.935156 12.491797 14.33086 12.294922 14.787109 C 12.098047 15.243359 12 15.731251 12 16.25 C 12 16.768749 12.098047 17.256641 12.294922 17.712891 C 12.491797 18.16914 12.760157 18.564844 13.097656 18.902344 C 13.435156 19.239843 13.83086 19.508203 14.287109 19.705078 C 14.743359 19.901953 15.231251 20 15.75 20 C 16.268749 20 16.756641 19.901953 17.212891 19.705078 C 17.66914 19.508203 18.064844 19.239843 18.402344 18.902344 C 18.739843 18.564844 19.008203 18.16914 19.205078 17.712891 C 19.401953 17.256641 19.5 16.768749 19.5 16.25 C 19.5 15.731251 19.401953 15.243359 19.205078 14.787109 C 19.008203 14.33086 18.739843 13.935156 18.402344 13.597656 C 18.064844 13.260157 17.66914 12.991797 17.212891 12.794922 C 16.756641 12.598047 16.268749 12.5 15.75 12.5 z M 15.75 13.25 C 16.581249 13.25 17.288672 13.542578 17.873047 14.126953 C 18.457421 14.711327 18.75 15.418751 18.75 16.25 C 18.75 17.081249 18.457421 17.788672 17.873047 18.373047 C 17.288672 18.957421 16.581249 19.25 15.75 19.25 C 14.918751 19.25 14.211327 18.957421 13.626953 18.373047 C 13.042578 17.788672 12.75 17.081249 12.75 16.25 C 12.75 15.418751 13.042578 14.711327 13.626953 14.126953 C 14.211327 13.542578 14.918751 13.25 15.75 13.25 z M 15.375 14.375 L 15.375 16.400391 L 16.988281 18.011719 L 17.511719 17.488281 L 16.125 16.099609 L 16.125 14.375 L 15.375 14.375 z"/> diff --git a/src/main/resources/downloads/drawable/revanced_yt_download_button.xml b/src/main/resources/downloads/drawable/revanced_yt_download_button.xml index 69ab6992..9e988c5e 100644 --- a/src/main/resources/downloads/drawable/revanced_yt_download_button.xml +++ b/src/main/resources/downloads/drawable/revanced_yt_download_button.xml @@ -1,4 +1,30 @@ - - - + + + + diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml index 76a4b8bc..c609ab8c 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml @@ -1,10 +1,30 @@ + + + android:tint="#FFFFFF" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="m 12,14.156532 q 0.913052,0 1.534792,-0.62174 0.62174,-0.62174 0.62174,-1.534792 0,-0.913052 -0.62174,-1.534792 Q 12.913052,9.843468 12,9.843468 q -0.913052,0 -1.534792,0.62174 -0.62174,0.62174 -0.62174,1.534792 0,0.913052 0.62174,1.534792 0.62174,0.62174 1.534792,0.62174 z M 12.0052,22 Q 9.930936,22 8.1033049,21.211917 6.2756454,20.423835 4.9237012,19.072851 3.5717572,17.721839 2.7858786,15.899494 2,14.077147 2,12.005172 2,9.930908 2.788083,8.1032766 3.576166,6.2756454 4.9271491,4.9237012 6.2781605,3.5717572 8.100507,2.7858786 9.922853,2 11.994828,2 q 2.074264,0 3.901896,0.788083 1.827631,0.788083 3.179575,2.1390661 1.351944,1.3510114 2.137823,3.1733579 Q 22,9.922853 22,11.994828 q 0,2.074264 -0.788083,3.901896 -0.788082,1.827631 -2.139066,3.179575 -1.351012,1.351944 -3.173357,2.137823 Q 14.077147,22 12.005172,22 Z m -0.0059,-1.043476 q 3.738745,0 6.347988,-2.608508 2.609242,-2.608536 2.609242,-6.347309 0,-3.7387455 -2.608508,-6.347988 -2.608536,-2.6092425 -6.347309,-2.6092425 -3.7387453,0 -6.3479878,2.6085077 -2.6092425,2.6085359 -2.6092425,6.3473088 0,3.738746 2.6085077,6.347988 2.608536,2.609243 6.3473096,2.609243 z M 12,12 Z"/> diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml new file mode 100644 index 00000000..be1aff2d --- /dev/null +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml @@ -0,0 +1,30 @@ + + + + + diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml index 04cc65e4..8e792377 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml @@ -1,10 +1,30 @@ + + + android:tint="#FFFFFF" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M 10.825834,24 V 21.361845 H 3.9569613 q -0.8248376,0 -1.3908832,-0.529956 Q 2,20.301968 2,19.535186 V 4.4648145 Q 2,3.6980325 2.5660781,3.1681093 3.1321238,2.6381557 3.9569613,2.6381557 H 10.825834 V 0 H 12 V 24 Z M 3.1741963,19.071741 h 7.6516377 v -8.583184 z m 11.2719827,2.290104 v -9.43514 l 6.379624,7.145036 V 4.4702328 q 0,-0.2748156 -0.244607,-0.503814 Q 20.336588,3.7374204 20.043037,3.7374204 H 14.446179 V 2.6381568 h 5.596858 q 0.824836,0 1.390889,0.5299536 Q 22,3.6980329 22,4.4648145 V 19.535186 q 0,0.766776 -0.566074,1.296706 -0.566053,0.529956 -1.390889,0.529956 z"/> diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml index e93574bd..12a05f83 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml @@ -1,10 +1,30 @@ + + + android:tint="#FFFFFF" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="m 3.1764691,20.823532 h 1.321094 L 18.151971,7.1727918 16.827212,5.8480338 3.1764691,19.506133 Z M 2,22 V 19.004901 L 18.642147,2.3296522 Q 18.818253,2.1719951 19.031033,2.0859976 19.243843,2 19.48495,2 q 0.236708,0 0.4586,0.07902 0.221893,0.079052 0.425336,0.2579928 l 1.301467,1.3051305 q 0.17894,0.1875125 0.254297,0.4089585 0.07534,0.2214462 0.07534,0.4471302 0,0.2407231 -0.08201,0.4619463 -0.08201,0.2212231 -0.249803,0.3912747 L 4.9951003,22 Z M 20.848038,4.4938664 19.506138,3.1519662 Z m -3.368881,2.0269814 -0.651945,-0.672814 1.324759,1.324758 z"/> diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml new file mode 100644 index 00000000..1ac21ea7 --- /dev/null +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml @@ -0,0 +1,30 @@ + + + + + diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml index c39b9e0b..709b1cdb 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml @@ -1,19 +1,19 @@ - - - - + + + + android:fillColor="@android:color/white" + android:pathData="M 12.000145,2.0000008 C 8.8230689,1.9990926 5.6959192,2.7864027 2.9017488,4.2906678 2.3373945,4.5948398 1.9899198,5.1860103 2.000223,5.8244635 2.0930396,12.358829 5.4926743,18.31271 11.094442,21.749998 c 0.557183,0.333336 1.253849,0.333336 1.811031,0 5.601767,-3.438045 9.001096,-9.391169 9.094295,-15.9255345 0.01052,-0.6386247 -0.337035,-1.2300179 -0.9016,-1.5341683 -2.794107,-1.5040456 -5.92111,-2.2912233 -9.098023,-2.2902944 z m 0.08082,0.8705548 c 3.003625,0.013255 5.957553,0.7636027 8.599879,2.1845129 0.277414,0.151228 0.448533,0.4421907 0.44513,0.7568723 C 21.034684,12.23921 17.58825,17.8544 12.446767,21.009378 c -0.274165,0.167124 -0.619386,0.167124 -0.893551,0 C 6.4117365,17.854399 2.9652339,12.239209 2.8739372,5.8119397 2.8705209,5.4972741 3.0416092,5.2063196 3.3189962,5.0550685 6.0095892,3.608201 9.0224769,2.8570356 12.080969,2.8705556 Z M 9.6351953,6.7701615 v 8.3406435 l 7.2606727,-4.170358 z"/> diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml index de4e58d3..47ad9f2b 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml @@ -1,10 +1,30 @@ + + + android:tint="#FFFFFF" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M 11.332873,22 V 9.436807 L 7.973321,12.79636 7.0294692,11.858168 12,6.8876376 16.984553,11.858168 16.040737,12.79636 12.681187,9.436807 V 22 Z M 2,7.723326 V 4.2422092 Q 2,3.3000372 2.6500003,2.6500003 3.3000372,2 4.2433411,2 H 19.756696 Q 20.699964,2 21.35,2.6500003 22,3.3000372 22,4.2422092 V 7.723326 H 20.651687 V 4.2471755 q 0,-0.3370874 -0.280888,-0.6179751 Q 20.089912,3.3483125 19.752825,3.3483125 H 4.2471755 q -0.3370874,0 -0.6179751,0.2808879 Q 3.3483125,3.9100881 3.3483125,4.2471755 V 7.723326 Z"/> diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml index 30224f14..45101e5a 100644 --- a/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml +++ b/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml @@ -1,10 +1,30 @@ + + + android:tint="#FFFFFF" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="m 3.3559223,13.077965 q -0.5714933,0 -0.9637189,-0.387709 Q 2,12.302548 2,11.722042 V 6.5635083 Q 2,6.4155507 2.0610119,6.272176 2.1220462,6.1288014 2.2453475,6.0054996 L 6.2508464,2 6.5932091,2.3423629 q 0.080402,0.082054 0.1368085,0.1887203 0.056429,0.1066661 0.056429,0.1943391 V 2.8542325 L 6.0203498,6.1627116 h 4.3059752 q 0.523856,0 0.87164,0.3508458 0.347805,0.3508459 0.347805,0.86948 v 0.2717442 q 0,0.1367424 -0.02204,0.2380763 -0.02203,0.1013119 -0.0661,0.2088374 L 9.5355944,12.549151 q -0.1142458,0.252068 -0.323656,0.390441 -0.2093882,0.138373 -0.4774967,0.138373 z M 8.7694977,12.264407 10.73219,7.6779612 V 7.5186341 q 0,-0.2288001 -0.152541,-0.3855933 -0.15254,-0.1567713 -0.389824,-0.1567713 H 5.0406784 L 5.7593141,3.6517056 2.8135578,6.6008558 v 5.1211862 q 0,0.237284 0.1525407,0.389824 0.1525406,0.152541 0.3898238,0.152541 z M 17.74915,22 17.403703,21.656866 q -0.07423,-0.07545 -0.132182,-0.182155 -0.05797,-0.10671 -0.05797,-0.20064 v -0.128303 l 0.766093,-3.30848 h -4.305975 q -0.523857,0 -0.87164,-0.346615 -0.347805,-0.346593 -0.347805,-0.87371 v -0.264187 q 0,-0.135817 0.02204,-0.235829 0.02204,-0.09999 0.06611,-0.218642 l 1.92204,-4.447456 q 0.111865,-0.242373 0.319491,-0.385594 0.207626,-0.14322 0.480515,-0.14322 h 5.379665 q 0.571494,0 0.963719,0.392203 Q 22,11.706464 22,12.277958 v 5.159327 q 0,0.159371 -0.06399,0.303054 -0.06396,0.143684 -0.183477,0.256276 z m -2.518651,-10.264407 -1.962692,4.586446 v 0.159327 q 0,0.237283 0.152541,0.389824 0.15254,0.15254 0.389823,0.15254 h 5.149147 l -0.718636,3.333048 2.945756,-2.94915 v -5.12967 q 0,-0.228801 -0.152541,-0.385593 -0.15254,-0.156772 -0.389824,-0.156772 z M 2.8135578,11.722042 V 6.6008558 12.264407 Z m 18.3728802,0.555916 v 5.12967 -5.672035 z"/> diff --git a/src/main/resources/sponsorblock/layout/revanced_sb_new_segment.xml b/src/main/resources/sponsorblock/layout/revanced_sb_new_segment.xml index 30204a39..05b4dd89 100644 --- a/src/main/resources/sponsorblock/layout/revanced_sb_new_segment.xml +++ b/src/main/resources/sponsorblock/layout/revanced_sb_new_segment.xml @@ -26,7 +26,7 @@ android:paddingTop="3.0dip" android:paddingEnd="5.0dip" android:paddingBottom="3.0dip" - android:src="@drawable/player_fast_rewind" /> + android:src="@drawable/revanced_sb_backward" /> + android:src="@drawable/revanced_sb_forward" /> - + + + + diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml index 2f6c7072..b80ab209 100644 --- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml +++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml @@ -1,5 +1,30 @@ - - + + + + diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml index 73dc595f..2628b330 100644 --- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml +++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml @@ -1,5 +1,30 @@ - - + + + + diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml index 30dff4be..45a19e95 100644 --- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml +++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml @@ -1,5 +1,30 @@ - - + + + +