From 92258988063db71ae14347bc1737d05efe13efd1 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 17 Jun 2010 02:11:37 -0700 Subject: [PATCH 01/30] Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. --- astrid/AndroidManifest.xml | 30 +- .../service/DependencyInjectionService.java | 3 - .../todoroo/astrid/filters/FilterExposer.java | 58 ++ astrid/res/drawable/background_gradient.xml | 11 + astrid/res/drawable/black_white_gradient.xml | 9 + astrid/res/drawable/edit_header.png | Bin 0 -> 3690 bytes astrid/res/drawable/edit_header_red.png | Bin 0 -> 3823 bytes astrid/res/drawable/edit_titlebar.png | Bin 0 -> 222 bytes astrid/res/drawable/expander_group.xml | 20 + .../res/drawable/expander_ic_maximized.9.png | Bin 0 -> 1795 bytes .../res/drawable/expander_ic_minimized.9.png | Bin 0 -> 1757 bytes astrid/res/drawable/ic_tasklist_back.png | Bin 0 -> 1263 bytes .../res/drawable/ic_tasklist_back_pressed.png | Bin 0 -> 1254 bytes .../drawable/ic_tasklist_back_selected.png | Bin 0 -> 1261 bytes astrid/res/drawable/none.png | Bin 0 -> 169 bytes astrid/res/drawable/tasklist_back.xml | 26 + astrid/res/layout/filter_list_activity.xml | 24 + astrid/res/layout/task_edit_activity.xml | 126 +++++ astrid/res/layout/task_list_activity.xml | 88 ++++ astrid/res/layout/task_row.xml | 51 ++ astrid/res/values/filter_strings.xml | 16 + astrid/res/values/styles.xml | 74 +++ astrid/res/xml/filter_list_searchable.xml | 7 + .../TaskModificationTabbedActivity.java | 2 +- .../activity/AbstractModelActivity.java | 92 ++++ .../astrid/activity/AstridActivity.java | 46 ++ .../astrid/activity/FilterListActivity.java | 361 +++++++++++++ .../todoroo/astrid/activity/HomeActivity.java | 82 +++ .../astrid/activity/TaskListActivity.java | 495 ++++++++++++++++++ .../todoroo/astrid/adapter/FilterAdapter.java | 173 ++++++ .../todoroo/astrid/adapter/TaskAdapter.java | 421 +++++++++++++++ .../service/AstridDependencyInjector.java | 5 + .../todoroo/astrid/service/TaskService.java | 6 + .../astrid/service/UpgradeService.java | 9 + 34 files changed, 2230 insertions(+), 5 deletions(-) create mode 100644 astrid/plugin-src/com/todoroo/astrid/filters/FilterExposer.java create mode 100644 astrid/res/drawable/background_gradient.xml create mode 100644 astrid/res/drawable/black_white_gradient.xml create mode 100644 astrid/res/drawable/edit_header.png create mode 100644 astrid/res/drawable/edit_header_red.png create mode 100644 astrid/res/drawable/edit_titlebar.png create mode 100644 astrid/res/drawable/expander_group.xml create mode 100644 astrid/res/drawable/expander_ic_maximized.9.png create mode 100644 astrid/res/drawable/expander_ic_minimized.9.png create mode 100644 astrid/res/drawable/ic_tasklist_back.png create mode 100644 astrid/res/drawable/ic_tasklist_back_pressed.png create mode 100644 astrid/res/drawable/ic_tasklist_back_selected.png create mode 100644 astrid/res/drawable/none.png create mode 100644 astrid/res/drawable/tasklist_back.xml create mode 100644 astrid/res/layout/filter_list_activity.xml create mode 100644 astrid/res/layout/task_edit_activity.xml create mode 100644 astrid/res/layout/task_list_activity.xml create mode 100644 astrid/res/layout/task_row.xml create mode 100644 astrid/res/values/filter_strings.xml create mode 100644 astrid/res/values/styles.xml create mode 100644 astrid/res/xml/filter_list_searchable.xml create mode 100644 astrid/src/com/todoroo/astrid/activity/AbstractModelActivity.java create mode 100644 astrid/src/com/todoroo/astrid/activity/AstridActivity.java create mode 100644 astrid/src/com/todoroo/astrid/activity/FilterListActivity.java create mode 100644 astrid/src/com/todoroo/astrid/activity/HomeActivity.java create mode 100644 astrid/src/com/todoroo/astrid/activity/TaskListActivity.java create mode 100644 astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java create mode 100644 astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 5cb12fbd7..ba316b115 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionName="3.0.0" android:versionCode="135"> @@ -29,6 +29,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java b/astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java index f347bd371..feaa2a4c8 100644 --- a/astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java @@ -3,8 +3,6 @@ package com.todoroo.andlib.service; import java.lang.reflect.Field; import java.util.Arrays; -import android.util.Log; - /** * Simple Dependency Injection Service for Android. *

@@ -138,6 +136,5 @@ public class DependencyInjectionService { */ public synchronized void setInjectors(AbstractDependencyInjector[] injectors) { this.injectors = injectors; - Log.e("INJECTION SETTING", "Set Injector List to: " + Arrays.asList(injectors)); // (debug) } } diff --git a/astrid/plugin-src/com/todoroo/astrid/filters/FilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/filters/FilterExposer.java new file mode 100644 index 000000000..937491f4c --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/filters/FilterExposer.java @@ -0,0 +1,58 @@ +/** + * See the file "LICENSE" for the full license governing this code. + */ +package com.todoroo.astrid.filters; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; + +import com.timsu.astrid.R; +import com.todoroo.astrid.activity.FilterListActivity; +import com.todoroo.astrid.api.AstridApiConstants; +import com.todoroo.astrid.api.Filter; +import com.todoroo.astrid.api.FilterListItem; +import com.todoroo.astrid.model.Task; + +/** + * Exposes Astrid's built in filters to the {@link FilterListActivity} + * + * @author Tim Su + * + */ +public class FilterExposer extends BroadcastReceiver { + + public static Filter buildInboxFilter(Resources r) { + return new Filter(r.getString(R.string.BFE_Inbox), + r.getString(R.string.BFE_Inbox), + /*String.format("WHERE %s AND %s ORDER BY CASE %s WHEN 0 THEN (%d + 1000 * %s) ELSE (%s + 1000 * %s) END ASC", //$NON-NLS-1$ + TaskSql.isActive(), TaskSql.isVisible(DateUtilities.now()), + Task.DUE_DATE, DateUtilities.now() + 60 * 24 * 3600, Task.IMPORTANCE, + Task.DUE_DATE, Task.IMPORTANCE)*/ "", + null); + } + + @Override + public void onReceive(Context context, Intent intent) { + Resources r = context.getResources(); + + // build filters + Filter inbox = buildInboxFilter(r); + + Filter all = new Filter(r.getString(R.string.BFE_All), + r.getString(R.string.BFE_All), + String.format("ORDER BY %s DESC", //$NON-NLS-1$ + Task.ID.name), + null); + + // transmit filter list + FilterListItem[] list = new FilterListItem[2]; + list[0] = inbox; + list[1] = all; + Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS); + broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ITEMS, list); + context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); + } + +} diff --git a/astrid/res/drawable/background_gradient.xml b/astrid/res/drawable/background_gradient.xml new file mode 100644 index 000000000..21ad1b2eb --- /dev/null +++ b/astrid/res/drawable/background_gradient.xml @@ -0,0 +1,11 @@ + + + + diff --git a/astrid/res/drawable/black_white_gradient.xml b/astrid/res/drawable/black_white_gradient.xml new file mode 100644 index 000000000..c468a2135 --- /dev/null +++ b/astrid/res/drawable/black_white_gradient.xml @@ -0,0 +1,9 @@ + + + + diff --git a/astrid/res/drawable/edit_header.png b/astrid/res/drawable/edit_header.png new file mode 100644 index 0000000000000000000000000000000000000000..91962ba252d147aa944700d705f94eb89da59a53 GIT binary patch literal 3690 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 OJhtZ@Y^u+p{`o&bC0c_3 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/edit_header_red.png b/astrid/res/drawable/edit_header_red.png new file mode 100644 index 0000000000000000000000000000000000000000..8a13f3e4a98da3bb2291cfc4857253152142a5db GIT binary patch literal 3823 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 Mp00i_>zopr03WnMbpQYW literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/expander_group.xml b/astrid/res/drawable/expander_group.xml new file mode 100644 index 000000000..ef665d3ff --- /dev/null +++ b/astrid/res/drawable/expander_group.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/astrid/res/drawable/expander_ic_maximized.9.png b/astrid/res/drawable/expander_ic_maximized.9.png new file mode 100644 index 0000000000000000000000000000000000000000..eb461e9d3827c1ad11d4b0c3081db62179a6a6a1 GIT binary patch literal 1795 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 Z`~xyjG+54?qDTM$002ovPDHLkV1hQCSlIvo literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/ic_tasklist_back_pressed.png b/astrid/res/drawable/ic_tasklist_back_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..3f052d99fdfc2e5847c160518f33348d0a5b1ef1 GIT binary patch literal 1254 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 XYc3^{Qj<&Q00000NkvXXu0mjfjI>9A literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/none.png b/astrid/res/drawable/none.png new file mode 100644 index 0000000000000000000000000000000000000000..3871ebb96a8d4820c5f2b3e9770712a5b9d91b33 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}&!3HE7PPGUDDaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#CWj=m7F)upw@R2TUXeFR)%Oz^;#OVvg9PQ>3(M82lE)&ftnaRUHx3v IIVCg!07QE(UH||9 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/tasklist_back.xml b/astrid/res/drawable/tasklist_back.xml new file mode 100644 index 000000000..3883b385f --- /dev/null +++ b/astrid/res/drawable/tasklist_back.xml @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml new file mode 100644 index 000000000..55d99b19f --- /dev/null +++ b/astrid/res/layout/filter_list_activity.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml new file mode 100644 index 000000000..d22ebdc7c --- /dev/null +++ b/astrid/res/layout/task_edit_activity.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + +