1.5.2: Fix legend on pre-lollipop devices

caarmen · Oct 5, 2016 · 0ec263a · 0ec263a
1 parent 41a1d46
commit 0ec263a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,8 +38,8 @@ android {
     }
     defaultConfig {
         applicationId "ca.rmen.android.scrumchatter"
-        versionCode 10501
-        versionName "1.5.1"
+        versionCode 10502
+        versionName "1.5.2"
         minSdkVersion 9
         targetSdkVersion 24
         return true; // Avoid "Not all execution paths return a value"

diff --git a/app/src/main/java/ca/rmen/android/scrumchatter/chart/ChartUtils.java b/app/src/main/java/ca/rmen/android/scrumchatter/chart/ChartUtils.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
@@ -60,8 +61,14 @@ static void addLegendEntry(Context context, ViewGroup legendView, String name, i
         memberLegendEntry.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         memberLegendEntry.setPadding(0, 0, context.getResources().getDimensionPixelSize(R.dimen.chart_legend_entry_padding), 0);
 
-        Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_legend_square).mutate();
-        DrawableCompat.setTint(icon, color);
+        final Drawable icon;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_legend_square);
+            memberLegendEntry.setTextColor(color);
+        } else {
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_legend_square).mutate();
+            DrawableCompat.setTint(icon, color);
+        }
         memberLegendEntry.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
         legendView.addView(memberLegendEntry);
     }