From 027e943213e303dccc6c4bbe35e601f52b51d400 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Tue, 24 Aug 2010 17:29:34 -0700 Subject: [PATCH] Made a nicer selection background for task rows --- .../astrid/reminders/Notifications.java | 6 ++-- .../list_selector_background_focus.9.png | Bin 0 -> 11006 bytes .../list_selector_background_longpress.9.png | Bin 0 -> 3017 bytes .../list_selector_background_pressed.9.png | Bin 0 -> 11006 bytes .../list_selector_background_transition.xml | 20 ++++++++++++ .../drawable/list_selector_highlighted.xml | 30 ++++++++++++++++++ astrid/res/values/colors.xml | 4 ++- .../todoroo/astrid/adapter/TaskAdapter.java | 9 +++--- 8 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 astrid/res/drawable/list_selector_background_focus.9.png create mode 100644 astrid/res/drawable/list_selector_background_longpress.9.png create mode 100644 astrid/res/drawable/list_selector_background_pressed.9.png create mode 100644 astrid/res/drawable/list_selector_background_transition.xml create mode 100644 astrid/res/drawable/list_selector_highlighted.xml diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java index cf57b5cf9..d7594a175 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java @@ -122,9 +122,6 @@ public class Notifications extends BroadcastReceiver { return false; } - // schedule next notification - ReminderService.getInstance().scheduleAlarm(task); - // you're done - don't sound, do delete if(task.isCompleted() || task.isDeleted()) return false; @@ -141,6 +138,9 @@ public class Notifications extends BroadcastReceiver { task.setValue(Task.REMINDER_LAST, DateUtilities.now()); taskDao.saveExisting(task); + // schedule next notification + ReminderService.getInstance().scheduleAlarm(task); + Context context = ContextManager.getContext(); String title = context.getString(R.string.app_name); String text = reminder + " " + taskTitle; //$NON-NLS-1$ diff --git a/astrid/res/drawable/list_selector_background_focus.9.png b/astrid/res/drawable/list_selector_background_focus.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e24158664231236713e1d769d4f7819b618786 GIT binary patch literal 11006 zcmds-J&Rpc6o$_o&BR1w5fLOd)*@DRf}l)DMlpzpU?+lLDHu?&5YmaIomf~1DFlCk zmi`2>u(GxgQYg`waX;stXU;o&_W8(!1mX(kzU$*%Yp?h2`3N`p{EaJ@&Yit*w(Gic z`f4*2uUkJrB}nKK_=e&?gEd-MsOP50H;PnG29 ztNX8CJpIdK=erl5yYc?VH@ohcZh!CPw>~(vx%%uEKW`2W4hrku+Gexq4=HDD?(Iok z*9-dY;^ttd9CcTxwVGQw6t&*NR&J$wT5p$^w}0rmhv_+Ys@&v5C74>EH5jh^8e9Ci zoMIC7=lX`)t-`(e?>6WKJ$a_<9xtMHi>O6Yh)6^F#*2drA(zHC))yCM{awV|_-9M% z1tI4A>GDn3M-$yUCGX-j(qhhb;yH79IJvlfjkl+V{dH@s^%A%l#GGvjVll;tE}zIu zMTp}$ZBJ2&wGd*&BsQk)4x(BTM!EuOWMOl#r-Y4@+FnZt%v?S>S!+++{!nPvTp09m zacjmRgYdQV&4DhNKDm78^=9`$+tDka7!q1yXVdh2q7@U3_bi{>&DS}uZOfj5+r7$?27fxNv z*>cS}(|n1yf=tX158o|@$ZPdkYaG_6T-bWX=`+XJbLgpk;{o{=JZ=<|s1Ng`HBUKd z|6HH53yy+v=^#wH$02Y0`SjsbHvZLTfmrp8zr`uo>rW!$^p7=1 z4>kDCFb3CJ^tNv(4@jQ_GERS~=5pDS{!)K((|7KG+Z%#_)kO1IUF*(e+ ziM3zH+s?7qIms)z_Lm%_BpQn@E_xVfPRv^RQ}f|W)#|+S%$Il+xW7}hVCBAjWxMrY?) z%rrlR$=3&qjWmqUfT=qGH4tc6dXG zfxl$Vgr^TGM$B5)Ge4X)3aW?N_~&mIUMl~%_Zj~ez(qL-T=q-uNz{kXGG`_;Y z67lm<7^qJ@efcG=&5LsYYy=ojiAhoPED3_+QZ3BoYhlS}&R}gpG-E8Jh(0mo@Lj%z zHP={Vrk0D3e3PV#p~XbIu5C z3xYtSUtYuvRY>~OQk*fkWX!=pALCqHKM`KTrUgM}fbVi5J_}3T#z z&&1$)K_0@tJaan?OA)mXf2|m}mKIWgY*~;)ysaq_3K8vF!dejgT8x~fS*5;S zP#%P@u-Z2Umn;`m1U>05&8X^kCMcU*hvx01pMCnZ81r|D{r_(KzkHI)=Z)XKdhPj7 T|JePN_htX$mA&s@dH33XGOeYN literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/list_selector_background_longpress.9.png b/astrid/res/drawable/list_selector_background_longpress.9.png new file mode 100644 index 0000000000000000000000000000000000000000..5cbb251a7dbf1e7186a9aae78a786b6d667de6ca GIT binary patch literal 3017 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 LNkvXXu0mjflqZiH literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/list_selector_background_pressed.9.png b/astrid/res/drawable/list_selector_background_pressed.9.png new file mode 100644 index 0000000000000000000000000000000000000000..02b4e9a536fedd342ecef1d0153ef97a3fe69452 GIT binary patch literal 11006 zcmds-yNg{_7{&J;lNmE+EFwbC#@gD>#>j+ZP=kmFVk1_TiYWvOL937^Vkd&>ECl}p zOItxi{3C3{CK%&f_c~|)-0Oa`&*R>?8HhWav%bgr9_yTWgqgYZ`i*M``_JsBln#!r zAHI?C1znHt=KGHyKl^)z-S=L(c9@p>clU>Hzs!*fA6$R?qm-U_O4lNN_4VZ(+`D=7 z+SR?^E?!D6UjF6h&tFaHxpZ`R<<0lcFK#}6``5*Cxy-DGdlrjDHzdzmJlshsb%MV8 zaIxIUqZZp3w{DLuJWsuo<9xk!C#7?GVh0!Uo6Od^$2NF=2mm)|(Ul+!T%*r}e^UDE zL0`}bdio%xC$p&C^E0}zxX^7%iQ!M73&0k-J<;R--zoihuP1eaB<9k^{7I-!(bi!} zM1bOY&iz)ORxB>=KEgcK=yC6U4R(U`W+Y~RuO|MpSU#c%#IPM@&pB~fM5q=!Vxun~ zU7estz7Mgma3^2*%3=$3BKFbg`;Z{T)e|wt)`}VnVGavoVHZNoQJwJVDu2#lX>nOx zwb;J6_K=S-&*da zkgL!H!-ABhU=G4}ls$CR6CvV6-|Lj)z!P$j%UA`G6zaG?$ELCw+Fh}os8k>cq2!F$+e-+ePl;y}ppEv^}o<;<Ow-4#+&mGC|*2 z#t%&$y%Dy$IA^@;NiKaNuGzPLLo7luO<9UONZgTJMCZ88({}Vcw)#bmVqDJ4c6~#U zAfjTNXv2?j@jXU;L^vRI^0}yq9O7P6V)b*#Np5>H8hD-jXD z`0?ynK96~Ch_622S#HQoaANj6K@&}y>9GaIa?NJ*gVW!KG~Bf?SAfmUmQhe3p@qT?RG5IkNGwTj;_XP1}M*q&Y(Te}Kv%g5`xe_`NrM zXO5%n=(`YdjqbyOMD{|2Aw)TBab1x7xrZ5!(U$MmNbhk$Dx?w1J1Q52;ExPlNvVfU z3z-e}%+dR_Aj)a#f|Nr5=rL-C5E05_J2G>qz7d}8yAR;{C_z_v0IDSO(GjV-E xG;R%^5gSDrymS20H+O#eLeJvp>W#ziUw-$qe*spuA{hVx literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/list_selector_background_transition.xml b/astrid/res/drawable/list_selector_background_transition.xml new file mode 100644 index 000000000..0dec1335d --- /dev/null +++ b/astrid/res/drawable/list_selector_background_transition.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/astrid/res/drawable/list_selector_highlighted.xml b/astrid/res/drawable/list_selector_highlighted.xml new file mode 100644 index 000000000..af1667da9 --- /dev/null +++ b/astrid/res/drawable/list_selector_highlighted.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml index 6ad31074c..e201ecdd0 100644 --- a/astrid/res/values/colors.xml +++ b/astrid/res/values/colors.xml @@ -6,7 +6,9 @@ #ffffffff #ffcfcfcf #ffb8b8b8 - #ffa0a0a0 + #ffa0a0a0 + + #33ffffff #FFFB6666 #ffF0E89E diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index f01e14a9a..d99c1caed 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -13,20 +13,19 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.text.Html; -import android.text.TextUtils; import android.text.Html.ImageGetter; +import android.text.TextUtils; import android.text.util.Linkify; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnClickListener; import android.view.View.OnCreateContextMenuListener; +import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.CheckBox; @@ -603,7 +602,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.taskRow.removeView(view); } if(taskId == expanded) - viewHolder.view.setBackgroundColor(Color.argb(20, 255, 255, 255)); + viewHolder.view.setBackgroundResource(R.drawable.list_selector_highlighted); else viewHolder.view.setBackgroundResource(android.R.drawable.list_selector_background); }