Restyled the add list button

astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -216,10 +216,11 @@ public class GCalControlSet extends PopupControlSet {
                 calendar.setText(R.string.gcal_TEA_none_selected);
             }
         } else {
+            int index = calendars.defaultIndex + 1;
             if (!TextUtils.isEmpty(model.getValue(Task.CALENDAR_URI))) {
                 calendar.setText(R.string.gcal_TEA_has_event);
-            } else if (calendars.defaultIndex + 1 != 0) {
+            } else if (index != 0 && index < calendars.calendars.length) {
-                calendar.setText(calendars.calendars[calendars.defaultIndex + 1]);
+                calendar.setText(calendars.calendars[index]);
             } else {
                 calendar.setText(R.string.gcal_TEA_none_selected);
             }

astrid/res/color/new_list_button_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
         <item android:state_pressed="true"
-              android:color="#444"/>
-        <item android:state_pressed="false"
               android:color="#888"/>
+        <item android:state_pressed="false"
+              android:color="#fff"/>
 </selector>

astrid/res/layout-land/filter_list_activity.xml

@@ -23,24 +23,20 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
+        android:padding="5dip"
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:layout_alignParentBottom="true">
         
-        <ImageView
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="8dip"
-            android:src="?attr/asAddButtonImg"
-            android:scaleType="fitCenter"/>
-            
         <TextView
             android:id="@+id/new_list_button"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:padding="10dip"
             android:gravity="left|center_vertical"
+            android:background="?attr/asThemeTextColor"
+            android:paddingLeft="12dip"
+            android:drawableLeft="@drawable/filter_plus_button"
+            android:drawablePadding="13dip"
             android:text="@string/FLA_new_list"
             style="@style/TextAppearance.FLA_Button"/>
         

astrid/res/layout/filter_list_activity.xml

@@ -23,24 +23,20 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
+        android:padding="5dip"
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:layout_alignParentBottom="true">
         
-        <ImageView
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="8dip"
-            android:src="?attr/asAddButtonImg"
-            android:scaleType="fitCenter"/>
-            
         <TextView
 		    android:id="@+id/new_list_button"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
-            android:padding="10dip"
 		    android:gravity="left|center_vertical"
+	        android:background="?attr/asThemeTextColor"
+	        android:paddingLeft="12dip"
+		    android:drawableLeft="@drawable/filter_plus_button"
+            android:drawablePadding="13dip"
 		    android:text="@string/FLA_new_list"
 		    style="@style/TextAppearance.FLA_Button"/>
         

astrid/res/layout/filter_list_activity_3pane.xml

@@ -15,31 +15,20 @@
         
         <include layout="@layout/fla_separator"/>
         
-        <LinearLayout
+        <TextView
+            android:id="@+id/new_list_button"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:gravity="center_vertical">
+            android:layout_margin="6dip"
-            
+            android:gravity="left|center_vertical"
-            <ImageView
+            android:background="?attr/asThemeTextColor"
-	            android:layout_width="39dip"
+            android:paddingLeft="8dip"
-	            android:layout_height="39dip"
+            android:drawableLeft="@drawable/filter_plus_button"
-	            android:layout_marginLeft="5dip"
+            android:drawablePadding="13dip"
-	            android:layout_marginRight="8dip"
+            android:text="@string/FLA_new_list"
-	            android:src="?attr/asAddButtonImg"
+            style="@style/TextAppearance.FLA_Button"/>
-	            android:scaleType="fitCenter"/>
-            
-	        <TextView
-	            android:id="@+id/new_list_button"
-	            android:layout_width="fill_parent"
-	            android:layout_height="fill_parent"
-	            android:paddingLeft="10dip"
-	            android:gravity="left|center_vertical"
-	            android:text="@string/FLA_new_list"
-	            style="@style/TextAppearance.FLA_Button"/>
-        </LinearLayout>        
         
     </LinearLayout>
-        
 
     <!-- List -->
     <ListView android:id="@android:id/list"

astrid/res/values/strings-repeat.xml

@@ -19,7 +19,7 @@
   <!-- hint when opening repeat interval -->
   <string name="repeat_interval_prompt">Repeat Interval</string>
   
-  <string name="repeat_never">Make Repeating</string>
+  <string name="repeat_never">Make Repeating?</string>
   
   <string name="repeat_dont">Don\'t repeat</string>
       

astrid/src/com/todoroo/astrid/activity/FilterListFragment.java

@@ -161,7 +161,7 @@ public class FilterListFragment extends ListFragment {
 
         getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
         //ImageView backButton = (ImageView) getView().findViewById(R.id.back);
-        newListButton = getView().findViewById(R.id.lists_footer);
+        newListButton = getView().findViewById(R.id.new_list_button);
 
         newListButton.setOnClickListener(new OnClickListener() {
             @Override