Sorting in apps and contacts

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

@@ -28,6 +28,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteStatement;
 import android.util.Log;
+import java.util.Arrays;
 
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +42,8 @@ import java.util.Map;
  */
 public class DataHelper {
 
+    public static final String[] SHARED_KEYS = new String[] { "contactid" };
+
     private static final String DATABASE_NAME = "contexthome.db";
     private static final int DATABASE_VERSION = 1;
 
@@ -67,42 +70,52 @@ public class DataHelper {
 
     public void registerAction(final String module, final Map<String, String> actions) {
         // TODO: It'd be nice if the two statements could be merged
-        insertActionStatement.bindString(0, module);
-        updateActionStatement.bindString(0, module);
+        insertActionStatement.bindString(1, module);
+        updateActionStatement.bindString(1, module);
 
         for (Map.Entry<String, String> action : actions.entrySet()) {
-            insertActionStatement.bindString(1, action.getKey());
-            insertActionStatement.bindString(2, action.getValue());
-            updateActionStatement.bindString(1, action.getKey());
-            updateActionStatement.bindString(2, action.getValue());
+            insertActionStatement.bindString(2, action.getKey());
+            insertActionStatement.bindString(3, action.getValue());
+            updateActionStatement.bindString(2, action.getKey());
+            updateActionStatement.bindString(3, action.getValue());
 
             for (ContextType context : contexts) {
-                insertActionStatement.bindString(3, context.getName());
-                insertActionStatement.bindString(4, context.getValue());
-                updateActionStatement.bindString(3, context.getName());
-                updateActionStatement.bindString(4, context.getValue());
+                insertActionStatement.bindString(4, context.getName());
+                insertActionStatement.bindString(5, context.getValue());
+                updateActionStatement.bindString(4, context.getName());
+                updateActionStatement.bindString(5, context.getValue());
                 insertActionStatement.execute();
                 updateActionStatement.execute();
             }
         }
     }
 
-    public Map<String, Map<String, Integer>> getActions(final String module) {
-        final Map<String, Map<String, Integer>> res = new HashMap<String, Map<String, Integer>>();
+    public Map<String, Integer> getActions(final String module) {
+        final Map<String, Integer> res = new HashMap<String, Integer>();
 
         final StringBuilder query = new StringBuilder("SELECT sum(number) AS total, "
-                + " actiontype, actionvalue FROM actions WHERE module = ? AND (0");
+                + " actiontype, actionvalue FROM actions WHERE (module = ?");
+
+        for (String key : SHARED_KEYS) {
+            query.append(" OR actiontype = \'");
+            query.append(key);
+            query.append('\'');
+        }
+
+        query.append(") AND (0");
         final String[] params = new String[1 + contexts.size() * 2];
         final String extraQuery = " OR (contexttype = ? AND contextvalue = ?)";
 
         int i = 1;
+        params[0] = module;
         for (ContextType context : contexts) {
             params[i++] = context.getName();
             params[i++] = context.getValue();
             query.append(extraQuery);
         }
 
-        query.append(") GROUP BY contexttype, contextvalue ORDER BY total DESC");
+        query.append(") GROUP BY actiontype, actionvalue ORDER BY total DESC");
+        Log.d("DataHelper", "Query: " + query + ", Params: " + Arrays.toString(params));
         final Cursor cursor = db.rawQuery(query.toString(), params);
 
         if (cursor.moveToFirst()) {
@@ -111,18 +124,15 @@ public class DataHelper {
             final int valueColumn = cursor.getColumnIndex("actionvalue");
 
             do {
-                final String type = cursor.getString(typeColumn);
-
-                if (!res.containsKey(type)) {
-                    res.put(type, new HashMap<String, Integer>());
-                }
-
-                res.get(type).put(cursor.getString(valueColumn), cursor.getInt(totalColumn));
+                res.put(cursor.getString(typeColumn) + "/"
+                        + cursor.getString(valueColumn), cursor.getInt(totalColumn));
             } while (cursor.moveToNext());
         }
 
         cursor.close();
 
+        Log.d("DataHelper", res.toString());
+
         return res;
     }
 

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

@@ -25,6 +25,8 @@ package uk.co.md87.android.contexthome;
 import android.content.Context;
 import android.view.View;
 
+import java.util.Map;
+
 /**
  * A module which can be displayed on the context-aware home screen.
  *
@@ -32,10 +34,36 @@ import android.view.View;
  */
 public abstract class Module {
 
+    private final String module;
     private final DataHelper helper;
+    private Map<String, Integer> actions;
 
     public Module(final DataHelper helper) {
+        this.module = getClass().getSimpleName().replace("Module", "").toLowerCase();
         this.helper = helper;
+
+        refreshActions();
+    }
+
+    public void refreshActions() {
+        actions = helper.getActions(module);
+    }
+
+    protected int getScore(final Map<String, String> params) {
+        int total = 0;
+
+        for (Map.Entry<String, String> pair : params.entrySet()) {
+            final String key = pair.getKey() + "/" + pair.getValue();
+            if (actions.containsKey(key)) {
+                total += actions.get(key);
+            }
+        }
+
+        return total;
+    }
+
+    protected void recordAction(final Map<String, String> params) {
+        helper.registerAction(module, params);
     }
 
     public abstract View getView(final Context context, final int weight);

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

@@ -22,17 +22,21 @@
 
 package uk.co.md87.android.contexthome.modules;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import java.util.Collections;
+import java.util.Comparator;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import uk.co.md87.android.contexthome.DataHelper;
 import uk.co.md87.android.contexthome.Module;
 import uk.co.md87.android.contexthome.R;
@@ -42,7 +46,7 @@ import uk.co.md87.android.contexthome.R;
  *
  * @author chris
  */
-public class AppsModule extends Module {
+public class AppsModule extends Module implements Comparator<ResolveInfo> {
 
     public AppsModule(DataHelper helper) {
         super(helper);
@@ -58,22 +62,27 @@ public class AppsModule extends Module {
         final View.OnClickListener listener = new View.OnClickListener() {
 
             public void onClick(View view) {
-                final ActivityInfo info = (ActivityInfo) view.getTag();
+                final ResolveInfo info = (ResolveInfo) view.getTag();
                 final Intent intent = new Intent();
                 intent.setAction(Intent.ACTION_MAIN);
-                intent.setClassName(info.packageName, info.name);
+                intent.setClassName(info.activityInfo.packageName, info.activityInfo.name);
                 context.startActivity(intent);
+
+                recordAction(getMap(info));
             }
         };
 
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
+
+        final List<ResolveInfo> infos = pm.queryIntentActivities(intent, 0);
+        Collections.sort(infos, this);
         
-        for (ResolveInfo res : pm.queryIntentActivities(intent, 0)) {
+        for (ResolveInfo res : infos) {
             final ImageView image = new ImageView(context);
             image.setImageDrawable(res.activityInfo.loadIcon(pm));
             image.setFocusable(true);
             image.setClickable(true);
-            image.setTag(res.activityInfo);
+            image.setTag(res);
             image.setOnClickListener(listener);
             image.setPadding(2, 2, 2, 2);
             image.setBackgroundResource(R.drawable.grid_selector);
@@ -83,4 +92,15 @@ public class AppsModule extends Module {
         return view;
     }
 
+    public Map<String, String> getMap(final ResolveInfo info) {
+        final Map<String, String> params = new HashMap<String, String>();
+        params.put("app", info.activityInfo.packageName);
+
+        return params;
+    }
+
+    public int compare(final ResolveInfo arg0, final ResolveInfo arg1) {
+        return getScore(getMap(arg1)) - getScore(getMap(arg0));
+    }
+
 }

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

@@ -32,6 +32,12 @@ import android.provider.Contacts.Photos;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import uk.co.md87.android.contexthome.DataHelper;
 
 import uk.co.md87.android.contexthome.Module;
@@ -42,7 +48,7 @@ import uk.co.md87.android.contexthome.R;
  *
  * @author chris
  */
-public class ContactsModule extends Module {
+public class ContactsModule extends Module implements Comparator<Long> {
 
     public ContactsModule(DataHelper helper) {
         super(helper);
@@ -62,6 +68,7 @@ public class ContactsModule extends Module {
                 intent.setData((Uri) view.getTag());
                 context.startActivity(intent);
 
+                recordAction(getMap(ContentUris.parseId((Uri) view.getTag())));
             }
         };
 
@@ -69,11 +76,19 @@ public class ContactsModule extends Module {
                 new String[] { "person" }, "exists_on_server != 0", null, null);
 
         final int column = cursor.getColumnIndex("person");
+        final List<Long> hits = new ArrayList<Long>(cursor.getCount());
         if (cursor.moveToFirst()) {
+            int i = 0;
             do {
-                layout.addView(getView(context, listener, cursor.getLong(column)), 52, 52);
+                hits.add(cursor.getLong(column));
             } while (cursor.moveToNext());
         }
+        
+        Collections.sort(hits, this);
+
+        for (Long id : hits) {
+            layout.addView(getView(context, listener, id), 52, 52);
+        }
 
         return view;
     }
@@ -94,4 +109,15 @@ public class ContactsModule extends Module {
         return image;
     }
 
+    public Map<String, String> getMap(final Long id) {
+        final Map<String, String> params = new HashMap<String, String>();
+        params.put("contactid", String.valueOf(id));
+
+        return params;
+    }
+
+    public int compare(final Long arg0, final Long arg1) {
+        return getScore(getMap(arg1)) - getScore(getMap(arg0));
+    }
+
 }

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

@@ -121,7 +121,8 @@ public class EmailModule extends Module {
         return layout;
     }
 
-    private View getView(final Context context, String text, String address, int count) {
+    private View getView(final Context context, final String text, final String address,
+            final int count) {
         final View view = View.inflate(context, R.layout.titledimage, null);
         view.setClickable(true);
         view.setFocusable(true);