From 2df80fc483f31f34281abb5c88af78fdb072465d Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 22 Feb 2012 15:00:50 -0800
Subject: [PATCH] Made a task list view style for all task lists, got rid of
 the Gesture stuff in the standard task list, and trying turning on smooth
 scrollbar

---
 astrid/res/layout/task_list_body_api3.xml     | 24 -------------------
 astrid/res/layout/task_list_body_standard.xml | 18 ++++----------
 astrid/res/layout/task_list_body_subtasks.xml |  7 ++----
 astrid/res/values/styles.xml                  |  8 +++++++
 .../astrid/activity/TaskListFragment.java     |  8 ++-----
 5 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 astrid/res/layout/task_list_body_api3.xml

diff --git a/astrid/res/layout/task_list_body_api3.xml b/astrid/res/layout/task_list_body_api3.xml
deleted file mode 100644
index e27262a5f..000000000
--- a/astrid/res/layout/task_list_body_api3.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See the file "LICENSE" for the full license governing this code. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="100">
-        
-    <!-- No Tasks label -->
-    <TextView android:id="@android:id/empty"
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent"
-        android:visibility="gone"
-        android:text="@string/TLA_no_items"
-        style="@style/TextAppearance.TLA_NoItems"/>
-
-    <!-- Task List -->
-    <ListView android:id="@android:id/list"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"            
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:smoothScrollbar="false"/>
-    
-</FrameLayout>
diff --git a/astrid/res/layout/task_list_body_standard.xml b/astrid/res/layout/task_list_body_standard.xml
index 84dd9de72..4f72a7823 100644
--- a/astrid/res/layout/task_list_body_standard.xml
+++ b/astrid/res/layout/task_list_body_standard.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- See the file "LICENSE" for the full license governing this code. -->
-<android.gesture.GestureOverlayView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gestures"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_weight="100" 
-    
-    android:gestureColor="#00000000"
-    android:uncertainGestureColor="#00000000"
-    android:eventsInterceptionEnabled="true"
-    android:orientation="vertical">
+    android:layout_weight="100">
         
     <!-- No Tasks label -->
 	<TextView android:id="@android:id/empty"
@@ -24,12 +18,10 @@
 	    style="@style/TextAppearance.TLA_NoItems"/>
     
     <!-- Task List -->
-    <ListView android:id="@android:id/list"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"            
+    <ListView android:id="@android:id/list"           
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:smoothScrollbar="false"/>
+        style="@style/ListView" />
     
     
-</android.gesture.GestureOverlayView>
+</FrameLayout>
diff --git a/astrid/res/layout/task_list_body_subtasks.xml b/astrid/res/layout/task_list_body_subtasks.xml
index eace2fb8b..cf8aef883 100644
--- a/astrid/res/layout/task_list_body_subtasks.xml
+++ b/astrid/res/layout/task_list_body_subtasks.xml
@@ -17,16 +17,13 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tlv="http://schemas.android.com/apk/res/com.timsu.astrid"
     
-        android:id="@android:id/list"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"            
+        android:id="@android:id/list"        
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:drawSelectorOnTop="false"
-        android:smoothScrollbar="false"
+        style="@style/ListView"
         
         tlv:normal_height="45dip"
-        tlv:expanded_height="90dip"
     />
                 
 </FrameLayout>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 83a34608e..eaa5544de 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -240,6 +240,14 @@
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">#000000</item>        
     </style>
+    
+    <style name="ListView">
+        <item name="android:divider">?attr/asSeparatorBackground</item>
+        <item name="android:dividerHeight">1px</item>
+        <item name="android:scrollbars">vertical</item>
+        <item name="android:cacheColorHint">#00000000</item>
+        <item name="android:smoothScrollbar">true</item>
+    </style>
 
     <!-- =============================================== TaskEditActivity == -->
     
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index b85c11211..e24568e07 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -227,12 +227,8 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
      *         android:id/list. It should NOT be attached to root
      */
     protected View getListBody(ViewGroup root) {
-        if (AndroidUtilities.getSdkVersion() > 3)
-            return getActivity().getLayoutInflater().inflate(
-                    R.layout.task_list_body_standard, root, false);
-        else
-            return getActivity().getLayoutInflater().inflate(
-                    R.layout.task_list_body_api3, root, false);
+        return getActivity().getLayoutInflater().inflate(
+                R.layout.task_list_body_standard, root, false);
     }
 
     /** Called when loading up the activity */