diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java index 45910e2dd..51d39efb8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java @@ -26,7 +26,6 @@ import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; @@ -38,6 +37,7 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TaskService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.OrderedListUpdater.Node; import com.todoroo.astrid.subtasks.OrderedListUpdater.OrderedListNodeVisitor; import com.todoroo.astrid.ui.DraggableListView; @@ -104,7 +104,7 @@ public class OrderedListFragmentHelper { "subtasks_horizontal.png", getActivity().getString(R.string.subtasks_help_3)); - String color = (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); + String color = ThemeService.getDialogTextColor(); String html = String.format("%s", color, body); diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 747520819..81b95a509 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -5,6 +5,7 @@ import android.graphics.PixelFormat; import android.view.WindowManager; import com.timsu.astrid.R; +import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; @SuppressWarnings("nls") @@ -59,4 +60,8 @@ public class ThemeService { return theme; } + public static String getDialogTextColor() { + return (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); + } + } diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index 1e3b0ccd7..7ba98e8e6 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -86,7 +86,7 @@ public class UpdateMessageService { if(activity == null) return; - String color = (AndroidUtilities.getSdkVersion() >= 14 ? "black" : "white"); + String color = ThemeService.getDialogTextColor(); final String html = "" + builder.append("").toString(); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index d1fab5551..6333f6623 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -21,7 +21,6 @@ import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; @@ -433,7 +432,7 @@ public final class UpgradeService { return; changeLog.append("Have a spectacular day!"); - String color = (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); + String color = ThemeService.getDialogTextColor(); String changeLogHtml = "" + changeLog; DialogUtilities.htmlDialog(context, changeLogHtml,