From edac784b1e6ec84493322772efb662833b117a3e Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 1 Jul 2025 20:38:19 +0200
Subject: [PATCH] ChartView should get colors from Material library (for
 Dynamic colors).

Part of #2123.
---
 .../de/dennisguse/opentracks/ui/util/ThemeUtils.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java
index 8725c663f..90da61ff4 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java
@@ -7,6 +7,8 @@ import android.util.TypedValue;
 
 import androidx.core.content.ContextCompat;
 
+import com.google.android.material.R;
+
 public class ThemeUtils {
 
     private ThemeUtils() {
@@ -18,7 +20,7 @@ public class ThemeUtils {
     public static int getBackgroundColor(Context context) {
         TypedValue typedValue = new TypedValue();
         Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+        theme.resolveAttribute(R.attr.colorSurface, typedValue, true);
 
         return ContextCompat.getColor(context, typedValue.resourceId);
     }
@@ -26,7 +28,7 @@ public class ThemeUtils {
     public static int getTextColorPrimary(Context context) {
         TypedValue typedValue = new TypedValue();
         Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
+        theme.resolveAttribute(R.attr.colorOnSurface, typedValue, true);
 
         return ContextCompat.getColor(context, typedValue.resourceId);
     }
@@ -34,20 +36,20 @@ public class ThemeUtils {
     public static int getTextColorSecondary(Context context) {
         TypedValue typedValue = new TypedValue();
         Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+        theme.resolveAttribute(R.attr.colorSecondary, typedValue, true);
 
         return ContextCompat.getColor(context, typedValue.resourceId);
     }
 
     public static int getFontSizeSmallInPx(Context context) {
-        TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize});
+        TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize});
         int fontSize = typedArray.getDimensionPixelSize(0, 12);
         typedArray.recycle();
         return fontSize;
     }
 
     public static int getFontSizeMediumInPx(Context context) {
-        TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize});
+        TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize});
         int fontSize = typedArray.getDimensionPixelSize(0, 15);
         typedArray.recycle();
         return fontSize;