diff --git a/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts new file mode 100644 index 000000000..bc416f685 --- /dev/null +++ b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts @@ -0,0 +1,5 @@ +android.namespace = "app.revanced.extension" + +dependencies { + compileOnly(libs.annotation) +} diff --git a/extensions/spoof-wifi/src/main/AndroidManifest.xml b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/AndroidManifest.xml similarity index 73% rename from extensions/spoof-wifi/src/main/AndroidManifest.xml rename to extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/AndroidManifest.xml index 7425a54c5..0bfc2a532 100644 --- a/extensions/spoof-wifi/src/main/AndroidManifest.xml +++ b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/AndroidManifest.xml @@ -1,4 +1,3 @@ - - + diff --git a/extensions/spoof-wifi/src/main/java/app/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch.java b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/java/app/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch.java similarity index 100% rename from extensions/spoof-wifi/src/main/java/app/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch.java rename to extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/java/app/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch.java diff --git a/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts b/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts new file mode 100644 index 000000000..bc416f685 --- /dev/null +++ b/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts @@ -0,0 +1,5 @@ +android.namespace = "app.revanced.extension" + +dependencies { + compileOnly(libs.annotation) +} diff --git a/extensions/remove-screen-capture-restriction/src/main/AndroidManifest.xml b/extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/AndroidManifest.xml similarity index 100% rename from extensions/remove-screen-capture-restriction/src/main/AndroidManifest.xml rename to extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/AndroidManifest.xml diff --git a/extensions/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java b/extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java similarity index 100% rename from extensions/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java rename to extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java diff --git a/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts b/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts new file mode 100644 index 000000000..88c859b78 --- /dev/null +++ b/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts @@ -0,0 +1 @@ +android.namespace = "app.revanced.extension" diff --git a/extensions/remove-screenshot-restriction/src/main/AndroidManifest.xml b/extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/AndroidManifest.xml similarity index 100% rename from extensions/remove-screenshot-restriction/src/main/AndroidManifest.xml rename to extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/AndroidManifest.xml diff --git a/extensions/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java b/extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java similarity index 100% rename from extensions/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java rename to extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java diff --git a/extensions/boostforreddit/build.gradle.kts b/extensions/boostforreddit/build.gradle.kts new file mode 100644 index 000000000..54c06871b --- /dev/null +++ b/extensions/boostforreddit/build.gradle.kts @@ -0,0 +1,4 @@ +dependencies { + compileOnly(project(":extensions:shared:library")) + compileOnly(project(":extensions:boostforreddit:stub")) +} diff --git a/extensions/boostforreddit/src/main/AndroidManifest.xml b/extensions/boostforreddit/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/boostforreddit/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java b/extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java similarity index 95% rename from extensions/shared/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java rename to extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java index b7a150fb1..1d6089737 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java +++ b/extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java @@ -4,7 +4,9 @@ import com.rubenmayayo.reddit.ui.activities.WebViewActivity; import app.revanced.extension.shared.fixes.slink.BaseFixSLinksPatch; -/** @noinspection unused*/ +/** + * @noinspection unused + */ public class FixSLinksPatch extends BaseFixSLinksPatch { static { INSTANCE = new FixSLinksPatch(); diff --git a/extensions/shared/stub/build.gradle.kts b/extensions/boostforreddit/stub/build.gradle.kts similarity index 100% rename from extensions/shared/stub/build.gradle.kts rename to extensions/boostforreddit/stub/build.gradle.kts diff --git a/extensions/boostforreddit/stub/src/main/AndroidManifest.xml b/extensions/boostforreddit/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/boostforreddit/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/com/rubenmayayo/reddit/ui/activities/WebViewActivity.java b/extensions/boostforreddit/stub/src/main/java/com/rubenmayayo/reddit/ui/activities/WebViewActivity.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/rubenmayayo/reddit/ui/activities/WebViewActivity.java rename to extensions/boostforreddit/stub/src/main/java/com/rubenmayayo/reddit/ui/activities/WebViewActivity.java diff --git a/extensions/shared/proguard-rules.pro b/extensions/proguard-rules.pro similarity index 100% rename from extensions/shared/proguard-rules.pro rename to extensions/proguard-rules.pro diff --git a/extensions/reddit/build.gradle.kts b/extensions/reddit/build.gradle.kts new file mode 100644 index 000000000..8693f97f5 --- /dev/null +++ b/extensions/reddit/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + compileOnly(project(":extensions:reddit:stub")) +} diff --git a/extensions/reddit/src/main/AndroidManifest.xml b/extensions/reddit/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/reddit/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/reddit/patches/FilterPromotedLinksPatch.java b/extensions/reddit/src/main/java/app/revanced/extension/patches/FilterPromotedLinksPatch.java similarity index 91% rename from extensions/shared/src/main/java/app/revanced/extension/reddit/patches/FilterPromotedLinksPatch.java rename to extensions/reddit/src/main/java/app/revanced/extension/patches/FilterPromotedLinksPatch.java index 7534d6928..5b3e61b2a 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/reddit/patches/FilterPromotedLinksPatch.java +++ b/extensions/reddit/src/main/java/app/revanced/extension/patches/FilterPromotedLinksPatch.java @@ -1,4 +1,4 @@ -package app.revanced.extension.reddit.patches; +package app.revanced.extension.patches; import com.reddit.domain.model.ILink; diff --git a/extensions/reddit/stub/build.gradle.kts b/extensions/reddit/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/reddit/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/reddit/stub/src/main/AndroidManifest.xml b/extensions/reddit/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/reddit/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/com/reddit/domain/model/ILink.java b/extensions/reddit/stub/src/main/java/com/reddit/domain/model/ILink.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/reddit/domain/model/ILink.java rename to extensions/reddit/stub/src/main/java/com/reddit/domain/model/ILink.java diff --git a/extensions/remove-screen-capture-restriction/build.gradle.kts b/extensions/remove-screen-capture-restriction/build.gradle.kts deleted file mode 100644 index 46f94dac8..000000000 --- a/extensions/remove-screen-capture-restriction/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -extension { - name = "extensions/all/screencapture/remove-screen-capture-restriction.rve" -} - -android { - namespace = "app.revanced.extension" -} - -dependencies { - compileOnly(libs.annotation) -} diff --git a/extensions/remove-screenshot-restriction/build.gradle.kts b/extensions/remove-screenshot-restriction/build.gradle.kts deleted file mode 100644 index cdbad5e1e..000000000 --- a/extensions/remove-screenshot-restriction/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -extension { - name = "extensions/all/screenshot/remove-screenshot-restriction.rve" -} - -android { - namespace = "app.revanced.extension" -} diff --git a/extensions/shared/build.gradle.kts b/extensions/shared/build.gradle.kts index 5abaf83ab..2da2e1e89 100644 --- a/extensions/shared/build.gradle.kts +++ b/extensions/shared/build.gradle.kts @@ -1,22 +1,3 @@ -extension { - name = "extensions/shared.rve" -} - -android { - namespace = "app.revanced.extension" - - buildTypes { - release { - isMinifyEnabled = true - } - } -} - dependencies { - compileOnly(libs.appcompat) - compileOnly(libs.annotation) - compileOnly(libs.okhttp) - compileOnly(libs.retrofit) - - compileOnly(project(":extensions:shared:stub")) + implementation(project(":extensions:shared:library")) } diff --git a/extensions/shared/library/build.gradle.kts b/extensions/shared/library/build.gradle.kts new file mode 100644 index 000000000..3cbb56069 --- /dev/null +++ b/extensions/shared/library/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("com.android.library") +} + +android { + namespace = "app.revanced.extension" + compileSdk = 34 + + defaultConfig { + minSdk = 23 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + compileOnly(libs.annotation) +} diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/StringRef.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/StringRef.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/Utils.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/checks/Check.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java similarity index 91% rename from extensions/shared/src/main/java/app/revanced/extension/shared/checks/Check.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java index 855e6003b..6d4db14e5 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/checks/Check.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java @@ -19,7 +19,7 @@ import java.util.Collection; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.Utils; -import app.revanced.extension.youtube.settings.Settings; +import app.revanced.extension.shared.settings.BaseSettings; abstract class Check { private static final int NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING = 2; @@ -46,11 +46,11 @@ abstract class Check { /** * For debugging and development only. * Forces all checks to be performed and the check failed dialog to be shown. - * Can be enabled by importing settings text with {@link Settings#CHECK_ENVIRONMENT_WARNINGS_ISSUED} + * Can be enabled by importing settings text with {@link BaseSettings#CHECK_ENVIRONMENT_WARNINGS_ISSUED} * set to -1. */ static boolean debugAlwaysShowWarning() { - final boolean alwaysShowWarning = Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() < 0; + final boolean alwaysShowWarning = BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() < 0; if (alwaysShowWarning) { Logger.printInfo(() -> "Debug forcing environment check warning to show"); } @@ -59,14 +59,14 @@ abstract class Check { } static boolean shouldRun() { - return Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() + return BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() < NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING; } static void disableForever() { Logger.printInfo(() -> "Environment checks disabled forever"); - Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(Integer.MAX_VALUE); + BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(Integer.MAX_VALUE); } @SuppressLint("NewApi") @@ -107,8 +107,8 @@ abstract class Check { " ", (dialog, which) -> { // Cleanup data if the user incorrectly imported a huge negative number. - final int current = Math.max(0, Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get()); - Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1); + final int current = Math.max(0, BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get()); + BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1); dialog.dismiss(); } diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/checks/PatchInfo.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/PatchInfo.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/checks/PatchInfo.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/PatchInfo.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/fixes/slink/BaseFixSLinksPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/slink/BaseFixSLinksPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/fixes/slink/BaseFixSLinksPatch.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/slink/BaseFixSLinksPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/fixes/slink/ResolveResult.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/slink/ResolveResult.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/fixes/slink/ResolveResult.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/slink/ResolveResult.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Requester.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Requester.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java index 69d43a4be..c25e71d78 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Requester.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java @@ -1,4 +1,4 @@ -package app.revanced.extension.youtube.requests; +package app.revanced.extension.shared.requests; import app.revanced.extension.shared.Utils; import org.json.JSONArray; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Route.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Route.java similarity index 97% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Route.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Route.java index c25d108b9..9e6f2c5a7 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Route.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Route.java @@ -1,4 +1,4 @@ -package app.revanced.extension.youtube.requests; +package app.revanced.extension.shared.requests; public class Route { private final String route; diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java similarity index 83% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java index 70d7589e8..13be9547c 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java @@ -14,4 +14,6 @@ public class BaseSettings { public static final BooleanSetting DEBUG = new BooleanSetting("revanced_debug", FALSE); public static final BooleanSetting DEBUG_STACKTRACE = new BooleanSetting("revanced_debug_stacktrace", FALSE, parent(DEBUG)); public static final BooleanSetting DEBUG_TOAST_ON_ERROR = new BooleanSetting("revanced_debug_toast_on_error", TRUE, "revanced_debug_toast_on_error_user_dialog_message"); + + public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false); } diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/FloatSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/FloatSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/FloatSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/FloatSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/IntegerSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/IntegerSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/IntegerSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/IntegerSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/LongSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/LongSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/LongSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/LongSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/Setting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java similarity index 92% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/Setting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java index 7507d802a..5f5a97474 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/Setting.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java @@ -7,7 +7,6 @@ import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.StringRef; import app.revanced.extension.shared.Utils; import app.revanced.extension.shared.settings.preference.SharedPrefCategory; -import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings; import org.jetbrains.annotations.NotNull; import org.json.JSONException; import org.json.JSONObject; @@ -62,6 +61,30 @@ public abstract class Setting { }; } + /** + * Callback for importing/exporting settings. + */ + public interface ImportExportCallback { + /** + * Called after all settings have been imported. + */ + void settingsImported(@Nullable Context context); + + /** + * Called after all settings have been exported. + */ + void settingsExported(@Nullable Context context); + } + + private static final List importExportCallbacks = new ArrayList<>(); + + /** + * Adds a callback for {@link #importFromJSON(Context, String)} and {@link #exportToJson(Context)}. + */ + public static void addImportExportCallback(@NonNull ImportExportCallback callback) { + importExportCallbacks.add(Objects.requireNonNull(callback)); + } + /** * All settings that were instantiated. * When a new setting is created, it is automatically added to this list. @@ -365,7 +388,10 @@ public abstract class Setting { setting.writeToJSON(json, importExportKey); } } - SponsorBlockSettings.showExportWarningIfNeeded(alertDialogContext); + + for (ImportExportCallback callback : importExportCallbacks) { + callback.settingsExported(alertDialogContext); + } if (json.length() == 0) { return ""; @@ -385,7 +411,7 @@ public abstract class Setting { /** * @return if any settings that require a reboot were changed. */ - public static boolean importFromJSON(@NonNull String settingsJsonString) { + public static boolean importFromJSON(@NonNull Context alertDialogContext, @NonNull String settingsJsonString) { try { if (!settingsJsonString.matches("[\\s\\S]*\\{")) { settingsJsonString = '{' + settingsJsonString + '}'; // Restore outer JSON braces @@ -411,12 +437,9 @@ public abstract class Setting { } } - // SB Enum categories are saved using StringSettings. - // Which means they need to reload again if changed by other code (such as here). - // This call could be removed by creating a custom Setting class that manages the - // "String <-> Enum" logic or by adding an event hook of when settings are imported. - // But for now this is simple and works. - SponsorBlockSettings.updateFromImportedSettings(); + for (ImportExportCallback callback : importExportCallbacks) { + callback.settingsExported(alertDialogContext); + } Utils.showToastLong(numberOfSettingsImported == 0 ? str("revanced_settings_import_reset") diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/StringSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/StringSetting.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/StringSetting.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/StringSetting.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java index c750ca3f1..4c06a97df 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java @@ -85,7 +85,8 @@ public class ImportExportPreference extends EditTextPreference implements Prefer return; } AbstractPreferenceFragment.settingImportInProgress = true; - final boolean rebootNeeded = Setting.importFromJSON(replacementSettings); + + final boolean rebootNeeded = Setting.importFromJSON(Utils.getContext(), replacementSettings); if (rebootNeeded) { AbstractPreferenceFragment.showRestartDialog(getContext()); } diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java index c3db3b4b0..cd62235fc 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java @@ -1,7 +1,7 @@ package app.revanced.extension.shared.settings.preference; import static app.revanced.extension.shared.StringRef.str; -import static app.revanced.extension.youtube.requests.Route.Method.GET; +import static app.revanced.extension.shared.requests.Route.Method.GET; import android.annotation.SuppressLint; import android.app.Dialog; @@ -34,8 +34,8 @@ import java.util.List; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.Utils; -import app.revanced.extension.youtube.requests.Requester; -import app.revanced.extension.youtube.requests.Route; +import app.revanced.extension.shared.requests.Requester; +import app.revanced.extension.shared.requests.Route; /** * Opens a dialog showing official links. diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java diff --git a/extensions/shared/src/main/AndroidManifest.xml b/extensions/shared/src/main/AndroidManifest.xml index e960b0003..9b65eb06c 100644 --- a/extensions/shared/src/main/AndroidManifest.xml +++ b/extensions/shared/src/main/AndroidManifest.xml @@ -1,4 +1 @@ - - - - + diff --git a/extensions/shared/stub/src/main/AndroidManifest.xml b/extensions/shared/stub/src/main/AndroidManifest.xml deleted file mode 100644 index 568741e54..000000000 --- a/extensions/shared/stub/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/extensions/spoof-wifi/build.gradle.kts b/extensions/spoof-wifi/build.gradle.kts deleted file mode 100644 index 9a2728690..000000000 --- a/extensions/spoof-wifi/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -extension { - name = "extensions/all/connectivity/wifi/spoof/spoof-wifi.rve" -} - -android { - namespace = "app.revanced.extension" -} - -dependencies { - compileOnly(libs.annotation) -} diff --git a/extensions/syncforreddit/build.gradle.kts b/extensions/syncforreddit/build.gradle.kts new file mode 100644 index 000000000..a2b2899db --- /dev/null +++ b/extensions/syncforreddit/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + compileOnly(project(":extensions:shared:library")) + compileOnly(project(":extensions:syncforreddit:stub")) + compileOnly(libs.annotation) +} diff --git a/extensions/syncforreddit/src/main/AndroidManifest.xml b/extensions/syncforreddit/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/syncforreddit/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/syncforreddit/FixRedditVideoDownloadPatch.java b/extensions/syncforreddit/src/main/java/app/revanced/extension/syncforreddit/FixRedditVideoDownloadPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/syncforreddit/FixRedditVideoDownloadPatch.java rename to extensions/syncforreddit/src/main/java/app/revanced/extension/syncforreddit/FixRedditVideoDownloadPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/syncforreddit/FixSLinksPatch.java b/extensions/syncforreddit/src/main/java/app/revanced/extension/syncforreddit/FixSLinksPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/syncforreddit/FixSLinksPatch.java rename to extensions/syncforreddit/src/main/java/app/revanced/extension/syncforreddit/FixSLinksPatch.java diff --git a/extensions/syncforreddit/stub/build.gradle.kts b/extensions/syncforreddit/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/syncforreddit/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/syncforreddit/stub/src/main/AndroidManifest.xml b/extensions/syncforreddit/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/syncforreddit/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/com/laurencedawson/reddit_sync/ui/activities/WebViewActivity.java b/extensions/syncforreddit/stub/src/main/java/com/laurencedawson/reddit_sync/ui/activities/WebViewActivity.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/laurencedawson/reddit_sync/ui/activities/WebViewActivity.java rename to extensions/syncforreddit/stub/src/main/java/com/laurencedawson/reddit_sync/ui/activities/WebViewActivity.java diff --git a/extensions/tiktok/build.gradle.kts b/extensions/tiktok/build.gradle.kts new file mode 100644 index 000000000..e9c01da56 --- /dev/null +++ b/extensions/tiktok/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + compileOnly(project(":extensions:shared:library")) + compileOnly(project(":extensions:tiktok:stub")) + compileOnly(libs.annotation) +} diff --git a/extensions/tiktok/src/main/AndroidManifest.xml b/extensions/tiktok/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/tiktok/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/Utils.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/Utils.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/Utils.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/Utils.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/cleardisplay/RememberClearDisplayPatch.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/cleardisplay/RememberClearDisplayPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/cleardisplay/RememberClearDisplayPatch.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/cleardisplay/RememberClearDisplayPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/download/DownloadsPatch.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/download/DownloadsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/download/DownloadsPatch.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/download/DownloadsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/AdsFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/AdsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/AdsFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/AdsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/IFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/IFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/IFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/IFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/ImageVideoFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ImageVideoFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/ImageVideoFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ImageVideoFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/LikeCountFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/LikeCountFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/LikeCountFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/LikeCountFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/LiveFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/LiveFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/LiveFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/LiveFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/StoryFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/StoryFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/StoryFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/StoryFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/ViewCountFilter.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ViewCountFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/feedfilter/ViewCountFilter.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ViewCountFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/Settings.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/Settings.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/Settings.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/Settings.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/SettingsStatus.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/SettingsStatus.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/SettingsStatus.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/SettingsStatus.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/InputTextPreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/InputTextPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/InputTextPreference.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/InputTextPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/RangeValuePreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/RangeValuePreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/RangeValuePreference.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/RangeValuePreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java index f20a0b635..2ca953e1c 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java +++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java @@ -8,7 +8,6 @@ import java.util.Map; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference; -@SuppressWarnings("unused") public class ReVancedTikTokAboutPreference extends ReVancedAboutPreference { /** diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/TogglePreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TogglePreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/TogglePreference.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TogglePreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ConditionalPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ConditionalPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ConditionalPreferenceCategory.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ConditionalPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/DownloadsPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/DownloadsPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/DownloadsPreferenceCategory.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/DownloadsPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/SimSpoofPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/SimSpoofPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/SimSpoofPreferenceCategory.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/SimSpoofPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/speed/PlaybackSpeedPatch.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/speed/PlaybackSpeedPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/speed/PlaybackSpeedPatch.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/speed/PlaybackSpeedPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java diff --git a/extensions/tiktok/stub/build.gradle.kts b/extensions/tiktok/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/tiktok/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/tiktok/stub/src/main/AndroidManifest.xml b/extensions/tiktok/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/tiktok/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/com/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity.java b/extensions/tiktok/stub/src/main/java/com/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity.java rename to extensions/tiktok/stub/src/main/java/com/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity.java diff --git a/extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java b/extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java rename to extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java diff --git a/extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/AwemeStatistics.java b/extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/AwemeStatistics.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/AwemeStatistics.java rename to extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/AwemeStatistics.java diff --git a/extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/FeedItemList.java b/extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/FeedItemList.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/FeedItemList.java rename to extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/FeedItemList.java diff --git a/extensions/tudortmund/build.gradle.kts b/extensions/tudortmund/build.gradle.kts new file mode 100644 index 000000000..1c9660b0e --- /dev/null +++ b/extensions/tudortmund/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + compileOnly(libs.appcompat) +} diff --git a/extensions/tudortmund/src/main/AndroidManifest.xml b/extensions/tudortmund/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/tudortmund/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java b/extensions/tudortmund/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java similarity index 97% rename from extensions/shared/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java rename to extensions/tudortmund/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java index 5ffa8ead6..f2868cf4e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java +++ b/extensions/tudortmund/src/main/java/app/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch.java @@ -11,6 +11,9 @@ import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; public class ShowOnLockscreenPatch { + /** + * @noinspection deprecation + */ public static Window getWindow(AppCompatActivity activity, float brightness) { Window window = activity.getWindow(); diff --git a/extensions/tumblr/build.gradle.kts b/extensions/tumblr/build.gradle.kts new file mode 100644 index 000000000..c4a52573c --- /dev/null +++ b/extensions/tumblr/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + compileOnly(project(":extensions:tumblr:stub")) +} diff --git a/extensions/tumblr/src/main/AndroidManifest.xml b/extensions/tumblr/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/tumblr/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/tumblr/patches/TimelineFilterPatch.java b/extensions/tumblr/src/main/java/app/revanced/extension/tumblr/patches/TimelineFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/tumblr/patches/TimelineFilterPatch.java rename to extensions/tumblr/src/main/java/app/revanced/extension/tumblr/patches/TimelineFilterPatch.java diff --git a/extensions/tumblr/stub/build.gradle.kts b/extensions/tumblr/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/tumblr/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/tumblr/stub/src/main/AndroidManifest.xml b/extensions/tumblr/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/tumblr/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/TimelineObject.java b/extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/TimelineObject.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/TimelineObject.java rename to extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/TimelineObject.java diff --git a/extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/TimelineObjectType.java b/extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/TimelineObjectType.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/TimelineObjectType.java rename to extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/TimelineObjectType.java diff --git a/extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/Timelineable.java b/extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/Timelineable.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/tumblr/rumblr/model/Timelineable.java rename to extensions/tumblr/stub/src/main/java/com/tumblr/rumblr/model/Timelineable.java diff --git a/extensions/twitch/build.gradle.kts b/extensions/twitch/build.gradle.kts new file mode 100644 index 000000000..3b6fa456a --- /dev/null +++ b/extensions/twitch/build.gradle.kts @@ -0,0 +1,8 @@ +dependencies { + compileOnly(project(":extensions:shared:library")) + compileOnly(project(":extensions:twitch:stub")) + compileOnly(libs.okhttp) + compileOnly(libs.retrofit) + compileOnly(libs.annotation) + compileOnly(libs.appcompat) +} diff --git a/extensions/twitch/src/main/AndroidManifest.xml b/extensions/twitch/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/twitch/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/Utils.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/Utils.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java similarity index 92% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java index 457ecdf97..fe5babd94 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java +++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/IAdblockService.java @@ -3,15 +3,7 @@ package app.revanced.extension.twitch.adblock; import okhttp3.Request; public interface IAdblockService { - String friendlyName(); - - Integer maxAttempts(); - - Boolean isAvailable(); - - Request rewriteHlsRequest(Request originalRequest); - - static boolean isVod(Request request){ + static boolean isVod(Request request) { return request.url().pathSegments().contains("vod"); } @@ -23,4 +15,13 @@ public interface IAdblockService { } return null; } + + String friendlyName(); + + Integer maxAttempts(); + + Boolean isAvailable(); + + Request rewriteHlsRequest(Request originalRequest); } + diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/LuminousService.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/LuminousService.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/LuminousService.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/LuminousService.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/PurpleAdblockService.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/PurpleAdblockService.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/adblock/PurpleAdblockService.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/adblock/PurpleAdblockService.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/api/PurpleAdblockApi.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/api/PurpleAdblockApi.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/api/PurpleAdblockApi.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/api/PurpleAdblockApi.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/api/RequestInterceptor.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/api/RequestInterceptor.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/api/RequestInterceptor.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/api/RequestInterceptor.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/api/RetrofitClient.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/api/RetrofitClient.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/api/RetrofitClient.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/api/RetrofitClient.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/AudioAdsPatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/AudioAdsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/AudioAdsPatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/AudioAdsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/AutoClaimChannelPointsPatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/AutoClaimChannelPointsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/AutoClaimChannelPointsPatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/AutoClaimChannelPointsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/DebugModePatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/DebugModePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/DebugModePatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/DebugModePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/EmbeddedAdsPatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/EmbeddedAdsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/EmbeddedAdsPatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/EmbeddedAdsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/ShowDeletedMessagesPatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/ShowDeletedMessagesPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/ShowDeletedMessagesPatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/ShowDeletedMessagesPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/patches/VideoAdsPatch.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/VideoAdsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/patches/VideoAdsPatch.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/patches/VideoAdsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/settings/Settings.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/Settings.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/settings/Settings.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/Settings.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java diff --git a/extensions/twitch/stub/build.gradle.kts b/extensions/twitch/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/twitch/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/twitch/stub/src/main/AndroidManifest.xml b/extensions/twitch/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/twitch/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/tv/twitch/android/feature/settings/menu/SettingsMenuGroup.java b/extensions/twitch/stub/src/main/java/tv/twitch/android/feature/settings/menu/SettingsMenuGroup.java similarity index 100% rename from extensions/shared/stub/src/main/java/tv/twitch/android/feature/settings/menu/SettingsMenuGroup.java rename to extensions/twitch/stub/src/main/java/tv/twitch/android/feature/settings/menu/SettingsMenuGroup.java diff --git a/extensions/shared/stub/src/main/java/tv/twitch/android/settings/SettingsActivity.java b/extensions/twitch/stub/src/main/java/tv/twitch/android/settings/SettingsActivity.java similarity index 100% rename from extensions/shared/stub/src/main/java/tv/twitch/android/settings/SettingsActivity.java rename to extensions/twitch/stub/src/main/java/tv/twitch/android/settings/SettingsActivity.java diff --git a/extensions/shared/stub/src/main/java/tv/twitch/android/shared/chat/util/ClickableUsernameSpan.java b/extensions/twitch/stub/src/main/java/tv/twitch/android/shared/chat/util/ClickableUsernameSpan.java similarity index 100% rename from extensions/shared/stub/src/main/java/tv/twitch/android/shared/chat/util/ClickableUsernameSpan.java rename to extensions/twitch/stub/src/main/java/tv/twitch/android/shared/chat/util/ClickableUsernameSpan.java diff --git a/extensions/twitter/build.gradle.kts b/extensions/twitter/build.gradle.kts new file mode 100644 index 000000000..f3c06ad73 --- /dev/null +++ b/extensions/twitter/build.gradle.kts @@ -0,0 +1 @@ +// Do not remove. Necessary for the extension plugin to be applied to the project. diff --git a/extensions/twitter/src/main/AndroidManifest.xml b/extensions/twitter/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/twitter/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/BaseJsonHook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/BaseJsonHook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/BaseJsonHook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/BaseJsonHook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/JsonHook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/JsonHook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/JsonHook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/JsonHook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/JsonHookPatch.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/JsonHookPatch.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/json/JsonHookPatch.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/json/JsonHookPatch.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/Hook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/Hook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/Hook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/Hook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/ads/HideAdsHook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/ads/HideAdsHook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/ads/HideAdsHook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/ads/HideAdsHook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/dummy/DummyHook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/dummy/DummyHook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/dummy/DummyHook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/dummy/DummyHook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/recommendation/RecommendedUsersHook.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/recommendation/RecommendedUsersHook.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/patch/recommendation/RecommendedUsersHook.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/patch/recommendation/RecommendedUsersHook.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/twifucker/TwiFucker.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFucker.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/twifucker/TwiFucker.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFucker.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/twifucker/TwiFuckerUtils.kt b/extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFuckerUtils.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/hook/twifucker/TwiFuckerUtils.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFuckerUtils.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/ChangeLinkSharingDomainPatch.java b/extensions/twitter/src/main/java/app/revanced/twitter/patches/links/ChangeLinkSharingDomainPatch.java similarity index 91% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/ChangeLinkSharingDomainPatch.java rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/links/ChangeLinkSharingDomainPatch.java index 808a8de03..ff67394c6 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/ChangeLinkSharingDomainPatch.java +++ b/extensions/twitter/src/main/java/app/revanced/twitter/patches/links/ChangeLinkSharingDomainPatch.java @@ -1,4 +1,4 @@ -package app.revanced.extension.twitter.patches.links; +package app.revanced.twitter.patches.links; public final class ChangeLinkSharingDomainPatch { private static final String DOMAIN_NAME = "https://fxtwitter.com"; diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/OpenLinksWithAppChooserPatch.java b/extensions/twitter/src/main/java/app/revanced/twitter/patches/links/OpenLinksWithAppChooserPatch.java similarity index 88% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/OpenLinksWithAppChooserPatch.java rename to extensions/twitter/src/main/java/app/revanced/twitter/patches/links/OpenLinksWithAppChooserPatch.java index 2b4bdc124..62220506a 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/twitter/patches/links/OpenLinksWithAppChooserPatch.java +++ b/extensions/twitter/src/main/java/app/revanced/twitter/patches/links/OpenLinksWithAppChooserPatch.java @@ -1,4 +1,4 @@ -package app.revanced.extension.twitter.patches.links; +package app.revanced.twitter.patches.links; import android.content.Context; import android.content.Intent; diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/utils/json/JsonUtils.kt b/extensions/twitter/src/main/java/app/revanced/twitter/utils/json/JsonUtils.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/utils/json/JsonUtils.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/utils/json/JsonUtils.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/twitter/utils/stream/StreamUtils.kt b/extensions/twitter/src/main/java/app/revanced/twitter/utils/stream/StreamUtils.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/twitter/utils/stream/StreamUtils.kt rename to extensions/twitter/src/main/java/app/revanced/twitter/utils/stream/StreamUtils.kt diff --git a/extensions/youtube/build.gradle.kts b/extensions/youtube/build.gradle.kts new file mode 100644 index 000000000..dccfb60d6 --- /dev/null +++ b/extensions/youtube/build.gradle.kts @@ -0,0 +1,8 @@ +//noinspection GradleDependency +android.compileSdk = 33 + +dependencies { + compileOnly(project(":extensions:shared:library")) + compileOnly(project(":extensions:youtube:stub")) + compileOnly(libs.annotation) +} diff --git a/extensions/youtube/src/main/AndroidManifest.xml b/extensions/youtube/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9b65eb06c --- /dev/null +++ b/extensions/youtube/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/Event.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/Event.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/Event.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/Event.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/ThemeHelper.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/ThemeHelper.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/ThemeHelper.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/ThemeHelper.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/TrieSearch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/TrieSearch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/TrieSearch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/TrieSearch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/AutoRepeatPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AutoRepeatPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/AutoRepeatPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AutoRepeatPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BypassURLRedirectsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassURLRedirectsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/BypassURLRedirectsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassURLRedirectsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CustomPlayerOverlayOpacityPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CustomPlayerOverlayOpacityPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/CustomPlayerOverlayOpacityPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CustomPlayerOverlayOpacityPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableFullscreenAmbientModePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableFullscreenAmbientModePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableFullscreenAmbientModePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableFullscreenAmbientModePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableRollingNumberAnimationsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableRollingNumberAnimationsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableRollingNumberAnimationsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableRollingNumberAnimationsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableSuggestedVideoEndScreenPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSuggestedVideoEndScreenPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DisableSuggestedVideoEndScreenPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSuggestedVideoEndScreenPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/EnableDebuggingPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/EnableDebuggingPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/EnableDebuggingPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/EnableDebuggingPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/FixBackToExitGesturePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixBackToExitGesturePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/FixBackToExitGesturePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixBackToExitGesturePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/FullscreenPanelsRemoverPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FullscreenPanelsRemoverPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/FullscreenPanelsRemoverPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FullscreenPanelsRemoverPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideEndscreenCardsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndscreenCardsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideEndscreenCardsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndscreenCardsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideInfoCardsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideInfoCardsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideInfoCardsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideInfoCardsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideTimestampPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideTimestampPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/HideTimestampPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideTimestampPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java index 068aa4d2e..80bb57f83 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java @@ -32,7 +32,7 @@ public final class MiniplayerPatch { /** Unmodified type, and same as un-patched. */ ORIGINAL(null, null), /** - * Exactly the same as MINIMAL, and only here for migration of user settings. + * Exactly the same as MINIMAL and only here for migration of user settings. * Eventually this should be deleted. */ @Deprecated @@ -342,4 +342,4 @@ public final class MiniplayerPatch { Logger.printException(() -> "playerOverlayGroupCreated failure", ex); } } -} +} \ No newline at end of file diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/OpenLinksExternallyPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenLinksExternallyPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/OpenLinksExternallyPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenLinksExternallyPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerOverlaysHookPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerOverlaysHookPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerOverlaysHookPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerOverlaysHookPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerTypeHookPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerTypeHookPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/PlayerTypeHookPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerTypeHookPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/RemoveTrackingQueryParameterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveTrackingQueryParameterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/RemoveTrackingQueryParameterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveTrackingQueryParameterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SlideToSeekPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SlideToSeekPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/SlideToSeekPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SlideToSeekPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/TabletLayoutPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/TabletLayoutPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/TabletLayoutPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/TabletLayoutPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ZoomHapticsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ZoomHapticsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/ZoomHapticsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ZoomHapticsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java index 10309da96..92490aabd 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java @@ -22,8 +22,8 @@ import java.time.LocalDateTime; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.Utils; +import app.revanced.extension.shared.requests.Requester; import app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes; -import app.revanced.extension.youtube.requests.Requester; import app.revanced.extension.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java similarity index 80% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java index ea54e1bd6..6f5261056 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java @@ -1,12 +1,12 @@ package app.revanced.extension.youtube.patches.announcements.requests; -import app.revanced.extension.youtube.requests.Requester; -import app.revanced.extension.youtube.requests.Route; +import app.revanced.extension.shared.requests.Requester; +import app.revanced.extension.shared.requests.Route; import java.io.IOException; import java.net.HttpURLConnection; -import static app.revanced.extension.youtube.requests.Route.Method.GET; +import static app.revanced.extension.shared.requests.Route.Method.GET; public class AnnouncementsRoutes { private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4"; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/VideoQualityMenuFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/VideoQualityMenuFilterPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/VideoQualityMenuFilterPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/VideoQualityMenuFilterPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java index ac74bc810..11874006e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java @@ -107,4 +107,4 @@ public final class RestoreOldVideoQualityMenuPatch { } }); } -} +} \ No newline at end of file diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java index 7e754407d..22d8df37e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java @@ -25,7 +25,7 @@ public class CustomPlaybackSpeedPatch { /** * Maximum playback speed, exclusive value. Custom speeds must be less than this value. - * + *

* Going over 8x does not increase the actual playback speed any higher, * and the UI selector starts flickering and acting weird. * Over 10x and the speeds show up out of order in the UI selector. @@ -157,11 +157,10 @@ public class CustomPlaybackSpeedPatch { } View firstChild = recyclerView.getChildAt(0); - if (!(firstChild instanceof ViewGroup)) { + if (!(firstChild instanceof ViewGroup PlaybackSpeedParentView)) { return false; } - ViewGroup PlaybackSpeedParentView = (ViewGroup) firstChild; if (PlaybackSpeedParentView.getChildCount() != expectedChildCount) { return false; } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/ClientType.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/ClientType.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/ClientType.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/ClientType.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/DeviceHardwareSupport.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/DeviceHardwareSupport.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/DeviceHardwareSupport.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/DeviceHardwareSupport.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofAppVersionPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofAppVersionPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofAppVersionPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofAppVersionPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofDeviceDimensionsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofDeviceDimensionsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofDeviceDimensionsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofDeviceDimensionsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java similarity index 95% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java index 3388892cc..8d6782cb3 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java @@ -7,9 +7,9 @@ import java.io.IOException; import java.net.HttpURLConnection; import app.revanced.extension.shared.Logger; +import app.revanced.extension.shared.requests.Requester; +import app.revanced.extension.shared.requests.Route; import app.revanced.extension.youtube.patches.spoof.ClientType; -import app.revanced.extension.youtube.requests.Requester; -import app.revanced.extension.youtube.requests.Route; final class PlayerRoutes { static final Route.CompiledRoute GET_STREAMING_DATA = new Route( diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/StreamingDataRequest.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/StreamingDataRequest.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/StreamingDataRequest.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/StreamingDataRequest.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/ProgressBarDrawable.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ProgressBarDrawable.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/ProgressBarDrawable.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ProgressBarDrawable.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/ThemePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ThemePatch.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/patches/theme/ThemePatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ThemePatch.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/RYDVoteData.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/RYDVoteData.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/RYDVoteData.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/RYDVoteData.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java index 0ccb87d32..1ebeea223 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java @@ -24,7 +24,7 @@ import java.util.Objects; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.Utils; -import app.revanced.extension.youtube.requests.Requester; +import app.revanced.extension.shared.requests.Requester; import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike; import app.revanced.extension.youtube.settings.Settings; @@ -147,6 +147,7 @@ public class ReturnYouTubeDislikeApi { */ private static void randomlyWaitIfLocallyDebugging() { final boolean DEBUG_RANDOMLY_DELAY_NETWORK_CALLS = false; // set true to debug UI + //noinspection ConstantValue if (DEBUG_RANDOMLY_DELAY_NETWORK_CALLS) { final long amountOfTimeToWaste = (long) (Math.random() @@ -188,6 +189,7 @@ public class ReturnYouTubeDislikeApi { */ private static boolean checkIfRateLimitWasHit(int httpResponseCode) { final boolean DEBUG_RATE_LIMIT = false; // set to true, to verify rate limit works + //noinspection ConstantValue if (DEBUG_RATE_LIMIT) { final double RANDOM_RATE_LIMIT_PERCENTAGE = 0.2; // 20% chance of a triggering a rate limit diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java similarity index 78% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java index 2c2ae7255..e4de849b0 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeRoutes.java @@ -1,13 +1,13 @@ package app.revanced.extension.youtube.returnyoutubedislike.requests; -import static app.revanced.extension.youtube.requests.Route.Method.GET; -import static app.revanced.extension.youtube.requests.Route.Method.POST; +import static app.revanced.extension.shared.requests.Route.Method.GET; +import static app.revanced.extension.shared.requests.Route.Method.POST; import java.io.IOException; import java.net.HttpURLConnection; -import app.revanced.extension.youtube.requests.Requester; -import app.revanced.extension.youtube.requests.Route; +import app.revanced.extension.shared.requests.Requester; +import app.revanced.extension.shared.requests.Route; class ReturnYouTubeDislikeRoutes { static final String RYD_API_URL = "https://returnyoutubedislikeapi.com/"; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java index 1a62b6df3..4f11de928 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -279,7 +279,6 @@ public class Settings extends BaseSettings { public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false); public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false); public static final BooleanSetting REMOVE_TRACKING_QUERY_PARAMETER = new BooleanSetting("revanced_remove_tracking_query_parameter", TRUE); - public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false); // Debugging /** @@ -384,12 +383,18 @@ public class Settings extends BaseSettings { SPOOF_APP_VERSION_TARGET.resetToDefault(); } - // Migrate renamed enum type. + // Migrate renamed enum. if (MINIPLAYER_TYPE.get() == PHONE) { MINIPLAYER_TYPE.save(MINIMAL); } // endregion + + // region SB import/export callbacks + + Setting.addImportExportCallback(SponsorBlockSettings.SB_IMPORT_EXPORT_CALLBACK); + + // endregion } } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ForceAVCSpoofingPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceAVCSpoofingPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ForceAVCSpoofingPreference.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceAVCSpoofingPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/HtmlPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/HtmlPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/HtmlPreference.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/HtmlPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedYouTubeAboutPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedYouTubeAboutPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedYouTubeAboutPreference.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedYouTubeAboutPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SponsorBlockPreferenceFragment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SponsorBlockPreferenceFragment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SponsorBlockPreferenceFragment.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SponsorBlockPreferenceFragment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibilityObserver.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibilityObserver.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibilityObserver.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibilityObserver.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerOverlays.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerOverlays.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerOverlays.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerOverlays.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java similarity index 96% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java index 0edc054c7..00ecfacf9 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java @@ -27,6 +27,17 @@ public class SponsorBlockSettings { */ private static final int SB_PRIVATE_USER_ID_MINIMUM_LENGTH = 30; + public static final Setting.ImportExportCallback SB_IMPORT_EXPORT_CALLBACK = new Setting.ImportExportCallback() { + @Override + public void settingsImported(@Nullable Context context) { + updateFromImportedSettings(); + } + @Override + public void settingsExported(@Nullable Context context) { + showExportWarningIfNeeded(context); + } + }; + public static void importDesktopSettings(@NonNull String json) { Utils.verifyOnMainThread(); try { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/CategoryBehaviour.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/CategoryBehaviour.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/CategoryBehaviour.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/CategoryBehaviour.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/UserStats.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/UserStats.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/UserStats.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/UserStats.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java similarity index 99% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java index 0f0a93afc..f67489850 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java @@ -17,14 +17,14 @@ import java.util.List; import java.util.Locale; import java.util.concurrent.TimeUnit; -import app.revanced.extension.youtube.requests.Requester; -import app.revanced.extension.youtube.requests.Route; import app.revanced.extension.youtube.settings.Settings; import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings; import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory; import app.revanced.extension.youtube.sponsorblock.objects.SponsorSegment; import app.revanced.extension.youtube.sponsorblock.objects.SponsorSegment.SegmentVote; import app.revanced.extension.youtube.sponsorblock.objects.UserStats; +import app.revanced.extension.shared.requests.Route; +import app.revanced.extension.shared.requests.Requester; import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.Utils; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java similarity index 86% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java index fe3403e56..0f7b54c90 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRoutes.java @@ -1,9 +1,9 @@ package app.revanced.extension.youtube.sponsorblock.requests; -import static app.revanced.extension.youtube.requests.Route.Method.GET; -import static app.revanced.extension.youtube.requests.Route.Method.POST; +import static app.revanced.extension.shared.requests.Route.Method.GET; +import static app.revanced.extension.shared.requests.Route.Method.POST; -import app.revanced.extension.youtube.requests.Route; +import app.revanced.extension.shared.requests.Route; class SBRoutes { static final Route IS_USER_VIP = new Route(GET, "/api/isUserVIP?userID={user_id}"); diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java index e19d3273c..4ec6c35b7 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButtonController.java @@ -1,5 +1,7 @@ package app.revanced.extension.youtube.sponsorblock.ui; +import static app.revanced.extension.shared.Utils.getResourceIdentifier; + import android.view.View; import android.widget.ImageView; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java index 9499d98ea..1f8d80c50 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java @@ -109,12 +109,11 @@ public final class NewSegmentLayout extends FrameLayout { final ButtonOnClickHandlerFunction handler, final String debugMessage) { ImageButton button = findViewById(getResourceIdentifier(context, resourceIdentifierName, "id")); - button.setBackgroundResource(rippleEffectId); + // Add ripple effect RippleDrawable rippleDrawable = new RippleDrawable( rippleColorStateList, null, null ); button.setBackground(rippleDrawable); - button.setOnClickListener((v) -> { handler.apply(); Logger.printDebug(() -> debugMessage); @@ -125,4 +124,4 @@ public final class NewSegmentLayout extends FrameLayout { private interface ButtonOnClickHandlerFunction { void apply(); } -} \ No newline at end of file +} diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java index 8609dd004..bad5f2484 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButtonController.java @@ -1,5 +1,7 @@ package app.revanced.extension.youtube.sponsorblock.ui; +import static app.revanced.extension.shared.Utils.getResourceIdentifier; + import android.view.View; import android.widget.ImageView; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/AudioVolumeController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/AudioVolumeController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/AudioVolumeController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/AudioVolumeController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/ScreenBrightnessController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/ScreenBrightnessController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/ScreenBrightnessController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/ScreenBrightnessController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/SwipeZonesController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/SwipeZonesController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/SwipeZonesController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/SwipeZonesController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/VolumeKeysController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/VolumeKeysController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/VolumeKeysController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/VolumeKeysController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/GestureController.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/GestureController.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/GestureController.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/GestureController.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Point.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Point.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Point.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Point.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Rectangle.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Rectangle.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Rectangle.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/Rectangle.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/ScrollDistanceHelper.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/ScrollDistanceHelper.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/ScrollDistanceHelper.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/ScrollDistanceHelper.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsOverlay.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsOverlay.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsOverlay.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsOverlay.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsUtils.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsUtils.kt similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsUtils.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/misc/SwipeControlsUtils.kt diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt similarity index 98% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt index fa30d5994..b3422d7bd 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt @@ -7,6 +7,8 @@ import android.os.Handler import android.os.Looper import android.util.TypedValue import android.view.HapticFeedbackConstants +import android.view.View +import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView import app.revanced.extension.shared.StringRef.str diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlButton.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlTimestampButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlTimestampButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlTimestampButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlTimestampButton.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/ExternalDownloadButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/ExternalDownloadButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/ExternalDownloadButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/ExternalDownloadButton.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/PlaybackSpeedDialogButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlaybackSpeedDialogButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/PlaybackSpeedDialogButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlaybackSpeedDialogButton.java diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java similarity index 100% rename from extensions/shared/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java diff --git a/extensions/youtube/stub/build.gradle.kts b/extensions/youtube/stub/build.gradle.kts new file mode 100644 index 000000000..c1cc5794c --- /dev/null +++ b/extensions/youtube/stub/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id(libs.plugins.android.library.get().pluginId) +} + +android { + namespace = "app.revanced.extension" + compileSdk = 33 + + defaultConfig { + minSdk = 24 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} diff --git a/extensions/youtube/stub/src/main/AndroidManifest.xml b/extensions/youtube/stub/src/main/AndroidManifest.xml new file mode 100644 index 000000000..15e7c2ae6 --- /dev/null +++ b/extensions/youtube/stub/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/extensions/shared/stub/src/main/java/android/support/v7/widget/RecyclerView.java b/extensions/youtube/stub/src/main/java/android/support/v7/widget/RecyclerView.java similarity index 86% rename from extensions/shared/stub/src/main/java/android/support/v7/widget/RecyclerView.java rename to extensions/youtube/stub/src/main/java/android/support/v7/widget/RecyclerView.java index d902dbfc8..b768b8484 100644 --- a/extensions/shared/stub/src/main/java/android/support/v7/widget/RecyclerView.java +++ b/extensions/youtube/stub/src/main/java/android/support/v7/widget/RecyclerView.java @@ -7,6 +7,7 @@ public class RecyclerView extends View { public RecyclerView(Context context) { super(context); + throw new UnsupportedOperationException("Stub"); } public View getChildAt(@SuppressWarnings("unused") final int index) { diff --git a/extensions/shared/stub/src/main/java/android/support/constraint/ConstraintLayout.java b/extensions/youtube/stub/src/main/java/com/google/android/android/support/constraint/ConstraintLayout.java similarity index 89% rename from extensions/shared/stub/src/main/java/android/support/constraint/ConstraintLayout.java rename to extensions/youtube/stub/src/main/java/com/google/android/android/support/constraint/ConstraintLayout.java index 2861235a5..627dcc47d 100644 --- a/extensions/shared/stub/src/main/java/android/support/constraint/ConstraintLayout.java +++ b/extensions/youtube/stub/src/main/java/com/google/android/android/support/constraint/ConstraintLayout.java @@ -1,4 +1,4 @@ -package android.support.constraint; +package com.google.android.android.support.constraint; import android.content.Context; import android.view.ViewGroup; @@ -7,7 +7,7 @@ import android.view.ViewGroup; * "CompileOnly" class * because android.support.android.support.constraint.ConstraintLayout is deprecated * in favour of androidx.constraintlayout.widget.ConstraintLayout. - * + *

* This class will not be included and "replaced" by the real package's class. */ public class ConstraintLayout extends ViewGroup { diff --git a/extensions/shared/stub/src/main/java/com/google/android/apps/youtube/app/ui/SlimMetadataScrollableButtonContainerLayout.java b/extensions/youtube/stub/src/main/java/com/google/android/apps/youtube/app/ui/SlimMetadataScrollableButtonContainerLayout.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/google/android/apps/youtube/app/ui/SlimMetadataScrollableButtonContainerLayout.java rename to extensions/youtube/stub/src/main/java/com/google/android/apps/youtube/app/ui/SlimMetadataScrollableButtonContainerLayout.java diff --git a/extensions/shared/stub/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java b/extensions/youtube/stub/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java rename to extensions/youtube/stub/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java diff --git a/extensions/shared/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java b/extensions/youtube/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java similarity index 100% rename from extensions/shared/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java rename to extensions/youtube/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java diff --git a/extensions/shared/stub/src/main/java/org/chromium/net/UrlRequest.java b/extensions/youtube/stub/src/main/java/org/chromium/net/UrlRequest.java similarity index 100% rename from extensions/shared/stub/src/main/java/org/chromium/net/UrlRequest.java rename to extensions/youtube/stub/src/main/java/org/chromium/net/UrlRequest.java diff --git a/extensions/shared/stub/src/main/java/org/chromium/net/UrlResponseInfo.java b/extensions/youtube/stub/src/main/java/org/chromium/net/UrlResponseInfo.java similarity index 100% rename from extensions/shared/stub/src/main/java/org/chromium/net/UrlResponseInfo.java rename to extensions/youtube/stub/src/main/java/org/chromium/net/UrlResponseInfo.java diff --git a/extensions/shared/stub/src/main/java/org/chromium/net/impl/CronetUrlRequest.java b/extensions/youtube/stub/src/main/java/org/chromium/net/impl/CronetUrlRequest.java similarity index 100% rename from extensions/shared/stub/src/main/java/org/chromium/net/impl/CronetUrlRequest.java rename to extensions/youtube/stub/src/main/java/org/chromium/net/impl/CronetUrlRequest.java diff --git a/patches/api/patches.api b/patches/api/patches.api index d920cf745..1c601b551 100644 --- a/patches/api/patches.api +++ b/patches/api/patches.api @@ -543,6 +543,7 @@ public final class app/revanced/patches/shared/misc/extension/ExtensionHook { public final class app/revanced/patches/shared/misc/extension/SharedExtensionPatchKt { public static final fun extensionHook (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook; public static synthetic fun extensionHook$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook; + public static final fun sharedExtensionPatch (Ljava/lang/String;[Lapp/revanced/patches/shared/misc/extension/ExtensionHook;)Lapp/revanced/patcher/patch/BytecodePatch; public static final fun sharedExtensionPatch ([Lapp/revanced/patches/shared/misc/extension/ExtensionHook;)Lapp/revanced/patcher/patch/BytecodePatch; } diff --git a/patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.kt b/patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.kt index 3e086f95c..ede9eb1dc 100644 --- a/patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.kt @@ -5,7 +5,8 @@ import app.revanced.patches.all.misc.transformation.IMethodCall import app.revanced.patches.all.misc.transformation.filterMapInstruction35c import app.revanced.patches.all.misc.transformation.transformInstructionsPatch -internal const val EXTENSION_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch" +internal const val EXTENSION_CLASS_DESCRIPTOR_PREFIX = + "Lapp/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch" internal const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;" @@ -15,7 +16,7 @@ val spoofWifiPatch = bytecodePatch( description = "Spoofs an existing Wi-Fi connection.", use = false, ) { - extendWith("extensions/all/connectivity/wifi/spoof/spoof-wifi.rve") + extendWith("extensions/all/misc/connectivity/wifi/spoof/spoof-wifi.rve") dependsOn( transformInstructionsPatch( diff --git a/patches/src/main/kotlin/app/revanced/patches/all/misc/screencapture/RemoveScreenCaptureRestrictionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/all/misc/screencapture/RemoveScreenCaptureRestrictionPatch.kt index 5eef83ac0..4b5955d87 100644 --- a/patches/src/main/kotlin/app/revanced/patches/all/misc/screencapture/RemoveScreenCaptureRestrictionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/all/misc/screencapture/RemoveScreenCaptureRestrictionPatch.kt @@ -34,7 +34,7 @@ val removeScreenCaptureRestrictionPatch = bytecodePatch( description = "Removes the restriction of capturing audio from apps that normally wouldn't allow it.", use = false, ) { - extendWith("extensions/all/screencapture/remove-screen-capture-restriction.rve") + extendWith("extensions/all/misc/screencapture/remove-screen-capture-restriction.rve") dependsOn( removeCaptureRestrictionResourcePatch, diff --git a/patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatch.kt index af689f5ed..19c4ba05f 100644 --- a/patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatch.kt @@ -19,7 +19,7 @@ val removeScreenshotRestrictionPatch = bytecodePatch( description = "Removes the restriction of taking screenshots in apps that normally wouldn't allow it.", use = false, ) { - extendWith("extensions/all/screenshot/remove-screenshot-restriction.rve") + extendWith("extensions/all/misc/screenshot/remove-screenshot-restriction.rve") dependsOn( // Remove the restriction of taking screenshots. diff --git a/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt similarity index 100% rename from patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Fingerprints.kt rename to patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/extension/SharedExtensionPatch.kt index e6c1c69fe..9351b600e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/misc/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/extension/SharedExtensionPatch.kt @@ -3,4 +3,7 @@ package app.revanced.patches.music.misc.extension import app.revanced.patches.music.misc.extension.hooks.applicationInitHook import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch(applicationInitHook) +val sharedExtensionPatch = sharedExtensionPatch( + "music", + applicationInitHook, +) diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/extension/SharedExtensionPatch.kt index 3d92d142b..9f85643f4 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/extension/SharedExtensionPatch.kt @@ -3,4 +3,4 @@ package app.revanced.patches.reddit.customclients.boostforreddit.misc.extension import app.revanced.patches.reddit.customclients.boostforreddit.misc.extension.hooks.initHook import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch(initHook) +val sharedExtensionPatch = sharedExtensionPatch("boostforreddit", initHook) diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/extension/SharedExtensionPatch.kt index 67f02676f..7f50bdf7e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/extension/SharedExtensionPatch.kt @@ -3,4 +3,4 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.extension import app.revanced.patches.reddit.customclients.sync.syncforreddit.extension.hooks.initHook import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch(initHook) +val sharedExtensionPatch = sharedExtensionPatch("sync", initHook) diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/misc/extension/ExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/misc/extension/ExtensionPatch.kt index db449a93e..5633647ed 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/misc/extension/ExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/misc/extension/ExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.reddit.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch() +val sharedExtensionPatch = sharedExtensionPatch("reddit") diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt index 7460ddd11..cfcf9d0b1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt @@ -14,6 +14,26 @@ import java.util.jar.JarFile internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/shared/Utils;" +/** + * A patch to extend with an extension shared with multiple patches. + * + * @param extensionName The name of the extension to extend with. + */ +fun sharedExtensionPatch( + extensionName: String, + vararg hooks: ExtensionHook, +) = bytecodePatch { + dependsOn(sharedExtensionPatch(*hooks)) + + extendWith("extensions/$extensionName.rve") +} + +/** + * A patch to extend with the "shared" extension. + * + * @param hooks The hooks to get the application context for use in the extension, + * commonly for the onCreate method of exported activities. + */ fun sharedExtensionPatch( vararg hooks: ExtensionHook, ) = bytecodePatch { diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/extension/ExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/extension/ExtensionPatch.kt index b714b9d1c..66efc7f51 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/extension/ExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/extension/ExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.tiktok.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch(initHook) +val sharedExtensionPatch = sharedExtensionPatch("tiktok", initHook) diff --git a/patches/src/main/kotlin/app/revanced/patches/tudortmund/misc/extension/ExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/tudortmund/misc/extension/ExtensionPatch.kt index 1c056b0c6..9ca0b78d7 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tudortmund/misc/extension/ExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tudortmund/misc/extension/ExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.tudortmund.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch() +val sharedExtensionPatch = sharedExtensionPatch("tudortmund") diff --git a/patches/src/main/kotlin/app/revanced/patches/tumblr/misc/extension/ExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/tumblr/misc/extension/ExtensionPatch.kt index 3a69b74a5..ce554e745 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tumblr/misc/extension/ExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tumblr/misc/extension/ExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.tumblr.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch() +val sharedExtensionPatch = sharedExtensionPatch("tumblr") diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/extension/SharedExtensionPatch.kt index 2299d3bb5..cd2f42b58 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/extension/SharedExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.twitch.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch(initHook) +val sharedExtensionPatch = sharedExtensionPatch("twitch", initHook) diff --git a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/extension/ExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/extension/ExtensionPatch.kt index f1e6a879b..c5c758245 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/extension/ExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/extension/ExtensionPatch.kt @@ -2,4 +2,4 @@ package app.revanced.patches.twitter.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch -val sharedExtensionPatch = sharedExtensionPatch() +val sharedExtensionPatch = sharedExtensionPatch("twitter") diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/extension/SharedExtensionPatch.kt index 369e3ea74..553cc486f 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/extension/SharedExtensionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/extension/SharedExtensionPatch.kt @@ -3,7 +3,4 @@ package app.revanced.patches.youtube.misc.extension import app.revanced.patches.shared.misc.extension.sharedExtensionPatch import app.revanced.patches.youtube.misc.extension.hooks.* -// TODO: Move this to a "Hook.kt" file. Same for other extension hook patches. -val sharedExtensionPatch = sharedExtensionPatch( - applicationInitHook, -) +val sharedExtensionPatch = sharedExtensionPatch("youtube", applicationInitHook) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsPatch.kt index d8e72d87f..f167a3bd5 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsPatch.kt @@ -11,6 +11,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patches.shared.misc.mapping.get import app.revanced.patches.shared.misc.mapping.resourceMappingPatch import app.revanced.patches.shared.misc.mapping.resourceMappings +import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater import app.revanced.patches.youtube.misc.playservice.is_19_35_or_greater import app.revanced.util.* @@ -214,15 +215,17 @@ private var visibilityImmediateInsertIndex: Int = 0 val playerControlsPatch = bytecodePatch( description = "Manages the code for the player controls of the YouTube player.", ) { - dependsOn(playerControlsResourcePatch) + dependsOn( + playerControlsResourcePatch, + sharedExtensionPatch, + ) execute { - fun MutableMethod.indexOfFirstViewInflateOrThrow() = - indexOfFirstInstructionOrThrow { - val reference = getReference() - reference?.definingClass == "Landroid/view/ViewStub;" && - reference.name == "inflate" - } + fun MutableMethod.indexOfFirstViewInflateOrThrow() = indexOfFirstInstructionOrThrow { + val reference = getReference() + reference?.definingClass == "Landroid/view/ViewStub;" && + reference.name == "inflate" + } playerBottomControlsInflateFingerprint.method.apply { inflateBottomControlMethod = this @@ -292,7 +295,7 @@ val playerControlsPatch = bytecodePatch( """ invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getPlayerTopControlsLayoutResourceName(Ljava/lang/String;)Ljava/lang/String; move-result-object v$register - """ + """, ) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 221f076f8..a43ee0c2e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,15 @@ pluginManagement { } plugins { - id("app.revanced.patches") version "1.0.0-dev.6" + id("app.revanced.patches") version "1.0.0-dev.7" +} + +settings { + extensions { + defaultNamespace = "app.revanced.extension" + + proguardFiles("../proguard-rules.pro") + } } include(":patches:stub")