archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade message on honeycomb should be black. Unify code.

Browse Source
pull/14/head
Tim Su 13 years ago
parent ff01ab795f
commit 49f1b7325e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java
Unescape Escape View File

@ -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<LIST> {
"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("<html><body style='text-align:center;color:%s'>%s</body></html>",
color, body);

5
astrid/src/com/todoroo/astrid/service/ThemeService.java
Unescape Escape View File

@ -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");
}
}

2
astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
Unescape Escape View File

@ -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 = "<html><body style='color: " + color + "'>" +
builder.append("</body></html>").toString();

3
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -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!</body></html>");
String color = (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white");
String color = ThemeService.getDialogTextColor();
String changeLogHtml = "<html><body style='color: " + color +"'>" + changeLog;
DialogUtilities.htmlDialog(context, changeLogHtml,

Write Preview
Loading…
Cancel
Save