refactor: Fix package and code structure

api/revanced-patches.api

@@ -525,6 +525,7 @@ public final class app/revanced/patches/shared/fingerprints/HomeActivityFingerpr
 
 public abstract class app/revanced/patches/shared/integrations/AbstractIntegrationsPatch : app/revanced/patcher/patch/BytecodePatch {
  public fun <init> (Ljava/lang/String;Ljava/util/Set;)V
+ public fun <init> (Ljava/util/Set;)V
  public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
  public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
@@ -616,13 +617,6 @@ public abstract class app/revanced/patches/shared/settings/preference/BaseResour
  public static synthetic fun serialize$default (Lapp/revanced/patches/shared/settings/preference/BaseResource;Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/w3c/dom/Element;
 }
 
-public abstract class app/revanced/patches/shared/settings/preference/DefaultBasePreference : app/revanced/patches/shared/settings/preference/BasePreference {
- public fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Ljava/lang/String;Ljava/lang/Object;)V
- public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;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;Lkotlin/jvm/functions/Function1;)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;
@@ -650,11 +644,9 @@ 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 <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Ljava/lang/String;)V
- public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;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 final class app/revanced/patches/shared/settings/preference/impl/ListPreference : app/revanced/patches/shared/settings/preference/BasePreference {
+ public fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;)V
+ public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/ArrayResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
  public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
@@ -700,18 +692,18 @@ public final class app/revanced/patches/shared/settings/preference/impl/StringRe
  public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
-public final class app/revanced/patches/shared/settings/preference/impl/SwitchPreference : app/revanced/patches/shared/settings/preference/DefaultBasePreference {
- public fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Z)V
- public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class app/revanced/patches/shared/settings/preference/impl/SwitchPreference : app/revanced/patches/shared/settings/preference/BasePreference {
+ public fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;)V
+ public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
  public final fun getSummaryOff ()Lapp/revanced/patches/shared/settings/preference/impl/StringResource;
  public final fun getSummaryOn ()Lapp/revanced/patches/shared/settings/preference/impl/StringResource;
  public final fun getUserDialogMessage ()Lapp/revanced/patches/shared/settings/preference/impl/StringResource;
  public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
-public final class app/revanced/patches/shared/settings/preference/impl/TextPreference : app/revanced/patches/shared/settings/preference/DefaultBasePreference {
- public fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;Ljava/lang/String;)V
- public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;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 <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/InputType;Ljava/lang/String;)V
+ public synthetic fun <init> (Ljava/lang/String;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;Lapp/revanced/patches/shared/settings/preference/impl/StringResource;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;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }

src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/SpoofWifiPatch.kt

@@ -18,7 +18,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 )
 @Suppress("unused")
 object SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
- private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+ private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch"
  private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
  override fun filterMap(

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionPatch.kt

@@ -20,7 +20,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 @Suppress("unused")
 object RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
  private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
- "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
+ "Lapp/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
  private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
  // Information about method calls we want to replace
  enum class MethodCall(

src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.kt

@@ -24,7 +24,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 @Suppress("unused")
 object RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
  private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
- "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
+ "Lapp/revanced/integrations/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
  private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
  override fun execute(context: BytecodeContext) {

src/main/kotlin/app/revanced/patches/reddit/ad/general/HideAdsPatch.kt

@@ -26,7 +26,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 @Suppress("unused")
 object HideAdsPatch : BytecodePatch(setOf(AdPostFingerprint, NewAdPostFingerprint)) {
  private const val FILTER_METHOD_DESCRIPTOR =
- "Lapp/revanced/reddit/patches/FilterPromotedLinksPatch;" +
+ "Lapp/revanced/integrations/reddit/patches/FilterPromotedLinksPatch;" +
  "->filterChildren(Ljava/lang/Iterable;)Ljava/util/List;"
 
  override fun execute(context: BytecodeContext) {

src/main/kotlin/app/revanced/patches/shared/integrations/AbstractIntegrationsPatch.kt

@@ -11,9 +11,27 @@ import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 
 abstract class AbstractIntegrationsPatch(
- private val integrationsDescriptor: String,
  private val hooks: Set<IntegrationsFingerprint>
 ) : BytecodePatch(hooks) {
+
+ @Deprecated(
+ "Use the constructor without the integrationsDescriptor parameter",
+ ReplaceWith("AbstractIntegrationsPatch(hooks)")
+ )
+ @Suppress("UNUSED_PARAMETER")
+ constructor(
+ integrationsDescriptor: String,
+ hooks: Set<IntegrationsFingerprint>
+ ) : this(hooks)
+
+ override fun execute(context: BytecodeContext) {
+ if (context.findClass(INTEGRATIONS_CLASS_DESCRIPTOR) == null) throw PatchException(
+ "Integrations have not been merged yet. This patch can not succeed without merging the integrations."
+ )
+
+ for (hook in hooks) hook.invoke(INTEGRATIONS_CLASS_DESCRIPTOR)
+ }
+
  /**
  * [MethodFingerprint] for integrations.
  *
@@ -53,11 +71,7 @@ abstract class AbstractIntegrationsPatch(
  }
  }
 
- override fun execute(context: BytecodeContext) {
- if (context.findClass(integrationsDescriptor) == null) throw PatchException(
- "Integrations have not been merged yet. This patch can not succeed without merging the integrations."
- )
-
- for (hook in hooks) hook.invoke(integrationsDescriptor)
+ private companion object {
+ private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/shared/Utils;"
  }
 }

src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt

@@ -11,6 +11,7 @@ import app.revanced.patches.shared.settings.preference.impl.ArrayResource
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
+import app.revanced.util.mergeStrings
 import org.w3c.dom.Node
 import java.io.Closeable
 
@@ -37,6 +38,8 @@ abstract class AbstractSettingsResourcePatch(
  stringsEditor = context.xmlEditor["res/values/strings.xml"]
  arraysEditor = context.xmlEditor["res/values/arrays.xml"]
  revancedPreferencesEditor = context.xmlEditor["res/xml/$preferenceFileName.xml"]
+
+ context.mergeStrings("settings/host/values/strings.xml")
  }
 
  internal companion object {

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.shared.settings.preference.impl
 
+import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
 import app.revanced.patches.shared.settings.preference.addSummary
 import org.w3c.dom.Document
 
@@ -13,16 +13,14 @@ import org.w3c.dom.Document
  * @param entries The human-readable entries of the list preference.
  * @param entryValues The entry values of the list preference.
  * @param summary The summary of the list preference.
- * @param default The default entry value of the list preference.
  */
 class ListPreference(
  key: String,
  title: StringResource,
- val entries: ArrayResource,
- val entryValues: ArrayResource,
- summary: StringResource? = null,
- default: String? = null,
-) : DefaultBasePreference<String>(key, title, summary, "ListPreference", default) {
+ private val entries: ArrayResource,
+ private val entryValues: ArrayResource,
+ summary: StringResource? = null
+) : BasePreference(key, title, summary, "ListPreference") {
  override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
  super.serialize(ownerDocument, resourceCallback).apply {
  setAttribute("android:entries", "@array/${entries.also { resourceCallback.invoke(it) }.name}")

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt

@@ -1,10 +1,10 @@
 package app.revanced.patches.shared.settings.preference.impl
 
+import app.revanced.patches.shared.settings.AbstractSettingsResourcePatch.Companion.include
+import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
 import app.revanced.patches.shared.settings.preference.SummaryType
 import app.revanced.patches.shared.settings.preference.addSummary
-import app.revanced.patches.shared.settings.AbstractSettingsResourcePatch.Companion.include
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 
@@ -16,15 +16,13 @@ import org.w3c.dom.Element
  * @param summaryOn The summary to show when the preference is enabled.
  * @param summaryOff The summary to show when the preference is disabled.
  * @param userDialogMessage The message to show in a dialog when the user toggles the preference.
- * @param default The default value of the switch.
  */
 class SwitchPreference(
  key: String, title: StringResource,
  val summaryOn: StringResource,
  val summaryOff: StringResource,
  val userDialogMessage: StringResource? = null,
- default: Boolean = false,
-) : DefaultBasePreference<Boolean>( key, title, null, "SwitchPreference", default) {
+) : BasePreference(key, title, null, "SwitchPreference") {
  override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit): Element {
  userDialogMessage?.include()
 

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.shared.settings.preference.impl
 
+import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
 import org.w3c.dom.Document
 
 /**
@@ -11,16 +11,14 @@ import org.w3c.dom.Document
  * @param title The title of the text preference.
  * @param inputType The input type of the text preference.
  * @param summary The summary of the text preference.
- * @param default The default value of the text preference.
  */
 class TextPreference(
  key: String?,
  title: StringResource,
  summary: StringResource?,
  val inputType: InputType = InputType.TEXT,
- default: String? = null,
- tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference"
-) : DefaultBasePreference<String>(key, title, summary, tag, default) {
+ tag: String = "app.revanced.integrations.shared.settingsmenu.ResettableEditTextPreference"
+) : BasePreference(key, title, summary, tag) {
 
  override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
  super.serialize(ownerDocument, resourceCallback).apply {

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/FeedFilterPatch.kt

@@ -36,13 +36,13 @@ object FeedFilterPatch : BytecodePatch(
  addInstruction(
  returnFeedItemInstruction.location.index,
  "invoke-static { v$feedItemsRegister }, " +
- "Lapp/revanced/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
+ "Lapp/revanced/integrations/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
  )
  } ?: throw FeedApiServiceLIZFingerprint.exception
 
  SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
  0,
- "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
+ "invoke-static {}, Lapp/revanced/integrations/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
  ) ?: throw SettingsStatusLoadFingerprint.exception
  }
 }