diff --git a/api/revanced-patches.api b/api/revanced-patches.api index 844d097b4..3f2b6c970 100644 --- a/api/revanced-patches.api +++ b/api/revanced-patches.api @@ -622,13 +622,6 @@ public abstract class app/revanced/patches/shared/settings/preference/BaseResour public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; } -public abstract class app/revanced/patches/shared/settings/preference/DefaultBasePreference : app/revanced/patches/shared/settings/preference/BasePreference { - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getDefault ()Ljava/lang/Object; - public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; -} - public final class app/revanced/patches/shared/settings/preference/SummaryType : java/lang/Enum { public static final field DEFAULT Lapp/revanced/patches/shared/settings/preference/SummaryType; public static final field OFF Lapp/revanced/patches/shared/settings/preference/SummaryType; @@ -659,9 +652,8 @@ public final class app/revanced/patches/shared/settings/preference/impl/InputTyp public static fun values ()[Lapp/revanced/patches/shared/settings/preference/impl/InputType; } -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;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 class app/revanced/patches/shared/settings/preference/impl/ListPreference : app/revanced/patches/shared/settings/preference/BasePreference { + 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;)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; @@ -703,17 +695,16 @@ 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/BasePreference { + public fun (Ljava/lang/String;)V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - 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 class app/revanced/patches/shared/settings/preference/impl/TextPreference : app/revanced/patches/shared/settings/preference/BasePreference { + public fun (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;)V + public synthetic fun (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;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;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getInputType ()Lapp/revanced/patches/shared/settings/preference/impl/InputType; public fun serialize (Lorg/w3c/dom/Document;)Lorg/w3c/dom/Element; } diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt deleted file mode 100644 index 7290ecd68..000000000 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt +++ /dev/null @@ -1,30 +0,0 @@ -package app.revanced.patches.shared.settings.preference - -import org.w3c.dom.Document - -/** - * Base preference class that also has a default value. - * - * @param key The key of the preference. - * @param titleKey The title of the preference. - * @param tag The tag of the preference. - * @param summaryKey The summary of the preference. - * @param default The default value of the preference. - */ -abstract class DefaultBasePreference( - key: String?, - titleKey: String, - summaryKey: String? = null, - tag: String, - val default: T? = null, -) : BasePreference(key, titleKey, summaryKey, tag) { - - /** - * Serialize preference element to XML. - * Overriding methods should invoke super and operate on its return value. - * @param ownerDocument Target document to create elements from. - * @return The serialized element. - */ - override fun serialize(ownerDocument: Document) = - super.serialize(ownerDocument).apply { addDefault(default) } -} \ No newline at end of file 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 41ab83471..d959356b6 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 @@ -1,6 +1,6 @@ package app.revanced.patches.shared.settings.preference.impl -import app.revanced.patches.shared.settings.preference.DefaultBasePreference +import app.revanced.patches.shared.settings.preference.BasePreference import app.revanced.patches.shared.settings.preference.addSummary import org.w3c.dom.Document @@ -18,9 +18,8 @@ class ListPreference( titleKey: String, summaryKey: String?, val entries: ArrayResource?, - val entryValues: ArrayResource?, - default: String? = null, -) : DefaultBasePreference(key, titleKey, summaryKey, "ListPreference", default) { + val entryValues: ArrayResource? +) : BasePreference(key, titleKey, summaryKey, "ListPreference") { override fun serialize(ownerDocument: Document) = super.serialize(ownerDocument).apply { 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 a5f48da93..a44b246ef 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 @@ -13,19 +13,18 @@ import org.w3c.dom.Element * @param titleKey The title of the switch. * @param summaryOnKey The summary to show when the preference is enabled. * @param summaryOffKey The summary to show when the preference is disabled. - * @param default The default value of the switch. */ class SwitchPreference( key: String, titleKey: String, private val summaryOnKey: String, private val summaryOffKey: String, -) : BasePreference( key, titleKey, null, "SwitchPreference") { +) : BasePreference(key, titleKey, null, "SwitchPreference") { /** * Initialize using title and summary keys with the suffix "_title", "_summary_on", "_summary_off" */ - constructor(key: String, default: Boolean = false) : this(key, "${key}_title", + constructor(key: String) : this(key, "${key}_title", "${key}_summary_on", "${key}_summary_off") override fun serialize(ownerDocument: Document): Element { 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 b53b39fad..c66039ddc 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 @@ -1,6 +1,6 @@ package app.revanced.patches.shared.settings.preference.impl -import app.revanced.patches.shared.settings.preference.DefaultBasePreference +import app.revanced.patches.shared.settings.preference.BasePreference import org.w3c.dom.Document /** @@ -16,17 +16,17 @@ class TextPreference( titleKey: String, summaryKey: String?, val inputType: InputType = InputType.TEXT, - default: String? = null, tag: String = "app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference" -) : DefaultBasePreference(key, titleKey, summaryKey, tag, default) { +) : BasePreference(key, titleKey, summaryKey, tag) { /** * Initialize using title and summary keys with the suffix "_title", "_summary_on", "_summary_off" */ constructor( - key: String, inputType: InputType = InputType.TEXT, default: String? = null, + key: String, + inputType: InputType = InputType.TEXT, tag: String = "app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference" - ) : this(key, "${key}_title", "${key}_summary", inputType, default, tag) + ) : this(key, "${key}_title", "${key}_summary", inputType, tag) override fun serialize(ownerDocument: Document) = 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 6df0d4ef6..cc49222d0 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,7 +42,6 @@ object AudioAdsPatch : BytecodePatch( SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences( SwitchPreference( "revanced_block_audio_ads", - default = true, ) ) } 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 32e4ef4d1..da8a09ca1 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 @@ -132,8 +132,7 @@ object VideoAdsPatch : AbstractAdPatch( StringsPatch.includePatchStrings("VideoAds") SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences( SwitchPreference( - "revanced_block_video_ads", - default = true + "revanced_block_video_ads" ) ) } 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 1cf6f7e3c..aabb090d9 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 @@ -27,8 +27,7 @@ object AutoClaimChannelPointPatch : BytecodePatch( StringsPatch.includePatchStrings("AutoClaimChannelPoint") SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences( SwitchPreference( - "revanced_auto_claim_channel_points", - default = true + "revanced_auto_claim_channel_points" ) ) 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 a25105a23..df772243d 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt @@ -51,7 +51,6 @@ object DebugModePatch : BytecodePatch( SettingsPatch.PreferenceScreen.MISC.OTHER.addPreferences( SwitchPreference( "revanced_debug_mode", - default = false, ) ) }