ReVanced-Mirror/revanced-patches
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patches synced 2025-02-19 17:46:51 +01:00
Code Issues Projects Releases Wiki Activity

fix(youtube/return-youtube-dislike): fix dislikes using wrong font if dark mode is enabled during video playback (#368)

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2023-04-25 16:48:01 +04:00 committed by GitHub
parent da4cd0dc23
commit 645612459f
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
integrations/java/app/revanced/integrations/returnyoutubedislike/ReturnYouTubeDislike.java
View File

@ -15,6 +15,7 @@ import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan; import android.text.style.ImageSpan;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue; import android.util.TypedValue;
@ -257,12 +258,11 @@ public class ReturnYouTubeDislike {
try { try {
synchronized (videoIdLockObject) { synchronized (videoIdLockObject) {
if (replacementLikeDislikeSpan != null) { if (replacementLikeDislikeSpan != null) {
String oldSpannableString = oldSpannable.toString(); if (spansHaveEqualTextAndColor(replacementLikeDislikeSpan, oldSpannable)) {
if (replacementLikeDislikeSpan.toString().equals(oldSpannableString)) {
LogHelper.printDebug(() -> "Ignoring previously created dislikes span"); LogHelper.printDebug(() -> "Ignoring previously created dislikes span");
return null; return null;
} }
if (originalDislikeSpan.toString().equals(oldSpannableString)) { if (spansHaveEqualTextAndColor(Objects.requireNonNull(originalDislikeSpan), oldSpannable)) {
LogHelper.printDebug(() -> "Replacing span with previously created dislike span"); LogHelper.printDebug(() -> "Replacing span with previously created dislike span");
return replacementLikeDislikeSpan; return replacementLikeDislikeSpan;
} }
@ -470,6 +470,27 @@ public class ReturnYouTubeDislike {
return false; return false;
} }
private static boolean spansHaveEqualTextAndColor(@NonNull Spanned one, @NonNull Spanned two) {
// Cannot use equals on the span, because many of the inner styling spans do not implement equals.
// Instead, compare the underlying text and the text color to handle when dark mode is changed.
// Cannot compare the status of device dark mode, as Litho components are updated just before dark mode status changes.
if (!one.toString().equals(two.toString())) {
return false;
}
ForegroundColorSpan[] oneColors = one.getSpans(0, one.length(), ForegroundColorSpan.class);
ForegroundColorSpan[] twoColors = two.getSpans(0, two.length(), ForegroundColorSpan.class);
final int oneLength = oneColors.length;
if (oneLength != twoColors.length) {
return false;
}
for (int i = 0; i < oneLength; i++) {
if (oneColors[i].getForegroundColor() != twoColors[i].getForegroundColor()) {
return false;
}
}
return true;
}
private static SpannableString newSpannableWithDislikes(@NonNull Spanned sourceStyling, @NonNull RYDVoteData voteData) { private static SpannableString newSpannableWithDislikes(@NonNull Spanned sourceStyling, @NonNull RYDVoteData voteData) {
return newSpanUsingStylingOfAnotherSpan(sourceStyling, return newSpanUsingStylingOfAnotherSpan(sourceStyling,
SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean() SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean()