diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 0ffdaa3aa..e3538bf26 100644 --- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -372,7 +372,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { TaskAction action = getTaskAction(task, viewHolder.hasFiles, viewHolder.hasNotes); if (action != null) { viewHolder.taskActionContainer.setVisibility(View.VISIBLE); - taskAction.setImageDrawable(action.icon); + taskAction.setImageResource(action.icon); taskAction.setTag(action); } else { viewHolder.taskActionContainer.setVisibility(View.GONE); diff --git a/src/main/java/com/todoroo/astrid/api/TaskAction.java b/src/main/java/com/todoroo/astrid/api/TaskAction.java index a8511accd..b83663da3 100644 --- a/src/main/java/com/todoroo/astrid/api/TaskAction.java +++ b/src/main/java/com/todoroo/astrid/api/TaskAction.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.api; import android.app.PendingIntent; -import android.graphics.drawable.BitmapDrawable; /** * Represents an intent that can be called on a task @@ -24,12 +23,12 @@ public class TaskAction { /** * Quick action icon */ - public BitmapDrawable icon = null; + public int icon = 0; /** * Create an EditOperation object */ - public TaskAction(PendingIntent intent, BitmapDrawable icon) { + public TaskAction(PendingIntent intent, int icon) { super(); this.intent = intent; this.icon = icon; diff --git a/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java index 32e17ee5c..9b200a5de 100644 --- a/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java +++ b/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java @@ -11,10 +11,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.style.URLSpan; import android.text.util.Linkify; @@ -26,7 +23,6 @@ import com.todoroo.astrid.notes.NotesAction; import org.tasks.R; -import java.util.HashMap; import java.util.List; /** @@ -64,15 +60,12 @@ public class LinkActionExposer { } } - Resources r = context.getResources(); if (hasAttachments) { - BitmapDrawable icon = getBitmapDrawable(context, R.drawable.action_attachments, r); - return new FilesAction(icon); + return new FilesAction(R.drawable.ic_attachment_24dp); } if (hasNotes) { - BitmapDrawable icon = getBitmapDrawable(context, R.drawable.action_notes, r); - return new NotesAction(icon); + return new NotesAction(R.drawable.ic_event_note_24dp); } return null; @@ -101,28 +94,15 @@ public class LinkActionExposer { } Resources r = context.getResources(); - Drawable icon; + int icon; if (url.startsWith("mailto")) { - icon = getBitmapDrawable(context, R.drawable.action_mail, r); + icon = R.drawable.ic_email_black_24dp; } else if (url.startsWith("tel")) { - icon = getBitmapDrawable(context, R.drawable.action_tel, r); + icon = R.drawable.ic_phone_white_24dp; } else { - icon = getBitmapDrawable(context, R.drawable.action_web, r); + icon = R.drawable.ic_public_black_24dp; } - return new TaskAction(PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon); + return new TaskAction(PendingIntent.getActivity(context, (int)id, actionIntent, 0), icon); } - - private static final HashMap IMAGE_CACHE = new HashMap<>(); - - private static BitmapDrawable getBitmapDrawable(Context context, int resId, Resources resources) { - if (IMAGE_CACHE.containsKey(resId)) { - return IMAGE_CACHE.get(resId); - } else { - BitmapDrawable b = (BitmapDrawable) ContextCompat.getDrawable(context, resId); - IMAGE_CACHE.put(resId, b); - return b; - } - } - } diff --git a/src/main/java/com/todoroo/astrid/files/FilesAction.java b/src/main/java/com/todoroo/astrid/files/FilesAction.java index 0242aeddc..32aacb055 100644 --- a/src/main/java/com/todoroo/astrid/files/FilesAction.java +++ b/src/main/java/com/todoroo/astrid/files/FilesAction.java @@ -5,13 +5,11 @@ */ package com.todoroo.astrid.files; -import android.graphics.drawable.BitmapDrawable; - import com.todoroo.astrid.api.TaskAction; public class FilesAction extends TaskAction { - public FilesAction(BitmapDrawable icon) { + public FilesAction(int icon) { super(null, icon); } } diff --git a/src/main/java/com/todoroo/astrid/notes/NotesAction.java b/src/main/java/com/todoroo/astrid/notes/NotesAction.java index d4c49d1e3..e5443de6a 100644 --- a/src/main/java/com/todoroo/astrid/notes/NotesAction.java +++ b/src/main/java/com/todoroo/astrid/notes/NotesAction.java @@ -5,13 +5,11 @@ */ package com.todoroo.astrid.notes; -import android.graphics.drawable.BitmapDrawable; - import com.todoroo.astrid.api.TaskAction; public class NotesAction extends TaskAction { - public NotesAction(BitmapDrawable icon) { + public NotesAction(int icon) { super(null, icon); } } diff --git a/src/main/res/drawable/action_attachments.png b/src/main/res/drawable/action_attachments.png deleted file mode 100644 index 1b3af7426..000000000 Binary files a/src/main/res/drawable/action_attachments.png and /dev/null differ diff --git a/src/main/res/drawable/action_mail.png b/src/main/res/drawable/action_mail.png deleted file mode 100644 index 25491a650..000000000 Binary files a/src/main/res/drawable/action_mail.png and /dev/null differ diff --git a/src/main/res/drawable/action_notes.png b/src/main/res/drawable/action_notes.png deleted file mode 100644 index 8b36627da..000000000 Binary files a/src/main/res/drawable/action_notes.png and /dev/null differ diff --git a/src/main/res/drawable/action_tel.png b/src/main/res/drawable/action_tel.png deleted file mode 100644 index 99842dab6..000000000 Binary files a/src/main/res/drawable/action_tel.png and /dev/null differ diff --git a/src/main/res/drawable/action_web.png b/src/main/res/drawable/action_web.png deleted file mode 100644 index 1ce3f93bb..000000000 Binary files a/src/main/res/drawable/action_web.png and /dev/null differ diff --git a/src/main/res/drawable/ic_email_black_24dp.xml b/src/main/res/drawable/ic_email_black_24dp.xml new file mode 100644 index 000000000..ab534198a --- /dev/null +++ b/src/main/res/drawable/ic_email_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_public_black_24dp.xml b/src/main/res/drawable/ic_public_black_24dp.xml new file mode 100644 index 000000000..dfa95a855 --- /dev/null +++ b/src/main/res/drawable/ic_public_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml index 98338ec52..15a232693 100644 --- a/src/main/res/layout/task_adapter_row_simple.xml +++ b/src/main/res/layout/task_adapter_row_simple.xml @@ -76,10 +76,12 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:alpha="?attr/alpha_secondary" + android:scaleType="center" + android:tint="?attr/icon_tint" />