From d213dd9b84246bf92de74bc352b8e8d72ecf042a Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 8 Jun 2014 02:36:16 -0500 Subject: [PATCH] Fix theme color lookup --- .../java/com/todoroo/astrid/helper/TaskEditControlSet.java | 4 ++-- .../main/java/org/tasks/preferences/ResourceResolver.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java index b9b8cbe69..11cfd10a0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java @@ -18,7 +18,7 @@ import com.todoroo.astrid.ui.EditDialogOkBackground; import org.tasks.R; -import static org.tasks.preferences.ResourceResolver.getResource; +import static org.tasks.preferences.ResourceResolver.getData; // --- interface @@ -42,7 +42,7 @@ public abstract class TaskEditControlSet { initialized = true; } - themeColor = getResource(activity, R.attr.task_edit_theme_color); + themeColor = getData(activity, R.attr.task_edit_theme_color); unsetColor = activity.getResources().getColor(R.color.task_edit_deadline_gray); } diff --git a/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java b/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java index 291e14aa6..f533cadd6 100644 --- a/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java +++ b/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java @@ -25,4 +25,10 @@ public class ResourceResolver { activity.getTheme().resolveAttribute(attr, typedValue, true); return typedValue.resourceId; } + + public static int getData(Activity activity, int attr) { + TypedValue typedValue = new TypedValue(); + activity.getTheme().resolveAttribute(attr, typedValue, true); + return typedValue.data; + } }