mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-05-03 16:14:28 +02:00
feat(YouTube - Navigation bar components): Remove settings Disable translucent status bar
, Disable light translucent bar
and Disable dark translucent bar
This commit is contained in:
parent
74d39ff034
commit
09c1d495eb
@ -462,16 +462,6 @@ public class Utils {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isDarkModeEnabled() {
|
|
||||||
return isDarkModeEnabled(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isDarkModeEnabled(Context context) {
|
|
||||||
Configuration config = context.getResources().getConfiguration();
|
|
||||||
final int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
|
|
||||||
return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return whether the device's API level is higher than a specific SDK version.
|
* @return whether the device's API level is higher than a specific SDK version.
|
||||||
*/
|
*/
|
||||||
|
@ -5,7 +5,6 @@ import static app.revanced.extension.shared.utils.Utils.getChildView;
|
|||||||
import static app.revanced.extension.shared.utils.Utils.hideViewByLayoutParams;
|
import static app.revanced.extension.shared.utils.Utils.hideViewByLayoutParams;
|
||||||
import static app.revanced.extension.shared.utils.Utils.hideViewGroupByMarginLayoutParams;
|
import static app.revanced.extension.shared.utils.Utils.hideViewGroupByMarginLayoutParams;
|
||||||
import static app.revanced.extension.shared.utils.Utils.hideViewUnderCondition;
|
import static app.revanced.extension.shared.utils.Utils.hideViewUnderCondition;
|
||||||
import static app.revanced.extension.shared.utils.Utils.isSDKAbove;
|
|
||||||
import static app.revanced.extension.youtube.patches.utils.PatchStatus.ImageSearchButton;
|
import static app.revanced.extension.youtube.patches.utils.PatchStatus.ImageSearchButton;
|
||||||
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
|
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
|
||||||
|
|
||||||
@ -245,48 +244,6 @@ public class GeneralPatch {
|
|||||||
hideViewUnderCondition(Settings.HIDE_NAVIGATION_BAR.get(), view);
|
hideViewUnderCondition(Settings.HIDE_NAVIGATION_BAR.get(), view);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean useTranslucentNavigationStatusBar(boolean original) {
|
|
||||||
try {
|
|
||||||
if (Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Logger.printException(() -> "Failed to load useTranslucentNavigationStatusBar", ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
|
|
||||||
= Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
|
|
||||||
|
|
||||||
private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
|
|
||||||
= Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
|
|
||||||
|
|
||||||
public static boolean useTranslucentNavigationButtons(boolean original) {
|
|
||||||
try {
|
|
||||||
// Feature requires Android 13+
|
|
||||||
if (!isSDKAbove(33)) {
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Utils.isDarkModeEnabled()
|
|
||||||
? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
|
|
||||||
: !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Logger.printException(() -> "Failed to load useTranslucentNavigationButtons", ex);
|
|
||||||
}
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region [Remove viewer discretion dialog] patch
|
// region [Remove viewer discretion dialog] patch
|
||||||
|
@ -147,7 +147,6 @@ public class Settings extends BaseSettings {
|
|||||||
new ChangeStartPagePatch.ChangeStartPageTypeAvailability());
|
new ChangeStartPagePatch.ChangeStartPageTypeAvailability());
|
||||||
public static final BooleanSetting DISABLE_AUTO_AUDIO_TRACKS = new BooleanSetting("revanced_disable_auto_audio_tracks", FALSE);
|
public static final BooleanSetting DISABLE_AUTO_AUDIO_TRACKS = new BooleanSetting("revanced_disable_auto_audio_tracks", FALSE);
|
||||||
public static final BooleanSetting DISABLE_SPLASH_ANIMATION = new BooleanSetting("revanced_disable_splash_animation", FALSE, true);
|
public static final BooleanSetting DISABLE_SPLASH_ANIMATION = new BooleanSetting("revanced_disable_splash_animation", FALSE, true);
|
||||||
public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
|
|
||||||
public static final BooleanSetting ENABLE_GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_enable_gradient_loading_screen", FALSE, true);
|
public static final BooleanSetting ENABLE_GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_enable_gradient_loading_screen", FALSE, true);
|
||||||
public static final BooleanSetting HIDE_FLOATING_MICROPHONE = new BooleanSetting("revanced_hide_floating_microphone", TRUE, true);
|
public static final BooleanSetting HIDE_FLOATING_MICROPHONE = new BooleanSetting("revanced_hide_floating_microphone", TRUE, true);
|
||||||
public static final BooleanSetting HIDE_GRAY_SEPARATOR = new BooleanSetting("revanced_hide_gray_separator", TRUE);
|
public static final BooleanSetting HIDE_GRAY_SEPARATOR = new BooleanSetting("revanced_hide_gray_separator", TRUE);
|
||||||
@ -190,8 +189,6 @@ public class Settings extends BaseSettings {
|
|||||||
public static final BooleanSetting HIDE_NAVIGATION_SUBSCRIPTIONS_BUTTON = new BooleanSetting("revanced_hide_navigation_subscriptions_button", FALSE, true);
|
public static final BooleanSetting HIDE_NAVIGATION_SUBSCRIPTIONS_BUTTON = new BooleanSetting("revanced_hide_navigation_subscriptions_button", FALSE, true);
|
||||||
public static final BooleanSetting HIDE_NAVIGATION_LABEL = new BooleanSetting("revanced_hide_navigation_label", FALSE, true);
|
public static final BooleanSetting HIDE_NAVIGATION_LABEL = new BooleanSetting("revanced_hide_navigation_label", FALSE, true);
|
||||||
public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true, "revanced_switch_create_with_notifications_button_user_dialog_message");
|
public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true, "revanced_switch_create_with_notifications_button_user_dialog_message");
|
||||||
public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
|
|
||||||
public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);
|
|
||||||
public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_hide_navigation_bar", FALSE, true);
|
public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_hide_navigation_bar", FALSE, true);
|
||||||
|
|
||||||
// PreferenceScreen: General - Override buttons
|
// PreferenceScreen: General - Override buttons
|
||||||
|
@ -203,11 +203,6 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
|
|||||||
Settings.REPLACE_TOOLBAR_CREATE_BUTTON,
|
Settings.REPLACE_TOOLBAR_CREATE_BUTTON,
|
||||||
Settings.REPLACE_TOOLBAR_CREATE_BUTTON_TYPE
|
Settings.REPLACE_TOOLBAR_CREATE_BUTTON_TYPE
|
||||||
);
|
);
|
||||||
enableDisablePreferences(
|
|
||||||
!isSDKAbove(33),
|
|
||||||
Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT,
|
|
||||||
Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -73,33 +73,3 @@ internal val setEnumMapFingerprint = legacyFingerprint(
|
|||||||
name = "setEnumMapFingerprint",
|
name = "setEnumMapFingerprint",
|
||||||
literals = listOf(ytFillBell),
|
literals = listOf(ytFillBell),
|
||||||
)
|
)
|
||||||
|
|
||||||
internal const val TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG = 45400535L
|
|
||||||
|
|
||||||
internal val translucentNavigationStatusBarFeatureFlagFingerprint = legacyFingerprint(
|
|
||||||
name = "translucentNavigationStatusBarFeatureFlagFingerprint",
|
|
||||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
|
||||||
returnType = "Z",
|
|
||||||
literals = listOf(TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG)
|
|
||||||
)
|
|
||||||
|
|
||||||
internal const val TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG = 45630927L
|
|
||||||
|
|
||||||
internal val translucentNavigationButtonsFeatureFlagFingerprint = legacyFingerprint(
|
|
||||||
name = "translucentNavigationButtonsFeatureFlagFingerprint",
|
|
||||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
|
||||||
returnType = "V",
|
|
||||||
literals = listOf(TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG)
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The device on screen back/home/recent buttons.
|
|
||||||
*/
|
|
||||||
internal const val TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG = 45632194L
|
|
||||||
|
|
||||||
internal val translucentNavigationButtonsSystemFeatureFlagFingerprint = legacyFingerprint(
|
|
||||||
name = "translucentNavigationButtonsSystemFeatureFlagFingerprint",
|
|
||||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
|
||||||
returnType = "Z",
|
|
||||||
literals = listOf(TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG)
|
|
||||||
)
|
|
@ -82,38 +82,6 @@ val navigationBarComponentsPatch = bytecodePatch(
|
|||||||
"SETTINGS: HIDE_NAVIGATION_COMPONENTS"
|
"SETTINGS: HIDE_NAVIGATION_COMPONENTS"
|
||||||
)
|
)
|
||||||
|
|
||||||
// region patch for enable translucent navigation bar
|
|
||||||
|
|
||||||
if (is_19_25_or_greater) {
|
|
||||||
arrayOf(
|
|
||||||
Triple(
|
|
||||||
translucentNavigationStatusBarFeatureFlagFingerprint,
|
|
||||||
TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG,
|
|
||||||
"useTranslucentNavigationStatusBar"
|
|
||||||
),
|
|
||||||
Triple(
|
|
||||||
translucentNavigationButtonsFeatureFlagFingerprint,
|
|
||||||
TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG,
|
|
||||||
"useTranslucentNavigationButtons"
|
|
||||||
),
|
|
||||||
Triple(
|
|
||||||
translucentNavigationButtonsSystemFeatureFlagFingerprint,
|
|
||||||
TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG,
|
|
||||||
"useTranslucentNavigationButtons"
|
|
||||||
)
|
|
||||||
).forEach {
|
|
||||||
it.first.injectLiteralInstructionBooleanCall(
|
|
||||||
it.second,
|
|
||||||
"$GENERAL_CLASS_DESCRIPTOR->${it.third}(Z)Z"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
settingArray += "SETTINGS: DISABLE_TRANSLUCENT_STATUS_BAR"
|
|
||||||
settingArray += "SETTINGS: TRANSLUCENT_NAVIGATION_BAR"
|
|
||||||
}
|
|
||||||
|
|
||||||
// endregion
|
|
||||||
|
|
||||||
// region patch for enable narrow navigation buttons
|
// region patch for enable narrow navigation buttons
|
||||||
|
|
||||||
arrayOf(
|
arrayOf(
|
||||||
|
@ -352,9 +352,6 @@ Limitation: Back button on the toolbar may not work."</string>
|
|||||||
<string name="revanced_disable_splash_animation_title">Disable splash animation</string>
|
<string name="revanced_disable_splash_animation_title">Disable splash animation</string>
|
||||||
<string name="revanced_disable_splash_animation_summary_on">Splash animation is disabled.</string>
|
<string name="revanced_disable_splash_animation_summary_on">Splash animation is disabled.</string>
|
||||||
<string name="revanced_disable_splash_animation_summary_off">Splash animation is enabled.</string>
|
<string name="revanced_disable_splash_animation_summary_off">Splash animation is enabled.</string>
|
||||||
<string name="revanced_disable_translucent_status_bar_title">Disable translucent status bar</string>
|
|
||||||
<string name="revanced_disable_translucent_status_bar_summary_on">Status bar is opaque.</string>
|
|
||||||
<string name="revanced_disable_translucent_status_bar_summary_off">Status bar is opaque or translucent.</string>
|
|
||||||
<string name="revanced_enable_gradient_loading_screen_title">Enable gradient loading screen</string>
|
<string name="revanced_enable_gradient_loading_screen_title">Enable gradient loading screen</string>
|
||||||
<string name="revanced_enable_gradient_loading_screen_summary_on">Gradient loading screen is enabled.</string>
|
<string name="revanced_enable_gradient_loading_screen_summary_on">Gradient loading screen is enabled.</string>
|
||||||
<string name="revanced_enable_gradient_loading_screen_summary_off">Gradient loading screen is disabled.</string>
|
<string name="revanced_enable_gradient_loading_screen_summary_off">Gradient loading screen is disabled.</string>
|
||||||
@ -543,12 +540,6 @@ Also, ads will no longer be blocked in Shorts.
|
|||||||
|
|
||||||
If this setting do not take effect, try switching to Incognito mode."</string>
|
If this setting do not take effect, try switching to Incognito mode."</string>
|
||||||
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_light_title">Disable light translucent bar</string>
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_light_summary_on">Light mode navigation bar is opaque.</string>
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_light_summary_off">Light mode navigation bar is opaque or translucent.</string>
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_dark_title">Disable dark translucent bar</string>
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Dark mode navigation bar is opaque.</string>
|
|
||||||
<string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Dark mode navigation bar is opaque or translucent.</string>
|
|
||||||
<string name="revanced_hide_navigation_bar_title">Hide navigation bar</string>
|
<string name="revanced_hide_navigation_bar_title">Hide navigation bar</string>
|
||||||
<string name="revanced_hide_navigation_bar_summary_on">Navigation bar is hidden.</string>
|
<string name="revanced_hide_navigation_bar_summary_on">Navigation bar is hidden.</string>
|
||||||
<string name="revanced_hide_navigation_bar_summary_off">Navigation bar is shown.</string>
|
<string name="revanced_hide_navigation_bar_summary_off">Navigation bar is shown.</string>
|
||||||
|
@ -213,10 +213,6 @@
|
|||||||
|
|
||||||
<PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>SETTINGS: HIDE_NAVIGATION_COMPONENTS -->
|
<PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>SETTINGS: HIDE_NAVIGATION_COMPONENTS -->
|
||||||
|
|
||||||
<!-- SETTINGS: TRANSLUCENT_NAVIGATION_BAR
|
|
||||||
<SwitchPreference android:title="@string/revanced_disable_translucent_navigation_bar_light_title" android:key="revanced_disable_translucent_navigation_bar_light" android:summaryOn="@string/revanced_disable_translucent_navigation_bar_light_summary_on" android:summaryOff="@string/revanced_disable_translucent_navigation_bar_light_summary_off" />
|
|
||||||
<SwitchPreference android:title="@string/revanced_disable_translucent_navigation_bar_dark_title" android:key="revanced_disable_translucent_navigation_bar_dark" android:summaryOn="@string/revanced_disable_translucent_navigation_bar_dark_summary_on" android:summaryOff="@string/revanced_disable_translucent_navigation_bar_dark_summary_off" />SETTINGS: TRANSLUCENT_NAVIGATION_BAR -->
|
|
||||||
|
|
||||||
<!-- SETTINGS: HIDE_NAVIGATION_COMPONENTS
|
<!-- SETTINGS: HIDE_NAVIGATION_COMPONENTS
|
||||||
<SwitchPreference android:title="@string/revanced_hide_navigation_bar_title" android:key="revanced_hide_navigation_bar" android:summaryOn="@string/revanced_hide_navigation_bar_summary_on" android:summaryOff="@string/revanced_hide_navigation_bar_summary_off" />
|
<SwitchPreference android:title="@string/revanced_hide_navigation_bar_title" android:key="revanced_hide_navigation_bar" android:summaryOn="@string/revanced_hide_navigation_bar_summary_on" android:summaryOff="@string/revanced_hide_navigation_bar_summary_off" />
|
||||||
</PreferenceScreen>SETTINGS: HIDE_NAVIGATION_COMPONENTS -->
|
</PreferenceScreen>SETTINGS: HIDE_NAVIGATION_COMPONENTS -->
|
||||||
@ -282,9 +278,6 @@
|
|||||||
<!-- SETTINGS: DISABLE_SPLASH_ANIMATION
|
<!-- SETTINGS: DISABLE_SPLASH_ANIMATION
|
||||||
<SwitchPreference android:title="@string/revanced_disable_splash_animation_title" android:key="revanced_disable_splash_animation" android:summaryOn="@string/revanced_disable_splash_animation_summary_on" android:summaryOff="@string/revanced_disable_splash_animation_summary_off" />SETTINGS: DISABLE_SPLASH_ANIMATION -->
|
<SwitchPreference android:title="@string/revanced_disable_splash_animation_title" android:key="revanced_disable_splash_animation" android:summaryOn="@string/revanced_disable_splash_animation_summary_on" android:summaryOff="@string/revanced_disable_splash_animation_summary_off" />SETTINGS: DISABLE_SPLASH_ANIMATION -->
|
||||||
|
|
||||||
<!-- SETTINGS: DISABLE_TRANSLUCENT_STATUS_BAR
|
|
||||||
<SwitchPreference android:title="@string/revanced_disable_translucent_status_bar_title" android:key="revanced_disable_translucent_status_bar" android:summaryOn="@string/revanced_disable_translucent_status_bar_summary_on" android:summaryOff="@string/revanced_disable_translucent_status_bar_summary_off" />SETTINGS: DISABLE_TRANSLUCENT_STATUS_BAR -->
|
|
||||||
|
|
||||||
<!-- SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN
|
<!-- SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN
|
||||||
<SwitchPreference android:title="@string/revanced_enable_gradient_loading_screen_title" android:key="revanced_enable_gradient_loading_screen" android:summaryOn="@string/revanced_enable_gradient_loading_screen_summary_on" android:summaryOff="@string/revanced_enable_gradient_loading_screen_summary_off" />SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN -->
|
<SwitchPreference android:title="@string/revanced_enable_gradient_loading_screen_title" android:key="revanced_enable_gradient_loading_screen" android:summaryOn="@string/revanced_enable_gradient_loading_screen_summary_on" android:summaryOff="@string/revanced_enable_gradient_loading_screen_summary_off" />SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN -->
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user