test/revanced-patches
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix(YouTube - Change form factor): Explore button sometimes shows in Automotive layout

Browse source 
Co-authored-by: inotia00 <108592928+inotia00@users.noreply.github.com>
This commit is contained in:
oSumAtrIX 2026-03-19 20:09:30 +01:00
parent 9fa641ed81
commit 733f3bb2cd
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
12 changed files with 222 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

108
extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java
View file

@ -2,13 +2,10 @@ package app.revanced.extension.youtube.patches;
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
import android.view.View;
import androidx.annotation.Nullable;
import java.util.Objects;
import java.util.Optional;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.NavigationBar;
import app.revanced.extension.youtube.shared.PlayerType;
@ -20,7 +17,7 @@ public class ChangeFormFactorPatch {
/**
* Unmodified, and same as un-patched.
*/
DEFAULT(null),
DEFAULT(null, false),
/**
* <pre>
* Some changes include:
@ -28,60 +25,56 @@ public class ChangeFormFactorPatch {
* - watch history is missing.
* - feed thumbnails fade in.
*/
UNKNOWN(0),
SMALL(1),
LARGE(2),
UNKNOWN(0, true),
SMALL(1, false),
LARGE(2, false),
/**
* Cars with 'Google built-in'.
* Layout seems identical to {@link #UNKNOWN}
* even when using an Android Automotive device.
*/
AUTOMOTIVE(3),
WEARABLE(4);
AUTOMOTIVE(3, true),
WEARABLE(4, true);
@Nullable
final Integer formFactorType;
final boolean isBroken;
FormFactor(@Nullable Integer formFactorType) {
FormFactor(@Nullable Integer formFactorType, boolean isBroken) {
this.formFactorType = formFactorType;
this.isBroken = isBroken;
}
}
private static final FormFactor FORM_FACTOR = Settings.CHANGE_FORM_FACTOR.get();
@Nullable
private static final Integer FORM_FACTOR_TYPE = Settings.CHANGE_FORM_FACTOR.get().formFactorType;
private static final boolean USING_AUTOMOTIVE_TYPE = Objects.requireNonNull(
FormFactor.AUTOMOTIVE.formFactorType).equals(FORM_FACTOR_TYPE);
private static final Integer FORM_FACTOR_TYPE = FORM_FACTOR.formFactorType;
private static final boolean IS_BROKEN_FORM_FACTOR = FORM_FACTOR.isBroken;
/**
* Injection point.
* <p>
* Called before {@link #replaceBrokenFormFactor(int)}.
* Called from all endpoints.
*/
public static int getFormFactor(int original) {
if (FORM_FACTOR_TYPE == null) return original;
if (USING_AUTOMOTIVE_TYPE) {
// Do not change if the player is opening or is opened,
// otherwise the video description cannot be opened.
PlayerType current = PlayerType.getCurrent();
if (current.isMaximizedOrFullscreen() || current == PlayerType.WATCH_WHILE_SLIDING_MINIMIZED_MAXIMIZED) {
Logger.printDebug(() -> "Using original form factor for player");
return original;
}
if (!NavigationBar.isSearchBarActive()) {
// Automotive type shows error 400 when opening a channel page and using some explore tab.
// This is a bug in unpatched YouTube that occurs on actual Android Automotive devices.
// Work around the issue by using the original form factor if not in search and the
// navigation back button is present.
if (NavigationBar.isBackButtonVisible()) {
Logger.printDebug(() -> "Using original form factor, as back button is visible without search present");
return original;
}
// Do not change library tab otherwise watch history is hidden.
// Do this check last since the current navigation button is required.
if (NavigationButton.getSelectedNavigationButton() == NavigationButton.LIBRARY) {
return original;
}
public static int getUniversalFormFactor(int original) {
if (FORM_FACTOR_TYPE == null) {
return original;
}
if (IS_BROKEN_FORM_FACTOR
&& !PlayerType.getCurrent().isMaximizedOrFullscreen()
&& !NavigationBar.isSearchBarActive()) {
// Automotive type shows error 400 when opening a channel page and using some explore tab.
// This is a bug in unpatched YouTube that occurs on actual Android Automotive devices.
// Work around the issue by using the tablet form factor if not in search and the
// navigation back button is present.
if (NavigationBar.isBackButtonVisible()
// Do not change library tab otherwise watch history is hidden.
// Do this check last since the current navigation button is required.
|| NavigationButton.getSelectedNavigationButton() == NavigationButton.LIBRARY) {
// The form factor most similar to AUTOMOTIVE is LARGE, so it is replaced with LARGE.
return Optional.ofNullable(FormFactor.LARGE.formFactorType).orElse(original);
}
}
@ -90,16 +83,31 @@ public class ChangeFormFactorPatch {
/**
* Injection point.
* <p>
* Called after {@link #getUniversalFormFactor(int)}.
* Called from the '/get_watch', '/guide', '/next' and '/reel' endpoints.
* <p>
* The '/guide' endpoint relates to navigation buttons.
* If {@link #IS_BROKEN_FORM_FACTOR} is true in this endpoint,
* the explore button (which is deprecated) will be shown.
* <p>
* The '/get_watch' and '/next' endpoints relate to elements below the player (channel bar, comments, related videos).
* If {@link #IS_BROKEN_FORM_FACTOR} is true in this endpoint,
* the video description panel will not open.
* <p>
* The '/reel' endpoint relates to Shorts player.
* If {@link #IS_BROKEN_FORM_FACTOR} is true in this endpoint,
* the Shorts comment panel will not open.
*/
public static void navigationTabCreated(NavigationButton button, View tabView) {
// On first startup of the app the navigation buttons are fetched and updated.
// If the user immediately opens the 'You' or opens a video, then the call to
// update the navigation buttons will use the non-automotive form factor
// and the explore tab is missing.
// Fixing this is not so simple because of the concurrent calls for the player and You tab.
// For now, always hide the explore tab.
if (USING_AUTOMOTIVE_TYPE && button == NavigationButton.EXPLORE) {
tabView.setVisibility(View.GONE);
public static int replaceBrokenFormFactor(int original) {
if (FORM_FACTOR_TYPE == null) {
return original;
}
if (IS_BROKEN_FORM_FACTOR) {
// The form factor most similar to AUTOMOTIVE is LARGE, so it is replaced with LARGE.
return Optional.ofNullable(FormFactor.LARGE.formFactorType).orElse(original);
} else {
return original;
}
}
}

15
extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java
View file

@ -4,23 +4,22 @@ import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
public class VideoAdsPatch {
private static final boolean SHOW_VIDEO_ADS = !Settings.HIDE_VIDEO_ADS.get();
private static final boolean HIDE_VIDEO_ADS = Settings.HIDE_VIDEO_ADS.get();
/**
* Injection point.
*/
public static boolean shouldShowAds() {
return SHOW_VIDEO_ADS;
public static boolean hideVideoAds() {
return HIDE_VIDEO_ADS;
}
/**
* Injection point.
*/
public static String hideShortsAds(String osName) {
return SHOW_VIDEO_ADS
? osName
: "Android Automotive";
public static String hideVideoAds(String osName) {
return HIDE_VIDEO_ADS
? "Android Automotive"
: osName;
}
}

2
extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/KeywordContentFilter.java
View file

@ -528,7 +528,7 @@ public final class KeywordContentFilter extends Filter {
}
return switch (selectedNavButton) {
case HOME, EXPLORE -> hideHome;
case HOME -> hideHome;
case SUBSCRIPTIONS -> hideSubscriptions;
// User is in the Library or notifications.
default -> false;

2
extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ShortsFilter.java
View file

@ -535,7 +535,7 @@ public final class ShortsFilter extends Filter {
}
return switch (selectedNavButton) {
case HOME, EXPLORE -> hideHome;
case HOME -> hideHome;
case SUBSCRIPTIONS -> hideSubscriptions;
case LIBRARY -> hideHistory;
default -> false;

4
extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
View file

@ -310,10 +310,6 @@ public final class NavigationBar {
* This tab will never be in a selected state, even if the Create video UI is on screen.
*/
CREATE("CREATION_TAB_LARGE", "CREATION_TAB_LARGE_CAIRO"),
/**
* Only shown to automotive layout.
*/
EXPLORE("TAB_EXPLORE"),
SUBSCRIPTIONS("PIVOT_SUBSCRIPTIONS", "TAB_SUBSCRIPTIONS_CAIRO"),
/**
* Notifications tab. Only present when