From 218f437025e72d2a31534251e6ba7dd555e6a88c Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 6 Jul 2010 17:21:41 -0700
Subject: [PATCH] code cleanup, cosmetic fixes

---
 astrid/res/layout/task_adapter_row.xml            |  5 +++--
 astrid/res/values/styles-3.0.xml                  |  1 -
 .../todoroo/astrid/activity/EditPreferences.java  | 15 ++++++++++++---
 .../todoroo/astrid/activity/TaskListActivity.java |  2 ++
 .../com/todoroo/astrid/adapter/TaskAdapter.java   | 12 +-----------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 4679a0f4c..cd118e7f5 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -4,10 +4,10 @@
     android:orientation="horizontal"
     android:background="@android:drawable/list_selector_background"
     android:focusable="true"
-    android:paddingTop="8px"
+    android:paddingTop="6px"
     android:paddingLeft="4dip"
     android:paddingRight="6dip"
-    android:paddingBottom="2px"
+    android:paddingBottom="6px"
     android:minHeight="56px"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
@@ -32,6 +32,7 @@
         <TextView android:id="@+id/title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:textSize="22sp"
             style="@style/TextAppearance.TAd_ItemTitle"
             android:gravity="center_vertical"/>
     
diff --git a/astrid/res/values/styles-3.0.xml b/astrid/res/values/styles-3.0.xml
index fd595df2e..6a89ffe4a 100644
--- a/astrid/res/values/styles-3.0.xml
+++ b/astrid/res/values/styles-3.0.xml
@@ -31,7 +31,6 @@
     <!-- =========================== TaskAdapter =========================== -->
 
     <style name="TextAppearance.TAd_ItemTitle">
-        <item name="android:textSize">22sp</item>
     </style>
     
     <style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle">
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index dc2c0bde2..b1a586d21 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -49,6 +49,12 @@ import com.todoroo.astrid.utility.Preferences;
  */
 public class EditPreferences extends PreferenceActivity {
 
+    // --- constants
+
+
+
+    // --- instance variables
+
     @Autowired
     TaskService taskService; // for debugging
 
@@ -198,13 +204,16 @@ public class EditPreferences extends PreferenceActivity {
         Resources r = getResources();
 
         // defaults options
-        /*if(r.getString(R.string.EPr_default_urgency_key).equals(preference.getKey())) {
+        if(r.getString(R.string.p_default_urgency_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_urgency,
                     R.array.EPr_default_urgency_values, R.string.EPr_default_urgency_desc);
-        } else if(r.getString(R.string.EPr_default_importance_key).equals(preference.getKey())) {
+        } else if(r.getString(R.string.p_default_importance_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_importance,
                     R.array.EPr_default_importance_values, R.string.EPr_default_importance_desc);
-        }*/
+        } else if(r.getString(R.string.p_default_hideUntil_key).equals(preference.getKey())) {
+            updateTaskListPreference(preference, value, r, R.array.EPr_default_hideUntil,
+                    R.array.EPr_default_hideUntil_values, R.string.EPr_default_hideUntil_desc);
+        }
 
         return true;
     }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index a9e649447..3f1898a9d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -351,6 +351,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
         taskService.cleanup();
         if(requestCode == ACTIVITY_EDIT_TASK && resultCode != TaskEditActivity.RESULT_CODE_DISCARDED)
             loadTaskListContent(true);
+        else if(requestCode == ACTIVITY_SETTINGS)
+            loadTaskListContent(true);
     }
 
     public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index c275b05ee..861c5d202 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -134,7 +134,6 @@ public class TaskAdapter extends CursorAdapter {
         ViewHolder viewHolder = new ViewHolder();
         viewHolder.task = new Task();
         viewHolder.nameView = (TextView)view.findViewById(R.id.title);
-        viewHolder.nameView.setTextSize(fontSize);
         viewHolder.completeBox = (CheckBox)view.findViewById(R.id.completeBox);
         viewHolder.dueDate = (TextView)view.findViewById(R.id.dueDate);
         viewHolder.details = (LinearLayout)view.findViewById(R.id.details);
@@ -190,16 +189,6 @@ public class TaskAdapter extends CursorAdapter {
         Resources r = activity.getResources();
         ViewHolder viewHolder = (ViewHolder)view.getTag();
 
-        // don't bother instantiating views if we're busy
-        /*if(isFling) {
-            viewHolder.details.removeViews(2, viewHolder.details.getChildCount() - 2);
-            viewHolder.dueDate.setVisibility(View.INVISIBLE);
-            viewHolder.nameView.setText(R.string.TAd_flingText);
-            viewHolder.importance.setVisibility(View.INVISIBLE);
-            viewHolder.completeBox.setVisibility(View.INVISIBLE);
-            return;
-        }*/
-
         // name
         final TextView nameView = viewHolder.nameView; {
             String nameValue = task.getValue(Task.TITLE);
@@ -410,6 +399,7 @@ public class TaskAdapter extends CursorAdapter {
             name.setPaintFlags(name.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
             name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle);
         }
+        name.setTextSize(fontSize);
     }
 
     /**