quota: on >80% red, else primary color

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -305,7 +305,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
         mQuotaProgressBar = (ProgressBar) findQuotaViewById(R.id.drawer_quota_ProgressBar);
         mQuotaTextPercentage = (TextView) findQuotaViewById(R.id.drawer_quota_percentage);
         mQuotaTextLink = (TextView) findQuotaViewById(R.id.drawer_quota_link);
-        ThemeUtils.colorHorizontalProgressBar(mQuotaProgressBar, ThemeUtils.primaryAccentColor(this));
+        ThemeUtils.colorHorizontalProgressBar(mQuotaProgressBar, ThemeUtils.primaryColor(this));
     }
 
     /**

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -33,7 +33,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.PictureDrawable;
@@ -108,8 +107,7 @@ public class DisplayUtils {
 
     private static final String[] sizeSuffixes = {"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
     private static final int[] sizeScales = {0, 0, 1, 1, 1, 2, 2, 2, 2};
-    private static final int RELATIVE_THRESHOLD_WARNING = 90;
-    private static final int RELATIVE_THRESHOLD_CRITICAL = 95;
+    private static final int RELATIVE_THRESHOLD_WARNING = 80;
     private static final String MIME_TYPE_UNKNOWN = "Unknown type";
 
     private static final String HTTP_PROTOCOL = "http://";
@@ -319,8 +317,7 @@ public class DisplayUtils {
 
 
     /**
-     * determines the info level color based on certain thresholds
-     * {@link #RELATIVE_THRESHOLD_WARNING} and {@link #RELATIVE_THRESHOLD_CRITICAL}.
+     * determines the info level color based on {@link #RELATIVE_THRESHOLD_WARNING}.
      *
      * @param context  the app's context
      * @param relative relative value for which the info level color should be looked up
@@ -328,16 +325,9 @@ public class DisplayUtils {
      */
     public static int getRelativeInfoColor(Context context, int relative) {
         if (relative < RELATIVE_THRESHOLD_WARNING) {
-            if (ThemeUtils.colorToHexString(ThemeUtils.primaryColor(context)).equalsIgnoreCase(
-                    ThemeUtils.colorToHexString(context.getResources().getColor(R.color.primary)))) {
-                return context.getResources().getColor(R.color.infolevel_info);
-            } else {
-                return Color.GRAY;
-            }
-        } else if (relative >= RELATIVE_THRESHOLD_WARNING && relative < RELATIVE_THRESHOLD_CRITICAL) {
-            return context.getResources().getColor(R.color.infolevel_warning);
+            return ThemeUtils.primaryColor(context, true);
         } else {
-            return context.getResources().getColor(R.color.infolevel_critical);
+            return context.getResources().getColor(R.color.infolevel_warning);
         }
     }
 

src/main/res/layout/drawer.xml

@@ -74,4 +74,4 @@
 
     </android.support.design.widget.NavigationView>
 
-</merge>
+</merge>

src/main/res/values/colors.xml

@@ -41,8 +41,6 @@
     <!-- standard material color definitions -->
 
     <!-- level colors for info notifications/visualisations -->
-    <color name="infolevel_info">@color/color_accent</color>
-    <color name="infolevel_warning">#fdd835</color>
-    <color name="infolevel_critical">#e57373</color>
+    <color name="infolevel_warning">#e9322d</color>
 
-</resources>
+</resources>