From 4b85db1e46ab72cb3054889654ce2f94402f106e Mon Sep 17 00:00:00 2001 From: Tim Su Date: Tue, 29 Jun 2010 18:03:32 -0700 Subject: [PATCH] Deleted some unused stuff, made prettier filters --- .../com/todoroo/andlib/sql/Constants.java | 1 + .../com/todoroo/andlib/sql/QueryTemplate.java | 9 +++++ .../astrid/filters/ExtendedFilterExposer.java | 24 ++++++++++-- .../todoroo/astrid/tags/FilterExposer.java | 19 ++++++++-- .../com/todoroo/astrid/tags/TagService.java | 8 ++++ astrid/res/drawable/btn_add.png | Bin 0 -> 733 bytes astrid/res/drawable/btn_add_extended.png | Bin 0 -> 666 bytes astrid/res/drawable/btn_check25.xml | 35 ------------------ astrid/res/drawable/btn_check50.xml | 35 ------------------ astrid/res/drawable/btn_check75.xml | 35 ------------------ astrid/res/drawable/btn_check_25.png | Bin 1502 -> 0 bytes astrid/res/drawable/btn_check_50.png | Bin 1508 -> 0 bytes astrid/res/drawable/btn_check_75.png | Bin 1499 -> 0 bytes astrid/res/drawable/filter_untagged.png | Bin 701 -> 780 bytes .../astrid/activities/TaskListAdapter.java | 30 ++++----------- 15 files changed, 62 insertions(+), 134 deletions(-) create mode 100644 astrid/res/drawable/btn_add.png create mode 100644 astrid/res/drawable/btn_add_extended.png delete mode 100644 astrid/res/drawable/btn_check25.xml delete mode 100644 astrid/res/drawable/btn_check50.xml delete mode 100644 astrid/res/drawable/btn_check75.xml delete mode 100644 astrid/res/drawable/btn_check_25.png delete mode 100644 astrid/res/drawable/btn_check_50.png delete mode 100644 astrid/res/drawable/btn_check_75.png diff --git a/astrid/common-src/com/todoroo/andlib/sql/Constants.java b/astrid/common-src/com/todoroo/andlib/sql/Constants.java index 4c59f6ead..36e425eae 100644 --- a/astrid/common-src/com/todoroo/andlib/sql/Constants.java +++ b/astrid/common-src/com/todoroo/andlib/sql/Constants.java @@ -21,4 +21,5 @@ public final class Constants { static final String WHERE = "WHERE"; public static final String EXISTS = "EXISTS"; public static final String NOT = "NOT"; + public static final String LIMIT = "LIMIT"; } diff --git a/astrid/common-src/com/todoroo/andlib/sql/QueryTemplate.java b/astrid/common-src/com/todoroo/andlib/sql/QueryTemplate.java index 33bb0376c..6251101a4 100644 --- a/astrid/common-src/com/todoroo/andlib/sql/QueryTemplate.java +++ b/astrid/common-src/com/todoroo/andlib/sql/QueryTemplate.java @@ -2,6 +2,7 @@ package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.Constants.COMMA; import static com.todoroo.andlib.sql.Constants.GROUP_BY; +import static com.todoroo.andlib.sql.Constants.LIMIT; import static com.todoroo.andlib.sql.Constants.ORDER_BY; import static com.todoroo.andlib.sql.Constants.SPACE; import static com.todoroo.andlib.sql.Constants.WHERE; @@ -23,6 +24,7 @@ public final class QueryTemplate { private final ArrayList groupBies = new ArrayList(); private final ArrayList orders = new ArrayList(); private final ArrayList havings = new ArrayList(); + private Integer limit = null; public QueryTemplate join(Join... join) { joins.addAll(asList(join)); @@ -51,6 +53,8 @@ public final class QueryTemplate { visitWhereClause(sql); visitGroupByClause(sql); visitOrderByClause(sql); + if(limit != null) + sql.append(LIMIT).append(SPACE).append(limit); return sql.toString(); } @@ -105,4 +109,9 @@ public final class QueryTemplate { this.havings.add(criterion); return this; } + + public QueryTemplate limit(int limitValue) { + this.limit = limitValue; + return this; + } } diff --git a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java index f496fc9b1..d24a233fb 100644 --- a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java @@ -7,7 +7,10 @@ import android.content.BroadcastReceiver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; +import android.graphics.drawable.BitmapDrawable; +import com.timsu.astrid.R; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Order; import com.todoroo.andlib.sql.QueryTemplate; @@ -30,6 +33,8 @@ public final class ExtendedFilterExposer extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + Resources r = context.getResources(); + // build filters FilterListHeader header = new FilterListHeader(ExtendedPlugin.pluginIdentifier, "Extended"); @@ -41,6 +46,14 @@ public final class ExtendedFilterExposer extends BroadcastReceiver { TaskCriteria.isVisible(DateUtilities.now()))). orderBy(Order.asc(Task.TITLE)), null); + alphabetical.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_alpha)).getBitmap(); + + Filter recent = new Filter(ExtendedPlugin.pluginIdentifier, + "Recently Modified", + "Recently Modified", + new QueryTemplate().orderBy(Order.desc(Task.MODIFICATION_DATE)).limit(15), + null); + recent.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_recent)).getBitmap(); ContentValues hiddenValues = new ContentValues(); hiddenValues.put(Task.HIDE_UNTIL.name, DateUtilities.now() + DateUtilities.ONE_DAY); @@ -50,7 +63,8 @@ public final class ExtendedFilterExposer extends BroadcastReceiver { new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(), Criterion.not(TaskCriteria.isVisible(DateUtilities.now())))). orderBy(Order.asc(Task.HIDE_UNTIL)), - hiddenValues); + hiddenValues); + hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_hidden)).getBitmap(); Filter deleted = new Filter(ExtendedPlugin.pluginIdentifier, "Deleted Tasks", @@ -58,13 +72,15 @@ public final class ExtendedFilterExposer extends BroadcastReceiver { new QueryTemplate().where(TaskCriteria.isDeleted()). orderBy(Order.desc(Task.DELETION_DATE)), null); + deleted.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_deleted)).getBitmap(); // transmit filter list - FilterListItem[] list = new FilterListItem[4]; + FilterListItem[] list = new FilterListItem[5]; list[0] = header; list[1] = alphabetical; - list[2] = hidden; - list[3] = deleted; + list[2] = recent; + list[3] = hidden; + list[4] = deleted; Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ITEMS, list); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java index 3ef39c1e1..fe9aa9e71 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java @@ -7,6 +7,8 @@ import android.content.BroadcastReceiver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; +import android.graphics.drawable.BitmapDrawable; import com.timsu.astrid.R; import com.todoroo.andlib.sql.QueryTemplate; @@ -62,6 +64,8 @@ public class FilterExposer extends BroadcastReceiver { if(tagsByAlpha.length == 0) return; + Resources r = context.getResources(); + Tag[] tagsBySize = tagService.getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE); Filter[] filtersByAlpha = new Filter[tagsByAlpha.length]; for(int i = 0; i < tagsByAlpha.length; i++) @@ -73,16 +77,25 @@ public class FilterExposer extends BroadcastReceiver { FilterListHeader tagsHeader = new FilterListHeader(TagsPlugin.IDENTIFIER, context.getString(R.string.tag_FEx_header)); + Filter untagged = new Filter(TagsPlugin.IDENTIFIER, + "Untagged", + "Untagged", + tagService.untaggedTemplate(), + null); + untagged.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_untagged)).getBitmap(); FilterCategory tagsCategoryBySize = new FilterCategory(TagsPlugin.IDENTIFIER, context.getString(R.string.tag_FEx_by_size), filtersBySize); + tagsCategoryBySize.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags1)).getBitmap(); FilterCategory tagsCategoryByAlpha = new FilterCategory(TagsPlugin.IDENTIFIER, context.getString(R.string.tag_FEx_alpha), filtersByAlpha); + tagsCategoryByAlpha.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags2)).getBitmap(); // transmit filter list - FilterListItem[] list = new FilterListItem[3]; + FilterListItem[] list = new FilterListItem[4]; list[0] = tagsHeader; - list[1] = tagsCategoryBySize; - list[2] = tagsCategoryByAlpha; + list[1] = untagged; + list[2] = tagsCategoryBySize; + list[3] = tagsCategoryByAlpha; Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ITEMS, list); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java index 2b3066835..e10b171ca 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java @@ -15,6 +15,7 @@ import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; +import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.model.Metadata; import com.todoroo.astrid.model.Task; import com.todoroo.astrid.service.MetadataService; @@ -79,6 +80,13 @@ public class TagService { } } + public QueryTemplate untaggedTemplate() { + return new QueryTemplate().join(Join.inner(Metadata.TABLE, + Task.ID.eq(Metadata.TASK))).where(Criterion.and( + TaskCriteria.isActive(), MetadataCriteria.withKey(KEY), + Metadata.VALUE.eq(null))); + } + /** * Return all tags ordered by given clause * diff --git a/astrid/res/drawable/btn_add.png b/astrid/res/drawable/btn_add.png new file mode 100644 index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898 GIT binary patch literal 733 zcmV<30wVp1P)9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2ZulL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@ z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2pgg+heWDyked|3R$$kL@A z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6< zT=e_Y=vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxEDK}O3T04USJ P00000NkvXXu0mjf^IS-S literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/btn_add_extended.png b/astrid/res/drawable/btn_add_extended.png new file mode 100644 index 0000000000000000000000000000000000000000..937bded9d85c849e8f94c11d9c04744622b6488d GIT binary patch literal 666 zcmV;L0%iS)P)8Wj^3Dc;Nh7)Vsv6dp$FpFhaq;+AFZR+9Q*|``QOHOq0+`PQM-~WA|=Y0tP#QzlU zjh~&FiBopjH?OgXag&EJVb1*cp(`tix4>^L!aJ%8p@0YB85-W3Qn)mtUcTuFPCh_5 zFp9{`7+0aGL3l_R!wU|7A3^w&71O;J5cE-8MFq6+XowfQ5_DkEUxA-KC0?70G2LAY zk3ohto45*oe-^hpQG^2vbN7mJZeUSlOyXme>$P8A?sO}tH35s93jSh^XL?Il?B-N(GohGAU+j4l6$w~;CB*oW5PMx5)+N2;0_Pf`&Hu^ybr-GWl75bc#2=&#=mr%uxI=X7>y z1#@RCc}Q&_##ng6KmSJd$a5(T>mXDS>wjPW1*Kof&ZRx - - - - - - - - - - - - - diff --git a/astrid/res/drawable/btn_check50.xml b/astrid/res/drawable/btn_check50.xml deleted file mode 100644 index a3bce13c9..000000000 --- a/astrid/res/drawable/btn_check50.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/astrid/res/drawable/btn_check75.xml b/astrid/res/drawable/btn_check75.xml deleted file mode 100644 index f18054182..000000000 --- a/astrid/res/drawable/btn_check75.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/astrid/res/drawable/btn_check_25.png b/astrid/res/drawable/btn_check_25.png deleted file mode 100644 index 4108bfa3e981608a92e36f66ffec2a14594f56fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcmV<41tI#0P)Px#24YJ`L;(K)t^few!3>!I000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOc7 z1Ogw(X3o|C00mx2L_t(o!|j+&Xd6cuhM)aWBw4W%*^yjHh_#eBQGV>$!H4|N1WF4H zJ+;u})?NysheDx+kV|_EJ*1_l-U_)Tr45ueq(-5Tl!oRIQl~^d*jAI6%C(VfX|-Be zmUg#?c*R<_Wt&(f2M;W0#q7+p@4WMU->hI+7B6EHc}d$g*fv*JhM5QGqLYGPvIi=LjIKKuW6#5#L*W@cu__wCzv5%}G*tl70Zwm+3hT?mCjeWqz* z7zT!6V4CKZU-r16P^d4JN?ic()AleFScOVdm z8HUkTsAjl8AP@s~w*r$b%fd9x{}oIW#T6_oz-$j}HJDmb`RVFs6!TNW51!=gxlf$o zX?-x;UmJm1ua7-(NiFjI*YDCm>a#v)8VtkdXor(V2{%hOfpTg0k&0&rLKKW zP59V(s%d-)oK;X zvTTouEfurl%W7boRq*Gl7m@zGK{5)vI$%zNIq@(j-u{Zk#YJkhnsX_o4S~Jr2Do|c z3a%xnuAMMnhUt=@jyWNbBkCV&gICkvVs!$^% zBe>melF1~Y;Aync4vM)O7>SQb4!usfT&7;HH+*QCCXytrzbjV*8yg#=zrUYEBEihe z43m?SJb3VcqeqV}d-(S4+ju;l=TM;#l}d&AuJ1h;2!R_&& zY1)d7Yg+iF7Nx57`RaLsX zyNN_1Xqtvy7_HrGRfH37@{Z=3$V`^#&S(Xt50iVx@*Xus0W^%GIc(GVy zXlRI1skFlEYgHthsbD3iO6x5}Jdt2Jn?-iH7#ti#*L4;a7B-#mHsX z(|I7%>Jz~m!28#)Uw^B&w|Dne*Z!*=+nzjmQaFG9{7vAhWm&1U!2G~D;I+$_FP|J3 z80d<{Vx8>(tJmx1$jHdlrAwFY0lxy@S(c@)1qKiTUIhk$IMCC^Gw&b3pTKXx>@t>B zzySQfo~2{EuZ>{;069Qy_Oh`3Iei;!8*CeF8>~I;Kl$;A2DG9@WB>pF07*qoM6N<$ Eg6P}0z5oCK diff --git a/astrid/res/drawable/btn_check_50.png b/astrid/res/drawable/btn_check_50.png deleted file mode 100644 index 60363ca746182fc968df5c9c300031f0102012e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1508 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 Bt9bwb diff --git a/astrid/res/drawable/filter_untagged.png b/astrid/res/drawable/filter_untagged.png index 9fbae67250babae698555c899907179c139932f0..d29ec7831cbe22c68af6933cff8eff602b87fe07 100644 GIT binary patch delta 756 zcmV*v$0*pySK~y-)m6ACSsr~t_4 z^I>Oa=M51xR8?i&Via}99SVg!!C>&Sl=3K($@~KmySuwQIXU?b0GJt;Wzi3~#6`>D zkQ?G#3(6g@P)<%xri;a*W}4>ng@uJi=Lh!r`MDneh<^wsByLHEhrEEp;2{s3dW-F7 zG`bfGg{rEme%RR9h;#y;777KcUaymsl05R4(I!X$k{R$w2*+{S!^6WE92_jEs(Q4( zz8(Pp0RY?E+mDIp!N|x+*zfmWv~9WsAQ(_A0_isRMh{fMaJ;>e^Z9&G)3k@CX-+Eu zFgG`sCV!$Y2L}i7TCH~3+apnGf*pqAmSC3xxFzhm=_tg2q9_eTQC5h^7M+P^GMN}N zuZ)h4zVGkvN5yb()5TDPfD}O6VU$jf`!r4S8HVvJ7K;^?PQd*9{3jwxWV6{P<#HK8 zuT;Ocg{ZdxM+jLuJ%*-f30>D;#bUAIRR(`6oo!CvC!!bQl~-Ta@t&|$vX&*@750000eD$_#z~y9 z3x^BudEejjyyv`!5k(Q1Oa`e`3dv*=i9`bNcpQQtAQp?w0$`>sCY?^B-|tVXYPG6B z!r|~#2t$==L8Verl*{Gv2ts4T1p-Cg41%^T)c)i|3 zAq-XBPb9^Eh=1iur_({B-2=ZfbW$pn;P?B%^ZW#aq00M~WmyI--rehCV{3pXp8>8i z+$$D~)CD{q&lrRuJxZ-sOG)Z>yQmZ8_4ojr8Q`@DJli^e6bc3E0#2uM1YshP$UNy$ zYBrlnQo7Ysl=TGgJ_o$XjzjYKJaqw^&89#UN-!AIl7AkhMx&u5Wxx0EROmx59zfRP z0J}Ye?q*|>ug6Ih3!>dgs?#`p*e2ziZjlEBI5W96zW*5}AC+?MHS*_dcmgpo>h)5ug z<#UioF@Ihx0c*zr-5gpQm*BagDjhmqE|*K|a5yA7i4;O@4+IPT{eC_=0q(MTaO8~J z?RE`0X^9RPcl9KGy}JpJqTlxz{2*(4RRzzYsyg+hS*=!$*=&}0-6|q0=jCr}bJ%?_ zgD)$`z%Qv~_oC_{^S|e6G#WJqgW*hI`Sg9F_#TzoCjT8;O!xl+&v_qytO7mD00000 LNkvXXu0mjfh@LtJ diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java index 188f6773f..29e5bd588 100644 --- a/astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java +++ b/astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java @@ -93,14 +93,14 @@ public class TaskListAdapter extends ArrayAdapter { private static Format alarmFormat = null; private final Activity activity; - private List objects; - private int resource; - private LayoutInflater inflater; - private TaskListAdapterHooks hooks; - private TextView deletedItemView = new TextView(getContext()); + private final List objects; + private final int resource; + private final LayoutInflater inflater; + private final TaskListAdapterHooks hooks; + private final TextView deletedItemView = new TextView(getContext()); - private Integer fontSizePreference; - private AlertController alarmController; + private final Integer fontSizePreference; + private final AlertController alarmController; private TaskModelForList recentlyCompleted = null; @@ -734,21 +734,7 @@ public class TaskListAdapter extends ArrayAdapter { } else { name.setPaintFlags(name.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); name.setTextColor(r.getColor(task.getTaskColorResource(getContext()))); - - float completedPercentage = 0; - if(task.getEstimatedSeconds() > 0) { - completedPercentage = 1.0f * task.getElapsedSeconds() / - task.getEstimatedSeconds(); - } - - if(completedPercentage < 0.25f) - progress.setButtonDrawable(R.drawable.btn_check0); - else if(completedPercentage < 0.5f) - progress.setButtonDrawable(R.drawable.btn_check25); - else if(completedPercentage < 0.75f) - progress.setButtonDrawable(R.drawable.btn_check50); - else - progress.setButtonDrawable(R.drawable.btn_check75); + progress.setButtonDrawable(R.drawable.btn_check0); } }