ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2024-06-02 11:26:18 +02:00
Code Issues Projects Releases Wiki Activity

fix: Use system dark mode setting

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-04-07 15:15:48 +04:00
parent 5d5029efe6
commit 6bdc1fdb7a
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/app/revanced/integrations/shared/settings/preference/ReVancedAboutPreference.java
View File

@ -8,6 +8,7 @@ import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
@ -140,17 +141,23 @@ public class ReVancedAboutPreference extends Preference {
return String.format("#%06X", (0xFFFFFF & color));
}
protected boolean isDarkModeEnabled() {
Configuration config = getContext().getResources().getConfiguration();
final int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
}
/**
* Subclasses can override this and provide a themed color and/or light/dark mode support.
* Subclasses can override this and provide a themed color.
*/
public int getForegroundColor() {
protected int getLightColor() {
return Color.WHITE;
}
/**
* Subclasses can override this and provide a themed color and/or light/dark mode support.
* Subclasses can override this and provide a themed color.
*/
public int getBackgroundColor() {
protected int getDarkColor() {
return Color.BLACK;
}
@ -161,8 +168,9 @@ public class ReVancedAboutPreference extends Preference {
builder.append("<html>");
builder.append("<body style=\"text-align: center; padding: 10px;\">");
String backgroundColorHex = getResourceColorHexString(getBackgroundColor());
String foregroundColorHex = getResourceColorHexString(getForegroundColor());
final boolean isDarkMode = isDarkModeEnabled();
String backgroundColorHex = getResourceColorHexString(isDarkMode ? getDarkColor() : getLightColor());
String foregroundColorHex = getResourceColorHexString(isDarkMode ? getLightColor() : getDarkColor());
// Apply light/dark mode colors.
builder.append("<style>")
.append("body { background-color: ").append(backgroundColorHex).append("; color: ").append(foregroundColorHex).append(" }")

20
app/src/main/java/app/revanced/integrations/youtube/ThemeHelper.java
View File

@ -79,24 +79,4 @@ public class ThemeHelper {
}
return Utils.getResourceColor(colorString);
}
/**
* @return The current foreground color, based on the light/dark theme status.
* If the Theme patch was not include, this returns a flat white color.
*/
public static int getCurrentForegroundColor() {
return isDarkTheme()
? getLightThemeColor()
: getDarkThemeColor();
}
/**
* @return The current background color, based on the light/dark theme status.
* If the Theme patch was not include, this returns a flat black color.
*/
public static int getCurrentBackgroundColor() {
return isDarkTheme()
? getDarkThemeColor()
: getLightThemeColor();
}
}

8
app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReVancedYouTubeAboutPreference.java
View File

@ -9,12 +9,12 @@ import app.revanced.integrations.youtube.ThemeHelper;
@SuppressWarnings("unused")
public class ReVancedYouTubeAboutPreference extends ReVancedAboutPreference {
public int getForegroundColor() {
return ThemeHelper.getCurrentForegroundColor();
public int getLightColor() {
return ThemeHelper.getLightThemeColor();
}
public int getBackgroundColor() {
return ThemeHelper.getCurrentBackgroundColor();
public int getDarkColor() {
return ThemeHelper.getDarkThemeColor();
}
public ReVancedYouTubeAboutPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {