From c55b11850a0b5f42a163faac05d70e339c530856 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 20 Oct 2016 15:24:44 -0500 Subject: [PATCH] Update task action icons --- .../todoroo/astrid/adapter/TaskAdapter.java | 2 +- .../com/todoroo/astrid/api/TaskAction.java | 5 ++- .../astrid/core/LinkActionExposer.java | 34 ++++-------------- .../com/todoroo/astrid/files/FilesAction.java | 4 +-- .../com/todoroo/astrid/notes/NotesAction.java | 4 +-- src/main/res/drawable/action_attachments.png | Bin 749 -> 0 bytes src/main/res/drawable/action_mail.png | Bin 523 -> 0 bytes src/main/res/drawable/action_notes.png | Bin 406 -> 0 bytes src/main/res/drawable/action_tel.png | Bin 918 -> 0 bytes src/main/res/drawable/action_web.png | Bin 1942 -> 0 bytes src/main/res/drawable/ic_email_black_24dp.xml | 5 +++ .../res/drawable/ic_public_black_24dp.xml | 5 +++ .../res/layout/task_adapter_row_simple.xml | 10 +++--- 13 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 src/main/res/drawable/action_attachments.png delete mode 100644 src/main/res/drawable/action_mail.png delete mode 100644 src/main/res/drawable/action_notes.png delete mode 100644 src/main/res/drawable/action_tel.png delete mode 100644 src/main/res/drawable/action_web.png create mode 100644 src/main/res/drawable/ic_email_black_24dp.xml create mode 100644 src/main/res/drawable/ic_public_black_24dp.xml 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 1b3af7426487ec37aa6a10caf347b2a48679d8f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 749 zcmVjah!U;<$RVFO?8-t%I7DXEYq$=&-?O6Ye(LVQ8IASP|NH-nf%>>!pnf697}Y#gV%AjVbU!MrZbu;*?wZ!W1~AxVFQGqjl567~x1%4WqQ|8e@VS@PV!% z9x!tqmCxm3e}$MKtTup(t}rGDO}AIeekAPL&{s)GL3o1X+9;?AVuCSXKEGr7OfjK2 z!?b}6lvGW7N{!R-1A#hd!%Vk<@C+H_byKR&@$*8vKIhht@C>OfQ+26rmTP8oa^V?b zyK(-k3#C=AFqeQ(s-``LTNi56Q*|l=g5*l7-W%4%&}E@{NywJD&P_Kb7?+R)t7*M$ zU0_^83X27wT>{eugzNu>*@J#11Q7{Dj>@~12&U&?d_gu$T3&Eq5dlQ+e`45kwjwgf z*zmGuRW*kO;rg%WNJ>Nw*{M@bL<~7#MmsiPVuAeWU!3`>I}Zh-WB&8bUTOuQH;9TE z;)At;P~n&3k9dX1)>rDDv?W9ZWy*Vq7YJd-OwncwNg5EHLTH-Z8r~&rAxQ`j!sJY; zy^jq-nC!$sK@Ne9$+D8|_p?B0pQya-Bfb+UyC}O2(`o+co4BqGz)_`Frwi+bZ7>9dpDVDO-I1 zfG=n>rk0y_3E}n``9Si|*dtsshlVM&!26yJ_mtX5JB6rghAZjsF!cX6+E`Z9G}1MG f-zh}4Zvh4XUW9LUL+=g$00000NkvXXu0mjfC!9`P diff --git a/src/main/res/drawable/action_mail.png b/src/main/res/drawable/action_mail.png deleted file mode 100644 index 25491a650297743cecba1315f95a996ec2f17285..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)IU!#=>}OL z8>AbA5jsI&f{p>qF5SrXkb6?rH9PTEa?i@T_9zisZmX;z&O))|c9J#ZVJ@WH z&a#F+jfRlhOV$|2=}|P{DL0i>xXK#qKJbbC(NS(H>(O|}<^Tm*H97~mO<6m#suf!U z(D1c`+^=M<*Fr#`@Ko*-hSksg5J$$n#GLOnffN((3<@w8-jw@HM73R67ehec@aE24 zk?CdIoEAYqgzyyN%X5UiAs|xtHO&hGn1%O-0EXecAb@FjX9!>%-U$MjhqppN0^w&N zAd&DdAvC~;s(S+AryzR3@RvlwQwV*xxF7O&;tY@hGC&6S*8sl)3;_LCrqa!y63PGo N002ovPDHLkV1k*E>ze=o diff --git a/src/main/res/drawable/action_notes.png b/src/main/res/drawable/action_notes.png deleted file mode 100644 index 8b36627da0a3446db335ba5a2c30afa540538ab4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)-j^npl02^L9K=TOL;F(|mRn69|8h~`k5_OfW3h)F+f&l{f z>;jlt2+2CRY9RAq+IOpn2|xe>5P$##AOHafKmY;|fB*y_fIoUJH$owyzTuHP^1-0NzLhh-~;*RoOZ$X$ZetSaATw6fxnmn)@So34i)l#3uZ> zDZF$56Mh2E;k|F4(IWiJ6<#VpF>U?~FBQNP>;gXcwi25K>;+!gp8wY=Q78oHQRT<{907*qoM6N<$g4dj< AXaE2J diff --git a/src/main/res/drawable/action_tel.png b/src/main/res/drawable/action_tel.png deleted file mode 100644 index 99842dab68341b0d1ebf69fea5da29014e3b1c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 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 c_*;Mh0L-VoSY6^C=Kufz07*qoM6N<$f{{$3!T + + 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" />