From a7107a54e89b1a9a84b18171450620794c92e74c Mon Sep 17 00:00:00 2001 From: inotia00 Date: Mon, 8 May 2023 05:01:46 +0900 Subject: [PATCH] feat(youtube): use better patch descriptions --- .../patch/HideEndScreenOverlayPatch.kt | 2 +- .../fingerprints/HideSnackbarFingerprint.kt | 12 ---- .../snackbar/patch/HideSnackbarPatch.kt | 59 ------------------- .../patch/TabletMiniPlayerPatch.kt | 2 +- .../patch/HideEndscreenCardsPatch.kt | 2 +- .../settings/resource/patch/SettingsPatch.kt | 2 - .../youtube/settings/host/values/strings.xml | 58 +++++++++--------- .../youtube/settings/values-v21/strings.xml | 11 ++-- .../youtube/settings/xml/revanced_prefs.xml | 32 +++++----- 9 files changed, 53 insertions(+), 127 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt index 3b6094172..28ee2a814 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt @@ -86,7 +86,7 @@ class HideEndScreenOverlayPatch : BytecodePatch() { SettingsPatch.addPreference( arrayOf( "PREFERENCE: FULLSCREEN_SETTINGS", - "SETTINGS: HIDE_ENDSCREEN_OVERLAY" + "SETTINGS: HIDE_END_SCREEN_OVERLAY" ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt deleted file mode 100644 index 37c9ab33d..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt +++ /dev/null @@ -1,12 +0,0 @@ -package app.revanced.patches.youtube.layout.general.snackbar.fingerprints - -import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import org.jf.dexlib2.AccessFlags - -object HideSnackbarFingerprint : MethodFingerprint( - returnType = "V", - access = AccessFlags.PUBLIC or AccessFlags.FINAL, - parameters = listOf("L", "L"), - customFingerprint = { it.definingClass == "Lcom/google/android/apps/youtube/app/common/ui/bottomui/BottomUiContainer;" } -) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt deleted file mode 100644 index 241bc50b0..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt +++ /dev/null @@ -1,59 +0,0 @@ -package app.revanced.patches.youtube.layout.general.snackbar.patch - -import app.revanced.extensions.toErrorResult -import app.revanced.patcher.annotation.Description -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version -import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.addInstructions -import app.revanced.patcher.extensions.instruction -import app.revanced.patcher.patch.BytecodePatch -import app.revanced.patcher.patch.PatchResult -import app.revanced.patcher.patch.PatchResultSuccess -import app.revanced.patcher.patch.annotations.DependsOn -import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.shared.annotation.YouTubeCompatibility -import app.revanced.patches.youtube.layout.general.snackbar.fingerprints.HideSnackbarFingerprint -import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch -import app.revanced.util.integrations.Constants.GENERAL - -@Patch -@Name("hide-snackbar") -@Description("Hides the snackbar action popup.") -@DependsOn([SettingsPatch::class]) -@YouTubeCompatibility -@Version("0.0.1") -class HideSnackbarPatch : BytecodePatch( - listOf( - HideSnackbarFingerprint - ) -) { - override fun execute(context: BytecodeContext): PatchResult { - - HideSnackbarFingerprint.result?.mutableMethod?.let { - it.addInstructions( - 0, """ - invoke-static {}, $GENERAL->hideSnackbar()Z - move-result v0 - if-eqz v0, :default - return-void - """, listOf(ExternalLabel("default", it.instruction(0))) - ) - } ?: return HideSnackbarFingerprint.toErrorResult() - - /* - * Add settings - */ - SettingsPatch.addPreference( - arrayOf( - "PREFERENCE: GENERAL_SETTINGS", - "SETTINGS: HIDE_SNACKBAR" - ) - ) - - SettingsPatch.updatePatchStatus("hide-snackbar") - - return PatchResultSuccess() - } -} diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt index 1d36f67cc..92052e17e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt @@ -72,7 +72,7 @@ class TabletMiniPlayerPatch : BytecodePatch( SettingsPatch.addPreference( arrayOf( "PREFERENCE: GENERAL_SETTINGS", - "SETTINGS: ENABLE_TABLET_MINIPLAYER" + "SETTINGS: ENABLE_TABLET_MINI_PLAYER" ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt index 9c01a8ba1..81e6ce220 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt @@ -61,7 +61,7 @@ class HideEndscreenCardsPatch : BytecodePatch( SettingsPatch.addPreference( arrayOf( "PREFERENCE: PLAYER_SETTINGS", - "SETTINGS: HIDE_ENDSCREEN_CARDS" + "SETTINGS: HIDE_END_SCREEN_CARDS" ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt index 5c2580f1c..4bc258d06 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt @@ -9,7 +9,6 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.shared.annotation.YouTubeCompatibility -import app.revanced.patches.shared.patch.options.PatchOptions import app.revanced.patches.shared.patch.settings.AbstractSettingsResourcePatch import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch @@ -32,7 +31,6 @@ import java.nio.file.Paths @DependsOn( [ IntegrationsPatch::class, - PatchOptions::class, SharedResourceIdPatch::class, SettingsBytecodePatch::class ] diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml index 852bc16ec..667ae979d 100644 --- a/src/main/resources/youtube/settings/host/values/strings.xml +++ b/src/main/resources/youtube/settings/host/values/strings.xml @@ -5,24 +5,24 @@ MicroG does not run in the background Enable cloud messaging settings to receive notifications Open MicroG - Buttoned ads are shown - Buttoned ads are hidden - Hide buttoned ad - Filter components by their name separated by a comma - Custom filter - General ads are shown - General ads are hidden - Hide general ads - Paid promotion label is shown - Paid promotion label is hidden - Hide paid promotion - Self sponsored cards are shown - Self sponsored cards are hidden - Hide self sponsored cards - User filter is disabled - User filter is enabled - Enable user filter Ads + Buttoned ads are shown + Buttoned ads are hidden + Hide buttoned ad + Filter components by their name separated by a comma + Custom filter + General ads are shown + General ads are hidden + Hide general ads + Paid promotion label is shown + Paid promotion label is hidden + Hide paid promotion + Self sponsored cards are shown + Self sponsored cards are hidden + Hide self sponsored cards + User filter is disabled + User filter is enabled + Enable user filter Import ReVanced settings from file or export ReVanced settings to file Bottom player Button container @@ -139,9 +139,9 @@ Known issues Enable volume gesture Tricks the dpi to use some tablet layouts Enable tablet layout - Tablet mini player is disabled - Tablet mini player is enabled - Enable tablet mini player + Tablet mini player is disabled + Tablet mini player is enabled + Enable tablet mini player Tablet navigation bar is disabled Tablet navigation bar is enabled Enable tablet navigation bar @@ -277,12 +277,12 @@ Please do not report any issues you encounter while using this feature."Emoji picker is shown Emoji picker is hidden Hide emoji picker - End screen cards are shown - End screen cards are hidden - Hide end screen cards - End screen overlay are shown - End screen overlay are hidden - Hide end screen overlay + End screen cards are shown + End screen cards are hidden + Hide end screen cards + End screen overlay are shown + End screen overlay are hidden + Hide end screen overlay Film strip overlay are shown Film strip overlay are hidden Hide film strip overlay @@ -420,9 +420,9 @@ Please do not report any issues you encounter while using this feature."Shorts shelves are shown Shorts shelves are hidden Hide shorts shelf - Snackbar is shown - Snackbar is hidden - Hide snackbar + Snack bar is shown + Snack bar is hidden + Hide snack bar Stories shelves are shown Stories shelves are hidden Hide stories shelf diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml index 8058f2b6e..d0ff3aad0 100644 --- a/src/main/resources/youtube/settings/values-v21/strings.xml +++ b/src/main/resources/youtube/settings/values-v21/strings.xml @@ -3,8 +3,8 @@ @string/pref_about_category - @string/revanced_adremover_custom_filter_summary - @string/revanced_adremover_custom_filter_title + @string/revanced_ad_remover_custom_filter_summary + @string/revanced_ad_remover_custom_filter_title @string/settings_ie ReVanced Extended @@ -37,9 +37,9 @@ @string/revanced_hide_info_panel_summary_off @string/revanced_hide_info_panel_summary_on @string/revanced_hide_info_panel_title - @string/revanced_adremover_paid_content_summary_off - @string/revanced_adremover_paid_content_summary_on - @string/revanced_adremover_paid_content_title + @string/revanced_ad_remover_paid_content_summary_off + @string/revanced_ad_remover_paid_content_summary_on + @string/revanced_ad_remover_paid_content_title @string/revanced_hide_button_remix_summary_off @string/revanced_hide_button_remix_summary_on @string/revanced_hide_button_remix_title @@ -54,7 +54,6 @@ afn / blue afn / red stock - custom mmt revancify / blue revancify / red diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 96e00e432..cda265b31 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -10,13 +10,13 @@ SETTINGS: HIDE_VIDEO_ADS --> + + + + + + + SETTINGS: HIDE_GENERAL_ADS --> @@ -80,8 +80,8 @@ - + @@ -101,8 +101,8 @@ - + @@ -183,8 +183,8 @@ - + @@ -219,8 +219,8 @@ - + @@ -477,7 +477,7 @@ - +