From 599e7b75612241dc5f40947f40e2a3771f6e62f2 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Wed, 22 Feb 2012 00:59:48 -0800
Subject: [PATCH] Theming and UI changes

---
 api/src/com/todoroo/astrid/data/TagData.java  |   3 +-
 .../astrid/actfm/TagSettingsActivity.java     |  56 ++-
 .../todoroo/astrid/tags/TagFilterExposer.java |   1 +
 .../com/todoroo/astrid/tags/TagService.java   |  12 +
 astrid/res/drawable/icn_add_contact.png       | Bin 0 -> 282 bytes
 astrid/res/drawable/icn_list_shortcut.png     | Bin 0 -> 8678 bytes
 astrid/res/layout/tag_settings_activity.xml   | 330 +++++++++---------
 astrid/res/values/strings-tags.xml            |   8 +-
 astrid/res/values/styles.xml                  |  16 +
 .../astrid/activity/TaskListActivity.java     | 188 +++++-----
 .../todoroo/astrid/adapter/UpdateAdapter.java |   9 +-
 .../todoroo/astrid/ui/PeopleContainer.java    |  10 +
 12 files changed, 367 insertions(+), 266 deletions(-)
 create mode 100644 astrid/res/drawable/icn_add_contact.png
 create mode 100644 astrid/res/drawable/icn_list_shortcut.png

diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index 78ed6ab37..be2e379b5 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -204,8 +204,7 @@ public final class TagData extends RemoteModel {
     }
 
     public String getPictureHash() {
-        String s = getValue(TagData.NAME) + "" + getValue(TagData.CREATION_DATE);
-        return s;
+       return getId() + "" + getValue(TagData.CREATION_DATE);
     }
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 6c583064d..9ce64110b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -23,6 +23,7 @@ import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -33,6 +34,7 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
@@ -40,7 +42,9 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.activity.ShortcutActivity;
+import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.service.StatisticsConstants;
@@ -172,6 +176,20 @@ public class TagSettingsActivity extends FragmentActivity {
         isSilent = (ToggleButton) findViewById(R.id.tag_silenced);
         isSilent.setChecked(tagData.getFlag(TagData.FLAGS, TagData.FLAG_SILENT));
 
+        Button leaveListButton = (Button) findViewById(R.id.leave_list);
+        leaveListButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                showDeleteDialog(tagData);
+            }
+        });
+        if (isNewTag) {
+            leaveListButton.setVisibility(View.GONE);
+        }
+        else if (tagData.getValue(TagData.MEMBER_COUNT) > 0) {
+            leaveListButton.setText(getString(R.string.tag_leave_button));
+        }
         if(actFmPreferenceService.isLoggedIn()) {
             findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE);
         }
@@ -370,13 +388,13 @@ public class TagSettingsActivity extends FragmentActivity {
             if (isNewTag) {
                 titleView.setText(getString(R.string.tag_new_list));
             } else {
-                titleView.setText(getString(R.string.tag_settings_title, tagData.getValue(TagData.NAME)));
+                titleView.setText(getString(R.string.tag_settings_title));
             }
         } else {
             if (isNewTag) {
                 setTitle(getString(R.string.tag_new_list));
             } else {
-                setTitle(getString(R.string.tag_settings_title, tagData.getValue(TagData.NAME)));
+                setTitle(getString(R.string.tag_settings_title));
             }
         }
         String tagImage = tagData.getValue(TagData.PICTURE);
@@ -492,6 +510,40 @@ public class TagSettingsActivity extends FragmentActivity {
 
 
 
+        protected void showDeleteDialog(TagData tagData) {
+            int string;
+            if (tagData != null && tagData.getValue(TagData.MEMBER_COUNT) > 0)
+                string = R.string.DLG_leave_this_shared_tag_question;
+            else
+                string = R.string.DLG_delete_this_tag_question;
+            DialogUtilities.okCancelDialog(this, getString(string, tagData.getValue(TagData.NAME)), new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    deleteTag();
+                }
+            }, null );
+        }
+
+        protected boolean deleteTag() {
+            tagDataService.delete(tagData.getId());
+            boolean shared = false;
+            if(tagData != null) {
+                tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());
+                PluginServices.getTagDataService().save(tagData);
+                shared = tagData.getValue(TagData.MEMBER_COUNT) > 0 && tagData.getValue(TagData.USER_ID) != 0; // Was I a list member and NOT owner?
+            }
+
+            Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
+            tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_NAME, tagData.getValue(TagData.NAME));
+            tagDeleted.putExtra(TagFilterExposer.TAG_SQL, TagFilterExposer.SHOW_ACTIVE_TASKS);
+
+            this.finish();
+            sendBroadcast(tagDeleted);
+
+            return true;
+        }
+
 
 
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index ab7e913eb..e3e13ba6c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -59,6 +59,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
 
     private static final String TAG = "tag"; //$NON-NLS-1$
     public static final String TAG_SQL = "tagSql"; //$NON-NLS-1$
+    public static final String SHOW_ACTIVE_TASKS = "show_main_task_view"; //$NON-NLS-1$
 
     @Autowired TagDataService tagDataService;
     @Autowired GtasksPreferenceService gtasksPreferenceService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index a332d381a..deed7b19c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -138,6 +138,18 @@ public final class TagService {
                             Field.field("mtags." + TAG.name).eqCaseInsensitive(tag)))).where(criterion);
         }
 
+
+        /**
+         * Return SQL selector query for getting tasks with a given tagData
+         *
+         * @param tagData
+         * @return
+         */
+        public static QueryTemplate queryTemplate(Criterion criterion, TagData tagData) {
+            return new QueryTemplate().join(Join.inner(Metadata.TABLE,
+                    Task.ID.eq(Metadata.TASK))).where(tagEqIgnoreCase(tagData.getValue(TagData.NAME), criterion));
+        }
+
     }
 
     public static Criterion memberOfTagData(long tagDataRemoteId) {
diff --git a/astrid/res/drawable/icn_add_contact.png b/astrid/res/drawable/icn_add_contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdbb282f2e76173a6b6c549b06b9c53ee748268c
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1<!3HE_Uh1g<DTQQ@AYTTCDpdxChGqtapZ|gM
zO9qBg0|tgy2@DKYGZ+}e^C!h0bpxv9EbxddW?<kJ24O~qS#v<9E%0=446!)<bc!SI
z0R<jcZAMOyhYbuWK3segj5sGZv8WhC>`GB&w6dC{YrThi;eWvl#<ivb8#*U+cpTW8
zr)z2xwjrib!!J&#;QR&$(?k9u?g^Yszw;XvIe4~rS1}!&+q_k9pPgYw+Lx*oOc@*x
zzB0L1G~b>)XLpikg%kVSiZz0|jXpchJ-?=$(6)zbQ)zO`wG%U$E=Z_9Oi221@H?w@
YeMN72$owfQfo^5+boFyt=akR{0JdRU@Bjb+

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icn_list_shortcut.png b/astrid/res/drawable/icn_list_shortcut.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ba4786ce0280f6432b8338bb7b641364721773f
GIT binary patch
literal 8678
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
Q|L28)uBp!bGtQC!4^BIhXaE2J

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 20d45df40..76bf02035 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -1,200 +1,202 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- settings tab -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
     android:id="@+id/settings"
-    style="@style/Content"
+    style="@style/Content_EditScroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_weight="100" >
 
-    <ScrollView
-        style="@style/Content_EditScroll"
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="100" >
+        android:orientation="vertical"
+        android:padding="5dip"
+        android:paddingTop="0dip" >
 
         <LinearLayout
+            android:id="@+id/save_and_cancel"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical"
-            android:padding="5dip"
-            android:paddingTop="0dip" >
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:visibility="gone" >
 
-            <LinearLayout
-                android:id="@+id/save_and_cancel"
-                android:layout_width="fill_parent"
+            <ImageButton
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right"
-                android:orientation="horizontal"
-                android:visibility="gone" >
+                android:layout_marginRight="10dip"
+                android:background="@android:color/transparent"
+                android:src="@android:drawable/ic_menu_close_clear_cancel" />
 
-                <ImageButton
-                    android:id="@+id/cancel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_close_clear_cancel" />
-
-                <ImageButton
-                    android:id="@+id/save"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_save" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
+            <ImageButton
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="10dip" >
-
-                <!-- picture -->
-
-                <greendroid.widget.AsyncImageView
-                    android:id="@+id/picture"
-                    android:layout_width="80dip"
-                    android:layout_height="80dip"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-                    android:paddingRight="10dip"
-                    android:scaleType="centerInside" />
+                android:layout_marginRight="10dip"
+                android:background="@android:color/transparent"
+                android:src="@android:drawable/ic_menu_save" />
+        </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tag_label"
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginTop="2dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:text="@string/actfm_TVA_tag_label" />
-
-                <EditText
-                    android:id="@+id/tag_name"
-                    style="@style/EditRow"
-                    android:maxLines="1"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tag_label"
-                    android:layout_marginTop="10dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:padding="10dip"
-                    android:paddingBottom="14dip" />
-            </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="5dip"
+            android:paddingTop="5dip" >
+
+            <!-- picture -->
+
+            <greendroid.widget.AsyncImageView
+                android:id="@+id/picture"
+                android:layout_width="80dip"
+                android:layout_height="80dip"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+                android:paddingRight="10dip"
+                android:scaleType="centerInside" />
 
             <TextView
+                android:id="@+id/tag_label"
                 style="@style/TextAppearance"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:layout_marginTop="10dip"
-                android:paddingBottom="5dip"
-                android:text="@string/actfm_TVA_members_label" />
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="2dip"
+                android:layout_toRightOf="@id/picture"
+                android:text="@string/actfm_TVA_tag_label" />
 
-            <com.todoroo.astrid.ui.PeopleContainer
-                android:id="@+id/members_container"
+            <EditText
+                android:id="@+id/tag_name"
                 style="@style/EditRow"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical" />
-
-            <TextView
-                android:id="@+id/description_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
+                android:layout_below="@id/tag_label"
                 android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_description_label" />
+                android:layout_toRightOf="@id/picture"
+                android:maxLines="1"
+                android:padding="10dip"
+                android:paddingBottom="14dip" />
+        </RelativeLayout>
+
+        <TextView
+            style="@style/TextAppearance"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:paddingBottom="5dip"
+            android:text="@string/actfm_TVA_members_label" />
+
+        <com.todoroo.astrid.ui.PeopleContainer
+            android:id="@+id/members_container"
+            style="@style/EditRow"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <TextView
+            android:id="@+id/description_label"
+            style="@style/TextAppearance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:text="@string/actfm_TVA_tag_description_label" />
+
+        <EditText
+            android:id="@+id/tag_description"
+            style="@style/EditRow"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:hint="@string/actfm_TVA_tag_description_hint"
+            android:padding="8dip"
+            android:paddingBottom="12dip" />
+
+        <!-- Footer -->
+
+        <TextView
+            android:id="@+id/settings_label"
+            style="@style/TextAppearance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:text="@string/actfm_TVA_tag_settings_label" />
 
-            <EditText
-                android:id="@+id/tag_description"
-                style="@style/EditRow"
+        <LinearLayout
+            style="@style/EditRow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:id="@+id/tag_silenced_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:hint="@string/actfm_TVA_tag_description_hint"
-                android:padding="8dip"
-                android:paddingBottom="12dip" />
+                android:orientation="horizontal" >
 
-            <!-- Footer -->
+                <TextView
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginTop="10dip"
+                    android:padding="5dip"
+                    android:text="@string/actfm_TVA_silence_label" />
 
-            <TextView
-                android:id="@+id/settings_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_settings_label" />
+                <ToggleButton
+                    android:id="@+id/tag_silenced"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:paddingRight="5dip" />
+            </RelativeLayout>
 
-            <LinearLayout
-                style="@style/EditRow"
-                android:layout_width="wrap_content"
+            <View
+                android:id="@+id/divider"
+                style="@style/TEA_Separator"
+                android:layout_width="fill_parent"
+                android:layout_height="1dip" />
+
+            <RelativeLayout
+                android:id="@+id/create_shortcut_container"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:orientation="vertical" >
+                android:orientation="horizontal"
+                android:padding="5dip" >
 
-                <RelativeLayout
-                    android:id="@+id/tag_silenced_container"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
-
-                    <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:text="@string/actfm_TVA_silence_label" />
-
-                    <ToggleButton
-                        android:id="@+id/tag_silenced"
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="35dip"
-                        android:background="#00000000"
-                        android:layout_alignParentRight="true" />
-                </RelativeLayout>
-
-                <View
-                    android:id="@+id/divider"
-                    style="@style/TEA_Separator"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dip" />
-
-                <RelativeLayout
-                    android:id="@+id/create_shortcut_container"
-                    android:layout_width="fill_parent"
+                <TextView
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
-
-                    <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:text="@string/FLA_shortcut_dialog_title" />
-
-                    <ImageButton
-                        android:id="@+id/create_shortcut"
-                        android:layout_width="40dip"
-                        android:layout_height="40dip"
-                        android:layout_alignParentRight="true"
-                        android:background="@android:color/transparent"
-                        android:scaleType="fitCenter"
-                        android:src="@android:drawable/ic_media_ff" />
-                </RelativeLayout>
-            </LinearLayout>
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginTop="10dip"
+                    android:text="@string/FLA_shortcut_dialog_title" />
+
+                <ImageButton
+                    android:id="@+id/create_shortcut"
+                    android:layout_width="40dip"
+                    android:layout_height="40dip"
+                    android:layout_alignParentRight="true"
+                    android:background="@android:color/transparent"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/icn_list_shortcut" />
+            </RelativeLayout>
         </LinearLayout>
-    </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/leave_list"
+            style="@style/DeleteTag"
+            android:layout_width="fill_parent"
+            android:layout_height="40dip"
+            android:layout_marginTop="10dip"
+            android:padding="5dip"
+            android:text="@string/tag_delete_button" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index b723980c8..3a82a01b3 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -102,9 +102,15 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">List Settings</string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
+  
+  <!-- Delete button for tag settings -->
+  <string name="tag_delete_button">Delete List</string>
+  
+  <!-- Leave button for tag settings -->
+  <string name="tag_leave_button">Leave This List</string>
 
 </resources>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 49daeb5b5..93a344d73 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -156,6 +156,11 @@
         <item name="android:windowTitleStyle">@style/DialogTitle</item>
         <item name="android:windowTitleBackgroundStyle">@style/DialogTitle</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
+        
+        
+        <item name="asEditBackground">#101010</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background</item>
+        <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
     
     <style name="Theme.Dialog.White">
@@ -171,6 +176,10 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
+        
+        <item name="asEditBackground">#dddddd</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
+        <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
         
     <!--================================================== General == -->
@@ -375,6 +384,13 @@
         <item name="android:textColor">?attr/asFilterHeaderColor</item>
     </style>
 
+    <!-- ========================================================= Tag Settings == -->
+    
+    <style name="DeleteTag" >
+        <item name="android:textColor">?attr/asTextColor</item>
+        <item name="android:background">?attr/asThemeTextColor</item>
+    </style>
+    
     <!-- ========================================================= Widget == -->
 
     <style name="TextAppearance.Widget">                                                                                                                                                                                      
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 9627ec238..ef19a3839 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -113,33 +113,33 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     };
 
     /**
-	 * @see android.app.Activity#onCreate(Bundle)
-	 */
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-	    ThemeService.applyTheme(this);
-		super.onCreate(savedInstanceState);
-
-		if (shouldUseThreePane(this))
-		    setContentView(R.layout.task_list_wrapper_activity_3pane);
-		else
-		    setContentView(R.layout.task_list_wrapper_activity);
-
-		ActionBar actionBar = getSupportActionBar();
-		actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setCustomView(R.layout.header_nav_views);
-
-		listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
-		listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
-		lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
-		mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
-		commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
-
-		initializeFragments(actionBar);
-		createMainMenuPopover();
-		mainMenu.setOnClickListener(mainMenuClickListener);
-		commentsButton.setOnClickListener(commentsButtonClickListener);
+     * @see android.app.Activity#onCreate(Bundle)
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        ThemeService.applyTheme(this);
+        super.onCreate(savedInstanceState);
+
+        if (shouldUseThreePane(this))
+            setContentView(R.layout.task_list_wrapper_activity_3pane);
+        else
+            setContentView(R.layout.task_list_wrapper_activity);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        actionBar.setCustomView(R.layout.header_nav_views);
+
+        listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
+        listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
+        lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
+        mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
+        commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
+
+        initializeFragments(actionBar);
+        createMainMenuPopover();
+        mainMenu.setOnClickListener(mainMenuClickListener);
+        commentsButton.setOnClickListener(commentsButtonClickListener);
 
         Filter savedFilter = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
 
@@ -151,50 +151,50 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
         if (savedFilter != null)
             setListsTitle(savedFilter.title);
-	}
+    }
 
-	/**
-	 *
-	 * @param actionBar
-	 */
+    /**
+     *
+     * @param actionBar
+     */
     protected void initializeFragments(ActionBar actionBar) {
         View filterFragment = findViewById(R.id.filterlist_fragment_container);
         View editFragment = findViewById(R.id.taskedit_fragment_container);
 
-		if (filterFragment != null) {
-		    actionBar.setDisplayHomeAsUpEnabled(false);
-		    actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE);
-		    listsNav.setOnClickListener(null);
-
-		    if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
-		        fragmentLayout = LAYOUT_TRIPLE;
-		        actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
-		    } else {
-		        fragmentLayout = LAYOUT_DOUBLE;
-		        createEditPopover();
-		        createCommentsPopover();
-		    }
-
-		    setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
-		            R.id.filterlist_fragment_container, FilterListFragment.class);
-		} else {
-		    fragmentLayout = LAYOUT_SINGLE;
-		    actionBar.setDisplayHomeAsUpEnabled(true);
-		    listsNav.setOnClickListener(popupMenuClickListener);
-		    createListsPopover();
-		    setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class));
-		}
+        if (filterFragment != null) {
+            actionBar.setDisplayHomeAsUpEnabled(false);
+            actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE);
+            listsNav.setOnClickListener(null);
+
+            if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
+                fragmentLayout = LAYOUT_TRIPLE;
+                actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
+            } else {
+                fragmentLayout = LAYOUT_DOUBLE;
+                createEditPopover();
+                createCommentsPopover();
+            }
+
+            setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
+                    R.id.filterlist_fragment_container, FilterListFragment.class);
+        } else {
+            fragmentLayout = LAYOUT_SINGLE;
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            listsNav.setOnClickListener(popupMenuClickListener);
+            createListsPopover();
+            setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class));
+        }
     }
 
     private void createListsPopover() {
-	    listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
+        listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
         listsPopover.setOnDismissListener(new OnDismissListener() {
             @Override
             public void onDismiss() {
                 setListsDropdownSelected(false);
             }
         });
-	}
+    }
 
     private void createEditPopover() {
         editPopover = new FragmentPopover(this, R.layout.taskedit_popover);
@@ -250,40 +250,40 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         }
     }
 
-	public void setupPopoverWithFilterList(FilterListFragment fla) {
-	    setupPopoverWithFragment(listsPopover, fla, null);
-	}
+    public void setupPopoverWithFilterList(FilterListFragment fla) {
+        setupPopoverWithFragment(listsPopover, fla, null);
+    }
 
-	@Override
+    @Override
     public void onTaskListItemClicked(long taskId) {
-	    super.onTaskListItemClicked(taskId);
-	    if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) {
-	        DisplayMetrics metrics = getResources().getDisplayMetrics();
-	        setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density)));
-	        editPopover.show(listsNav);
-	    }
-	}
-
-
-	@Override
-	public boolean onFilterItemClicked(FilterListItem item) {
-	    if (listsPopover != null)
-	        listsPopover.dismiss();
-	    setCommentsCount(0);
-	    return super.onFilterItemClicked(item);
-	}
-
-	private void setListsDropdownSelected(boolean selected) {
-	    int oldTextColor = lists.getTextColors().getDefaultColor();
-	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
-	        R.style.TextAppearance_ActionBar_ListsHeader);
-
-	    TypedValue listDisclosure = new TypedValue();
-	    getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
-	    lists.setTextAppearance(this, textStyle);
-	    listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
-	    listsNavDisclosure.setSelected(selected);
-	}
+        super.onTaskListItemClicked(taskId);
+        if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) {
+            DisplayMetrics metrics = getResources().getDisplayMetrics();
+            setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density)));
+            editPopover.show(listsNav);
+        }
+    }
+
+
+    @Override
+    public boolean onFilterItemClicked(FilterListItem item) {
+        if (listsPopover != null)
+            listsPopover.dismiss();
+        setCommentsCount(0);
+        return super.onFilterItemClicked(item);
+    }
+
+    private void setListsDropdownSelected(boolean selected) {
+        int oldTextColor = lists.getTextColors().getDefaultColor();
+        int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
+            R.style.TextAppearance_ActionBar_ListsHeader);
+
+        TypedValue listDisclosure = new TypedValue();
+        getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
+        lists.setTextAppearance(this, textStyle);
+        listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
+        listsNavDisclosure.setSelected(selected);
+    }
 
     @Override
     protected void onPostResume() {
@@ -330,7 +330,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     }
 
     public void setSelectedItem(Filter item) {
-       lists.setText(item.title);
+        lists.setText(item.title);
     }
 
     public void setCommentsCount(int count) {
@@ -352,7 +352,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     public void onBackPressed() {
-     // manage task edit visibility
+        // manage task edit visibility
         View taskeditFragmentContainer = findViewById(R.id.taskedit_fragment_container);
         if(taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) {
             if(fragmentLayout == LAYOUT_DOUBLE) {
@@ -488,7 +488,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             String deletedTag = intent.getStringExtra(TagViewFragment.EXTRA_TAG_NAME);
             String deletedTagSql = intent.getStringExtra(TagFilterExposer.TAG_SQL);
             FilterListFragment fl = getFilterListFragment();
-            if (fl != null) {
+            if (deletedTagSql.equals(TagFilterExposer.SHOW_ACTIVE_TASKS)) {
+                fl.switchToActiveTasks();
+                fl.clear(); // Should auto refresh
+            }
+            else if (fl != null) {
                 Filter currentlyShowing = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
                 if (currentlyShowing != null) {
                     boolean titlesMatch = currentlyShowing.title != null && currentlyShowing.title.equals(deletedTag);
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 8dde76499..cb3a034c8 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -56,10 +56,10 @@ public class UpdateAdapter extends CursorAdapter {
     private static final String UPDATE_FRIENDS = "friends";  //$NON-NLS-1$
     private static final String UPDATE_REQUEST_FRIENDSHIP = "request_friendship"; //$NON-NLS-1$
     private static final String UPDATE_CONFIRMED_FRIENDSHIP = "confirmed_friendship"; //$NON-NLS-1$
-    private static final String UPDATE_TASK_CREATED = "task_created";
-    private static final String UPDATE_TASK_COMPLETED = "task_completed";
-    private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted";
-    private static final String UPDATE_TASK_TAGGED = "task_tagged";
+    private static final String UPDATE_TASK_CREATED = "task_created"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_COMPLETED = "task_completed"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_TAGGED = "task_tagged"; //$NON-NLS-1$
     private static final String UPDATE_TASK_ASSIGNED = "task_assigned";
     private static final String UPDATE_TASK_COMMENT = "task_comment";
     private static final String UPDATE_TAG_COMMENT = "tag_comment";
@@ -270,7 +270,6 @@ public class UpdateAdapter extends CursorAdapter {
         else if (actionCode.equals(UPDATE_TAG_COMMENT)) {
             if (fromView.equals(FROM_TAG_VIEW))
                 commentResource = R.string.update_string_default_comment;
-
             else
                 commentResource = R.string.update_string_tag_comment;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
index 48ce6e69a..a21e35b8b 100644
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@@ -86,6 +86,12 @@ public class PeopleContainer extends LinearLayout {
         final AsyncImageView imageView = (AsyncImageView)tagItem.
             findViewById(R.id.icon);
         imageView.setUrl(image);
+        if (TextUtils.isEmpty(textView.getText())) {
+            imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+        }
+        else {
+            imageView.setDefaultImageResource(R.drawable.icn_add_contact);
+        }
 
         textView.addTextChangedListener(new TextWatcher() {
             @Override
@@ -102,6 +108,10 @@ public class PeopleContainer extends LinearLayout {
                     int count) {
                 if(count > 0 && getLastTextView() == textView) {
                     addPerson("", ""); //$NON-NLS-1$
+                    imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+                }
+                else {
+                    imageView.setDefaultImageResource(R.drawable.icn_add_contact);
                 }
 
                 if(onAddNewPerson != null)