From b1a9e044ad7934eded79af0a518b4175c8c1bc83 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:06:16 +0900 Subject: [PATCH] feat(YouTube): revert all changes except minimal-header --- .../visual/VisualPreferencesIconsPatch.kt | 3 +- .../revanced_extended_settings_key_icon.xml | 2057 +--------- .../afn_blue/splash/drawable/avd_anim.xml | 96 + .../afn_blue/splash/values-v31/styles.xml | 7 + .../revanced_extended_settings_key_icon.xml | 2257 +---------- .../afn_red/splash/drawable/avd_anim.xml | 96 + .../afn_red/splash/values-v31/styles.xml | 7 + .../revanced_extended_settings_key_icon.xml | 3311 +---------------- .../revanced_extended_settings_key_icon.xml | 1063 +----- .../revanced_extended_settings_key_icon.xml | 1055 +----- .../revanced_extended_settings_key_icon.xml | 25 + ...mium_early_access_browse_page_key_icon.xml | 15 +- 12 files changed, 378 insertions(+), 9614 deletions(-) create mode 100644 src/main/resources/youtube/branding/afn_blue/splash/drawable/avd_anim.xml create mode 100644 src/main/resources/youtube/branding/afn_blue/splash/values-v31/styles.xml create mode 100644 src/main/resources/youtube/branding/afn_red/splash/drawable/avd_anim.xml create mode 100644 src/main/resources/youtube/branding/afn_red/splash/values-v31/styles.xml create mode 100644 src/main/resources/youtube/visual/icons/yt_alt/drawable/revanced_extended_settings_key_icon.xml diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt index 4df48287f4..9f9277f4d6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt @@ -32,6 +32,7 @@ object VisualPreferencesIconsPatch : BaseResourcePatch( "Custom branding icon" to "custom_branding_icon", "Extension" to DEFAULT_ICON, "Gear" to "gear", + "YT alt" to "yt_alt", "ReVanced" to "revanced", "ReVanced Colored" to "revanced_colored", ), @@ -116,7 +117,7 @@ object VisualPreferencesIconsPatch : BaseResourcePatch( // endregion. - SettingsPatch.updatePatchStatus(this) + SettingsPatch.updatePatchStatus("Visual preferences icons") } override fun close() { diff --git a/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml index ede82d9f1f..c420684c34 100644 --- a/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml +++ b/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml @@ -1,2032 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:height="48dp" + android:viewportWidth="740" + android:viewportHeight="740"> + + + + diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/afn_blue/splash/drawable/avd_anim.xml new file mode 100644 index 0000000000..9512159953 --- /dev/null +++ b/src/main/resources/youtube/branding/afn_blue/splash/drawable/avd_anim.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/youtube/branding/afn_blue/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/afn_blue/splash/values-v31/styles.xml new file mode 100644 index 0000000000..c7462f74ae --- /dev/null +++ b/src/main/resources/youtube/branding/afn_blue/splash/values-v31/styles.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml index bc9942311e..97c066bd83 100644 --- a/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml +++ b/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml @@ -1,2232 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:height="48dp" + android:viewportWidth="740" + android:viewportHeight="740"> + + + + diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/afn_red/splash/drawable/avd_anim.xml new file mode 100644 index 0000000000..877e9452b6 --- /dev/null +++ b/src/main/resources/youtube/branding/afn_red/splash/drawable/avd_anim.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/youtube/branding/afn_red/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/afn_red/splash/values-v31/styles.xml new file mode 100644 index 0000000000..c7462f74ae --- /dev/null +++ b/src/main/resources/youtube/branding/afn_red/splash/values-v31/styles.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml index 085d98c173..13a1298ec5 100644 --- a/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml +++ b/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml @@ -1,3288 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:height="48dp" + android:viewportWidth="326" + android:viewportHeight="326"> + + + + diff --git a/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml index c088bcfcc8..5f052277f4 100644 --- a/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml +++ b/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml @@ -1,1034 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android" + android:name="vector" + android:width="48dp" + android:height="48dp" + android:viewportWidth="384" + android:viewportHeight="384"> + + + + + diff --git a/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml index 98cfb9cccc..668ea4cc6f 100644 --- a/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml +++ b/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml @@ -1,1026 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android" + android:name="vector" + android:width="48dp" + android:height="48dp" + android:viewportWidth="384" + android:viewportHeight="384"> + + + + + diff --git a/src/main/resources/youtube/visual/icons/yt_alt/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/visual/icons/yt_alt/drawable/revanced_extended_settings_key_icon.xml new file mode 100644 index 0000000000..d135324c6b --- /dev/null +++ b/src/main/resources/youtube/visual/icons/yt_alt/drawable/revanced_extended_settings_key_icon.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml index b7a18cb13f..3a2e75e3f9 100644 --- a/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml +++ b/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml @@ -5,14 +5,9 @@ android:height="48dp" android:viewportWidth="960" android:viewportHeight="960"> - - - +