From fe94013a2235953b32fed6e0710a252698a264b3 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 13 Aug 2023 18:36:07 +0200 Subject: [PATCH] fix: allow using `PreferenceScreen` outside of current module --- .../patches/shared/settings/preference/BasePreference.kt | 2 +- .../patches/shared/settings/preference/BaseResource.kt | 2 +- .../shared/settings/preference/DefaultBasePreference.kt | 2 +- .../patches/shared/settings/preference/impl/ArrayResource.kt | 2 +- .../patches/shared/settings/preference/impl/ListPreference.kt | 2 +- .../settings/preference/impl/NonInteractivePreference.kt | 2 +- .../patches/shared/settings/preference/impl/Preference.kt | 4 ++-- .../shared/settings/preference/impl/PreferenceCategory.kt | 2 +- .../shared/settings/preference/impl/PreferenceScreen.kt | 2 +- .../patches/shared/settings/preference/impl/StringResource.kt | 2 +- .../shared/settings/preference/impl/SwitchPreference.kt | 2 +- .../patches/shared/settings/preference/impl/TextPreference.kt | 2 +- .../patches/shared/settings/util/AbstractPreferenceScreen.kt | 2 +- .../youtube/misc/settings/bytecode/patch/SettingsPatch.kt | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/BasePreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/BasePreference.kt index 09fe4bc61..4fc84105d 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/BasePreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/BasePreference.kt @@ -12,7 +12,7 @@ import org.w3c.dom.Element * @param tag The tag of the preference. * @param summary The summary of the preference. */ -internal abstract class BasePreference( +abstract class BasePreference( val key: String?, val title: StringResource, val summary: StringResource? = null, diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/BaseResource.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/BaseResource.kt index 61a9b35a2..682ccb33a 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/BaseResource.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/BaseResource.kt @@ -9,7 +9,7 @@ import org.w3c.dom.Element * @param name The name of the resource. * @param tag The tag of the resource. */ -internal abstract class BaseResource( +abstract class BaseResource( val name: String, val tag: String ) { 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 index 64d35878c..9371d48f8 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt @@ -12,7 +12,7 @@ import org.w3c.dom.Document * @param summary The summary of the preference. * @param default The default value of the preference. */ -internal abstract class DefaultBasePreference( +abstract class DefaultBasePreference( key: String?, title: StringResource, summary: StringResource? = null, diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt index 9db57cff0..fa5e12f3c 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt @@ -10,7 +10,7 @@ import org.w3c.dom.Document * @param name The name of the array resource. * @param items The items of the array resource. */ -internal class ArrayResource( +class ArrayResource( name: String, val items: List ) : BaseResource(name, "string-array") { 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 3df3c87e9..37181267f 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 @@ -15,7 +15,7 @@ import org.w3c.dom.Document * @param summary The summary of the list preference. * @param default The default entry value of the list preference. */ -internal class ListPreference( +class ListPreference( key: String, title: StringResource, val entries: ArrayResource, diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt index c97913c2a..eb16067c2 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt @@ -15,7 +15,7 @@ import org.w3c.dom.Element * @param title The title of the preference. * @param summary The summary of the text preference. */ -internal class NonInteractivePreference( +class NonInteractivePreference( title: StringResource, summary: StringResource, ) : BasePreference(null, title, summary, "Preference") { diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/Preference.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/Preference.kt index 2ada5625d..463a1fce2 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/Preference.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/Preference.kt @@ -12,7 +12,7 @@ import org.w3c.dom.Document * @param summary The summary of the text preference. * @param intent The intent of the preference. */ -internal class Preference( +class Preference( key: String, title: StringResource, summary: StringResource, @@ -33,7 +33,7 @@ internal class Preference( }) } - internal class Intent( + class Intent( internal val targetPackage: String, internal val data: String, internal val targetClass: String diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt index 56e02f45d..633e8d784 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt @@ -11,7 +11,7 @@ import org.w3c.dom.Document * @param title The title of the preference. * @param preferences Child preferences of this category. */ -internal open class PreferenceCategory( +open class PreferenceCategory( key: String, title: StringResource, var preferences: List, 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 e6bf32d43..e0e435b23 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 @@ -13,7 +13,7 @@ import org.w3c.dom.Document * @param preferences Child preferences of this screen. * @param summary The summary of the text preference. */ -internal open class PreferenceScreen( +open class PreferenceScreen( key: String, title: StringResource, var preferences: List, diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/StringResource.kt b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/StringResource.kt index 7934b1270..b3cd83972 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/StringResource.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/StringResource.kt @@ -11,7 +11,7 @@ import org.w3c.dom.Document * @param value The value of the string. * @param formatted If the string is formatted. If false, the attribute will be set. */ -internal class StringResource( +class StringResource( name: String, val value: String, val formatted: Boolean = true 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 5a9e6778e..a24b6dfa9 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,7 +18,7 @@ import org.w3c.dom.Element * @param userDialogMessage The message to show in a dialog when the user toggles the preference. * @param default The default value of the switch. */ -internal class SwitchPreference( +class SwitchPreference( key: String, title: StringResource, val summaryOn: StringResource, val summaryOff: StringResource, 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 5895a5e6e..aaac8c5c0 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 @@ -13,7 +13,7 @@ import org.w3c.dom.Document * @param summary The summary of the text preference. * @param default The default value of the text preference. */ -internal class TextPreference( +class TextPreference( key: String?, title: StringResource, summary: StringResource?, 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 a17b9c381..30402f5a7 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 @@ -6,7 +6,7 @@ import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen import app.revanced.patches.shared.settings.preference.impl.StringResource import java.io.Closeable -internal abstract class AbstractPreferenceScreen( +abstract class AbstractPreferenceScreen( private val root: MutableList = mutableListOf() ) : Closeable { diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt index 9bc4f4648..9436d1616 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt @@ -123,7 +123,7 @@ class SettingsPatch : BytecodePatch( /** * Preference screens patches should add their settings to. */ - internal object PreferenceScreen : AbstractPreferenceScreen() { + object PreferenceScreen : AbstractPreferenceScreen() { val ADS = Screen("ads", "Ads", "Ad related settings") val INTERACTIONS = Screen("interactions", "Interaction", "Settings related to interactions") val LAYOUT = Screen("layout", "Layout", "Settings related to the layout")