diff --git a/api/revanced-patches.api b/api/revanced-patches.api index 9ec4e8b479..cc6b4bdafb 100644 --- a/api/revanced-patches.api +++ b/api/revanced-patches.api @@ -317,8 +317,8 @@ public final class app/revanced/patches/music/misc/gms/GmsCoreSupportPatch : app public static final field INSTANCE Lapp/revanced/patches/music/misc/gms/GmsCoreSupportPatch; } -public final class app/revanced/patches/music/misc/gms/YTMusicGmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch { - public static final field INSTANCE Lapp/revanced/patches/music/misc/gms/YTMusicGmsCoreSupportResourcePatch; +public final class app/revanced/patches/music/misc/gms/GmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch { + public static final field INSTANCE Lapp/revanced/patches/music/misc/gms/GmsCoreSupportResourcePatch; public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V } @@ -659,8 +659,8 @@ public final class app/revanced/patches/shared/settings/preference/impl/InputTyp } public final class app/revanced/patches/shared/settings/preference/impl/ListPreference : app/revanced/patches/shared/settings/preference/DefaultBasePreference { - public fun (Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Ljava/lang/String;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Ljava/lang/String;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getEntries ()Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource; public final fun getEntryValues ()Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource; public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; @@ -693,8 +693,9 @@ public class app/revanced/patches/shared/settings/preference/impl/PreferenceCate } public class app/revanced/patches/shared/settings/preference/impl/PreferenceScreen : app/revanced/patches/shared/settings/preference/BasePreference { - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Ljava/util/List;)V public final fun getPreferences ()Ljava/util/List; public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; public final fun setPreferences (Ljava/util/List;)V @@ -703,12 +704,14 @@ public class app/revanced/patches/shared/settings/preference/impl/PreferenceScre public final class app/revanced/patches/shared/settings/preference/impl/SwitchPreference : app/revanced/patches/shared/settings/preference/DefaultBasePreference { public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getSummaryOffKey ()Ljava/lang/String; - public final fun getSummaryOnKey ()Ljava/lang/String; + public fun (Ljava/lang/String;Z)V + public synthetic fun (Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; } public final class app/revanced/patches/shared/settings/preference/impl/TextPreference : app/revanced/patches/shared/settings/preference/DefaultBasePreference { + public fun (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;Ljava/lang/String;)V + public synthetic fun (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;Ljava/lang/String;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getInputType ()Lapp/revanced/patches/shared/settings/preference/impl/InputType; @@ -735,9 +738,10 @@ public abstract class app/revanced/patches/shared/settings/util/AbstractPreferen public class app/revanced/patches/shared/settings/util/AbstractPreferenceScreen$Screen : app/revanced/patches/shared/settings/util/AbstractPreferenceScreen$BasePreferenceCollection { public fun (Lapp/revanced/patches/shared/settings/util/AbstractPreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V public synthetic fun (Lapp/revanced/patches/shared/settings/util/AbstractPreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lapp/revanced/patches/shared/settings/util/AbstractPreferenceScreen;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V + public synthetic fun (Lapp/revanced/patches/shared/settings/util/AbstractPreferenceScreen;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun addPreferences ([Lapp/revanced/patches/shared/settings/preference/BasePreference;)V public final fun getCategories ()Ljava/util/List; - public final fun getSummaryKey ()Ljava/lang/String; public synthetic fun transform ()Lapp/revanced/patches/shared/settings/preference/BasePreference; public fun transform ()Lapp/revanced/patches/shared/settings/preference/impl/PreferenceScreen; } @@ -1451,8 +1455,8 @@ public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch : a public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V } -public final class app/revanced/patches/youtube/misc/gms/YouTubeGmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch { - public static final field INSTANCE Lapp/revanced/patches/youtube/misc/gms/YouTubeGmsCoreSupportResourcePatch; +public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch { + public static final field INSTANCE Lapp/revanced/patches/youtube/misc/gms/GmsCoreSupportResourcePatch; public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V } diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt index 298f701774..fa1ad21a8a 100644 --- a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt @@ -7,7 +7,7 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint -@Patch(description = "Removes ads in the comments.",) +@Patch(description = "Removes ads in the comments.") object HideCommentAdsPatch : BytecodePatch( setOf(HideCommentAdsFingerprint) ) { diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch.kt index e075ee69c6..e190e4a4a3 100644 --- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch.kt +++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch.kt @@ -6,7 +6,7 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint -@Patch(description = "Disables detection of modified versions.",) +@Patch(description = "Disables detection of modified versions.") object DisablePiracyDetectionPatch : BytecodePatch(setOf(PiracyDetectionFingerprint)) { override fun execute(context: BytecodeContext) { // Do not throw an error if the fingerprint is not resolved. diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt index 55f56d4b9f..540fb22f4e 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt @@ -17,9 +17,9 @@ import org.w3c.dom.Document class ListPreference( key: String, titleKey: String, + summaryKey: String?, val entries: ArrayResource?, val entryValues: ArrayResource?, - summaryKey: String? = null, default: String? = null, ) : DefaultBasePreference(key, titleKey, summaryKey, "ListPreference", default) { diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt index 502e5ae988..54f123b81d 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt @@ -15,10 +15,17 @@ import org.w3c.dom.Document open class PreferenceScreen( key: String, titleKey: String, - var preferences: List, - summaryKey: String? = null + summaryKey: String? = null, + var preferences: List ) : BasePreference(key, titleKey, summaryKey, "PreferenceScreen") { + /** + * Initialize using title and summary keys with suffix "_title" and "_summary". + */ + constructor( + key: String, preferences: List + ) : this(key, "${key}_title", "${key}_summary", preferences) + override fun serialize(ownerDocument: Document) = super.serialize(ownerDocument).apply { addSummary(summaryKey) diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt index f9d6eee87d..6a2aeb85b4 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt @@ -18,11 +18,17 @@ import org.w3c.dom.Element class SwitchPreference( key: String, titleKey: String, - val summaryOnKey: String, - val summaryOffKey: String, + private val summaryOnKey: String, + private val summaryOffKey: String, default: Boolean = false, ) : DefaultBasePreference( key, titleKey, null, "SwitchPreference", default) { + /** + * Initialize using title and summary keys with the suffix "_title", "_summary_on", "_summary_off" + */ + constructor(key: String, default: Boolean = false) : this(key, "${key}_title", + "${key}_summary_on", "${key}_summary_off", default) + override fun serialize(ownerDocument: Document): Element { return super.serialize(ownerDocument).apply { addSummary(summaryOnKey, SummaryType.ON) diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt index e20f832810..81966cc655 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt @@ -21,6 +21,15 @@ class TextPreference( tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference" ) : DefaultBasePreference(key, titleKey, summaryKey, tag, default) { + /** + * Initialize using title and summary keys with the suffix "_title", "_summary_on", "_summary_off" + */ + constructor( + key: String, inputType: InputType = InputType.TEXT, default: String? = null, + tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference" + ) : this(key, "${key}_title", "${key}_summary", inputType, default, tag) + + override fun serialize(ownerDocument: Document) = super.serialize(ownerDocument).apply { setAttribute("android:inputType", inputType.type) diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt b/src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt index 12accef8a4..ffb35ed1ac 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt @@ -26,18 +26,26 @@ abstract class AbstractPreferenceScreen( open inner class Screen( key: String, titleKey: String, - val summaryKey: String? = null, + private val summaryKey: String? = null, preferences: MutableList = mutableListOf(), val categories: MutableList = mutableListOf() ) : BasePreferenceCollection(key, titleKey, preferences) { + + /** + * Initialize using title and summary keys with suffix "_title" and "_summary". + */ + constructor( + key: String, preferences: MutableList = mutableListOf(), categories: MutableList = mutableListOf() + ) : this(key, key + "_title", key + "_summary", preferences, categories) + override fun transform(): PreferenceScreen { return PreferenceScreen( key, titleKey, + summaryKey, // Screens and preferences are sorted at runtime by integrations code, // so they appear in alphabetical order for the localized language in use. - preferences + categories.map { it.transform() }, - summaryKey + preferences + categories.map { it.transform() } ) } diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt index 7edae32e14..af1a59601c 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt @@ -1,8 +1,6 @@ package app.revanced.patches.tiktok.interaction.speed.fingerprints -import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.MethodFingerprint -import com.android.tools.smali.dexlib2.AccessFlags internal object SpeedControlParentFingerprint : MethodFingerprint( strings = listOf( diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/audio/AudioAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/audio/AudioAdsPatch.kt index 01c9b90797..17e15a3265 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/ad/audio/AudioAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/ad/audio/AudioAdsPatch.kt @@ -42,9 +42,6 @@ object AudioAdsPatch : BytecodePatch( SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences( SwitchPreference( "revanced_block_audio_ads", - "revanced_block_audio_ads", - "revanced_block_audio_ads_on", - "revanced_block_audio_ads_off", default = true, ) ) diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt index 8077bd376a..c09be881eb 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt @@ -41,9 +41,10 @@ object EmbeddedAdsPatch : BytecodePatch( StringsPatch.includePatchStrings("EmbeddedAds") SettingsPatch.PreferenceScreen.ADS.SURESTREAM.addPreferences( ListPreference( - "revanced_block_embedded_ads", - "revanced_block_embedded_ads", - ArrayResource( + key = "revanced_block_embedded_ads", + titleKey = "revanced_block_embedded_ads", + summaryKey = null, + entries = ArrayResource( "revanced_hls_proxies", listOf( "revanced_proxy_disabled", @@ -51,7 +52,7 @@ object EmbeddedAdsPatch : BytecodePatch( "revanced_proxy_purpleadblock", ) ), - ArrayResource( + entryValues = ArrayResource( "revanced_hls_proxies_values", listOf( "disabled", diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/video/VideoAdsPatch.kt index 38d41c5207..b7ccf75331 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/ad/video/VideoAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/ad/video/VideoAdsPatch.kt @@ -133,9 +133,6 @@ object VideoAdsPatch : AbstractAdPatch( SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences( SwitchPreference( "revanced_block_video_ads", - "revanced_block_video_ads", - "revanced_block_video_ads_on", - "revanced_block_video_ads_off", default = true ) ) diff --git a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/ShowDeletedMessagesPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/ShowDeletedMessagesPatch.kt index 91d1993672..4e5006aef7 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/ShowDeletedMessagesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/ShowDeletedMessagesPatch.kt @@ -73,9 +73,10 @@ object ShowDeletedMessagesPatch : BytecodePatch( StringsPatch.includePatchStrings("ShowDeletedMessages") SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences( ListPreference( - "revanced_show_deleted_messages", - "revanced_show_deleted_messages_title", - ArrayResource( + key = "revanced_show_deleted_messages", + titleKey = "revanced_show_deleted_messages_title", + summaryKey = null, + entries = ArrayResource( "revanced_deleted_messages_entries", listOf( "revanced_deleted_messages_entry_hide", @@ -83,7 +84,7 @@ object ShowDeletedMessagesPatch : BytecodePatch( "revanced_deleted_messages_entry_cross_out", ) ), - ArrayResource( + entryValues = ArrayResource( "revanced_deleted_messages_values", listOf( "hide", diff --git a/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/AutoClaimChannelPointsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/AutoClaimChannelPointsPatch.kt index 54e4bed698..f093ca494b 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/AutoClaimChannelPointsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/AutoClaimChannelPointsPatch.kt @@ -28,9 +28,6 @@ object AutoClaimChannelPointPatch : BytecodePatch( SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences( SwitchPreference( "revanced_auto_claim_channel_points", - "revanced_auto_claim_channel_points", - "revanced_auto_claim_channel_points_on", - "revanced_auto_claim_channel_points_off", default = true ) ) diff --git a/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt b/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt index cd6152bdec..20dd269a1b 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt @@ -51,9 +51,6 @@ object DebugModePatch : BytecodePatch( SettingsPatch.PreferenceScreen.MISC.OTHER.addPreferences( SwitchPreference( "revanced_debug_mode", - "revanced_debug_mode_title", - "revanced_debug_mode_on", - "revanced_debug_mode_off", default = false, ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt index 28caf9ba9a..c52569a54f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt @@ -26,60 +26,15 @@ object HideAdsResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideAds") PreferenceScreen.ADS.addPreferences( - SwitchPreference( - "revanced_hide_general_ads", - "revanced_hide_general_ads_title", - "revanced_hide_general_ads_summary_on", - "revanced_hide_general_ads_summary_off" - ), - SwitchPreference( - "revanced_hide_fullscreen_ads", - "revanced_hide_fullscreen_ads_title", - "revanced_hide_fullscreen_ads_summary_on", - "revanced_hide_fullscreen_ads_summary_off" - ), - SwitchPreference( - "revanced_hide_buttoned_ads", - "revanced_hide_buttoned_ads_title", - "revanced_hide_buttoned_ads_summary_on", - "revanced_hide_buttoned_ads_summary_off" - ), - SwitchPreference( - "revanced_hide_paid_content_ads", - "revanced_hide_paid_content_ads_title", - "revanced_hide_paid_content_ads_summary_on", - "revanced_hide_paid_content_ads_summary_off" - ), - SwitchPreference( - "revanced_hide_self_sponsor_ads", - "revanced_hide_self_sponsor_ads_title", - "revanced_hide_self_sponsor_ads_summary_on", - "revanced_hide_self_sponsor_ads_summary_off" - ), - SwitchPreference( - "revanced_hide_products_banner", - "revanced_hide_products_banner_title", - "revanced_hide_products_banner_summary_on", - "revanced_hide_products_banner_summary_off" - ), - SwitchPreference( - "revanced_hide_shopping_links", - "revanced_hide_shopping_links_title", - "revanced_hide_shopping_links_summary_on", - "revanced_hide_shopping_links_summary_off", - ), - SwitchPreference( - "revanced_hide_web_search_results", - "revanced_hide_web_search_results_title", - "revanced_hide_web_search_results_summary_on", - "revanced_hide_web_search_results_summary_off", - ), - SwitchPreference( - "revanced_hide_merchandise_banners", - "revanced_hide_merchandise_banners_title", - "revanced_hide_merchandise_banners_summary_on", - "revanced_hide_merchandise_banners_summary_off", - ) + SwitchPreference("revanced_hide_general_ads"), + SwitchPreference("revanced_hide_fullscreen_ads"), + SwitchPreference("revanced_hide_buttoned_ads"), + SwitchPreference("revanced_hide_paid_content_ads"), + SwitchPreference("revanced_hide_self_sponsor_ads"), + SwitchPreference("revanced_hide_products_banner"), + SwitchPreference("revanced_hide_shopping_links"), + SwitchPreference("revanced_hide_web_search_results"), + SwitchPreference("revanced_hide_merchandise_banners") ) LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR) diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt index ac367778a0..e6b9d1ccef 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt @@ -38,12 +38,7 @@ object HideGetPremiumPatch : BytecodePatch(setOf(GetPremiumViewFingerprint)) { override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideGetPremium") SettingsPatch.PreferenceScreen.ADS.addPreferences( - SwitchPreference( - "revanced_hide_get_premium", - "revanced_hide_get_premium_title", - "revanced_hide_get_premium_summary_on", - "revanced_hide_get_premium_summary_off", - ) + SwitchPreference("revanced_hide_get_premium") ) GetPremiumViewFingerprint.result?.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt index 120e0932a1..9caecd82d0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt @@ -42,12 +42,7 @@ object VideoAdsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("VideoAds") SettingsPatch.PreferenceScreen.ADS.addPreferences( - SwitchPreference( - "revanced_hide_video_ads", - "revanced_hide_video_ads_title", - "revanced_hide_video_ads_summary_on", - "revanced_hide_video_ads_summary_off" - ) + SwitchPreference("revanced_hide_video_ads") ) val loadVideoAdsFingerprintMethod = LoadVideoAdsFingerprint.result!!.mutableMethod diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt index 51340d8f46..b253981dee 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt @@ -23,23 +23,10 @@ internal object CopyVideoUrlResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( PreferenceScreen( "revanced_copy_video_url_preference_screen", - "revanced_copy_video_url_preference_screen_title", listOf( - SwitchPreference( - "revanced_copy_video_url", - "revanced_copy_video_url_title", - "revanced_copy_video_url_summary_on", - "revanced_copy_video_url_summary_off" - ), - SwitchPreference( - "revanced_copy_video_url_timestamp", - "revanced_copy_video_url_timestamp_title", - "revanced_copy_video_url_timestamp_summary_on", - "revanced_copy_video_url_timestamp_summary_off" - ) - ), - - "revanced_copy_video_url_preference_screen_summary" + SwitchPreference("revanced_copy_video_url"), + SwitchPreference("revanced_copy_video_url_timestamp") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt index a50ac8d74e..0c9257314c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt @@ -36,12 +36,7 @@ object RemoveViewerDiscretionDialogPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("RemoveViewerDiscretionDialog") SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( - SwitchPreference( - "revanced_remove_viewer_discretion_dialog", - "revanced_remove_viewer_discretion_dialog_title", - "revanced_remove_viewer_discretion_dialog_summary_on", - "revanced_remove_viewer_discretion_dialog_summary_off", - ) + SwitchPreference("revanced_remove_viewer_discretion_dialog") ) CreateDialogFingerprint.result?.mutableMethod?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsResourcePatch.kt index ee0058a6fa..0a3dc41f5b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsResourcePatch.kt @@ -3,7 +3,6 @@ package app.revanced.patches.youtube.interaction.downloads import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.shared.settings.preference.impl.InputType import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen import app.revanced.patches.shared.settings.preference.impl.SwitchPreference import app.revanced.patches.shared.settings.preference.impl.TextPreference @@ -26,24 +25,10 @@ internal object ExternalDownloadsResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( PreferenceScreen( "revanced_external_downloader_preference_screen", - "revanced_external_downloader_preference_screen_title", listOf( - SwitchPreference( - "revanced_external_downloader", - "revanced_external_downloader_title", - "revanced_external_downloader_summary_on", - - "revanced_external_downloader_summary_off" - ), - TextPreference( - "revanced_external_downloader_name", - "revanced_external_downloader_name_title", - "revanced_external_downloader_name_summary", - InputType.TEXT - ) - ), - - "revanced_external_downloader_preference_screen_summary" + SwitchPreference("revanced_external_downloader"), + TextPreference("revanced_external_downloader_name") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt index aeab6733d8..22421630b8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt @@ -44,12 +44,7 @@ object DisablePreciseSeekingGesturePatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("DisablePreciseSeekingGesture") SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( - SwitchPreference( - "revanced_disable_precise_seeking_gesture", - "revanced_disable_precise_seeking_gesture_title", - "revanced_disable_precise_seeking_gesture_summary_on", - "revanced_disable_precise_seeking_gesture_summary_off", - ) + SwitchPreference("revanced_disable_precise_seeking_gesture") ) IsSwipingUpFingerprint.result?.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt index 289a3fd818..a63354d84e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt @@ -45,12 +45,7 @@ object EnableSeekbarTappingPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("EnableSeekbarTapping") SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( - SwitchPreference( - "revanced_seekbar_tapping", - "revanced_seekbar_tapping_title", - "revanced_seekbar_tapping_summary_on", - "revanced_seekbar_tapping_summary_off", - ) + SwitchPreference("revanced_seekbar_tapping") ) // Find the required methods to tap the seekbar. diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt index 910003a257..f8615fa4e0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt @@ -43,12 +43,7 @@ object EnableSlideToSeekPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("EnableSlideToSeek") SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( - SwitchPreference( - "revanced_slide_to_seek", - "revanced_slide_to_seek_title", - "revanced_slide_to_seek_summary_on", - "revanced_slide_to_seek_summary_off", - ) + SwitchPreference("revanced_slide_to_seek") ) arrayOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsResourcePatch.kt index f4893a3454..494c23de86 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsResourcePatch.kt @@ -18,64 +18,17 @@ internal object SwipeControlsResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( PreferenceScreen( "revanced_swipe_controls_preference_screen", - "revanced_swipe_controls_preference_screen_title", listOf( - SwitchPreference( - "revanced_swipe_brightness", - "revanced_swipe_brightness_title", - "revanced_swipe_brightness_summary_on", - "revanced_swipe_brightness_summary_off" - ), - SwitchPreference( - "revanced_swipe_volume", - "revanced_swipe_volume_title", - "revanced_swipe_volume_summary_on", - "revanced_swipe_volume_summary_off" - ), - SwitchPreference( - "revanced_swipe_press_to_engage", - "revanced_swipe_press_to_engage_title", - "revanced_swipe_press_to_engage_summary_on", - "revanced_swipe_press_to_engage_summary_off" - ), - SwitchPreference( - "revanced_swipe_haptic_feedback", - "revanced_swipe_haptic_feedback_title", - "revanced_swipe_haptic_feedback_summary_on", - "revanced_swipe_haptic_feedback_summary_off" - ), - SwitchPreference( - "revanced_swipe_save_and_restore_brightness", - "revanced_swipe_save_and_restore_brightness_title", - "revanced_swipe_save_and_restore_brightness_summary_on", - "revanced_swipe_save_and_restore_brightness_summary_off" - ), - TextPreference( - "revanced_swipe_overlay_timeout", - "revanced_swipe_overlay_timeout_title", - "revanced_swipe_overlay_timeout_summary", - InputType.NUMBER - ), - TextPreference( - "revanced_swipe_text_overlay_size", - "revanced_swipe_text_overlay_size_title", - "revanced_swipe_text_overlay_size_summary", - InputType.NUMBER - ), - TextPreference( - "revanced_swipe_overlay_background_alpha", - "revanced_swipe_overlay_background_alpha_title", - "revanced_swipe_overlay_background_alpha_summary", - InputType.NUMBER - ), - TextPreference( - "revanced_swipe_threshold", - "revanced_swipe_threshold_title", - "revanced_swipe_threshold_summary", - InputType.NUMBER - ) - ), - "revanced_swipe_controls_preference_screen_summary" + SwitchPreference("revanced_swipe_brightness"), + SwitchPreference("revanced_swipe_volume"), + SwitchPreference("revanced_swipe_press_to_engage"), + SwitchPreference("revanced_swipe_haptic_feedback"), + SwitchPreference("revanced_swipe_save_and_restore_brightness"), + TextPreference("revanced_swipe_overlay_timeout", InputType.NUMBER), + TextPreference("revanced_swipe_text_overlay_size", InputType.NUMBER), + TextPreference("revanced_swipe_overlay_background_alpha", InputType.NUMBER), + TextPreference("revanced_swipe_threshold", InputType.NUMBER) + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt index fc315cade5..9209a1d245 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt @@ -41,12 +41,7 @@ object AutoCaptionsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("AutoCaptions") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_auto_captions", - "revanced_auto_captions_title", - "revanced_auto_captions_summary_on", - "revanced_auto_captions_summary_off" - ) + SwitchPreference("revanced_auto_captions") ) mapOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt index 911032cab8..8467430471 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt @@ -44,70 +44,18 @@ object HideButtonsPatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_hide_buttons_preference_screen", - "revanced_hide_buttons_preference_screen_title", listOf( - SwitchPreference( - "revanced_hide_like_dislike_button", - "revanced_hide_like_dislike_button_title", - "revanced_hide_like_dislike_button_summary_on", - "revanced_hide_like_dislike_button_summary_off" - ), - SwitchPreference( - "revanced_hide_live_chat_button", - "revanced_hide_live_chat_button_title", - "revanced_hide_live_chat_button_summary_on", - "revanced_hide_live_chat_button_summary_off", - ), - SwitchPreference( - "revanced_hide_share_button", - "revanced_hide_share_button_title", - "revanced_hide_share_button_summary_on", - "revanced_hide_share_button_summary_off" - ), - SwitchPreference( - "revanced_hide_report_button", - "revanced_hide_report_button_title", - "revanced_hide_report_button_summary_on", - "revanced_hide_report_button_summary_off", - ), - SwitchPreference( - "revanced_hide_remix_button", - "revanced_hide_remix_button_title", - "revanced_hide_remix_button_summary_on", - "revanced_hide_remix_button_summary_off", - ), - SwitchPreference( - "revanced_hide_download_button", - "revanced_hide_download_button_title", - "revanced_hide_download_button_summary_on", - "revanced_hide_download_button_summary_off" - ), - SwitchPreference( - "revanced_hide_thanks_button", - "revanced_hide_thanks_button_title", - "revanced_hide_thanks_button_summary_on", - "revanced_hide_thanks_button_summary_off", - ), - SwitchPreference( - "revanced_hide_clip_button", - "revanced_hide_clip_button_title", - "revanced_hide_clip_button_summary_on", - "revanced_hide_clip_button_summary_off", - ), - SwitchPreference( - "revanced_hide_playlist_button", - "revanced_hide_playlist_button_title", - "revanced_hide_playlist_button_summary_on", - "revanced_hide_playlist_button_summary_off", - ), - SwitchPreference( - "revanced_hide_shop_button", - "revanced_hide_shop_button_title", - "revanced_hide_shop_button_summary_on", - "revanced_hide_shop_button_summary_off", - ) - ), - "revanced_hide_buttons_preference_screen_summary" + SwitchPreference("revanced_hide_like_dislike_button"), + SwitchPreference("revanced_hide_live_chat_button"), + SwitchPreference("revanced_hide_share_button"), + SwitchPreference("revanced_hide_report_button"), + SwitchPreference("revanced_hide_remix_button"), + SwitchPreference("revanced_hide_download_button"), + SwitchPreference("revanced_hide_thanks_button"), + SwitchPreference("revanced_hide_clip_button"), + SwitchPreference("revanced_hide_playlist_button"), + SwitchPreference("revanced_hide_shop_button") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt index 214aba35c3..463db7c069 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt @@ -50,12 +50,7 @@ object HideAutoplayButtonPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideAutoplayButton") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_autoplay_button", - "revanced_hide_autoplay_button_title", - "revanced_hide_autoplay_button_summary_on", - "revanced_hide_autoplay_button_summary_off" - ), + SwitchPreference("revanced_hide_autoplay_button") ) LayoutConstructorFingerprint.result?.mutableMethod?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt index 66669ff3a4..3e996cb72c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt @@ -41,12 +41,7 @@ object HideCaptionsButtonPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideCaptionsButton") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_captions_button", - "revanced_hide_captions_button_title", - "revanced_hide_captions_button_summary_on", - "revanced_hide_captions_button_summary_off" - ) + SwitchPreference("revanced_hide_captions_button") ) val subtitleButtonControllerMethod = diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/HideCastButtonPatch.kt index ef669be986..bce1e5eb29 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/HideCastButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/HideCastButtonPatch.kt @@ -26,12 +26,7 @@ object HideCastButtonPatch : BytecodePatch() { override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideCastButton") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_cast_button", - "revanced_hide_cast_button_title", - "revanced_hide_cast_button_summary_on", - "revanced_hide_cast_button_summary_off" - ) + SwitchPreference("revanced_hide_cast_button") ) val buttonClass = context.findClass("MediaRouteButton") diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt index c79bd19e2d..35f5d3e483 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt @@ -52,40 +52,13 @@ object NavigationButtonsPatch : BytecodePatch( SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_navigation_buttons_preference_screen", - "revanced_navigation_buttons_preference_screen_title", listOf( - SwitchPreference( - "revanced_hide_home_button", - "revanced_hide_home_button_title", - "revanced_hide_home_button_summary_on", - "revanced_hide_home_button_summary_off" - ), - SwitchPreference( - "revanced_hide_shorts_button", - "revanced_hide_shorts_button_title", - "revanced_hide_shorts_button_summary_on", - "revanced_hide_shorts_button_summary_off" - ), - SwitchPreference( - "revanced_hide_create_button", - "revanced_hide_create_button_title", - "revanced_hide_create_button_summary_on", - "revanced_hide_create_button_summary_off" - ), - SwitchPreference( - "revanced_hide_subscriptions_button", - "revanced_hide_subscriptions_button_title", - "revanced_hide_subscriptions_button_summary_on", - "revanced_hide_subscriptions_button_summary_off" - ), - SwitchPreference( - "revanced_switch_create_with_notifications_button", - "revanced_switch_create_with_notifications_button_title", - "revanced_switch_create_with_notifications_button_summary_on", - "revanced_switch_create_with_notifications_button_summary_off", - ), - ), - "revanced_navigation_buttons_preference_screen_summary" + SwitchPreference("revanced_hide_home_button"), + SwitchPreference("revanced_hide_shorts_button"), + SwitchPreference("revanced_hide_create_button"), + SwitchPreference("revanced_hide_subscriptions_button"), + SwitchPreference("revanced_switch_create_with_notifications_button") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt index 5df8bf88cf..11754bb931 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt @@ -45,12 +45,7 @@ object HidePlayerButtonsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HidePlayerButtons") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_player_buttons", - "revanced_hide_player_buttons_title", - "revanced_hide_player_buttons_summary_on", - "revanced_hide_player_buttons_summary_off" - ) + SwitchPreference("revanced_hide_player_buttons") ) PlayerControlsVisibilityModelFingerprint.result?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsResourcePatch.kt index e0ee572626..e7be5684a9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsResourcePatch.kt @@ -20,12 +20,7 @@ internal object AlbumCardsResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("AlbumCards") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_album_cards", - "revanced_hide_album_cards_title", - "revanced_hide_album_cards_summary_on", - "revanced_hide_album_cards_summary_off" - ) + SwitchPreference("revanced_hide_album_cards") ) albumCardId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt index 2701cd0348..77a07a56f4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt @@ -20,12 +20,7 @@ internal object BreakingNewsResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("BreakingNews") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_breaking_news", - "revanced_hide_breaking_news_title", - "revanced_hide_breaking_news_summary_on", - "revanced_hide_breaking_news_summary_off" - ) + SwitchPreference("revanced_hide_breaking_news") ) horizontalCardListId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt index 96b867e42a..0b8719d701 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt @@ -44,22 +44,10 @@ object CommentsPatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_comments_preference_screen", - "revanced_comments_preference_screen_title", listOf( - SwitchPreference( - "revanced_hide_comments_section", - "revanced_hide_comments_section_title", - "revanced_hide_comments_section_summary_on", - "revanced_hide_comments_section_summary_off" - ), - SwitchPreference( - "revanced_hide_preview_comment", - "revanced_hide_preview_comment_title", - "revanced_hide_preview_comment_on", - "revanced_hide_preview_comment_off" - ) - ), - "revanced_comments_preference_screen_summary" + SwitchPreference("revanced_hide_comments_section"), + SwitchPreference("revanced_hide_preview_comment") + ) ) ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxResourcePatch.kt index 726fb2ec9e..2f11c3084c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxResourcePatch.kt @@ -20,12 +20,7 @@ internal object CrowdfundingBoxResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("CrowdfundingBox") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_crowdfunding_box", - "revanced_hide_crowdfunding_box_title", - "revanced_hide_crowdfunding_box_summary_on", - "revanced_hide_crowdfunding_box_summary_off" - ) + SwitchPreference("revanced_hide_crowdfunding_box") ) crowdfundingBoxId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsResourcePatch.kt index b4953c6151..1ffc111069 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsResourcePatch.kt @@ -22,12 +22,7 @@ internal object HideEndscreenCardsResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideEndscreenCards") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_endscreen_cards", - "revanced_hide_endscreen_cards_title", - "revanced_hide_endscreen_cards_summary_on", - "revanced_hide_endscreen_cards_summary_off" - ), + SwitchPreference("revanced_hide_endscreen_cards") ) fun findEndscreenResourceId(name: String) = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarResourcePatch.kt index c4ee4a6949..37bdeb9145 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarResourcePatch.kt @@ -20,28 +20,11 @@ internal object HideFilterBarResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_hide_filter_bar_screen", - "revanced_hide_filter_bar_screen_title", listOf( - SwitchPreference( - "revanced_hide_filter_bar_feed_in_feed", - "revanced_hide_filter_bar_feed_in_feed_title", - "revanced_hide_filter_bar_feed_in_feed_summary_on", - "revanced_hide_filter_bar_feed_in_feed_summary_off" - ), - SwitchPreference( - "revanced_hide_filter_bar_feed_in_search", - "revanced_hide_filter_bar_feed_in_search_title", - "revanced_hide_filter_bar_feed_in_search_summary_on", - "revanced_hide_filter_bar_feed_in_search_summary_off" - ), - SwitchPreference( - "revanced_hide_filter_bar_feed_in_related_videos", - "revanced_hide_filter_bar_feed_in_related_videos_title", - "revanced_hide_filter_bar_feed_in_related_videos_summary_on", - "revanced_hide_filter_bar_feed_in_related_videos_summary_off" - ), - ), - "revanced_hide_filter_bar_screen_summary" + SwitchPreference("revanced_hide_filter_bar_feed_in_feed"), + SwitchPreference("revanced_hide_filter_bar_feed_in_search"), + SwitchPreference("revanced_hide_filter_bar_feed_in_related_videos") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonResourcePatch.kt index 157e0cc49c..24063bce69 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonResourcePatch.kt @@ -21,12 +21,7 @@ internal object HideFloatingMicrophoneButtonResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideFloatingMicrophoneButton") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_floating_microphone_button", - "revanced_hide_floating_microphone_button_enabled_title", - "revanced_hide_floating_microphone_button_summary_on", - "revanced_hide_floating_microphone_button_summary_off" - ) + SwitchPreference("revanced_hide_floating_microphone_button") ) fabButtonId = diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt index c95aa3b2f8..a38a5ff943 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt @@ -39,12 +39,7 @@ object DisableFullscreenAmbientModePatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("DisableFullscreenAmbientMode") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_disable_fullscreen_ambient_mode", - "revanced_disable_fullscreen_ambient_mode_title", - "revanced_disable_fullscreen_ambient_mode_summary_on", - "revanced_disable_fullscreen_ambient_mode_summary_off", - ) + SwitchPreference("revanced_disable_fullscreen_ambient_mode") ) InitializeAmbientModeFingerprint.result?.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt index 71a1193725..c25e6421ef 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt @@ -58,242 +58,55 @@ object HideLayoutComponentsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideLayoutComponents") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_gray_separator", - "revanced_hide_gray_separator_title", - "revanced_hide_gray_separator_summary_on", - "revanced_hide_gray_separator_summary_off", - ), - SwitchPreference( - "revanced_hide_join_membership_button", - "revanced_hide_join_membership_button_title", - "revanced_hide_join_membership_button_summary_on", - "revanced_hide_join_membership_button_summary_off", - ), - SwitchPreference( - "revanced_hide_channel_watermark_title", - "revanced_hide_channel_watermark_title", - "revanced_hide_channel_watermark_title_summary_on", - "revanced_hide_channel_watermark_title_summary_off", - ), - SwitchPreference( - "revanced_hide_for_you_shelf", - "revanced_hide_for_you_shelf_title", - "revanced_hide_for_you_shelf_summary_on", - "revanced_hide_for_you_shelf_summary_off", - ), - SwitchPreference( - "revanced_hide_notify_me_button", - "revanced_hide_notify_me_button_title", - "revanced_hide_notify_me_button_summary_on", - "revanced_hide_notify_me_button_summary_off", - ), - SwitchPreference( - "revanced_hide_timed_reactions", - "revanced_hide_timed_reactions_title", - "revanced_hide_timed_reactions_summary_on", - "revanced_hide_timed_reactions_summary_off", - ), - SwitchPreference( - "revanced_hide_search_result_recommendations", - "revanced_hide_search_result_recommendations_title", - "revanced_hide_search_result_recommendations_summary_on", - "revanced_hide_search_result_recommendations_summary_off", - ), - SwitchPreference( - "revanced_hide_search_result_shelf_header", - "revanced_hide_search_result_shelf_header_title", - "revanced_hide_search_result_shelf_header_summary_on", - "revanced_hide_search_result_shelf_header_summary_off", - ), - SwitchPreference( - "revanced_hide_channel_guidelines", - "revanced_hide_channel_guidelines_title", - "revanced_hide_channel_guidelines_summary_on", - "revanced_hide_channel_guidelines_summary_off", - ), - SwitchPreference( - "revanced_hide_expandable_chip", - "revanced_hide_expandable_chip_title", - "revanced_hide_expandable_chip_summary_on", - "revanced_hide_expandable_chip_summary_off", - ), - SwitchPreference( - "revanced_hide_video_quality_menu_footer", - "revanced_hide_video_quality_menu_footer_title", - "revanced_hide_video_quality_menu_footer_summary_on", - "revanced_hide_video_quality_menu_footer_summary_off", - ), - SwitchPreference( - "revanced_hide_chapters", - "revanced_hide_chapters_title", - "revanced_hide_chapters_summary_on", - "revanced_hide_chapters_summary_off", - ), - SwitchPreference( - "revanced_hide_community_posts", - "revanced_hide_community_posts_title", - "revanced_hide_community_posts_summary_on", - "revanced_hide_community_posts_summary_off", - ), - SwitchPreference( - "revanced_hide_compact_banner", - "revanced_hide_compact_banner_title", - "revanced_hide_compact_banner_summary_on", - "revanced_hide_compact_banner_summary_off", - ), - SwitchPreference( - "revanced_hide_movies_section", - "revanced_hide_movies_section_title", - "revanced_hide_movies_section_summary_on", - "revanced_hide_movies_section_summary_off", - ), - SwitchPreference( - "revanced_hide_feed_survey", - "revanced_hide_feed_survey_title", - "revanced_hide_feed_survey_summary_on", - "revanced_hide_feed_survey_summary_off", - ), - SwitchPreference( - "revanced_hide_community_guidelines", - "revanced_hide_community_guidelines_title", - "revanced_hide_community_guidelines_summary_on", - "revanced_hide_community_guidelines_summary_off", - ), - SwitchPreference( - "revanced_hide_subscribers_community_guidelines", - "revanced_hide_subscribers_community_guidelines_title", - "revanced_hide_subscribers_community_guidelines_summary_on", - "revanced_hide_subscribers_community_guidelines_summary_off", - ), - SwitchPreference( - "revanced_hide_channel_member_shelf", - "revanced_hide_channel_member_shelf_title", - "revanced_hide_channel_member_shelf_summary_on", - "revanced_hide_channel_member_shelf_summary_off", - ), - SwitchPreference( - "revanced_hide_emergency_box", - "revanced_hide_emergency_box_title", - "revanced_hide_emergency_box_summary_on", - "revanced_hide_emergency_box_summary_off", - ), - SwitchPreference( - "revanced_hide_info_panels", - "revanced_hide_info_panels_title", - "revanced_hide_info_panels_summary_on", - "revanced_hide_info_panels_summary_off", - ), - SwitchPreference( - "revanced_hide_medical_panels", - "revanced_hide_medical_panels_title", - "revanced_hide_medical_panels_summary_on", - "revanced_hide_medical_panels_summary_off", - ), - SwitchPreference( - "revanced_hide_channel_bar", - "revanced_hide_channel_bar_title", - "revanced_hide_channel_bar_summary_on", - "revanced_hide_channel_bar_summary_off", - ), - SwitchPreference( - "revanced_hide_quick_actions", - "revanced_hide_quick_actions_title", - "revanced_hide_quick_actions_summary_on", - "revanced_hide_quick_actions_summary_off", - ), - SwitchPreference( - "revanced_hide_related_videos", - "revanced_hide_related_videos_title", - "revanced_hide_related_videos_summary_on", - "revanced_hide_related_videos_summary_off", - ), - SwitchPreference( - "revanced_hide_image_shelf", - "revanced_hide_image_shelf_title", - "revanced_hide_image_shelf_summary_on", - "revanced_hide_image_shelf_summary_off", - ), - SwitchPreference( - "revanced_hide_latest_posts_ads", - "revanced_hide_latest_posts_ads_title", - "revanced_hide_latest_posts_ads_summary_on", - "revanced_hide_latest_posts_ads_summary_off", - ), - SwitchPreference( - "revanced_hide_mix_playlists", - "revanced_hide_mix_playlists_title", - "revanced_hide_mix_playlists_summary_on", - "revanced_hide_mix_playlists_summary_off", - ), - SwitchPreference( - "revanced_hide_artist_cards", - "revanced_hide_artist_cards_title", - "revanced_hide_artist_cards_on", - "revanced_hide_artist_cards_off", - ), - SwitchPreference( - "revanced_hide_chips_shelf", - "revanced_hide_chips_shelf_title", - "revanced_hide_chips_shelf_on", - "revanced_hide_chips_shelf_off", - ), + SwitchPreference("revanced_hide_gray_separator"), + SwitchPreference("revanced_hide_join_membership_button"), + SwitchPreference("revanced_hide_channel_watermark"), + SwitchPreference("revanced_hide_for_you_shelf"), + SwitchPreference("revanced_hide_notify_me_button"), + SwitchPreference("revanced_hide_timed_reactions"), + SwitchPreference("revanced_hide_search_result_recommendations"), + SwitchPreference("revanced_hide_search_result_shelf_header"), + SwitchPreference("revanced_hide_channel_guidelines"), + SwitchPreference("revanced_hide_expandable_chip"), + SwitchPreference("revanced_hide_video_quality_menu_footer"), + SwitchPreference("revanced_hide_chapters"), + SwitchPreference("revanced_hide_community_posts"), + SwitchPreference("revanced_hide_compact_banner"), + SwitchPreference("revanced_hide_movies_section"), + SwitchPreference("revanced_hide_feed_survey"), + SwitchPreference("revanced_hide_community_guidelines"), + SwitchPreference("revanced_hide_subscribers_community_guidelines"), + SwitchPreference("revanced_hide_channel_member_shelf"), + SwitchPreference("revanced_hide_emergency_box"), + SwitchPreference("revanced_hide_info_panels"), + SwitchPreference("revanced_hide_medical_panels"), + SwitchPreference("revanced_hide_channel_bar"), + SwitchPreference("revanced_hide_quick_actions"), + SwitchPreference("revanced_hide_related_videos"), + SwitchPreference("revanced_hide_image_shelf"), + SwitchPreference("revanced_hide_latest_posts_ads"), + SwitchPreference("revanced_hide_mix_playlists"), + SwitchPreference("revanced_hide_artist_cards"), + SwitchPreference("revanced_hide_chips_shelf"), PreferenceScreen( "revanced_hide_description_components_preference_screen", - "revanced_hide_description_components_preference_screen_title", listOf( - SwitchPreference( - "revanced_hide_info_cards_section", - "revanced_hide_info_cards_section_title", - "revanced_hide_info_cards_section_summary_on", - "revanced_hide_info_cards_section_summary_off", - ), - SwitchPreference( - "revanced_hide_game_section", - "revanced_hide_game_section_title", - "revanced_hide_game_section_summary_on", - "revanced_hide_game_section_summary_off", - ), - SwitchPreference( - "revanced_hide_music_section", - "revanced_hide_music_section_title", - "revanced_hide_music_section_summary_on", - "revanced_hide_music_section_summary_off", - ), - SwitchPreference( - "revanced_hide_podcast_section", - "revanced_hide_podcast_section_title", - "revanced_hide_podcast_section_summary_on", - "revanced_hide_podcast_section_summary_off", - ), - SwitchPreference( - "revanced_hide_transcript_section", - "revanced_hide_transcript_section_title", - "revanced_hide_transcript_section_summary_on", - "revanced_hide_transcript_section_summary_off", - ), - ), - "revanced_hide_description_components_preference_screen_summary" + SwitchPreference("revanced_hide_info_cards_section"), + SwitchPreference("revanced_hide_game_section"), + SwitchPreference("revanced_hide_music_section"), + SwitchPreference("revanced_hide_podcast_section"), + SwitchPreference("revanced_hide_transcript_section"), + ) ), PreferenceScreen( "revanced_custom_filter_preference_screen", - "revanced_custom_filter_preference_screen_title", listOf( - SwitchPreference( - "revanced_custom_filter", - "revanced_custom_filter_title", - "revanced_custom_filter_summary_on", - "revanced_custom_filter_summary_off", - ), - // TODO: This should be a dynamic ListPreference, which does not exist yet + SwitchPreference("revanced_custom_filter"), TextPreference( "revanced_custom_filter_strings", - "revanced_custom_filter_strings_title", - "revanced_custom_filter_strings_summary", inputType = InputType.TEXT_MULTI_LINE ) - ), - "revanced_custom_filter_preference_screen_summary" + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfocardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfocardsResourcePatch.kt index 47e68eb974..eb4aa7e517 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfocardsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfocardsResourcePatch.kt @@ -20,12 +20,7 @@ object HideInfocardsResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideInfocards") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_info_cards", - "revanced_hide_info_cards_title", - "revanced_hide_info_cards_summary_on", - "revanced_hide_info_cards_summary_off" - ) + SwitchPreference("revanced_hide_info_cards") ) drawerResourceId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt index 699fba062f..6878b80187 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt @@ -20,12 +20,7 @@ internal object HideLoadMoreButtonResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideLoadMoreButton") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_load_more_button", - "revanced_hide_load_more_button_title", - "revanced_hide_load_more_button_summary_on", - "revanced_hide_load_more_button_summary_off", - ) + SwitchPreference("revanced_hide_load_more_button") ) expandButtonDownId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressResourcePatch.kt index c1ae2a9a3a..61eb5d5660 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressResourcePatch.kt @@ -16,12 +16,7 @@ internal object HideEmailAddressResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("HideEmailAddress") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_email_address", - "revanced_hide_email_address_title", - "revanced_hide_email_address_summary_on", - "revanced_hide_email_address_summary_off" - ) + SwitchPreference("revanced_hide_email_address") ) accountSwitcherAccessibilityLabelId = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt index fb9e3f85cd..40e36d0f48 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt @@ -43,70 +43,18 @@ object HidePlayerFlyoutMenuPatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_hide_player_flyout_screen", - "revanced_hide_player_flyout_screen_title", listOf( - SwitchPreference( - "revanced_hide_player_flyout_captions", - "revanced_hide_player_flyout_captions_title", - "revanced_hide_player_flyout_captions_on", - "revanced_hide_player_flyout_captions_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_additional_settings", - "revanced_hide_player_flyout_additional_settings_title", - "revanced_hide_player_flyout_additional_settings_on", - "revanced_hide_player_flyout_additional_settings_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_loop_video", - "revanced_hide_player_flyout_loop_video_title", - "revanced_hide_player_flyout_loop_video_on", - "revanced_hide_player_flyout_loop_video_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_ambient_mode", - "revanced_hide_player_flyout_ambient_mode_title", - "revanced_hide_player_flyout_ambient_mode_on", - "revanced_hide_player_flyout_ambient_mode_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_report", - "revanced_hide_player_flyout_report_title", - "revanced_hide_player_flyout_report_on", - "revanced_hide_player_flyout_report_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_help", - "revanced_hide_player_flyout_help_title", - "revanced_hide_player_flyout_help_on", - "revanced_hide_player_flyout_help_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_speed", - "revanced_hide_player_flyout_speed_title", - "revanced_hide_player_flyout_speed_on", - "revanced_hide_player_flyout_speed_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_more_info", - "revanced_hide_player_flyout_more_info_title", - "revanced_hide_player_flyout_more_info_on", - "revanced_hide_player_flyout_more_info_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_audio_track", - "revanced_hide_player_flyout_audio_track_title", - "revanced_hide_player_flyout_audio_track_on", - "revanced_hide_player_flyout_audio_track_off", - ), - SwitchPreference( - "revanced_hide_player_flyout_watch_in_vr", - "revanced_hide_player_flyout_watch_in_vr_title", - "revanced_hide_player_flyout_watch_in_vr_on", - "revanced_hide_player_flyout_watch_in_vr_off", - ), + SwitchPreference("revanced_hide_player_flyout_captions"), + SwitchPreference("revanced_hide_player_flyout_additional_settings"), + SwitchPreference("revanced_hide_player_flyout_loop_video"), + SwitchPreference("revanced_hide_player_flyout_ambient_mode"), + SwitchPreference("revanced_hide_player_flyout_report"), + SwitchPreference("revanced_hide_player_flyout_help"), + SwitchPreference("revanced_hide_player_flyout_speed"), + SwitchPreference("revanced_hide_player_flyout_more_info"), + SwitchPreference("revanced_hide_player_flyout_audio_track"), + SwitchPreference("revanced_hide_player_flyout_watch_in_vr") ), - "revanced_hide_player_flyout_screen_summary", ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt index 64b4e25e7b..a7a2a76f4d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt @@ -43,12 +43,7 @@ object DisableRollingNumberAnimationPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("DisableRollingNumberAnimation") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_disable_rolling_number_animations", - "revanced_disable_rolling_number_animations_title", - "revanced_disable_rolling_number_animations_summary_on", - "revanced_disable_rolling_number_animations_summary_off", - ) + SwitchPreference("revanced_disable_rolling_number_animations") ) // Animations are disabled by preventing an Image from being applied to the text span, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt index 3c79dbcf4f..e101365504 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt @@ -44,18 +44,8 @@ object HideSeekbarPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideSeekbar") SeekbarPreferencesPatch.addPreferences( - SwitchPreference( - "revanced_hide_seekbar", - "revanced_hide_seekbar_title", - "revanced_hide_seekbar_summary_on", - "revanced_hide_seekbar_summary_off" - ), - SwitchPreference( - "revanced_hide_seekbar_thumbnail", - "revanced_hide_seekbar_thumbnail_title", - "revanced_hide_seekbar_thumbnail_summary_on", - "revanced_hide_seekbar_thumbnail_summary_off" - ) + SwitchPreference("revanced_hide_seekbar"), + SwitchPreference("revanced_hide_seekbar_thumbnail") ) SeekbarFingerprint.result!!.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt index 2d76fbd5cc..6a1f74f2d9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt @@ -19,82 +19,20 @@ object HideShortsComponentsResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_shorts_preference_screen", - "revanced_shorts_preference_screen_title", listOf( - SwitchPreference( - "revanced_hide_shorts", - "revanced_hide_shorts_title", - "revanced_hide_shorts_on", - "revanced_hide_shorts_off" - ), - SwitchPreference( - "revanced_hide_shorts_join_button", - "revanced_hide_shorts_join_button_title", - "revanced_hide_shorts_join_button_on", - "revanced_hide_shorts_join_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_subscribe_button", - "revanced_hide_shorts_subscribe_button_title", - "revanced_hide_shorts_subscribe_button_on", - "revanced_hide_shorts_subscribe_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_subscribe_button_paused", - "revanced_hide_shorts_subscribe_button_paused_title", - "revanced_hide_shorts_subscribe_button_paused_on", - "revanced_hide_shorts_subscribe_button_paused_off", - ), - SwitchPreference( - "revanced_hide_shorts_thanks_button", - "revanced_hide_shorts_thanks_button_title", - "revanced_hide_shorts_thanks_button_on", - "revanced_hide_shorts_thanks_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_comments_button", - "revanced_hide_shorts_comments_button_title", - "revanced_hide_shorts_comments_button_on", - "revanced_hide_shorts_comments_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_remix_button", - "revanced_hide_shorts_remix_button_title", - "revanced_hide_shorts_remix_button_on", - "revanced_hide_shorts_remix_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_share_button", - "revanced_hide_shorts_share_button_title", - "revanced_hide_shorts_share_button_on", - "revanced_hide_shorts_share_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_info_panel", - "revanced_hide_shorts_info_panel_title", - "revanced_hide_shorts_info_panel_on", - "revanced_hide_shorts_info_panel_off" - ), - SwitchPreference( - "revanced_hide_shorts_channel_bar", - "revanced_hide_shorts_channel_bar_title", - "revanced_hide_shorts_channel_bar_on", - "revanced_hide_shorts_channel_bar_off" - ), - SwitchPreference( - "revanced_hide_shorts_sound_button", - "revanced_hide_shorts_sound_button_title", - "revanced_hide_shorts_sound_button_on", - "revanced_hide_shorts_sound_button_off" - ), - SwitchPreference( - "revanced_hide_shorts_navigation_bar", - "revanced_hide_shorts_navigation_bar_title", - "revanced_hide_shorts_navigation_bar_on", - "revanced_hide_shorts_navigation_bar_off" - ) - ), - "revanced_shorts_preference_screen_summary" + SwitchPreference("revanced_hide_shorts"), + SwitchPreference("revanced_hide_shorts_join_button"), + SwitchPreference("revanced_hide_shorts_subscribe_button"), + SwitchPreference("revanced_hide_shorts_subscribe_button_paused"), + SwitchPreference("revanced_hide_shorts_thanks_button"), + SwitchPreference("revanced_hide_shorts_comments_button"), + SwitchPreference("revanced_hide_shorts_remix_button"), + SwitchPreference("revanced_hide_shorts_share_button"), + SwitchPreference("revanced_hide_shorts_info_panel"), + SwitchPreference("revanced_hide_shorts_channel_bar"), + SwitchPreference("revanced_hide_shorts_sound_button"), + SwitchPreference("revanced_hide_shorts_navigation_bar") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenResourcePatch.kt index f4e2adad3c..470292bb8b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenResourcePatch.kt @@ -20,12 +20,7 @@ internal object DisableSuggestedVideoEndScreenResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("DisableSuggestedVideoEndScreen") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_disable_suggested_video_end_screen", - "revanced_disable_suggested_video_end_screen_title", - "revanced_disable_suggested_video_end_screen_summary_on", - "revanced_disable_suggested_video_end_screen_summary_off", - ) + SwitchPreference("revanced_disable_suggested_video_end_screen") ) sizeAdjustableLiteAutoNavOverlay = ResourceMappingPatch.resourceMappings.single { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt index 86a01b87fe..f4561b1a13 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt @@ -37,12 +37,7 @@ object HideTimestampPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("HideTimestamp") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_timestamp", - "revanced_hide_timestamp_title", - "revanced_hide_timestamp_summary_on", - "revanced_hide_timestamp_summary_off" - ) + SwitchPreference("revanced_hide_timestamp") ) TimeCounterFingerprint.result?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt index e0e8b0c0de..b7dcef5561 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt @@ -37,12 +37,7 @@ object PlayerPopupPanelsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("PlayerPopupPanels") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_hide_player_popup_panels", - "revanced_hide_player_popup_panels_title", - "revanced_hide_player_popup_panels_summary_on", - "revanced_hide_player_popup_panels_summary_off" - ) + SwitchPreference("revanced_hide_player_popup_panels") ) val engagementPanelControllerMethod = EngagementPanelControllerFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityResourcePatch.kt index 4ff657f9b3..aeafc3bd40 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityResourcePatch.kt @@ -19,8 +19,6 @@ internal object CustomPlayerOverlayOpacityResourcePatch : ResourcePatch() { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( TextPreference( "revanced_player_overlay_opacity", - "revanced_player_overlay_opacity_title", - "revanced_player_overlay_opacity_summary", InputType.NUMBER ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt index 8e6580b93b..160530d78b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt @@ -42,12 +42,7 @@ object WideSearchbarPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("WideSearchbar") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_wide_searchbar", - "revanced_wide_searchbar_enabled_title", - "revanced_wide_searchbar_summary_on", - "revanced_wide_searchbar_summary_off" - ) + SwitchPreference("revanced_wide_searchbar") ) val result = CreateSearchSuggestionsFingerprint.result diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt index e6b836cc57..7dca9c4bf9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt @@ -39,12 +39,7 @@ object RestoreOldSeekbarThumbnailsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("RestoreOldSeekbarThumbnails") SeekbarPreferencesPatch.addPreferences( - SwitchPreference( - "revanced_restore_old_seekbar_thumbnails", - "revanced_restore_old_seekbar_thumbnails_title", - "revanced_restore_old_seekbar_thumbnails_summary_on", - "revanced_restore_old_seekbar_thumbnails_summary_off" - ) + SwitchPreference("revanced_restore_old_seekbar_thumbnails") ) FullscreenSeekbarThumbnailsFingerprint.result?.mutableMethod?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarPreferencesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarPreferencesPatch.kt index 4ef1078e56..9bf4f87ffe 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarPreferencesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarPreferencesPatch.kt @@ -23,9 +23,7 @@ internal object SeekbarPreferencesPatch : ResourcePatch(), Closeable { SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_seekbar_preference_screen", - "revanced_seekbar_preference_screen_title", - seekbarPreferences, - "revanced_seekbar_preference_screen_summary" + seekbarPreferences ) ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt index 1ac8598692..b4fd901ff2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt @@ -44,16 +44,12 @@ object SpoofAppVersionPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("SpoofAppVersion") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_spoof_app_version", - "revanced_spoof_app_version_title", - "revanced_spoof_app_version_summary_on", - "revanced_spoof_app_version_summary_off" - ), + SwitchPreference("revanced_spoof_app_version"), ListPreference( - "revanced_spoof_app_version_target", - "revanced_spoof_app_version_target_title", - ArrayResource( + key = "revanced_spoof_app_version_target", + titleKey = "revanced_spoof_app_version_target_title", + summaryKey = null, + entries = ArrayResource( "revanced_spoof_app_version_target_entries", listOf( "revanced_spoof_app_version_target_entry_1", @@ -63,7 +59,7 @@ object SpoofAppVersionPatch : BytecodePatch( "revanced_spoof_app_version_target_entry_5", ) ), - ArrayResource( + entryValues = ArrayResource( "revanced_spoof_app_version_target_entry_values", listOf( "18.33.40", diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt index 2a44ab58ec..cc686c3c2e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt @@ -35,9 +35,10 @@ object ChangeStartPagePatch : BytecodePatch( StringsPatch.includePatchStrings("ChangeStartPage") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( ListPreference( - "revanced_start_page", - "revanced_start_page_title", - ArrayResource( + key = "revanced_start_page", + titleKey = "revanced_start_page_title", + summaryKey = null, + entries = ArrayResource( "revanced_start_page_entries", listOf( "revanced_start_page_home_entry_0", @@ -48,7 +49,7 @@ object ChangeStartPagePatch : BytecodePatch( "revanced_start_page_home_entry_5", ) ), - ArrayResource( + entryValues = ArrayResource( "revanced_start_page_values", listOf( "", diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt index 3f1da5c751..453445a790 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt @@ -41,12 +41,7 @@ object DisableResumingShortsOnStartupPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("DisableResumingShortsOnStartup") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_disable_resuming_shorts_player", - "revanced_disable_resuming_shorts_player_title", - "revanced_disable_resuming_shorts_player_summary_on", - "revanced_disable_resuming_shorts_player_summary_off" - ) + SwitchPreference("revanced_disable_resuming_shorts_player") ) UserWasInShortsFingerprint.result?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt index 542deba17f..5f5e324e39 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt @@ -28,12 +28,7 @@ object EnableTabletLayoutPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("EnableTabletLayout") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_tablet_layout", - "revanced_tablet_layout_enabled_title", - "revanced_tablet_layout_summary_on", - "revanced_tablet_layout_summary_off", - ) + SwitchPreference("revanced_tablet_layout") ) GetFormFactorFingerprint.result?.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt index 54fb9e2f53..f7893b444e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt @@ -49,12 +49,7 @@ object TabletMiniPlayerPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("TabletMiniPlayer") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_tablet_miniplayer", - "revanced_tablet_miniplayer_title", - "revanced_tablet_miniplayer_summary_on", - "revanced_tablet_miniplayer_summary_off" - ) + SwitchPreference("revanced_tablet_miniplayer") ) // First resolve the fingerprints via the parent fingerprint. diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt index 5e1694ed08..0dd6fb3795 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt @@ -93,12 +93,7 @@ object ThemeBytecodePatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("ThemeBytecode") SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( - SwitchPreference( - "revanced_gradient_loading_screen", - "revanced_gradient_loading_screen_title", - "revanced_gradient_loading_screen_summary_on", - "revanced_gradient_loading_screen_summary_off" - ) + SwitchPreference("revanced_gradient_loading_screen") ) UseGradientLoadingScreenFingerprint.result?.mutableMethod?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeResourcePatch.kt index 028e9a1e8a..5ec45ffa5b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeResourcePatch.kt @@ -24,16 +24,9 @@ internal object ThemeResourcePatch : ResourcePatch() { override fun execute(context: ResourceContext) { StringsPatch.includePatchStrings("Theme") SeekbarPreferencesPatch.addPreferences( - SwitchPreference( - "revanced_seekbar_custom_color", - "revanced_seekbar_custom_color_title", - "revanced_seekbar_custom_color_summary_on", - "revanced_seekbar_custom_color_summary_off", - ), + SwitchPreference("revanced_seekbar_custom_color"), TextPreference( "revanced_seekbar_custom_color_value", - "revanced_seekbar_custom_color_value_title", - "revanced_seekbar_custom_color_value_summary", InputType.TEXT_CAP_CHARACTERS ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt index 62714f3992..021cc9eace 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt @@ -117,30 +117,15 @@ object AlternativeThumbnailsPatch : BytecodePatch( SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( PreferenceScreen( "revanced_alt_thumbnail_preference_screen", - "revanced_alt_thumbnail_preference_screen_title", listOf( NonInteractivePreference( "revanced_alt_thumbnail_about_title", null, // Summary is dynamically updated based on the current settings. tag = "app.revanced.integrations.settingsmenu.AlternativeThumbnailsStatusPreference" ), - SwitchPreference( - "revanced_alt_thumbnail_dearrow", - "revanced_alt_thumbnail_dearrow_title", - "revanced_alt_thumbnail_dearrow_summary_on", - "revanced_alt_thumbnail_dearrow_summary_off", - ), - SwitchPreference( - "revanced_alt_thumbnail_dearrow_connection_toast", - "revanced_alt_thumbnail_dearrow_connection_toast_title", - "revanced_alt_thumbnail_dearrow_connection_toast_summary_on", - "revanced_alt_thumbnail_dearrow_connection_toast_summary_off", - ), - TextPreference( - "revanced_alt_thumbnail_dearrow_api_url", - "revanced_alt_thumbnail_dearrow_api_url_title", - "revanced_alt_thumbnail_dearrow_api_url_summary", - ), + SwitchPreference("revanced_alt_thumbnail_dearrow"), + SwitchPreference("revanced_alt_thumbnail_dearrow_connection_toast"), + TextPreference("revanced_alt_thumbnail_dearrow_api_url"), NonInteractivePreference( "revanced_alt_thumbnail_dearrow_about_title", "revanced_alt_thumbnail_dearrow_about_summary", @@ -148,16 +133,12 @@ object AlternativeThumbnailsPatch : BytecodePatch( tag = "app.revanced.integrations.settingsmenu.AlternativeThumbnailsAboutDeArrowPreference", selectable = true ), - SwitchPreference( - "revanced_alt_thumbnail_stills", - "revanced_alt_thumbnail_stills_title", - "revanced_alt_thumbnail_stills_summary_on", - "revanced_alt_thumbnail_stills_summary_off", - ), + SwitchPreference("revanced_alt_thumbnail_stills"), ListPreference( - "revanced_alt_thumbnail_stills_time", - "revanced_alt_thumbnail_stills_time_title", - ArrayResource( + key = "revanced_alt_thumbnail_stills_time", + titleKey = "revanced_alt_thumbnail_stills_time_title", + summaryKey = null, + entries = ArrayResource( "revanced_alt_thumbnail_type_entries", listOf( "revanced_alt_thumbnail_stills_time_entry_1", @@ -165,7 +146,7 @@ object AlternativeThumbnailsPatch : BytecodePatch( "revanced_alt_thumbnail_stills_time_entry_3", ) ), - ArrayResource( + entryValues = ArrayResource( "revanced_alt_thumbnail_stills_time_entry_values", listOf( "1", @@ -175,20 +156,14 @@ object AlternativeThumbnailsPatch : BytecodePatch( literalValues = true ) ), - SwitchPreference( - "revanced_alt_thumbnail_stills_fast", - "revanced_alt_thumbnail_stills_fast_title", - "revanced_alt_thumbnail_stills_fast_summary_on", - "revanced_alt_thumbnail_stills_fast_summary_off", - ), + SwitchPreference("revanced_alt_thumbnail_stills_fast"), NonInteractivePreference( - "revanced_alt_thumbnail_stills_about_title", - "revanced_alt_thumbnail_stills_about_summary", + titleKey = "revanced_alt_thumbnail_stills_about_title", + summaryKey = "revanced_alt_thumbnail_stills_about_summary", // Restore the preference dividers to keep it from looking weird. selectable = true ) - ), - "revanced_alt_thumbnail_preference_screen_summary", + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt index c22b98de71..ab0a02925c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt @@ -41,12 +41,7 @@ object AnnouncementsPatch : BytecodePatch( StringsPatch.includePatchStrings("Announcements") SettingsPatch.PreferenceScreen.MISC.addPreferences( - SwitchPreference( - "revanced_announcements", - "revanced_announcements_title", - "revanced_announcements_summary_on", - "revanced_announcements_summary_off", - ) + SwitchPreference("revanced_announcements") ) } } diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt index 8a52e04e48..0f3a56bca2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt @@ -40,12 +40,7 @@ object AutoRepeatPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("AutoRepeat") SettingsPatch.PreferenceScreen.MISC.addPreferences( - SwitchPreference( - "revanced_auto_repeat", - "revanced_auto_repeat_title", - "revanced_auto_repeat_summary_on", - "revanced_auto_repeat_summary_off" - ) + SwitchPreference("revanced_auto_repeat") ) //Get Result from the ParentFingerprint which is the playMethod we need to get. diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt index 923e5845fb..a8e6d8a66d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt @@ -22,34 +22,12 @@ object DebuggingPatch : ResourcePatch() { SettingsPatch.PreferenceScreen.MISC.addPreferences( app.revanced.patches.shared.settings.preference.impl.PreferenceScreen( "revanced_debug_preference_screen", - "revanced_debug_preference_screen_title", listOf( - SwitchPreference( - "revanced_debug", - "revanced_debug_title", - "revanced_debug_summary_on", - "revanced_debug_summary_off" - ), - SwitchPreference( - "revanced_debug_protobuffer", - "revanced_debug_protobuffer_title", - "revanced_debug_protobuffer_summary_on", - "revanced_debug_protobuffer_summary_off", - ), - SwitchPreference( - "revanced_debug_stacktrace", - "revanced_debug_stacktrace_title", - "revanced_debug_stacktrace_summary_on", - "revanced_debug_stacktrace_summary_off" - ), - SwitchPreference( - "revanced_debug_toast_on_error", - "revanced_debug_toast_on_error_title", - "revanced_debug_toast_on_error_summary_on", - "revanced_debug_toast_on_error_summary_off" - ), - ), - "revanced_debug_preference_screen_summary" + SwitchPreference("revanced_debug"), + SwitchPreference("revanced_debug_protobuffer"), + SwitchPreference("revanced_debug_stacktrace"), + SwitchPreference("revanced_debug_toast_on_error") + ) ) ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt index 9358694c9d..904d5d5090 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt @@ -40,12 +40,7 @@ object SpoofDeviceDimensionsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("SpoofDeviceDimensions") SettingsPatch.PreferenceScreen.MISC.addPreferences( - SwitchPreference( - "revanced_spoof_device_dimensions", - "revanced_spoof_device_dimensions_title", - "revanced_spoof_device_dimensions_summary_on", - "revanced_spoof_device_dimensions_summary_off", - ) + SwitchPreference("revanced_spoof_device_dimensions") ) DeviceDimensionsModelToStringFingerprint.result diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt index 6d76f5783e..d03afdb4de 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt @@ -58,28 +58,11 @@ object SpoofSignaturePatch : BytecodePatch( SettingsPatch.PreferenceScreen.MISC.addPreferences( PreferenceScreen( "revanced_spoof_signature_verification_screen", - "revanced_spoof_signature_verification_screen_title", listOf( - SwitchPreference( - "revanced_spoof_signature_verification_enabled", - "revanced_spoof_signature_verification_enabled_title", - "revanced_spoof_signature_verification_enabled_summary_on", - "revanced_spoof_signature_verification_enabled_summary_off" - ), - SwitchPreference( - "revanced_spoof_signature_in_feed_enabled", - "revanced_spoof_signature_in_feed_enabled_title", - "revanced_spoof_signature_in_feed_enabled_summary_on", - "revanced_spoof_signature_in_feed_enabled_summary_off" - ), - SwitchPreference( - "revanced_spoof_storyboard", - "revanced_spoof_storyboard_title", - "revanced_spoof_storyboard_summary_on", - "revanced_spoof_storyboard_summary_off" - ) - ), - "revanced_spoof_signature_verification_screen_summary" + SwitchPreference("revanced_spoof_signature_verification_enabled"), + SwitchPreference("revanced_spoof_signature_in_feed_enabled"), + SwitchPreference("revanced_spoof_storyboard") + ) ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt index 21f4c5eec4..564e944acd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt @@ -38,12 +38,7 @@ object BypassURLRedirectsPatch : BytecodePatch( override fun execute(context: BytecodeContext) { StringsPatch.includePatchStrings("BypassURLRedirects") SettingsPatch.PreferenceScreen.MISC.addPreferences( - SwitchPreference( - "revanced_bypass_url_redirects", - "revanced_bypass_url_redirects_title", - "revanced_bypass_url_redirects_summary_on", - "revanced_bypass_url_redirects_summary_off", - ) + SwitchPreference("revanced_bypass_url_redirects") ) mapOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt index 672859e718..0c5bafe086 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt @@ -64,12 +64,7 @@ object OpenLinksExternallyPatch : AbstractTransformInstructionsPatch - Block audio ads + Block audio ads Audio ads are unblocked Audio ads are blocked diff --git a/src/main/resources/twitch/translation/values-fr-v21/strings.xml b/src/main/resources/twitch/translation/values-fr-v21/strings.xml index 84183a3470..78d58b1c95 100644 --- a/src/main/resources/twitch/translation/values-fr-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-fr-v21/strings.xml @@ -19,7 +19,7 @@ Réclamez automatiquement des points de chaîne Les publicités audio ne sont pas bloquées Les publicités audio sont bloquées - Bloquer les publicités audio + Bloquer les publicités audio Bloquer les publicités vidéo intégrées Les publicités vidéo ne sont pas bloquées Les publicités vidéo sont bloquées diff --git a/src/main/resources/twitch/translation/values-iw-v21/strings.xml b/src/main/resources/twitch/translation/values-iw-v21/strings.xml index 150f9cca17..ce0ecdc6ac 100644 --- a/src/main/resources/twitch/translation/values-iw-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-iw-v21/strings.xml @@ -19,7 +19,7 @@ תבע אוטומטית נקודות ערוץ חסימת מודעות אודיו בוטלה מודעות אודיו חסומות - חסום מודעות אודיו + חסום מודעות אודיו חסום מודעות וידאו משובצות חסימת מודעות וידאו בוטלה מודעות וידאו חסומות diff --git a/src/main/resources/twitch/translation/values-ug-v21/strings.xml b/src/main/resources/twitch/translation/values-ug-v21/strings.xml index ef0a9d411c..06155fe2a4 100644 --- a/src/main/resources/twitch/translation/values-ug-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-ug-v21/strings.xml @@ -19,7 +19,7 @@ قانال نۇقتىلىرىنى ئاپتوماتىك تەلەپ قىلىدۇ. ئاۋازلىق ئېلانلار چەكلەنگەن. ئاۋازلىق ئېلانلار چەكلەنگەن. - ئاۋازلىق ئېلانلارنى چەكلەڭ. + ئاۋازلىق ئېلانلارنى چەكلەڭ. قىستۇرۇلغان سىن ئېلانىنى چەكلەڭ. سىنلىق ئېلانلار چەكلەنگەن. سىنلىق ئېلانلار چەكلەنگەن. diff --git a/src/main/resources/twitch/translation/values-ur-v21/strings.xml b/src/main/resources/twitch/translation/values-ur-v21/strings.xml index 3856c7c30e..a7c18102f0 100644 --- a/src/main/resources/twitch/translation/values-ur-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-ur-v21/strings.xml @@ -19,7 +19,7 @@ خودکار طور پر چینل پوائنٹس کا دعوی کریں۔ آڈیو اشتہارات غیر مسدود ہیں۔ آڈیو اشتہارات مسدود ہیں۔ - آڈیو اشتہارات کو مسدود کریں۔ + آڈیو اشتہارات کو مسدود کریں۔ ایمبیڈڈ ویڈیو اشتہارات کو مسدود کریں۔ ویڈیو اشتہارات غیر مسدود ہیں۔ ویڈیو اشتہارات مسدود ہیں۔ diff --git a/src/main/resources/twitch/translation/values-zh-v21/strings.xml b/src/main/resources/twitch/translation/values-zh-v21/strings.xml index 302e329fff..3a378466b8 100644 --- a/src/main/resources/twitch/translation/values-zh-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-zh-v21/strings.xml @@ -19,7 +19,7 @@ 自动索取频道点数 音频广告已解锁 音频广告被屏蔽 - 屏蔽音频广告 + 屏蔽音频广告 屏蔽嵌入式视频广告 视频广告畅通无阻 视频广告被屏蔽 diff --git a/src/main/resources/twitch/translation/values-zu-v21/strings.xml b/src/main/resources/twitch/translation/values-zu-v21/strings.xml index 7dc8a30804..1447f0d3c0 100644 --- a/src/main/resources/twitch/translation/values-zu-v21/strings.xml +++ b/src/main/resources/twitch/translation/values-zu-v21/strings.xml @@ -19,7 +19,7 @@ Thola Amaphuzu Esiteshi ngokuzenzakalelayo Izikhangiso zomsindo zivuliwe Izikhangiso zomsindo zivinjelwe - Vimba izikhangiso ezilalelwayo + Vimba izikhangiso ezilalelwayo Vimba izikhangiso zevidiyo ezishumekiwe Izikhangiso zevidiyo azivinjiwe Izikhangiso zevidiyo zivinjelwe diff --git a/src/main/resources/youtube/stringspatch/values/Comments.xml b/src/main/resources/youtube/stringspatch/values/Comments.xml index 6c441c7fb6..ff5d0c569b 100644 --- a/src/main/resources/youtube/stringspatch/values/Comments.xml +++ b/src/main/resources/youtube/stringspatch/values/Comments.xml @@ -8,6 +8,6 @@ Comment section is shown Hide preview comment - Preview comment is hidden - Preview comment is shown + Preview comment is hidden + Preview comment is shown diff --git a/src/main/resources/youtube/stringspatch/values/EnableTabletLayout.xml b/src/main/resources/youtube/stringspatch/values/EnableTabletLayout.xml index d5d9922f8d..b895346a0f 100644 --- a/src/main/resources/youtube/stringspatch/values/EnableTabletLayout.xml +++ b/src/main/resources/youtube/stringspatch/values/EnableTabletLayout.xml @@ -1,6 +1,6 @@ - Enable tablet layout + Enable tablet layout Tablet layout is enabled Tablet layout is disabled Community posts do not show up on tablet layouts diff --git a/src/main/resources/youtube/stringspatch/values/HideFloatingMicrophoneButton.xml b/src/main/resources/youtube/stringspatch/values/HideFloatingMicrophoneButton.xml index 5101532f0d..ee54dfd46d 100644 --- a/src/main/resources/youtube/stringspatch/values/HideFloatingMicrophoneButton.xml +++ b/src/main/resources/youtube/stringspatch/values/HideFloatingMicrophoneButton.xml @@ -1,6 +1,6 @@ - Hide floating microphone button + Hide floating microphone button Microphone button hidden Microphone button shown diff --git a/src/main/resources/youtube/stringspatch/values/HideLayoutComponents.xml b/src/main/resources/youtube/stringspatch/values/HideLayoutComponents.xml index e292998b83..d34382b143 100644 --- a/src/main/resources/youtube/stringspatch/values/HideLayoutComponents.xml +++ b/src/main/resources/youtube/stringspatch/values/HideLayoutComponents.xml @@ -9,8 +9,8 @@ Button is shown Hide creator watermark on videos - Watermark is hidden - Watermark is shown + Watermark is hidden + Watermark is shown Hide \'For you\' shelf in channel page Shelf is hidden @@ -109,8 +109,8 @@ Latest posts are shown Hide chips shelf - Chips shelf is hidden - Chips shelf is shown + Chips shelf is hidden + Chips shelf is shown Hide components in the video description Hide components under the video description @@ -136,8 +136,8 @@ Transcript section is shown Hide artist cards - Artist cards are hidden - Artist cards are shown + Artist cards are hidden + Artist cards are shown Hide mix playlists Mix playlists are hidden diff --git a/src/main/resources/youtube/stringspatch/values/HidePlayerFlyoutMenu.xml b/src/main/resources/youtube/stringspatch/values/HidePlayerFlyoutMenu.xml index 4671638f60..98c0468240 100644 --- a/src/main/resources/youtube/stringspatch/values/HidePlayerFlyoutMenu.xml +++ b/src/main/resources/youtube/stringspatch/values/HidePlayerFlyoutMenu.xml @@ -4,42 +4,42 @@ Manage the visibility of player flyout menu items Hide Captions menu - Captions menu item is hidden - Captions menu item is shown + Captions menu item is hidden + Captions menu item is shown Hide Additional settings menu - Additional settings menu item is hidden - Additional settings menu item is shown + Additional settings menu item is hidden + Additional settings menu item is shown Hide Loop video menu - Loop video menu item is hidden - Loop video menu item is shown + Loop video menu item is hidden + Loop video menu item is shown Hide Ambient mode menu - Ambient mode menu item is hidden - Ambient mode menu item is shown + Ambient mode menu item is hidden + Ambient mode menu item is shown Hide Report menu - Report menu item is hidden - Report menu item is shown + Report menu item is hidden + Report menu item is shown Hide Help menu - Help menu item is hidden - Help menu item is shown + Help menu item is hidden + Help menu item is shown Hide Speed menu - Speed menu item is hidden - Speed menu item is shown + Speed menu item is hidden + Speed menu item is shown Hide More info menu - More info menu item is hidden - More info menu item is shown + More info menu item is hidden + More info menu item is shown Hide Audio track menu - Audio track menu item is hidden - Audio track menu item is shown + Audio track menu item is hidden + Audio track menu item is shown Hide Watch in VR menu - Watch in VR menu item is hidden - Watch in VR menu item is shown + Watch in VR menu item is hidden + Watch in VR menu item is shown diff --git a/src/main/resources/youtube/stringspatch/values/HideShortsComponents.xml b/src/main/resources/youtube/stringspatch/values/HideShortsComponents.xml index 8240633b56..5d8e0e243c 100644 --- a/src/main/resources/youtube/stringspatch/values/HideShortsComponents.xml +++ b/src/main/resources/youtube/stringspatch/values/HideShortsComponents.xml @@ -4,50 +4,50 @@ Shorts components Hide Shorts in feed - Shorts are hidden - Shorts are shown + Shorts are hidden + Shorts are shown Hide channel bar - Channel bar is hidden - Channel bar is shown + Channel bar is hidden + Channel bar is shown Hide comments button - Comments button is hidden - Comments button is shown + Comments button is hidden + Comments button is shown Hide info panel - Info panel is hidden - Info panel is shown + Info panel is hidden + Info panel is shown Hide join button - Join button is hidden - Join button is shown + Join button is hidden + Join button is shown Hide navigation bar - Navigation bar is hidden - Navigation bar is shown + Navigation bar is hidden + Navigation bar is shown Hide remix button - Remix button is hidden - Remix button is shown + Remix button is hidden + Remix button is shown Hide share button - Share button is hidden - Share button is shown + Share button is hidden + Share button is shown Hide sound button - Sound button is hidden - Sound button is shown + Sound button is hidden + Sound button is shown Hide subscribe button - Subscribe button is hidden - Subscribe button is shown + Subscribe button is hidden + Subscribe button is shown Hide subscribe button when paused - Subscribe button is hidden - Subscribe button is shown + Subscribe button is hidden + Subscribe button is shown Hide thanks button - Thanks button is hidden - Thanks button is shown + Thanks button is hidden + Thanks button is shown diff --git a/src/main/resources/youtube/stringspatch/values/WideSearchbar.xml b/src/main/resources/youtube/stringspatch/values/WideSearchbar.xml index 007d338c35..5820b12c73 100644 --- a/src/main/resources/youtube/stringspatch/values/WideSearchbar.xml +++ b/src/main/resources/youtube/stringspatch/values/WideSearchbar.xml @@ -1,6 +1,6 @@ - Enable wide search bar + Enable wide search bar Wide search bar is enabled Wide search bar is disabled diff --git a/src/main/resources/youtube/translation/values-fr-v26/strings.xml b/src/main/resources/youtube/translation/values-fr-v26/strings.xml index ce4e268b0c..61f377cd2c 100644 --- a/src/main/resources/youtube/translation/values-fr-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-fr-v26/strings.xml @@ -83,8 +83,8 @@ Les cartes d\'album sont affichées Les fiches d\'album sont masquées Masquer les fiches d\'album - Les cartes d\'artistes sont affichées - Les cartes d\'artiste sont masquées + Les cartes d\'artistes sont affichées + Les cartes d\'artiste sont masquées Masquer les cartes d\'artiste Le bouton de lecture automatique s\'affiche Le bouton de lecture automatique est masqué @@ -160,7 +160,7 @@ Masquer dans la recherche Gérer la visibilité de la barre de filtre dans le flux, la recherche et les vidéos associées Masquer la barre de filtre - Masquer le bouton du microphone flottant + Masquer le bouton du microphone flottant Bouton du microphone affiché Bouton du microphone caché Les panneaux plein écran sont affichés @@ -223,8 +223,8 @@ Le bouton de la liste de lecture est affiché Le bouton de la liste de lecture est masqué Masquer le bouton de la liste de lecture - Le commentaire d\'aperçu est affiché - Le commentaire d\'aperçu est masqué + Le commentaire d\'aperçu est affiché + Le commentaire d\'aperçu est masqué Masquer le commentaire d\'aperçu La bannière est affichée La bannière est masquée @@ -247,37 +247,37 @@ Le bouton du short est affiché Le bouton du short est caché Masquer le bouton du short - La barre des chaînes s\'affiche - La barre des chaînes est masquée + La barre des chaînes s\'affiche + La barre des chaînes est masquée Masquer la barre des chaînes - Le bouton Commentaires est affiché - Le bouton Commentaires est masqué + Le bouton Commentaires est affiché + Le bouton Commentaires est masqué Bouton Masquer les commentaires - Le panneau d\'informations s\'affiche - Le panneau d\'informations est masqué + Le panneau d\'informations s\'affiche + Le panneau d\'informations est masqué Masquer le panneau d\'informations - Le bouton Rejoindre est affiché - Le bouton Rejoindre est masqué + Le bouton Rejoindre est affiché + Le bouton Rejoindre est masqué Cacher le bouton de jointure - La barre de navigation s\'affiche - La barre de navigation est masquée + La barre de navigation s\'affiche + La barre de navigation est masquée Masquer la barre de navigation - Les shorts sont affichés - Les shorts sont cachés - Le bouton Remix est affiché - Le bouton Remix est masqué + Les shorts sont affichés + Les shorts sont cachés + Le bouton Remix est affiché + Le bouton Remix est masqué Masquer le bouton de remix - Le bouton Partager est affiché - Le bouton Partager est masqué + Le bouton Partager est affiché + Le bouton Partager est masqué Masquer le bouton de partage - Le bouton Son est affiché - Le bouton son est caché + Le bouton Son est affiché + Le bouton son est caché Masquer le bouton du son - Le bouton S\'abonner est affiché - Le bouton S\'abonner est masqué + Le bouton S\'abonner est affiché + Le bouton S\'abonner est masqué Masquer le bouton d\'abonnement - Le bouton Merci s\'affiche - Le bouton Merci est masqué + Le bouton Merci s\'affiche + Le bouton Merci est masqué Masquer le bouton de remerciement Masquer les shorts dans le flux Les directives de la communauté des abonnés sont affichées @@ -301,7 +301,7 @@ Les résultats de la recherche Web sont affichés Les résultats de la recherche Web sont masqués Masquer les résultats de la recherche Web - Lecture minimisée + Lecture minimisée Ce paramètre peut être trouvé dans Paramètres -> Arrière-plan Patchs divers Divers diff --git a/src/main/resources/youtube/translation/values-iw-v26/strings.xml b/src/main/resources/youtube/translation/values-iw-v26/strings.xml index 5a653e2c5a..30b03cfd06 100644 --- a/src/main/resources/youtube/translation/values-iw-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-iw-v26/strings.xml @@ -83,8 +83,8 @@ מוצגים כרטיסי אלבום כרטיסי אלבום מוסתרים הסתר כרטיסי אלבום - מוצגים כרטיסי אמן - כרטיסי אמן מוסתרים + מוצגים כרטיסי אמן + כרטיסי אמן מוסתרים הסתר כרטיסי אמן לחצן הפעלה אוטומטית מוצג לחצן ההפעלה האוטומטית מוסתר @@ -160,7 +160,7 @@ התחבא בחיפוש נהל את הנראות של סרגל הסינון בפיד, בחיפוש ובסרטונים קשורים הסתר סרגל סינון - הסתר כפתור מיקרופון צף + הסתר כפתור מיקרופון צף לחצן המיקרופון מוצג כפתור המיקרופון מוסתר לוחות מסך מלא מוצגים @@ -223,8 +223,8 @@ לחצן רשימת השמעה מוצג לחצן רשימת השמעה מוסתר כפתור הסתר רשימת השמעה - תגובת התצוגה המקדימה מוצגת - הערת תצוגה מקדימה מוסתרת + תגובת התצוגה המקדימה מוצגת + הערת תצוגה מקדימה מוסתרת הסתר הערת תצוגה מקדימה באנר מוצג באנר מוסתר @@ -247,37 +247,37 @@ לחצן מכנסיים קצרים מוצג כפתור מכנסיים קצרים מוסתר כפתור הסתר מכנסיים קצרים - סרגל הערוצים מוצג - סרגל הערוצים מוסתר + סרגל הערוצים מוצג + סרגל הערוצים מוסתר הסתר את סרגל הערוצים - לחצן הערות מוצג - כפתור ההערות מוסתר + לחצן הערות מוצג + כפתור ההערות מוסתר כפתור הסתר הערות - חלונית המידע מוצגת - חלונית המידע מוסתרת + חלונית המידע מוצגת + חלונית המידע מוסתרת הסתר חלונית מידע - לחצן הצטרפות מוצג - כפתור ההצטרפות מוסתר + לחצן הצטרפות מוצג + כפתור ההצטרפות מוסתר הסתר כפתור הצטרפות - סרגל הניווט מוצג - סרגל הניווט מוסתר + סרגל הניווט מוצג + סרגל הניווט מוסתר הסתר את סרגל הניווט - מוצגים מכנסיים קצרים - מכנסיים קצרים מוסתרים - לחצן רמיקס מוצג - כפתור הרמיקס מוסתר + מוצגים מכנסיים קצרים + מכנסיים קצרים מוסתרים + לחצן רמיקס מוצג + כפתור הרמיקס מוסתר הסתר כפתור רמיקס - לחצן השיתוף מוצג - כפתור השיתוף מוסתר + לחצן השיתוף מוצג + כפתור השיתוף מוסתר הסתר כפתור שיתוף - לחצן הצליל מוצג - כפתור הקול מוסתר + לחצן הצליל מוצג + כפתור הקול מוסתר הסתר כפתור צליל - לחצן הירשם מוצג - כפתור ההרשמה מוסתר + לחצן הירשם מוצג + כפתור ההרשמה מוסתר הסתר כפתור הרשמה - לחצן תודה מוצג - כפתור תודה מוסתר + לחצן תודה מוצג + כפתור תודה מוסתר הסתר כפתור תודה הסתר מכנסיים קצרים בפיד הנחיות הקהילה של המנויים מוצגות @@ -301,7 +301,7 @@ תוצאות חיפוש באינטרנט מוצגות תוצאות החיפוש באינטרנט מוסתרות הסתר תוצאות חיפוש באינטרנט - השמעה ממוזערת + השמעה ממוזערת ניתן למצוא הגדרה זו בהגדרות -> רקע טלאים שונים שונות diff --git a/src/main/resources/youtube/translation/values-ug-v26/strings.xml b/src/main/resources/youtube/translation/values-ug-v26/strings.xml index 56fcc0631e..b2f8876dc1 100644 --- a/src/main/resources/youtube/translation/values-ug-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-ug-v26/strings.xml @@ -84,8 +84,8 @@ پىلاستىنكا كارتىلىرى كۆرسىتىلدى پىلاستىنكا كارتىلىرى يوشۇرۇنغان پىلاستىنكا كارتىلىرىنى يوشۇرۇش - سەنئەتكار كارتىلىرى كۆرسىتىلدى - سەنئەتكار كارتىلىرى يوشۇرۇنغان + سەنئەتكار كارتىلىرى كۆرسىتىلدى + سەنئەتكار كارتىلىرى يوشۇرۇنغان سەنئەتكار كارتىلىرىنى يوشۇرۇش ئاپتوماتىك كۇنۇپكا كۆرسىتىلدى ئاپتۇماتىك كۇنۇپكا يوشۇرۇنغان @@ -161,7 +161,7 @@ ئىزدەشكە يوشۇرۇن يەم ، ئىزدەش ۋە مۇناسىۋەتلىك سىنلاردىكى سۈزگۈچ بالدىقىنىڭ كۆرۈنۈشچانلىقىنى باشقۇرۇڭ سۈزگۈچ بالدىقىنى يوشۇرۇش - لەيلىمە مىكروفون كۇنۇپكىسىنى يوشۇرۇش + لەيلىمە مىكروفون كۇنۇپكىسىنى يوشۇرۇش مىكروفون كۇنۇپكىسى كۆرسىتىلدى مىكروفون كۇنۇپكىسى يوشۇرۇنغان تولۇق ئېكران تاختىسى كۆرسىتىلدى @@ -224,8 +224,8 @@ قويۇش تىزىملىكى كۇنۇپكىسى كۆرسىتىلدى قويۇش تىزىملىكى كۇنۇپكىسى يوشۇرۇنغان قويۇش تىزىملىكى كۇنۇپكىسىنى يوشۇرۇش - ئالدىن كۆرۈش باھاسى كۆرسىتىلدى - ئالدىن كۆرۈش باھاسى يوشۇرۇن + ئالدىن كۆرۈش باھاسى كۆرسىتىلدى + ئالدىن كۆرۈش باھاسى يوشۇرۇن ئالدىن كۆرۈش باھاسىنى يوشۇرۇش بايراق كۆرسىتىلدى بايراق يوشۇرۇنغان @@ -248,37 +248,37 @@ كالتە ئىشتان كۇنۇپكىسى كۆرسىتىلدى كالتە ئىشتان كۇنۇپكىسى يوشۇرۇنغان كالتە ئىشتان كۇنۇپكىسىنى يوشۇرۇش - قانال بالدىقى كۆرسىتىلدى - قانال بالدىقى يوشۇرۇنغان + قانال بالدىقى كۆرسىتىلدى + قانال بالدىقى يوشۇرۇنغان قانال بالدىقىنى يوشۇرۇش - باھا كۇنۇپكىسى كۆرسىتىلدى - باھا كۇنۇپكىسى يوشۇرۇنغان + باھا كۇنۇپكىسى كۆرسىتىلدى + باھا كۇنۇپكىسى يوشۇرۇنغان باھا كۇنۇپكىسىنى يوشۇرۇش - ئۇچۇر تاختىسى كۆرسىتىلدى - ئۇچۇر تاختىسى يوشۇرۇن + ئۇچۇر تاختىسى كۆرسىتىلدى + ئۇچۇر تاختىسى يوشۇرۇن ئۇچۇر تاختىسىنى يوشۇرۇش - قوشۇش كۇنۇپكىسى كۆرسىتىلدى - قوشۇش كۇنۇپكىسى يوشۇرۇن + قوشۇش كۇنۇپكىسى كۆرسىتىلدى + قوشۇش كۇنۇپكىسى يوشۇرۇن قوشۇش كۇنۇپكىسىنى يوشۇرۇش - يولباشچى ستونى كۆرسىتىلدى - يولباشچى ستونى يوشۇرۇنغان + يولباشچى ستونى كۆرسىتىلدى + يولباشچى ستونى يوشۇرۇنغان يولباشچى ستونىنى يوشۇرۇش - كالتە ئىشتان كۆرسىتىلدى - كالتە ئىشتان يوشۇرۇنغان - Remix كۇنۇپكىسى كۆرسىتىلدى - Remix كۇنۇپكىسى يوشۇرۇنغان + كالتە ئىشتان كۆرسىتىلدى + كالتە ئىشتان يوشۇرۇنغان + Remix كۇنۇپكىسى كۆرسىتىلدى + Remix كۇنۇپكىسى يوشۇرۇنغان Remix كۇنۇپكىسىنى يوشۇرۇش - ئورتاقلىشىش كۇنۇپكىسى كۆرسىتىلدى - ھەمبەھىرلەش كۇنۇپكىسى يوشۇرۇنغان + ئورتاقلىشىش كۇنۇپكىسى كۆرسىتىلدى + ھەمبەھىرلەش كۇنۇپكىسى يوشۇرۇنغان ھەمبەھىر كۇنۇپكىسىنى يوشۇرۇش - ئاۋاز كۇنۇپكىسى كۆرسىتىلدى - ئاۋاز كۇنۇپكىسى يوشۇرۇنغان + ئاۋاز كۇنۇپكىسى كۆرسىتىلدى + ئاۋاز كۇنۇپكىسى يوشۇرۇنغان ئاۋاز كۇنۇپكىسىنى يوشۇرۇش - مۇشتەرى بولۇش كۇنۇپكىسى كۆرسىتىلدى - مۇشتەرى بولۇش كۇنۇپكىسى يوشۇرۇنغان + مۇشتەرى بولۇش كۇنۇپكىسى كۆرسىتىلدى + مۇشتەرى بولۇش كۇنۇپكىسى يوشۇرۇنغان مۇشتەرى بولۇش كۇنۇپكىسىنى يوشۇرۇش - رەھمەت كۇنۇپكىسى كۆرسىتىلدى - رەھمەت كۇنۇپكىسى يوشۇرۇنغان + رەھمەت كۇنۇپكىسى كۆرسىتىلدى + رەھمەت كۇنۇپكىسى يوشۇرۇنغان رەھمەت كۇنۇپكىسىنى يوشۇرۇش يەم-خەشەكتە كالتە ئىشتاننى يوشۇرۇش مۇشتەرى بولغان مەھەللە كۆرسەتمىلىرى كۆرسىتىلدى @@ -302,7 +302,7 @@ تور ئىزدەش نەتىجىسى كۆرسىتىلدى تور ئىزدەش نەتىجىسى يوشۇرۇن تور ئىزدەش نەتىجىسىنى يوشۇرۇش - كىچىكلىتىلگەن قويۇش + كىچىكلىتىلگەن قويۇش بۇ تەڭشەكنى تەڭشەك -> تەگلىكتىن تاپقىلى بولىدۇ ھەرخىل ياماقلار Misc diff --git a/src/main/resources/youtube/translation/values-ur-v26/strings.xml b/src/main/resources/youtube/translation/values-ur-v26/strings.xml index 193575c9c1..ebab01baf7 100644 --- a/src/main/resources/youtube/translation/values-ur-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-ur-v26/strings.xml @@ -83,8 +83,8 @@ البم کارڈ دکھائے گئے ہیں۔ البم کارڈز چھپے ہوئے ہیں۔ البم کارڈ چھپائیں۔ - آرٹسٹ کارڈ دکھائے گئے ہیں۔ - آرٹسٹ کارڈز چھپے ہوئے ہیں۔ + آرٹسٹ کارڈ دکھائے گئے ہیں۔ + آرٹسٹ کارڈز چھپے ہوئے ہیں۔ آرٹسٹ کارڈ چھپائیں۔ آٹو پلے بٹن دکھایا گیا ہے۔ آٹو پلے بٹن چھپا ہوا ہے۔ @@ -160,7 +160,7 @@ تلاش میں چھپ جائیں۔ فیڈ، تلاش اور متعلقہ ویڈیوز میں فلٹر بار کی مرئیت کا نظم کریں۔ فلٹر بار چھپائیں۔ - تیرتے ہوئے مائیکروفون بٹن کو چھپائیں۔ + تیرتے ہوئے مائیکروفون بٹن کو چھپائیں۔ مائیکروفون بٹن دکھایا گیا ہے۔ مائیکروفون بٹن چھپا ہوا ہے۔ فل سکرین پینلز دکھائے گئے ہیں۔ @@ -223,8 +223,8 @@ پلے لسٹ بٹن دکھایا گیا ہے۔ پلے لسٹ بٹن پوشیدہ ہے۔ پلے لسٹ بٹن چھپائیں۔ - پیش نظارہ تبصرہ دکھایا گیا ہے۔ - پیش نظارہ تبصرہ پوشیدہ ہے۔ + پیش نظارہ تبصرہ دکھایا گیا ہے۔ + پیش نظارہ تبصرہ پوشیدہ ہے۔ پیش نظارہ تبصرہ چھپائیں۔ بینر دکھایا گیا ہے۔ بینر چھپا ہوا ہے۔ @@ -247,37 +247,37 @@ شارٹس کا بٹن دکھایا گیا ہے۔ شارٹس کا بٹن چھپا ہوا ہے۔ شارٹس کا بٹن چھپائیں۔ - چینل بار دکھایا گیا ہے۔ - چینل بار چھپا ہوا ہے۔ + چینل بار دکھایا گیا ہے۔ + چینل بار چھپا ہوا ہے۔ چینل بار چھپائیں۔ - تبصرے کا بٹن دکھایا گیا ہے۔ - تبصرے کا بٹن چھپا ہوا ہے۔ + تبصرے کا بٹن دکھایا گیا ہے۔ + تبصرے کا بٹن چھپا ہوا ہے۔ تبصرے کا بٹن چھپائیں۔ - معلوماتی پینل دکھایا گیا ہے۔ - معلوماتی پینل چھپا ہوا ہے۔ + معلوماتی پینل دکھایا گیا ہے۔ + معلوماتی پینل چھپا ہوا ہے۔ معلوماتی پینل چھپائیں۔ - شمولیت کا بٹن دکھایا گیا ہے۔ - شمولیت کا بٹن چھپا ہوا ہے۔ + شمولیت کا بٹن دکھایا گیا ہے۔ + شمولیت کا بٹن چھپا ہوا ہے۔ شامل ہونے کا بٹن چھپائیں۔ - نیویگیشن بار دکھایا گیا ہے۔ - نیویگیشن بار پوشیدہ ہے۔ + نیویگیشن بار دکھایا گیا ہے۔ + نیویگیشن بار پوشیدہ ہے۔ نیویگیشن بار چھپائیں۔ - شارٹس دکھائے گئے ہیں۔ - شارٹس چھپے ہوئے ہیں۔ - ریمکس بٹن دکھایا گیا ہے۔ - ریمکس بٹن چھپا ہوا ہے۔ + شارٹس دکھائے گئے ہیں۔ + شارٹس چھپے ہوئے ہیں۔ + ریمکس بٹن دکھایا گیا ہے۔ + ریمکس بٹن چھپا ہوا ہے۔ ریمکس بٹن چھپائیں۔ - شیئر بٹن دکھایا گیا ہے۔ - شیئر بٹن چھپا ہوا ہے۔ + شیئر بٹن دکھایا گیا ہے۔ + شیئر بٹن چھپا ہوا ہے۔ شیئر بٹن چھپائیں۔ - ساؤنڈ بٹن دکھایا گیا ہے۔ - ساؤنڈ بٹن چھپا ہوا ہے۔ + ساؤنڈ بٹن دکھایا گیا ہے۔ + ساؤنڈ بٹن چھپا ہوا ہے۔ آواز کا بٹن چھپائیں۔ - سبسکرائب بٹن دکھایا گیا ہے۔ - سبسکرائب بٹن چھپا ہوا ہے۔ + سبسکرائب بٹن دکھایا گیا ہے۔ + سبسکرائب بٹن چھپا ہوا ہے۔ سبسکرائب بٹن کو چھپائیں۔ - شکریہ بٹن دکھایا گیا ہے۔ - شکریہ بٹن چھپا ہوا ہے۔ + شکریہ بٹن دکھایا گیا ہے۔ + شکریہ بٹن چھپا ہوا ہے۔ شکریہ بٹن چھپائیں۔ فیڈ میں شارٹس چھپائیں۔ سبسکرائبرز کمیونٹی کے رہنما خطوط دکھائے گئے ہیں۔ @@ -301,7 +301,7 @@ ویب تلاش کے نتائج دکھائے گئے ہیں۔ ویب تلاش کے نتائج پوشیدہ ہیں۔ ویب تلاش کے نتائج چھپائیں۔ - کم سے کم پلے بیک + کم سے کم پلے بیک یہ ترتیب ترتیبات -> پس منظر میں مل سکتی ہے۔ متفرق پیچ متفرق diff --git a/src/main/resources/youtube/translation/values-zh-v26/strings.xml b/src/main/resources/youtube/translation/values-zh-v26/strings.xml index 2cfa5c6ea1..405ac7e5d0 100644 --- a/src/main/resources/youtube/translation/values-zh-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-zh-v26/strings.xml @@ -83,8 +83,8 @@ 显示相册卡片 相册卡被隐藏 隐藏相册卡片 - 显示艺术家卡片 - 艺术家卡片已隐藏 + 显示艺术家卡片 + 艺术家卡片已隐藏 隐藏艺术家名片 显示自动播放按钮 自动播放按钮被隐藏 @@ -160,7 +160,7 @@ 隐藏在搜索中 管理提要、搜索和相关视频中过滤栏的可见性 隐藏过滤栏 - 隐藏浮动麦克风按钮 + 隐藏浮动麦克风按钮 显示麦克风按钮 隐藏麦克风按钮 显示全屏面板 @@ -223,8 +223,8 @@ 显示播放列表按钮 播放列表按钮被隐藏 隐藏播放列表按钮 - 显示预览评论 - 预览评论被隐藏 + 显示预览评论 + 预览评论被隐藏 隐藏预览评论 显示横幅 横幅被隐藏 @@ -247,37 +247,37 @@ 显示短裤按钮 隐藏短裤按钮 隐藏短裤按钮 - 显示频道栏 - 隐藏频道栏 + 显示频道栏 + 隐藏频道栏 隐藏频道栏 - 显示评论按钮 - 隐藏评论按钮 + 显示评论按钮 + 隐藏评论按钮 隐藏评论按钮 - 显示信息面板 - 信息面板被隐藏 + 显示信息面板 + 信息面板被隐藏 隐藏信息面板 - 显示加入按钮 - 加入按钮被隐藏 + 显示加入按钮 + 加入按钮被隐藏 隐藏加入按钮 - 显示导航栏 - 导航栏被隐藏 + 显示导航栏 + 导航栏被隐藏 隐藏导航栏 - 显示短裤 - 短裤被隐藏 - 显示混音按钮 - 隐藏混音按钮 + 显示短裤 + 短裤被隐藏 + 显示混音按钮 + 隐藏混音按钮 隐藏混音按钮 - 显示分享按钮 - 分享按钮被隐藏 + 显示分享按钮 + 分享按钮被隐藏 隐藏分享按钮 - 显示声音按钮 - 声音按钮被隐藏 + 显示声音按钮 + 声音按钮被隐藏 隐藏声音按钮 - 显示订阅按钮 - 隐藏订阅按钮 + 显示订阅按钮 + 隐藏订阅按钮 隐藏订阅按钮 - 显示感谢按钮 - 感谢按钮被隐藏 + 显示感谢按钮 + 感谢按钮被隐藏 隐藏感谢按钮 在 Feed 中隐藏短裤 显示订阅者社区指南 @@ -301,7 +301,7 @@ 网页搜索结果显示 网络搜索结果被隐藏 隐藏网络搜索结果 - 最小化播放 + 最小化播放 此设置可以在设置 -> 背景中找到 杂项补丁 杂项 @@ -377,7 +377,7 @@ 自动质量 移动网络上的默认视频质量 Wi-Fi 网络上的默认视频质量 - 启用宽搜索栏 + 启用宽搜索栏 宽搜索栏已禁用 宽搜索栏已启用 diff --git a/src/main/resources/youtube/translation/values-zu-v26/strings.xml b/src/main/resources/youtube/translation/values-zu-v26/strings.xml index bb011109bd..dc6cc81746 100644 --- a/src/main/resources/youtube/translation/values-zu-v26/strings.xml +++ b/src/main/resources/youtube/translation/values-zu-v26/strings.xml @@ -83,8 +83,8 @@ Amakhadi e-albhamu ayaboniswa Amakhadi e-albhamu afihliwe Fihla amakhadi e-albhamu - Amakhadi omculi ayaboniswa - Amakhadi omculi afihliwe + Amakhadi omculi ayaboniswa + Amakhadi omculi afihliwe Fihla amakhadi omculi Inkinobho yokuzidlalela iyaboniswa Inkinobho yokuzidlalela ifihliwe @@ -160,7 +160,7 @@ Fihla ekusesheni Phatha ukubonakala kwebha yokuhlunga kokuphakelayo, ukusesha namavidiyo ahlobene Fihla ibha yokuhlunga - Fihla inkinobho yemakrofoni entantayo + Fihla inkinobho yemakrofoni entantayo Inkinobho yemakrofoni ibonisiwe Inkinobho yemakrofoni ifihliwe Amaphaneli esikrini esigcwele ayaboniswa @@ -223,8 +223,8 @@ Inkinobho yohlu lwadlalwayo iyaboniswa Inkinobho yohlu lwadlalwayo ifihliwe Fihla inkinobho yohlu lwadlalwayo - Amazwana okubuka kuqala abonisiwe - Amazwana okubuka kuqala afihliwe + Amazwana okubuka kuqala abonisiwe + Amazwana okubuka kuqala afihliwe Fihla ukubuka kuqala amazwana Isibhengezo siyaboniswa Isibhengezo sifihliwe @@ -247,37 +247,37 @@ Inkinobho yokufushane iyaboniswa Inkinobho yokufushane ifihliwe Fihla inkinobho yezikhindi - Ibha yesiteshi iyaboniswa - Ibha yesiteshi ifihliwe + Ibha yesiteshi iyaboniswa + Ibha yesiteshi ifihliwe Fihla ibha yesiteshi - Inkinobho yamazwana iyaboniswa - Inkinobho yamazwana ifihliwe + Inkinobho yamazwana iyaboniswa + Inkinobho yamazwana ifihliwe Fihla inkinobho yamazwana - Iphaneli yolwazi iyaboniswa - Iphaneli yolwazi ifihliwe + Iphaneli yolwazi iyaboniswa + Iphaneli yolwazi ifihliwe Fihla iphaneli yolwazi - Inkinobho yokujoyina ibonisiwe - Inkinobho yokujoyina ifihliwe + Inkinobho yokujoyina ibonisiwe + Inkinobho yokujoyina ifihliwe Fihla inkinobho yokujoyina - Ibha yokuzula iyaboniswa - Ibha yokuzulazula ifihliwe + Ibha yokuzula iyaboniswa + Ibha yokuzulazula ifihliwe Fihla ibha yokuzulazula - Okufushane kuyaboniswa - Okufushane kufihliwe - Inkinobho yokuhlanganisa kabusha iyaboniswa - Inkinobho ye-Remix ifihliwe + Okufushane kuyaboniswa + Okufushane kufihliwe + Inkinobho yokuhlanganisa kabusha iyaboniswa + Inkinobho ye-Remix ifihliwe Fihla inkinobho ye-remix - Inkinobho yokwabelana iyaboniswa - Inkinobho yokwabelana ifihliwe + Inkinobho yokwabelana iyaboniswa + Inkinobho yokwabelana ifihliwe Fihla inkinobho yokwabelana - Inkinobho yomsindo iyaboniswa - Inkinobho yomsindo ifihliwe + Inkinobho yomsindo iyaboniswa + Inkinobho yomsindo ifihliwe Fihla inkinobho yomsindo - Inkinobho yokubhalisa iyaboniswa - Inkinobho yokubhalisa ifihliwe + Inkinobho yokubhalisa iyaboniswa + Inkinobho yokubhalisa ifihliwe Fihla inkinobho yokubhalisa - Inkinobho yokubonga iyaboniswa - Inkinobho yokubonga ifihliwe + Inkinobho yokubonga iyaboniswa + Inkinobho yokubonga ifihliwe Fihla inkinobho yokubonga Fihla izikhindi kokuphakelayo Imihlahlandlela yomphakathi yababhalisile iyaboniswa @@ -301,7 +301,7 @@ Imiphumela yosesho lwewebhu iyaboniswa Imiphumela yosesho lwewebhu ifihliwe Fihla imiphumela yosesho lwewebhu - Ukudlala okuncishisiwe + Ukudlala okuncishisiwe Lesi silungiselelo singatholakala kokuthi Izilungiselelo -> Ingemuva Amapheshana ahlukahlukene Okunhlobonhlobo