Merge pull request #1314 from nextcloud/colorThreshold

Use same color detection as in server
nextcloud · Aug 11, 2017 · 519702c · 519702c
2 parents e3fe948 + fa35cc5
commit 519702c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/com/owncloud/android/utils/ThemeUtils.java b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
@@ -125,12 +125,9 @@ public static int fontColor() {
      */
     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 static String getDefaultDisplayNameForRootFolder() {
     }
 
     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.
      *