ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-24 02:42:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube - Toolbar components): Use Cairo icon for settings icon when Replace Create button is turned on

Browse Source
This commit is contained in:
inotia00 2025-01-03 22:09:39 +09:00
parent 07cb38d7a2
commit 2760fce646
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java
View File

@ -44,6 +44,7 @@ import app.revanced.extension.shared.utils.Logger;
import app.revanced.extension.shared.utils.ResourceUtils; import app.revanced.extension.shared.utils.ResourceUtils;
import app.revanced.extension.shared.utils.Utils; import app.revanced.extension.shared.utils.Utils;
import app.revanced.extension.youtube.settings.Settings; import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.utils.ExtendedUtils;
import app.revanced.extension.youtube.utils.ThemeUtils; import app.revanced.extension.youtube.utils.ThemeUtils;
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -520,14 +521,30 @@ public class GeneralPatch {
imageView.setImageDrawable(drawable); imageView.setImageDrawable(drawable);
} }
private static final int settingsDrawableId =
ResourceUtils.getDrawableIdentifier("yt_outline_gear_black_24");
public static int getCreateButtonDrawableId(int original) { public static int getCreateButtonDrawableId(int original) {
return Settings.REPLACE_TOOLBAR_CREATE_BUTTON.get() && if (!Settings.REPLACE_TOOLBAR_CREATE_BUTTON.get()) {
settingsDrawableId != 0 return original;
}
final int settingsDrawableId =
ResourceUtils.getDrawableIdentifier("yt_outline_gear_black_24");
if (settingsDrawableId == 0) {
return original;
}
// If the user has patched YouTube 19.26.42,
// Or spoofed the app version to 19.26.42 or earlier.
if (!ExtendedUtils.IS_19_28_OR_GREATER || ExtendedUtils.isSpoofingToLessThan("19.27.00")) {
return settingsDrawableId;
}
final int settingsCairoDrawableId =
ResourceUtils.getDrawableIdentifier("yt_outline_gear_cairo_black_24");
return settingsCairoDrawableId == 0
? settingsDrawableId ? settingsDrawableId
: original; : settingsCairoDrawableId;
} }
public static void replaceCreateButton(String enumString, View toolbarView) { public static void replaceCreateButton(String enumString, View toolbarView) {

1
extensions/shared/src/main/java/app/revanced/extension/youtube/utils/ExtendedUtils.java
View File

@ -16,6 +16,7 @@ public class ExtendedUtils extends PackageUtils {
public static final boolean IS_19_20_OR_GREATER = getAppVersionName().compareTo("19.20.00") >= 0; public static final boolean IS_19_20_OR_GREATER = getAppVersionName().compareTo("19.20.00") >= 0;
public static final boolean IS_19_21_OR_GREATER = getAppVersionName().compareTo("19.21.00") >= 0; public static final boolean IS_19_21_OR_GREATER = getAppVersionName().compareTo("19.21.00") >= 0;
public static final boolean IS_19_26_OR_GREATER = getAppVersionName().compareTo("19.26.00") >= 0; public static final boolean IS_19_26_OR_GREATER = getAppVersionName().compareTo("19.26.00") >= 0;
public static final boolean IS_19_28_OR_GREATER = getAppVersionName().compareTo("19.28.00") >= 0;
public static final boolean IS_19_29_OR_GREATER = getAppVersionName().compareTo("19.29.00") >= 0; public static final boolean IS_19_29_OR_GREATER = getAppVersionName().compareTo("19.29.00") >= 0;
public static final boolean IS_19_34_OR_GREATER = getAppVersionName().compareTo("19.34.00") >= 0; public static final boolean IS_19_34_OR_GREATER = getAppVersionName().compareTo("19.34.00") >= 0;