diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java index d8e6a0afc..b0fbf2a62 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java @@ -462,16 +462,6 @@ public class Utils { 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. */ diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java index 0893398fb..6dd7ceffe 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java @@ -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.hideViewGroupByMarginLayoutParams; 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.shared.NavigationBar.NavigationButton; @@ -245,48 +244,6 @@ public class GeneralPatch { 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 // region [Remove viewer discretion dialog] patch diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java index 9d593c8f5..223508b8a 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -147,7 +147,6 @@ public class Settings extends BaseSettings { new ChangeStartPagePatch.ChangeStartPageTypeAvailability()); 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_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 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); @@ -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_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 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); // PreferenceScreen: General - Override buttons diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java index d1dfbcdb4..02549cb77 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java @@ -203,11 +203,6 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment { Settings.REPLACE_TOOLBAR_CREATE_BUTTON, Settings.REPLACE_TOOLBAR_CREATE_BUTTON_TYPE ); - enableDisablePreferences( - !isSDKAbove(33), - Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT, - Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK - ); } /** diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt index fd74a28bd..712ce9700 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt @@ -73,33 +73,3 @@ internal val setEnumMapFingerprint = legacyFingerprint( name = "setEnumMapFingerprint", 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) -) \ No newline at end of file diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt index 8e8d38987..4b709b5d4 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt @@ -82,38 +82,6 @@ val navigationBarComponentsPatch = bytecodePatch( "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 arrayOf( diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml index f8b1eed0e..e1472e106 100644 --- a/patches/src/main/resources/youtube/settings/host/values/strings.xml +++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml @@ -352,9 +352,6 @@ Limitation: Back button on the toolbar may not work." Disable splash animation Splash animation is disabled. Splash animation is enabled. - Disable translucent status bar - Status bar is opaque. - Status bar is opaque or translucent. Enable gradient loading screen Gradient loading screen is enabled. Gradient loading screen is disabled. @@ -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." - Disable light translucent bar - Light mode navigation bar is opaque. - Light mode navigation bar is opaque or translucent. - Disable dark translucent bar - Dark mode navigation bar is opaque. - Dark mode navigation bar is opaque or translucent. Hide navigation bar Navigation bar is hidden. Navigation bar is shown. diff --git a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml index dbe7b8c0e..4ae2ad1ae 100644 --- a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -213,10 +213,6 @@ SETTINGS: HIDE_NAVIGATION_COMPONENTS --> - - @@ -282,9 +278,6 @@ - -