diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java index d08adf488..ba9a879c0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java @@ -62,7 +62,7 @@ public class NoteDetailExposer extends BroadcastReceiver implements DetailExpose if(notes.length() == 0) return null; - return notes; + return " " + notes; //$NON-NLS-1$ } @Override diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java index 31d754e9c..c26ee6cc0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java @@ -7,7 +7,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.AstridApiConstants; @@ -78,8 +77,7 @@ public class ProducteevDetailExposer extends BroadcastReceiver implements Detail != Preferences.getLong(ProducteevUtilities.PREF_DEFAULT_DASHBOARD, 0L) && ownerDashboard != null) { String dashboardName = ownerDashboard.getValue(ProducteevDashboard.NAME); - builder.append(context.getString(R.string.producteev_TLA_dashboard, - dashboardName)).append(TaskAdapter.DETAIL_SEPARATOR); + builder.append(" ").append(dashboardName).append(TaskAdapter.DETAIL_SEPARATOR); //$NON-NLS-1$ } // display responsible user if not current one @@ -90,8 +88,7 @@ public class ProducteevDetailExposer extends BroadcastReceiver implements Detail if(index > -1) { String user = users.substring(users.indexOf(',', index) + 1, users.indexOf(';', index + 1)); - builder.append(context.getString(R.string.producteev_TLA_responsible, - user)).append(TaskAdapter.DETAIL_SEPARATOR); + builder.append(" ").append(user).append(TaskAdapter.DETAIL_SEPARATOR); //$NON-NLS-1$ } } } else { diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java index 4d332b583..e3cc35d97 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java @@ -114,7 +114,7 @@ public class RepeatDetailExposer extends BroadcastReceiver implements DetailExpo else detail = context.getString(R.string.repeat_detail_duedate, interval); - return detail; + return " " + detail; //$NON-NLS-1$ } return null; } diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java index 08f827acf..d32bd8f08 100644 --- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java @@ -66,9 +66,8 @@ public class MilkDetailExposer extends BroadcastReceiver implements DetailExpose if(listName == null) return null; - if(listId > 0) { - builder.append(context.getString(R.string.rmilk_TLA_list, - listName)).append(TaskAdapter.DETAIL_SEPARATOR); + if(listId > 0 && !"Inbox".equals(listName)) { //$NON-NLS-1$ + builder.append(" ").append(listName).append(TaskAdapter.DETAIL_SEPARATOR); //$NON-NLS-1$ } int repeat = metadata.getValue(MilkTask.REPEATING); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java index d8c4ea6fc..21172fe2e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java @@ -7,7 +7,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.DetailExposer; @@ -49,7 +48,7 @@ public class TagDetailExposer extends BroadcastReceiver implements DetailExposer if(tagList.length() == 0) return null; - return context.getString(R.string.tag_TLA_detail, tagList); + return " " + tagList; //$NON-NLS-1$ } @Override diff --git a/astrid/res/drawable/ic_menu_rmilk.png b/astrid/res/drawable/ic_menu_rmilk.png deleted file mode 100644 index 12f9cf24a..000000000 Binary files a/astrid/res/drawable/ic_menu_rmilk.png and /dev/null differ diff --git a/astrid/res/drawable/silk_date.png b/astrid/res/drawable/silk_date.png new file mode 100644 index 000000000..783c83357 Binary files /dev/null and b/astrid/res/drawable/silk_date.png differ diff --git a/astrid/res/drawable/silk_folder.png b/astrid/res/drawable/silk_folder.png new file mode 100644 index 000000000..3c4724da2 Binary files /dev/null and b/astrid/res/drawable/silk_folder.png differ diff --git a/astrid/res/drawable/silk_note.png b/astrid/res/drawable/silk_note.png new file mode 100644 index 000000000..18357c7d9 Binary files /dev/null and b/astrid/res/drawable/silk_note.png differ diff --git a/astrid/res/drawable/silk_script.png b/astrid/res/drawable/silk_script.png new file mode 100644 index 000000000..afc499be9 Binary files /dev/null and b/astrid/res/drawable/silk_script.png differ diff --git a/astrid/res/drawable/silk_tag_pink.png b/astrid/res/drawable/silk_tag_pink.png new file mode 100644 index 000000000..45c5041ac Binary files /dev/null and b/astrid/res/drawable/silk_tag_pink.png differ diff --git a/astrid/res/drawable/silk_user_gray.png b/astrid/res/drawable/silk_user_gray.png new file mode 100644 index 000000000..20b8cdf7b Binary files /dev/null and b/astrid/res/drawable/silk_user_gray.png differ diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml index cb4a4a99c..f0b09acef 100644 --- a/astrid/res/values/strings-repeat.xml +++ b/astrid/res/values/strings-repeat.xml @@ -37,9 +37,9 @@ $I on $D - Repeats every %s + Every %s - Repeats %s after completion + %s after completion diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml index 2712e57e4..86ed091ae 100644 --- a/astrid/res/values/strings-tags.xml +++ b/astrid/res/values/strings-tags.xml @@ -11,11 +11,6 @@ Tag Name - - - - - Tags: %s diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 7724c392b..3b77f959c 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -13,7 +13,9 @@ import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Paint; +import android.graphics.drawable.Drawable; import android.text.Html; +import android.text.Html.ImageGetter; import android.text.util.Linkify; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -52,6 +54,7 @@ import com.todoroo.astrid.repeats.RepeatDetailExposer; import com.todoroo.astrid.rmilk.MilkDetailExposer; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagDetailExposer; +import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Preferences; /** @@ -376,6 +379,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable { */ public class DetailManager extends AddOnManager { + private final ImageGetter imageGetter = new ImageGetter() { + public Drawable getDrawable(String source) { + Resources r = activity.getResources(); + int drawable = r.getIdentifier("drawable/" + source, null, Constants.PACKAGE); //$NON-NLS-1$ + if(drawable == 0) + return null; + Drawable d = r.getDrawable(drawable); + d.setBounds(0,0,d.getIntrinsicWidth(),d.getIntrinsicHeight()); + return d; + } + }; + private final boolean extended; public DetailManager(boolean extended) { this.extended = extended; @@ -441,7 +456,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } String string = detailText.toString(); if(string.contains("<")) - view.setText(Html.fromHtml(string.trim().replace("\n", "
"))); + view.setText(Html.fromHtml(string.trim().replace("\n", "
"), imageGetter, null)); else view.setText(string.trim()); Linkify.addLinks(view, Linkify.ALL); diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index 0e608f23b..ca7468c35 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java @@ -206,7 +206,7 @@ public class AddOnService { list[2] = new AddOn(true, true, "Remember the Milk", null, "Synchronize with Remember The Milk service.", Constants.PACKAGE, "http://www.rmilk.com", - ((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_rmilk)).getBitmap()); + ((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_refresh)).getBitmap()); list[3] = new AddOn(true, true, "Producteev", null, "Synchronize with Producteev service. Also changes Astrid's importance levels to stars.",