From 0b3e447258bf3ca0f075aabc344f9053b47ba175 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 15 Sep 2020 21:29:03 +0200
Subject: [PATCH] Theming: charts use theme text colors.

---
 .../dennisguse/opentracks/chart/ChartView.java   |  4 ++--
 .../dennisguse/opentracks/util/ThemeUtils.java   | 16 ++++++++++++++++
 src/main/res/values/colors.xml                   |  2 --
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
index 0e07c51ee..4af772ab3 100644
--- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
+++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
@@ -313,7 +313,7 @@ public class ChartView extends View {
 
         axisPaint = new Paint();
         axisPaint.setStyle(Style.FILL_AND_STROKE);
-        axisPaint.setColor(context.getResources().getColor(R.color.chart_axis_text));
+        axisPaint.setColor(ThemeUtils.getTextColorPrimary(context));
         axisPaint.setAntiAlias(true);
         axisPaint.setTextSize(SMALL_TEXT_SIZE * scale);
 
@@ -322,7 +322,7 @@ public class ChartView extends View {
 
         gridPaint = new Paint();
         gridPaint.setStyle(Style.STROKE);
-        gridPaint.setColor(context.getResources().getColor(R.color.chart_grid));
+        gridPaint.setColor(ThemeUtils.getTextColorSecondary(context));
         gridPaint.setAntiAlias(false);
         gridPaint.setPathEffect(new DashPathEffect(new float[]{3, 2}, 0));
 
diff --git a/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java b/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java
index 9334f2812..7f44841ad 100644
--- a/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java
@@ -21,4 +21,20 @@ public class ThemeUtils {
 
         return ContextCompat.getColor(context, typedValue.resourceId);
     }
+
+    public static int getTextColorPrimary(Context context) {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = context.getTheme();
+        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
+
+        return ContextCompat.getColor(context, typedValue.resourceId);
+    }
+
+    public static int getTextColorSecondary(Context context) {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = context.getTheme();
+        theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+
+        return ContextCompat.getColor(context, typedValue.resourceId);
+    }
 }
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index f10449d6d..dfc766cbc 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -26,8 +26,6 @@ limitations under the License.
     <color name="chart_power_fill">#40401465</color> <!-- transparent purple -->
     <color name="chart_speed_border">#FF0066FF</color> <!-- blue -->
     <color name="chart_speed_fill">#40C8E0FF</color> <!-- transparent blue -->
-    <color name="chart_grid">@android:color/darker_gray</color>
-    <color name="chart_axis_text">@android:color/black</color>
 
     <color name="holo_orange_dark">#FFFF8800</color>
     <color name="holo_orange_dark_activated">#55FF8800</color>