Added by due date and importance filter, also fixed launch behavior of FLA

astrid/AndroidManifest.xml

@@ -58,6 +58,7 @@
     <!-- Activity that displays task list -->
     <activity android:name="com.todoroo.astrid.activity.TaskListActivity"
               android:windowSoftInputMode="stateHidden"
+              android:clearTaskOnLaunch="true"
               android:theme="@style/Theme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -78,6 +79,7 @@
     </activity>
     <!-- Activity that displays filter list -->
     <activity android:name="com.todoroo.astrid.activity.FilterListActivity"
+              android:launchMode="singleTask"
               android:theme="@style/Theme">
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />

astrid/astrid.launch

@@ -6,7 +6,7 @@
 <intAttribute key="ch.zork.quicklaunch.index" value="0"/>
 <stringAttribute key="ch.zork.quicklaunch.mode" value="run"/>
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
-<stringAttribute key="com.android.ide.eclipse.adt.avd" value="evo-8-google"/>
+<stringAttribute key="com.android.ide.eclipse.adt.avd" value="android-16"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value="-scale 0.7"/>
 <intAttribute key="com.android.ide.eclipse.adt.delay" value="0"/>
 <booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="true"/>

astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java

@@ -12,6 +12,7 @@ import android.graphics.drawable.BitmapDrawable;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.DateUtilities;
@@ -44,16 +45,9 @@ public final class CoreFilterExposer extends BroadcastReceiver {
         searchFilter.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_search)).getBitmap();
 
         // extended
-        FilterCategory extended = new FilterCategory(r.getString(R.string.BFE_Extended),
-                new Filter[5]);
 
-        Filter alphabetical = new Filter(r.getString(R.string.BFE_Alphabetical),
-                r.getString(R.string.BFE_Alphabetical),
-                new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
-                        TaskCriteria.isVisible())).
-                        orderBy(Order.asc(Task.TITLE)),
-                null);
-        alphabetical.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_alpha)).getBitmap();
+        FilterCategory extended = new FilterCategory(r.getString(R.string.BFE_Extended),
+                new Filter[7]);
 
         Filter recent = new Filter(r.getString(R.string.BFE_Recent),
                 r.getString(R.string.BFE_Recent),
@@ -86,11 +80,43 @@ public final class CoreFilterExposer extends BroadcastReceiver {
                 null);
         deleted.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_trash)).getBitmap();
 
-        extended.children[0] = alphabetical;
-        extended.children[1] = recent;
-        extended.children[2] = hidden;
-        extended.children[3] = completed;
-        extended.children[4] = deleted;
+        // sorting filters
+
+        Filter alphabetical = new Filter(r.getString(R.string.BFE_Alphabetical),
+                r.getString(R.string.BFE_Alphabetical),
+                new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
+                        TaskCriteria.isVisible())).
+                        orderBy(Order.asc(Task.TITLE)),
+                null);
+        alphabetical.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_alpha)).getBitmap();
+
+        Filter dueDate = new Filter(r.getString(R.string.BFE_DueDate),
+                r.getString(R.string.BFE_DueDate),
+                new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
+                        TaskCriteria.isVisible())).
+                        orderBy(Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
+                                Long.MAX_VALUE, Task.DUE_DATE) + "+" + Task.IMPORTANCE)), //$NON-NLS-1$
+                        null);
+        dueDate.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_calendar)).getBitmap();
+
+        Filter importance = new Filter(r.getString(R.string.BFE_Importance),
+                r.getString(R.string.BFE_Importance),
+                new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
+                        TaskCriteria.isVisible())).
+                        orderBy(Order.asc(Task.IMPORTANCE + "*" + (2*DateUtilities.now()) + //$NON-NLS-1$
+                                "+" + Functions.caseStatement(Task.DUE_DATE.eq(0), //$NON-NLS-1$
+                                        Functions.now() + "+" + DateUtilities.ONE_WEEK, //$NON-NLS-1$
+                                        Task.DUE_DATE))),
+                        null);
+        importance.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_warning)).getBitmap();
+
+        extended.children[0] = recent;
+        extended.children[1] = hidden;
+        extended.children[2] = completed;
+        extended.children[3] = deleted;
+        extended.children[4] = alphabetical;
+        extended.children[5] = dueDate;
+        extended.children[6] = importance;
 
         // transmit filter list
         FilterListItem[] list = new FilterListItem[3];

astrid/res/values/strings-filters.xml

@@ -16,9 +16,6 @@
     <!-- Extended Filters Category -->
     <string name="BFE_Extended">More...</string>
 
-    <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Alphabetical</string>
-
     <!-- sort recent modification filter -->
     <string name="BFE_Recent">Recently Modified</string>
     
@@ -28,6 +25,15 @@
     <!-- hidden tasks filter -->
     <string name="BFE_Hidden">Hidden Tasks</string>
 
+    <!-- sort Alphabetical filter -->
+    <string name="BFE_Alphabetical">By Title</string>
+
+    <!-- sort Due Date filter -->
+    <string name="BFE_DueDate">By Due Date</string>
+
+    <!-- sort Importance filter -->
+    <string name="BFE_Importance">By Importance</string>
+
     <!-- deleted tasks filter -->
     <string name="BFE_Deleted">Deleted Tasks</string>