From da02524fa9b25f9f7e6801560cb8bbaf38c477db Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 2 Jan 2009 11:01:16 +0000
Subject: [PATCH]   Reversed completed task ordering.

---
 AndroidManifest.xml                                  | 4 ++--
 src/com/timsu/astrid/data/task/TaskModelForList.java | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6bd14e8cf..c5e38ac24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="27"
-      android:versionName="1.9.2">
+      android:versionCode="28"
+      android:versionName="1.9.3">
       
     <uses-permission android:name="android.permission.VIBRATE"/>
     
diff --git a/src/com/timsu/astrid/data/task/TaskModelForList.java b/src/com/timsu/astrid/data/task/TaskModelForList.java
index a8def359d..d89347f58 100644
--- a/src/com/timsu/astrid/data/task/TaskModelForList.java
+++ b/src/com/timsu/astrid/data/task/TaskModelForList.java
@@ -92,6 +92,7 @@ public class TaskModelForList extends AbstractTaskModel {
                     System.currentTimeMillis())/1000/3600;
             if(hoursLeft < 5*24)
                 weight += (hoursLeft - 5*24);
+            weight -= 20;
         }
 
         // looming preferred deadline
@@ -100,15 +101,16 @@ public class TaskModelForList extends AbstractTaskModel {
                     System.currentTimeMillis())/1000/3600;
             if(hoursLeft < 5*24)
                 weight += (hoursLeft - 5*24)/2;
+            weight -= 10;
         }
 
         // bubble completed tasks to the bottom
         if(isTaskCompleted()) {
             if(getCompletionDate() == null)
-                weight += 5e6;
+                weight += 20000;
             else
-                weight = (int)Math.max(5e6 - (System.currentTimeMillis() -
-                    getCompletionDate().getTime()) / 1000, 5000);
+                weight = (int)Math.max(10000 + (System.currentTimeMillis() -
+                    getCompletionDate().getTime()) / 1000, 10000);
             return weight;
         }