diff --git a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt index 61d8e85dae..2e6703b8ba 100644 --- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt +++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt @@ -17,4 +17,4 @@ internal interface PatchesFileGenerator { arrayOf(JsonGenerator()).forEach { generator -> generator.generate(bundle) } } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/app/revanced/patches/all/misc/strings/AddResourcesPatch.kt b/src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt similarity index 97% rename from src/main/kotlin/app/revanced/patches/all/misc/strings/AddResourcesPatch.kt rename to src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt index bc8ed19f44..9ae468db77 100644 --- a/src/main/kotlin/app/revanced/patches/all/misc/strings/AddResourcesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.all.misc.strings +package app.revanced.patches.all.misc.resources import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch.kt index 87b2e6c312..6e37ebbe90 100644 --- a/src/main/kotlin/app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/misc/gms/AbstractGmsCoreSupportResourcePatch.kt @@ -5,7 +5,7 @@ import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption import app.revanced.patches.all.misc.packagename.ChangePackageNamePatch -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.util.copyStrings import org.w3c.dom.Element import org.w3c.dom.Node diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt index 08e7dcdce6..73226fefd2 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.PatchClass import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.util.DomFileEditor -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.settings.preference.BasePreference import app.revanced.patches.shared.settings.preference.impl.IntentPreference import app.revanced.util.ResourceGroup 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 f72195eb7a..17d794a3da 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 @@ -5,8 +5,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.all.misc.strings.AddResourcesPatch -import app.revanced.patches.all.misc.strings.AddResourcesPatch.addString +import app.revanced.patches.all.misc.resources.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch.addString import app.revanced.patches.shared.settings.preference.impl.ListPreference import app.revanced.patches.twitch.ad.embedded.fingerprints.CreateUsherClientFingerprint import app.revanced.patches.twitch.ad.video.VideoAdsPatch 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 5bcbd7bfc8..50224d4232 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 @@ -8,7 +8,7 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.settings.preference.impl.ListPreference import app.revanced.patches.twitch.chat.antidelete.fingerprints.ChatUtilCreateDeletedSpanFingerprint import app.revanced.patches.twitch.chat.antidelete.fingerprints.DeletedMessageClickableSpanCtorFingerprint diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt index faeb8cdc96..b59a3e05a4 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt @@ -11,8 +11,8 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.all.misc.strings.AddResourcesPatch -import app.revanced.patches.all.misc.strings.AddResourcesPatch.addString +import app.revanced.patches.all.misc.resources.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch.addString import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory import app.revanced.patches.shared.settings.preference.impl.SwitchPreference import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen 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 f708e7063e..d98b271c90 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 @@ -3,7 +3,7 @@ package app.revanced.patches.youtube.interaction.copyvideourl import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen import app.revanced.patches.shared.settings.preference.impl.SwitchPreference import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch 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 d272643a2f..3bba3c1c93 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,7 @@ 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.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch 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 diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt index 76a9d8a526..fe70b776c4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.youtube.layout.returnyoutubedislike import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch import app.revanced.patches.shared.settings.preference.impl.IntentPreference import app.revanced.patches.youtube.misc.settings.SettingsPatch diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt index cd37941454..475684bba4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.youtube.layout.sponsorblock import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch import app.revanced.patches.shared.settings.preference.impl.IntentPreference import app.revanced.patches.youtube.misc.settings.SettingsPatch diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsResourcePatch.kt index 5f8575f6f4..5cb9e0a03a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsResourcePatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.youtube.layout.thumbnails import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.youtube.misc.settings.SettingsPatch import app.revanced.util.copyStrings diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt index ed7c6209af..a7200b9607 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt @@ -1,13 +1,12 @@ package app.revanced.patches.youtube.misc.settings import app.revanced.patcher.data.ResourceContext -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch import app.revanced.patches.shared.settings.AbstractSettingsResourcePatch import app.revanced.patches.shared.settings.preference.impl.IntentPreference import app.revanced.util.ResourceGroup import app.revanced.util.copyResources -import app.revanced.util.copyStrings import app.revanced.util.resource.StringResource import org.w3c.dom.Element diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt index c8489d20a7..8636fbf5a3 100644 --- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt +++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt @@ -2,7 +2,7 @@ package app.revanced.util import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.util.DomFileEditor -import app.revanced.patches.all.misc.strings.AddResourcesPatch +import app.revanced.patches.all.misc.resources.AddResourcesPatch import app.revanced.util.resource.BaseResource import org.w3c.dom.Node import java.io.InputStream