From ad4e1db7a41ff568d3823c346fdedefe0d0c038b Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 2 Aug 2010 13:55:43 -0700
Subject: [PATCH] add on adapter, add on items, add on activity now populated

---
 .../andlib/service/ContextManager.java        |  11 ++
 .../astrid/timers/TimerActionExposer.java     |   4 +-
 astrid/res/drawable/icon_pp.png               | Bin 15789 -> 11883 bytes
 astrid/res/layout/addon_activity.xml          |  32 ++--
 astrid/res/layout/addon_adapter_row.xml       |  67 ++++++++
 astrid/res/layout/task_edit_activity.xml      |  90 +++++++----
 astrid/res/values/strings-core.xml            |  14 +-
 .../astrid/activity/AddOnActivity.java        |  62 +++++++-
 .../astrid/activity/TaskEditActivity.java     |  27 +---
 .../astrid/activity/TaskListActivity.java     |   4 +-
 .../todoroo/astrid/adapter/AddOnAdapter.java  | 147 ++++++++++++++++++
 .../src/com/todoroo/astrid/model/AddOn.java   |  90 +++++++++++
 .../{AddonService.java => AddOnService.java}  |  54 ++++++-
 .../service/AstridDependencyInjector.java     |   1 +
 .../astrid/service/UpgradeService.java        |   2 +-
 15 files changed, 511 insertions(+), 94 deletions(-)
 create mode 100644 astrid/res/layout/addon_adapter_row.xml
 create mode 100644 astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
 create mode 100644 astrid/src/com/todoroo/astrid/model/AddOn.java
 rename astrid/src/com/todoroo/astrid/service/{AddonService.java => AddOnService.java} (70%)

diff --git a/astrid/common-src/com/todoroo/andlib/service/ContextManager.java b/astrid/common-src/com/todoroo/andlib/service/ContextManager.java
index de75b7bbc..fb8c0b6c9 100644
--- a/astrid/common-src/com/todoroo/andlib/service/ContextManager.java
+++ b/astrid/common-src/com/todoroo/andlib/service/ContextManager.java
@@ -4,6 +4,7 @@
 package com.todoroo.andlib.service;
 
 import android.content.Context;
+import android.content.res.Resources;
 
 /**
  * Singleton class to manage current application context
@@ -43,4 +44,14 @@ public final class ContextManager {
     public static String getString(int resId, Object... formatArgs) {
         return context.getString(resId, formatArgs);
     }
+
+    /**
+     * Convenience method to read resources
+     *
+     * @return
+     */
+    public static Resources getResources() {
+        return context.getResources();
+    }
+
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
index 42dc25d19..03dbb5c7f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
@@ -14,7 +14,7 @@ import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.api.TaskDecoration;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.model.Task;
-import com.todoroo.astrid.service.AddonService;
+import com.todoroo.astrid.service.AddOnService;
 
 /**
  * Exposes {@link TaskDecoration} for timers
@@ -32,7 +32,7 @@ public class TimerActionExposer extends BroadcastReceiver {
         if(taskId == -1)
             return;
 
-        if(!AddonService.isPowerPack())
+        if(!AddOnService.isPowerPack())
             return;
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TIMER_START,
diff --git a/astrid/res/drawable/icon_pp.png b/astrid/res/drawable/icon_pp.png
index df0637a7ad70e3b401e2908bcb2fcb16066871be..d6300277c94eacaac18c3fcd2fa9574d429139e3 100644
GIT binary patch
delta 9265
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
TPPumg0000<MFvhpu0mjfGgpJa

delta 13201
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
DyYZz2

diff --git a/astrid/res/layout/addon_activity.xml b/astrid/res/layout/addon_activity.xml
index 2b5c794c3..a93654032 100644
--- a/astrid/res/layout/addon_activity.xml
+++ b/astrid/res/layout/addon_activity.xml
@@ -7,32 +7,18 @@
 
   <!-- =================================================== tab: installed == -->
   
-  <ScrollView android:id="@+id/installed_tab"
+  <ListView android:id="@+id/installed"
+    android:paddingRight="8dip"
+    android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    
-    <LinearLayout android:id="@+id/installed_container"
-      android:paddingRight="8dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      
-    </LinearLayout>
-  </ScrollView>
+    android:layout_height="fill_parent" />      
   
   <!-- =================================================== tab: available == -->
   
-  <ScrollView android:id="@+id/availble_tab"
+  <ListView android:id="@+id/available"
+    android:paddingRight="8dip"
+    android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    
-    <LinearLayout android:id="@+id/available_container"
-      android:paddingRight="8dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      
-    </LinearLayout>
-  </ScrollView>
-
+    android:layout_height="fill_parent" />      
+  
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/addon_adapter_row.xml b/astrid/res/layout/addon_adapter_row.xml
new file mode 100644
index 000000000..d5a9cebd5
--- /dev/null
+++ b/astrid/res/layout/addon_adapter_row.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See the file "LICENSE" for the full license governing this code. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@android:drawable/list_selector_background"
+    android:paddingTop="4dip"
+    android:paddingBottom="4dip"
+    android:paddingLeft="4dip"
+    android:paddingRight="4dip">
+        
+    <!-- icon -->
+    <ImageView android:id="@+id/icon"
+        android:layout_width="34dip"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:paddingLeft="5dip" 
+        android:scaleType="fitCenter"/>
+            
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100"
+        android:paddingLeft="8dip" 
+        android:paddingRight="3dip" 
+        android:orientation="vertical">
+            
+        <!-- add-on name -->
+        <TextView android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/icon"
+            android:singleLine="true"
+            style="@style/TextAppearance.TAd_ItemTitle"/>
+    
+        <!-- description -->
+        <TextView android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+            android:layout_toRightOf="@id/icon"
+            android:singleLine="true"
+            style="@style/TextAppearance.TAd_ItemDetails"/>
+            
+    </LinearLayout>
+          
+    <!-- buttons -->
+    
+    <ImageButton android:id="@+id/button_web"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center" />
+        
+    <ImageButton android:id="@+id/button_market"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center" />
+        
+    <ImageView android:id="@+id/check"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center"
+        android:src="@android:drawable/checkbox_on_background"/>
+            
+</LinearLayout>
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 91e5c5504..36b64d672 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -236,53 +236,75 @@
   
   <!-- ===================================================== tab: add-ons == -->
   
-  <ScrollView
+  <LinearLayout
     android:id="@+id/tab_addons"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
               
-    <LinearLayout
-      android:paddingRight="8dip"
-      android:orientation="vertical"
+    <ScrollView
       android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-                
+      android:layout_height="fill_parent"
+      android:layout_weight="100">
+                                
       <!-- add-ons -->
       <LinearLayout android:id="@+id/tab_addons_addons"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="100"
         android:orientation="vertical" />
-                
-      <!-- separator -->
-      <View
+        
+    </ScrollView>
+        
+    <LinearLayout android:id="@+id/addons_empty"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:layout_weight="100"
+      android:visibility="gone"
+      android:orientation="vertical">
+      
+      <ImageView
         android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_weight="1"
-        android:padding="5dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
+        android:layout_height="wrap_content"
+        android:padding="10dip"
+        android:src="@drawable/icon_pp" />
+      
+      <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/TEA_no_addons"
+        android:gravity="center"
+        style="@style/TextAppearance.TLA_NoItems" />
+      
+      <Button android:id="@+id/addons_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/TEA_addons_button" />
+      
+    </LinearLayout>
         
-      <LinearLayout
-        android:orientation="horizontal"
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:orientation="horizontal"
+      android:background="@drawable/edit_header"
+      android:padding="5dip"
+      android:baselineAligned="false">
+      
+      <ImageButton
+        android:id="@+id/save_addons"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="bottom"
-        android:paddingTop="5dip"
-        android:baselineAligned="false">
-        <ImageButton
-          android:id="@+id/save_addons"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_save" />
-        <ImageButton
-          android:id="@+id/discard_addons"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_stop" />
-      </LinearLayout>
+        android:src="@drawable/tango_save" />
+      <ImageButton
+        android:id="@+id/discard_addons"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:src="@drawable/tango_stop" />
     </LinearLayout>
-  </ScrollView>
+    
+  </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 20a30f974..8faca89a1 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -445,11 +445,15 @@ to the plugin creator for fastest service.
   
   <!-- Add-on Activity - available add-ons tab -->
   <string name="AOA_tab_available">Available</string>
-    
-  <!-- Dialog for Astrid Power Pack -->
-  <string name="AOA_power_pack">Support Astrid and get more productive with 
-  the Astrid Power Pack backup, widgets, no ads, and calendar integration. 
-  Power up today!</string>
+  
+  <!-- Add-on Activity - free add-ons label -->
+  <string name="AOA_free">Free</string>
+  
+  <!-- Add-on Activity - menu item to visit add-on website -->
+  <string name="AOA_visit_website">Visit Website</string>
+  
+  <!-- Add-on Activity - menu item to visit android market -->
+  <string name="AOA_visit_market">Android Market</string>
   
   <!-- ========================================== SynchronizationProvider == -->
           
diff --git a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
index abcd77c27..095494d20 100644
--- a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
@@ -1,16 +1,40 @@
 package com.todoroo.astrid.activity;
 
 
+import java.util.ArrayList;
+
 import android.app.TabActivity;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.widget.ListView;
 import android.widget.TabHost;
+import android.widget.TextView;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.astrid.adapter.AddOnAdapter;
+import com.todoroo.astrid.model.AddOn;
+import com.todoroo.astrid.service.AddOnService;
+import com.todoroo.astrid.service.AstridDependencyInjector;
 
 public class AddOnActivity extends TabActivity {
 
+    /** boolean: whether to start on available page */
+    public static final String TOKEN_START_WITH_AVAILABLE = "av"; //$NON-NLS-1$
+
+    @Autowired
+    AddOnService addOnService;
+
+    static {
+        AstridDependencyInjector.initialize();
+    }
+
+    public AddOnActivity() {
+        DependencyInjectionService.getInstance().inject(this);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -24,13 +48,47 @@ public class AddOnActivity extends TabActivity {
         tabHost.addTab(tabHost.newTabSpec(r.getString(R.string.AOA_tab_installed)).
                 setIndicator(r.getString(R.string.AOA_tab_installed),
                         r.getDrawable(R.drawable.tab_addons)).setContent(
-                                R.id.installed_tab));
+                                R.id.installed));
         tabHost.addTab(tabHost.newTabSpec(r.getString(R.string.AOA_tab_available)).
                 setIndicator(r.getString(R.string.AOA_tab_available),
                         r.getDrawable(R.drawable.tab_add)).setContent(
-                                R.id.availble_tab));
+                                R.id.available));
 
         setTitle(R.string.AOA_title);
+
+        populate();
     }
 
+    private void populate() {
+        AddOn[] list = addOnService.getAddOns();
+        if(list == null)
+            return;
+
+        ArrayList<AddOn> installed = new ArrayList<AddOn>();
+        ArrayList<AddOn> available = new ArrayList<AddOn>();
+
+        for(AddOn addOn : list) {
+            if(addOnService.isInstalled(addOn))
+                installed.add(addOn);
+            else
+                available.add(addOn);
+        }
+        if(installed.size() == 0 || getIntent().getBooleanExtra(TOKEN_START_WITH_AVAILABLE, false))
+            getTabHost().setCurrentTab(1);
+
+        TextView noAddons = new TextView(this);
+        noAddons.setText(R.string.TEA_no_addons);
+        noAddons.setTextAppearance(this, R.style.TextAppearance_TLA_NoItems);
+
+        ListView installedList = (ListView) findViewById(R.id.installed);
+        installedList.setEmptyView(noAddons);
+        installedList.setAdapter(new AddOnAdapter(this, true, installed));
+
+        ListView availableList = (ListView) findViewById(R.id.available);
+        availableList.setEmptyView(noAddons);
+        availableList.setAdapter(new AddOnAdapter(this, false, available));
+    }
+
+
+
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 385eb2847..2872f0209 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -37,7 +37,6 @@ import android.content.IntentFilter;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -51,17 +50,14 @@ import android.widget.CompoundButton;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.Spinner;
 import android.widget.TabHost;
-import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ImageView.ScaleType;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -76,7 +72,7 @@ import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.gcal.GCalControlSet;
 import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.repeats.RepeatControlSet;
-import com.todoroo.astrid.service.AddonService;
+import com.todoroo.astrid.service.AddOnService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.tags.TagsControlSet;
@@ -215,30 +211,15 @@ public final class TaskEditActivity extends TabActivity {
         controls.add(new RepeatControlSet(this, extrasAddons));
 
         LinearLayout addonsAddons = (LinearLayout) findViewById(R.id.tab_addons_addons);
-        if(AddonService.isPowerPack()) {
+        if(AddOnService.isPowerPack()) {
             controls.add(new GCalControlSet(this, addonsAddons));
             controls.add(new TimerControlSet(this, addonsAddons));
         }
 
         // show add-on help if necessary
         if(addonsAddons.getChildCount() == 0) {
-            ImageView ppIcon = new ImageView(this);
-            ppIcon.setImageResource(R.drawable.icon_pp);
-            ppIcon.setScaleType(ScaleType.CENTER);
-            ppIcon.setPadding(5, 10, 5, 10);
-            addonsAddons.addView(ppIcon);
-
-            TextView addOnText = new TextView(this);
-            addOnText.setText(R.string.TEA_no_addons);
-            addOnText.setTextAppearance(this, R.style.TextAppearance_TLA_NoItems);
-            addOnText.setGravity(Gravity.CENTER);
-            addOnText.setPadding(5, 10, 5, 10);
-            addonsAddons.addView(addOnText);
-
-            Button addOnButton = new Button(this);
-            addOnButton.setText(R.string.TEA_addons_button);
-            addonsAddons.addView(addOnButton);
-            addOnButton.setOnClickListener(new View.OnClickListener() {
+            findViewById(R.id.addons_empty).setVisibility(View.VISIBLE);
+            ((Button)findViewById(R.id.addons_button)).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     startActivity(new Intent(TaskEditActivity.this, AddOnActivity.class));
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 1956f7988..252585aef 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -64,7 +64,7 @@ import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.reminders.Notifications;
 import com.todoroo.astrid.reminders.ReminderService;
 import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
-import com.todoroo.astrid.service.AddonService;
+import com.todoroo.astrid.service.AddOnService;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
@@ -158,7 +158,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
         if(database == null)
             return;
 
-        AddonService.checkForUpgrades(this);
+        AddOnService.checkForUpgrades(this);
 
         database.openForWriting();
         setUpUiComponents();
diff --git a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
new file mode 100644
index 000000000..829417062
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
@@ -0,0 +1,147 @@
+/**
+ * See the file "LICENSE" for the full license governing this code.
+ */
+package com.todoroo.astrid.adapter;
+
+import java.util.List;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.timsu.astrid.R;
+import com.todoroo.astrid.model.AddOn;
+
+/**
+ * Adapter for {@link AddOn}s
+ *
+ * @author Tim Su <tim@todoroo.com>
+ *
+ */
+public class AddOnAdapter extends ArrayAdapter<AddOn> {
+
+    // --- instance variables
+
+    private final Activity activity;
+    private final LayoutInflater inflater;
+    private final boolean installed;
+
+    public AddOnAdapter(Activity activity, boolean installed, List<AddOn> objects) {
+        super(activity, R.id.title, objects);
+        this.installed = installed;
+        this.activity = activity;
+        inflater = (LayoutInflater) activity.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    // --- view construction
+
+    View.OnClickListener intentClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            Intent intent = (Intent) v.getTag();
+            activity.startActivity(intent);
+        }
+    };
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if(convertView == null) {
+            convertView = inflater.inflate(R.layout.addon_adapter_row, parent, false);
+            ViewHolder viewHolder = new ViewHolder();
+            viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon);
+            viewHolder.title = (TextView) convertView.findViewById(R.id.title);
+            viewHolder.description = (TextView) convertView.findViewById(R.id.description);
+            viewHolder.web = (ImageButton) convertView.findViewById(R.id.button_web);
+            viewHolder.market = (ImageButton) convertView.findViewById(R.id.button_market);
+            viewHolder.installedIcon = (ImageView) convertView.findViewById(R.id.check);
+            convertView.setTag(viewHolder);
+
+            viewHolder.web.setOnClickListener(intentClickListener);
+            viewHolder.market.setOnClickListener(intentClickListener);
+
+        }
+        ((ViewHolder)convertView.getTag()).item = getItem(position);
+        initializeView(convertView);
+
+        return convertView;
+    }
+
+    private class ViewHolder {
+        public AddOn item;
+        public ImageView icon;
+        public TextView title;
+        public TextView description;
+        public ImageButton web;
+        public ImageButton market;
+        public ImageView installedIcon;
+    }
+
+    private void initializeView(View convertView) {
+        ViewHolder viewHolder = (ViewHolder) convertView.getTag();
+        AddOn item = viewHolder.item;
+
+        viewHolder.icon.setImageBitmap(item.getIcon());
+        viewHolder.title.setText(item.getTitle());
+        viewHolder.description.setText(item.getDescription());
+
+        // populate buttons
+        if(item.getWebPage() != null) {
+            viewHolder.web.setVisibility(View.VISIBLE);
+            Intent webPageIntent = new Intent(Intent.ACTION_VIEW,
+                    Uri.parse(item.getWebPage()));
+            Drawable icon = getIntentIcon(webPageIntent);
+            if(icon == null)
+                viewHolder.web.setImageResource(
+                        android.R.drawable.presence_online);
+            else
+                viewHolder.web.setImageDrawable(icon);
+            viewHolder.web.setTag(webPageIntent);
+        } else {
+            viewHolder.web.setVisibility(View.GONE);
+        }
+
+        if(installed) {
+            viewHolder.market.setVisibility(View.GONE);
+            viewHolder.installedIcon.setVisibility(View.VISIBLE);
+        } else {
+            viewHolder.market.setVisibility(View.VISIBLE);
+            viewHolder.installedIcon.setVisibility(View.GONE);
+            Intent marketIntent = new Intent(Intent.ACTION_VIEW,
+                    Uri.parse("market://search?q=pname:" + //$NON-NLS-1$
+                            item.getPackageName()));
+            marketIntent.setClassName("com.android.vending", //$NON-NLS-1$
+                "com.android.vending.SearchAssetListActivity"); //$NON-NLS-1$
+            Drawable icon = getIntentIcon(marketIntent);
+            if(icon == null)
+                viewHolder.web.setImageResource(
+                        android.R.drawable.stat_sys_download);
+            else
+                viewHolder.web.setImageDrawable(icon);
+        }
+    }
+
+    public Drawable getIntentIcon(Intent intent) {
+        PackageManager pm = activity.getPackageManager();
+        List<ResolveInfo> resolveInfoList = pm.queryIntentActivities(intent, 0);
+
+        // if options > 1, display open with...
+        if(resolveInfoList.size() > 0) {
+            return resolveInfoList.get(0).activityInfo.loadIcon(pm);
+        }
+
+        return null;
+    }
+
+}
diff --git a/astrid/src/com/todoroo/astrid/model/AddOn.java b/astrid/src/com/todoroo/astrid/model/AddOn.java
new file mode 100644
index 000000000..c23961a52
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/model/AddOn.java
@@ -0,0 +1,90 @@
+package com.todoroo.astrid.model;
+
+import android.graphics.Bitmap;
+
+/**
+ * An add-on installable by Astrid
+ *
+ * @author Tim Su <tim@todoroo.com>
+ *
+ */
+public class AddOn {
+
+    private final boolean free;
+    private final boolean internal;
+    private final String title;
+    private final String author;
+    private final String description;
+    private final String packageName;
+    private final String webPage;
+    private final Bitmap icon;
+
+    public AddOn(boolean free, boolean internal, String title, String author, String description,
+            String packageName, String webPage, Bitmap icon) {
+        this.free = free;
+        this.internal = internal;
+        this.title = title;
+        this.author = author;
+        this.description = description;
+        this.packageName = packageName;
+        this.webPage = webPage;
+        this.icon = icon;
+    }
+
+    /**
+     * @return whether this add-on is available for free
+     */
+    public boolean isFree() {
+        return free;
+    }
+
+    /**
+     * @return whether this add-on is signed with the same key as Astrid
+     */
+    public boolean isInternal() {
+        return internal;
+    }
+
+    /**
+     * @return add-on title
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @return add-on author
+     */
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * @return add-on description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @return add-on java package name
+     */
+    public String getPackageName() {
+        return packageName;
+    }
+
+    /**
+     * @return add-on web-page
+     */
+    public String getWebPage() {
+        return webPage;
+    }
+
+    /**
+     * @return add-on icon
+     */
+    public Bitmap getIcon() {
+        return icon;
+    }
+
+}
diff --git a/astrid/src/com/todoroo/astrid/service/AddonService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java
similarity index 70%
rename from astrid/src/com/todoroo/astrid/service/AddonService.java
rename to astrid/src/com/todoroo/astrid/service/AddOnService.java
index e337ee3df..2be038a07 100644
--- a/astrid/src/com/todoroo/astrid/service/AddonService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java
@@ -11,11 +11,14 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.model.AddOn;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Preferences;
 
@@ -26,13 +29,16 @@ import com.todoroo.astrid.utility.Preferences;
  *
  */
 @SuppressWarnings("nls")
-public class AddonService {
+public class AddOnService {
 
     /** OEM preference key */
     private static final String PREF_OEM = "poem";
 
     /** Astrid Power Pack package */
-    private static final String POWER_PACK_PACKAGE = "com.todoroo.astrid.ppack";
+    public static final String POWER_PACK_PACKAGE = "com.todoroo.astrid.ppack";
+
+    /** Astrid Locale package */
+    public static final String LOCALE_PACKAGE = "com.todoroo.astrid.locale";
 
     /** Astrid Power Pack label */
     public static final String POWER_PACK_LABEL = "Astrid Power Pack";
@@ -135,4 +141,48 @@ public class AddonService {
         Preferences.setBoolean(PREF_OEM, true);
     }
 
+    /**
+     * Check whether a given add-on is installed
+     * @param addOn
+     * @return
+     */
+    public boolean isInstalled(AddOn addOn) {
+        Context context = ContextManager.getContext();
+        ApplicationInfo applicationInfo;
+        try {
+            applicationInfo = context.getPackageManager().getApplicationInfo(
+                    addOn.getPackageName(), 0);
+        } catch (Exception e) {
+            return false;
+        }
+
+        if(applicationInfo == null)
+            return false;
+        if(!addOn.isInternal())
+            return true;
+        return applicationInfo.uid == context.getApplicationInfo().uid;
+    }
+
+    /**
+     * Get a list of add-ons
+     *
+     * @return available add-ons
+     */
+    public AddOn[] getAddOns() {
+        Resources r = ContextManager.getContext().getResources();
+
+        // temporary temporary
+        AddOn[] list = new AddOn[2];
+        list[0] = new AddOn(false, true, "Astrid Power Pack", null,
+                "Support Astrid and get more productive with the Astrid Power Pack backup, widgets, no ads, and calendar integration. Power up today!",
+                POWER_PACK_PACKAGE, "http://www.weloveastrid.com/store",
+                ((BitmapDrawable)r.getDrawable(R.drawable.icon_pp)).getBitmap());
+
+        list[1] = new AddOn(false, true, "Astrid Locale Plugin", null,
+                "Allows Astrid to make use of the Locale application to send you notifications based on filter conditions",
+                LOCALE_PACKAGE, "http://www.weloveastrid.com/store",
+                ((BitmapDrawable)r.getDrawable(R.drawable.icon_pp)).getBitmap());
+
+        return list;
+    }
 }
diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
index 01bfb337c..0020f9216 100644
--- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
+++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
@@ -102,6 +102,7 @@ public class AstridDependencyInjector implements AbstractDependencyInjector {
         injectables.put("taskService", TaskService.class);
         injectables.put("metadataService", MetadataService.class);
         injectables.put("upgradeService", UpgradeService.class);
+        injectables.put("addonService", AddOnService.class);
 
         // com.timsu.astrid.data
         injectables.put("tasksTable", "tasks");
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index ea6859840..5b58578f3 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -23,7 +23,7 @@ public final class UpgradeService {
             return;
 
         if(from == 135)
-            AddonService.recordOem();
+            AddOnService.recordOem();
 
         if(from < 136)
             new Astrid2To3UpgradeHelper().upgrade2To3();