chore: Merge branch dev to main (#5857)

Author: LisoUseInAIKyrios

CHANGELOG.md

@@ -1,3 +1,59 @@
+# [5.38.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.38.0-dev.4...v5.38.0-dev.5) (2025-09-16)
+
+
+### Bug Fixes
+
+* **YouTube Music:** Use correct light/dark mode settings UI ([1475643](https://github.com/ReVanced/revanced-patches/commit/1475643f84e9ee4af2ba360a2274001ff1570dad))
+
+# [5.38.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.38.0-dev.3...v5.38.0-dev.4) (2025-09-16)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Show settings summary if `Force original audio` is enabled ([3776dda](https://github.com/ReVanced/revanced-patches/commit/3776dda710a7780717b7e6f2cdc1333ab67b92fc))
+
+# [5.38.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.38.0-dev.2...v5.38.0-dev.3) (2025-09-16)
+
+
+### Features
+
+* **YouTube - Spoof video streams:** Add iPadOS client ([2726231](https://github.com/ReVanced/revanced-patches/commit/2726231404384d87f101d825e10a17c944e8f1bd))
+
+# [5.38.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.38.0-dev.1...v5.38.0-dev.2) (2025-09-16)
+
+
+### Features
+
+* **YouTube Music:** Add `Settings` patch ([#5838](https://github.com/ReVanced/revanced-patches/issues/5838)) ([5e20bd8](https://github.com/ReVanced/revanced-patches/commit/5e20bd80f138d7ca94f18857194c46e489c435dc))
+
+# [5.38.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.3...v5.38.0-dev.1) (2025-09-15)
+
+
+### Features
+
+* **Instagram:** Add `Hide explore feed` patch ([#5856](https://github.com/ReVanced/revanced-patches/issues/5856)) ([1d65887](https://github.com/ReVanced/revanced-patches/commit/1d65887e015a067196f5a84db486fff355c96596))
+
+## [5.37.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.2...v5.37.1-dev.3) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Spoof video streams:** Remove Android TV and iOS TV clients, add experimental VisionOS, add temporary fix for `Force original audio` to work with any spoof client ([#5861](https://github.com/ReVanced/revanced-patches/issues/5861)) ([abe3943](https://github.com/ReVanced/revanced-patches/commit/abe3943f98fd86dcd74c7e07cf65d3c7fc24fef9))
+
+## [5.37.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.1...v5.37.1-dev.2) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Support v397.1.0.52.81 ([#5855](https://github.com/ReVanced/revanced-patches/issues/5855)) ([f11d1ef](https://github.com/ReVanced/revanced-patches/commit/f11d1ef9907082512f139d4ab0e2e9f707de7e48))
+
+## [5.37.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.37.0...v5.37.1-dev.1) (2025-09-15)
+
+
+### Bug Fixes
+
+* **YouTube Music - Spoof video streams:** Fix playback issues when using a cellular network ([fa04c8e](https://github.com/ReVanced/revanced-patches/commit/fa04c8eecfbdd0b6ed082b464ca9032536d71762))
+
 # [5.37.0](https://github.com/ReVanced/revanced-patches/compare/v5.36.0...v5.37.0) (2025-09-15)
 
 

extensions/music/src/main/java/app/revanced/extension/music/patches/HideCategoryBarPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideCategoryBarPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean hideCategoryBar() {
+        return Settings.HIDE_CATEGORY_BAR.get();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideGetPremiumPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideGetPremiumPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean hideGetPremiumLabel() {
+        return Settings.HIDE_GET_PREMIUM_LABEL.get();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideUpgradeButtonPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideUpgradeButtonPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean hideUpgradeButton() {
+        return Settings.HIDE_UPGRADE_BUTTON.get();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideVideoAdsPatch.java

@@ -0,0 +1,17 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideVideoAdsPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean showVideoAds(boolean original) {
+        if (Settings.HIDE_VIDEO_ADS.get()) {
+            return false;
+        }
+        return original;
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/PermanentRepeatPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class PermanentRepeatPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean permanentRepeat() {
+        return Settings.PERMANENT_REPEAT.get();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java

@@ -2,6 +2,9 @@
 
 import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
 import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
+import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
+
+import java.util.List;
 
 import app.revanced.extension.shared.spoof.ClientType;
 import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
@@ -13,10 +16,11 @@ public class SpoofVideoStreamsPatch {
      * Injection point.
      */
     public static void setClientOrderToUse() {
-        ClientType[] availableClients = {
+        List<ClientType> availableClients = List.of(
                 ANDROID_VR_1_43_32,
                 ANDROID_VR_1_61_48,
-        };
+                VISIONOS
+        );
 
         StreamingDataRequest.setClientOrderToUse(availableClients, ANDROID_VR_1_43_32);
     }

extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java

@@ -0,0 +1,87 @@
+package app.revanced.extension.music.settings;
+
+import android.app.Activity;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceFragment;
+import android.view.View;
+
+import app.revanced.extension.music.settings.preference.ReVancedPreferenceFragment;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseActivityHook;
+
+/**
+ * Hooks GoogleApiActivity to inject a custom ReVancedPreferenceFragment with a toolbar.
+ */
+public class GoogleApiActivityHook extends BaseActivityHook {
+    /**
+     * Injection point
+     * <p>
+     * Creates an instance of GoogleApiActivityHook for use in static initialization.
+     */
+    @SuppressWarnings("unused")
+    public static GoogleApiActivityHook createInstance() {
+        // Must touch the Music settings to ensure the class is loaded and
+        // the values can be found when setting the UI preferences.
+        // Logging anything under non debug ensures this is set.
+        Logger.printInfo(() -> "Permanent repeat enabled: " + Settings.PERMANENT_REPEAT.get());
+
+        // YT Music always uses dark mode.
+        Utils.setIsDarkModeEnabled(true);
+
+        return new GoogleApiActivityHook();
+    }
+
+    /**
+     * Sets the fixed theme for the activity.
+     */
+    @Override
+    protected void customizeActivityTheme(Activity activity) {
+        // Override the default YouTube Music theme to increase start padding of list items.
+        // Custom style located in resources/music/values/style.xml
+        activity.setTheme(Utils.getResourceIdentifier("Theme.ReVanced.YouTubeMusic.Settings", "style"));
+    }
+
+    /**
+     * Returns the resource ID for the YouTube Music settings layout.
+     */
+    @Override
+    protected int getContentViewResourceId() {
+        return Utils.getResourceIdentifier("revanced_music_settings_with_toolbar", "layout");
+    }
+
+    /**
+     * Returns the fixed background color for the toolbar.
+     */
+    @Override
+    protected int getToolbarBackgroundColor() {
+        return Utils.getResourceColor("ytm_color_black");
+    }
+
+    /**
+     * Returns the navigation icon with a color filter applied.
+     */
+    @Override
+    protected Drawable getNavigationIcon() {
+        Drawable navigationIcon = ReVancedPreferenceFragment.getBackButtonDrawable();
+        navigationIcon.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
+        return navigationIcon;
+    }
+
+    /**
+     * Returns the click listener that finishes the activity when the navigation icon is clicked.
+     */
+    @Override
+    protected View.OnClickListener getNavigationClickListener(Activity activity) {
+        return view -> activity.finish();
+    }
+
+    /**
+     * Creates a new ReVancedPreferenceFragment for the activity.
+     */
+    @Override
+    protected PreferenceFragment createPreferenceFragment() {
+        return new ReVancedPreferenceFragment();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java

@@ -0,0 +1,21 @@
+package app.revanced.extension.music.settings;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.BooleanSetting;
+
+public class Settings extends BaseSettings {
+
+    // Ads
+    public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);
+    public static final BooleanSetting HIDE_GET_PREMIUM_LABEL = new BooleanSetting("revanced_music_hide_get_premium_label", TRUE, true);
+    public static final BooleanSetting HIDE_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_upgrade_button", TRUE, true);
+
+    // General
+    public static final BooleanSetting HIDE_CATEGORY_BAR = new BooleanSetting("revanced_music_hide_category_bar", FALSE, true);
+
+    // Player
+    public static final BooleanSetting PERMANENT_REPEAT = new BooleanSetting("revanced_music_play_permanent_repeat", FALSE, true);
+}

extensions/music/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java

@@ -0,0 +1,38 @@
+package app.revanced.extension.music.settings.preference;
+
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.GoogleApiActivityHook;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+
+/**
+ * Preference fragment for ReVanced settings.
+ */
+@SuppressWarnings({"deprecation", "NewApi"})
+public class ReVancedPreferenceFragment extends ToolbarPreferenceFragment {
+
+    /**
+     * Initializes the preference fragment.
+     */
+    @Override
+    protected void initialize() {
+        super.initialize();
+
+        try {
+            Utils.sortPreferenceGroups(getPreferenceScreen());
+            setPreferenceScreenToolbar(getPreferenceScreen());
+        } catch (Exception ex) {
+            Logger.printException(() -> "initialize failure", ex);
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
+    @Override
+    protected void customizeToolbar(Toolbar toolbar) {
+        GoogleApiActivityHook.setToolbarLayoutParams(toolbar);
+    }
+}