mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 13:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

use same color detection as https://github.com/nextcloud/server/pull/5953/files#diff-3de1769d04fcc4f13f8d546d9fbdac19

Browse source
This commit is contained in:
tobiaskaminsky 2017-08-11 14:46:47 +02:00
parent 424e2cdbc0
commit fa35cc5914
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/owncloud/android/utils/ThemeUtils.java
View file

@ -125,12 +125,9 @@ public class ThemeUtils {
*/
public static boolean darkTheme() {
int primaryColor = primaryColor();
float[] hsl = colorToHSL(primaryColor);
int red = Color.red(primaryColor);
int green = Color.green(primaryColor);
int blue = Color.blue(primaryColor);
return ((0.299 * red + 0.587 * green + 0.114 * blue) / 255) <= 0.5;
return (hsl[2] / 100) <= 0.5;
}
/**
@ -172,14 +169,20 @@ public class ThemeUtils {
}
public static int adjustLightness(float lightnessDelta, int color) {
float[] hsl = new float[3];
ColorUtils.RGBToHSL(Color.red(color), Color.green(color), Color.blue(color), hsl);
float[] hsl = colorToHSL(color);
hsl[2] += lightnessDelta;
return ColorUtils.HSLToColor(hsl);
}
private static float[] colorToHSL(int color) {
float[] hsl = new float[3];
ColorUtils.RGBToHSL(Color.red(color), Color.green(color), Color.blue(color), hsl);
return hsl;
}
/**
* sets the tinting of the given ImageButton's icon to color_accent.
*