Sorting and threading butchery

code/ContextHome/res/layout/z.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/score">
+            <!-- Dummy file to force compiler to create a "score" id -->
+</LinearLayout>

code/ContextHome/src/uk/co/md87/android/contexthome/ContextHome.java

@@ -24,7 +24,10 @@ package uk.co.md87.android.contexthome;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
+import android.view.Menu;
+import android.view.View;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.LinearLayout;
 import java.util.Arrays;
@@ -38,7 +41,9 @@ import uk.co.md87.android.contexthome.modules.*;
  *
  * @author chris
  */
-public class ContextHome extends Activity {
+public class ContextHome extends Activity implements Runnable {
+
+    public static int TAG_SCORE = 10;
 
     private LinearLayout layout, fixedLayout;
 
@@ -46,8 +51,12 @@ public class ContextHome extends Activity {
 
     private DataHelper helper;
 
+    private int previousCount = 0;
+
     private Module[] modules, fixedModules;
 
+    private final Handler handler = new Handler();
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
@@ -94,6 +103,49 @@ public class ContextHome extends Activity {
             end = System.currentTimeMillis();
             Log.v("ContextHome", module.getClass().getSimpleName() + ": " + (end - start));
         }
+
+        handler.postDelayed(this, 1000);
+    }
+
+    public boolean sortModules() {
+        boolean changed = false;
+        
+        int lastScore = Integer.MAX_VALUE;
+        
+        for (int i = 0; i < layout.getChildCount(); i++) {
+            final View view = layout.getChildAt(i);
+
+            if (view.getTag(R.id.score) == null) {
+                Log.w("ContextHome", "Removing view without score");
+                layout.removeViewAt(i);
+                i--;
+                continue;
+            }
+
+            final int score = (Integer) view.getTag(R.id.score);
+
+            while (score > lastScore) {
+                // TODO: This could be optimised quite a lot
+                changed = true;
+                layout.removeViewAt(i);
+                layout.addView(view, --i);
+                lastScore = i == 0 ? Integer.MAX_VALUE
+                        : (Integer) layout.getChildAt(i - 1).getTag(R.id.score);
+            }
+
+            lastScore = (Integer) layout.getChildAt(i).getTag(R.id.score);
+        }
+
+        changed |= layout.getChildCount() > previousCount;
+        previousCount = layout.getChildCount();
+
+        return changed;
+    }
+
+    public void run() {
+        if (sortModules()) {
+            handler.postDelayed(this, 1000);
+        }
     }
 
 }

code/ContextHome/src/uk/co/md87/android/contexthome/R.java

@@ -22,6 +22,7 @@ public final class R {
         public static final int content=0x7f050002;
         public static final int fixedcontent=0x7f050000;
         public static final int image=0x7f050003;
+        public static final int score=0x7f050006;
         public static final int scroll=0x7f050001;
         public static final int title=0x7f050004;
     }
@@ -29,6 +30,7 @@ public final class R {
         public static final int container=0x7f030000;
         public static final int scroller=0x7f030001;
         public static final int titledimage=0x7f030002;
+        public static final int z=0x7f030003;
     }
     public static final class string {
         public static final int app_name=0x7f040000;

code/ContextHome/src/uk/co/md87/android/contexthome/modules/Email.java

@@ -43,13 +43,15 @@ public class Email implements Runnable {
     private final long convId;
     private final Handler handler;
     private final Context context;
+    private final EmailModule module;
     private final View view;
     private long id = -1;
 
-    public Email(Handler handler, Context context, long convId, View view) {
+    public Email(Handler handler, Context context, EmailModule module, long convId, View view) {
         this.handler = handler;
         this.convId = convId;
         this.context = context;
+        this.module = module;
         this.view = view;
         
         new Thread(this).start(); // Ick!
@@ -143,6 +145,8 @@ public class Email implements Runnable {
 
         cursor.close();
 
+        module.updateScore(this);
+
         final TextView body = (TextView) view.findViewById(R.id.body);
 
         handler.post(new Runnable() {

code/ContextHome/src/uk/co/md87/android/contexthome/modules/EmailModule.java

@@ -36,6 +36,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import uk.co.md87.android.contexthome.ContextHome;
 import uk.co.md87.android.contexthome.DataHelper;
 
 import uk.co.md87.android.contexthome.Module;
@@ -78,8 +79,6 @@ public class EmailModule extends Module implements Comparator<Email> {
                 LayoutParams.WRAP_CONTENT);
         params.weight = 1;
 
-        final List<Email> messages = new ArrayList<Email>(weight);
-
         if (cursor.moveToFirst()) {
             do {
                 final View view = View.inflate(context, R.layout.titledimage, null);
@@ -96,30 +95,29 @@ public class EmailModule extends Module implements Comparator<Email> {
                     }
                 });
 
-                final Email message = new Email(handler, context,
+                final Email message = new Email(handler, context, EmailModule.this,
                         cursor.getLong(convIdIndex), view);
                 view.setTag(message);
-
-                messages.add(message);
-            } while (cursor.moveToNext());
-        }
-
-        cursor.close();
-
-        Collections.sort(messages, EmailModule.this);
+                updateScore(message);
 
         handler.post(new Runnable() {
 
                     public void run() {
-                                for (Email message : messages) {
             parent.addView(message.getView(), params);
-        }
                     }
                 });
+            } while (cursor.moveToNext());
+        }
+
+        cursor.close();
                     }
         }).start();
     }
 
+    public void updateScore(final Email email) {
+        email.getView().setTag(R.id.score, getScore(getMap(email)));
+    }
+
     public Map<String, String> getMap(final Email email) {
         final Map<String, String> params = new HashMap<String, String>();
         if (email.getId() >= 0) {

code/ContextHome/src/uk/co/md87/android/contexthome/modules/SmsModule.java

@@ -34,11 +34,9 @@ import android.text.Html;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
-import java.util.ArrayList;
-import java.util.List;
+import uk.co.md87.android.contexthome.ContextHome;
+
 import uk.co.md87.android.contexthome.DataHelper;
 import uk.co.md87.android.contexthome.Module;
 import uk.co.md87.android.contexthome.R;
@@ -70,17 +68,13 @@ public class SmsModule extends Module {
         final int bodyIndex = cursor.getColumnIndex("body");
         final int addressIndex = cursor.getColumnIndex("address");
 
-        final LayoutParams params = new LayoutParams(LayoutParams.FILL_PARENT,
-                LayoutParams.WRAP_CONTENT);
-        params.weight = 1;
-
-        final List<View> views = new ArrayList<View>(weight);
         boolean success = cursor.moveToFirst();
         for (int i = 0; i < weight && success; i++) {
             final String body = cursor.getString(bodyIndex);
             final String address = cursor.getString(addressIndex);
 
-            final View view = getView(context, body, address, cursor.getLong(idIndex));
+            final View view = getView(context, handler, body, address, cursor.getLong(idIndex));
+            view.setTag(R.id.score, 0); // TODO
 
         handler.post(new Runnable() {
 
@@ -97,8 +91,8 @@ public class SmsModule extends Module {
         }).start();
     }
 
-    private View getView(final Context context, String text,
-            String address, final long threadId) {
+    private View getView(final Context context, final Handler handler,
+            final String text, final String address, final long threadId) {
         final View view = View.inflate(context, R.layout.titledimage, null);
         view.setClickable(true);
         view.setFocusable(true);
@@ -112,7 +106,10 @@ public class SmsModule extends Module {
             }
         });
 
-        final Uri contactUri = Uri.withAppendedPath(Contacts.Phones.CONTENT_FILTER_URL,
+        new Thread(new Runnable() {
+
+            public void run() {
+          final Uri contactUri = Uri.withAppendedPath(Contacts.Phones.CONTENT_FILTER_URL,
                 Uri.encode(address));
 
         final Cursor cursor = context.getContentResolver().query(contactUri,
@@ -123,12 +120,18 @@ public class SmsModule extends Module {
         final ImageView image = (ImageView) view.findViewById(R.id.image);
 
         if (cursor.moveToFirst()) {
-            title.setText(Html.fromHtml("<b>" + cursor.getString(cursor
-                    .getColumnIndex(Contacts.Phones.DISPLAY_NAME)) + "</b>"));
-            Uri uri = ContentUris.withAppendedId(People.CONTENT_URI,
+            final Uri uri = ContentUris.withAppendedId(People.CONTENT_URI,
                     cursor.getLong(cursor.getColumnIndex(Contacts.Phones.PERSON_ID)));
+            final String name = cursor.getString(cursor
+                    .getColumnIndex(Contacts.Phones.DISPLAY_NAME));
+            handler.post(new Runnable() {
+
+                        public void run() {
+            title.setText(Html.fromHtml("<b>" + name + "</b>"));
             image.setImageBitmap(Contacts.People.loadContactPhoto(context,
                     uri, R.drawable.blank, null));
+                                    }
+                    });
         } else {
             title.setText(Html.fromHtml("<b>" + address + "</b>"));
         }
@@ -136,7 +139,16 @@ public class SmsModule extends Module {
         cursor.close();
 
         final TextView body = (TextView) view.findViewById(R.id.body);
+
+                    handler.post(new Runnable() {
+
+                        public void run() {
         body.setText(text);
+                        }
+                    });
+
+                  }
+        }).start();
 
         return view;
     }