Lots of styling and new images, fixed a few task edit bugs

astrid/res/layout-large-land/task_list_activity.xml

@@ -1,60 +0,0 @@
-<?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:id="@+id/taskListParent"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    style="@style/Content"
-    android:orientation="vertical">
-    
-    <!-- Body goes here -->
-        
-    <!-- Footer -->
-    <LinearLayout
-        android:id="@+id/taskListFooter"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:minHeight="47dip"
-        android:layout_weight="1"
-        android:background="@drawable/footer_background"
-        android:padding="3dip"
-        android:orientation="horizontal">
-        
-        <!-- Voice Add Button -->
-        <ImageButton android:id="@+id/voiceAddButton"
-            android:layout_width="wrap_content"
-            android:layout_height="39dip"
-            android:layout_gravity="top"
-            android:layout_marginRight="3dip"
-            android:layout_weight="1"
-            android:visibility="gone"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/ic_footer_mic"
-            android:scaleType="center"/> 
-    
-        <!-- Quick Add Task -->
-        <EditText android:id="@+id/quickAddText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:layout_weight="100"
-            android:background="@drawable/footer_edittext"
-            android:hint="@string/TLA_quick_add_hint"
-            android:textSize="16sp"
-            android:autoText="true"
-            android:capitalize="sentences"/>
-        
-        <!-- Extended Add Button -->
-        <ImageButton android:id="@+id/quickAddButton"
-            android:layout_width="wrap_content"
-            android:layout_height="39dip"
-            android:layout_gravity="top"
-            android:layout_marginRight="3dip"
-            android:layout_weight="1"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/ic_footer_add"
-            android:scaleType="center"/> 
-
-    </LinearLayout>
-        
-</LinearLayout>

astrid/res/layout/header_nav_views.xml

@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+    
+    <ImageView
+        android:id="@+id/main_menu"
+        android:layout_width="51dip"
+        android:padding="10dip"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="3dip"
+        android:src="@drawable/menu"
+        android:scaleType="fitCenter"/>
+        
+        
+	<RelativeLayout 
 	    android:id="@+id/lists_nav"
 	    android:layout_width="wrap_content"
 	    android:layout_height="match_parent"
-    android:orientation="horizontal"
 	    android:layout_marginLeft="5dip"
 	    android:layout_marginTop="5dip"
 	    android:layout_marginBottom="5dip"
@@ -28,7 +42,9 @@
 	        android:layout_marginLeft="10dip" 
 	        android:layout_toRightOf="@id/list_title"
 	        android:layout_alignBottom="@id/list_title"
-        android:src="@drawable/list_disclosure"
+	        android:src="?attr/asListsDisclosure"
 	        android:scaleType="fitCenter"/>
 	
 	</RelativeLayout>
+
+</LinearLayout>

astrid/res/layout/task_edit_activity.xml

@@ -119,11 +119,12 @@
         android:id="@+id/updatesFooter"
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@drawable/footer_background"
         android:minHeight="47dip"
+        android:layout_weight="1"
+        android:padding="3dip"
+        android:layout_marginBottom="5dip"
         android:orientation="horizontal"
-        android:padding="3dip" >
+        style="@style/Content">
 
         <!-- Voice Add Button -->
 
@@ -132,41 +133,40 @@
             android:layout_width="39dip"
             android:layout_height="39dip"
             android:layout_gravity="top"
+            android:layout_marginLeft="5dip"
             android:layout_marginRight="3dip"
             android:layout_weight="1"
-            android:background="@drawable/footer_button"
-            android:paddingBottom="2dip"
-            android:paddingLeft="7dip"
-            android:paddingRight="7dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/icn_camera" />
+            android:background="?attr/asCameraButtonImg"
+            android:scaleType="fitCenter"/>
 
         <!-- Quick Add Task -->
 
         <EditText
             android:id="@+id/commentField"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
+            android:layout_height="39dip"
+            android:layout_marginRight="8dip"
+            android:layout_marginLeft="5dip"
             android:layout_weight="100"
+            android:paddingLeft="5dip"
+            android:background="@drawable/edit_title_background"
+            android:textSize="16sp"
             android:autoText="true"
-            android:background="@drawable/footer_edittext"
-            android:capitalize="sentences"
+            android:textColor="@android:color/black"
             android:hint="@string/TVA_add_comment"
-            android:textSize="16sp" />
+            android:capitalize="sentences"/>
 
         <!-- Extended Add Button -->
 
         <ImageButton
             android:id="@+id/commentButton"
-            android:layout_width="wrap_content"
+            android:layout_width="39dip"
             android:layout_height="39dip"
             android:layout_gravity="top"
-            android:layout_marginRight="3dip"
+            android:layout_marginRight="5dip"
             android:layout_weight="1"
-            android:background="@drawable/footer_button"
-            android:scaleType="center"
-            android:src="@drawable/ic_footer_add" />
+            android:background="?attr/asAddButtonImg"
+            android:scaleType="center"/> 
     </LinearLayout>
 
 </LinearLayout>

astrid/res/layout/task_list_activity.xml

@@ -24,29 +24,32 @@
         android:layout_height="wrap_content"
         android:minHeight="47dip"
         android:layout_weight="1"
-        android:background="@drawable/footer_background"
         android:padding="3dip"
-        android:orientation="horizontal">
+        android:layout_marginBottom="5dip"
+        android:orientation="horizontal"
+        style="@style/Content">
         
         <!-- Voice Add Button -->
         <ImageButton android:id="@+id/voiceAddButton"
-            android:layout_width="wrap_content"
+            android:layout_width="39dip"
             android:layout_height="39dip"
             android:layout_gravity="top"
+            android:layout_marginLeft="5dip"
             android:layout_marginRight="3dip"
             android:layout_weight="1"
             android:visibility="gone"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/ic_footer_mic"
+            android:background="?attr/asMicButtonImg"
             android:scaleType="center"/> 
     
         <!-- Quick Add Task -->
         <EditText android:id="@+id/quickAddText"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
+            android:layout_height="39dip"
+            android:layout_marginRight="8dip"
+            android:layout_marginLeft="5dip"
             android:layout_weight="100"
-            android:background="@drawable/footer_edittext"
+            android:paddingLeft="5dip"
+            android:background="@drawable/edit_title_background"
             android:hint="@string/TLA_quick_add_hint"
             android:textSize="16sp"
             android:autoText="true"
@@ -55,13 +58,12 @@
         
         <!-- Extended Add Button -->
         <ImageButton android:id="@+id/quickAddButton"
-            android:layout_width="wrap_content"
+            android:layout_width="39dip"
             android:layout_height="39dip"
             android:layout_gravity="top"
-            android:layout_marginRight="3dip"
+            android:layout_marginRight="5dip"
             android:layout_weight="1"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/ic_footer_add"
+            android:background="?attr/asAddButtonImg"
             android:scaleType="center"/> 
 
     </LinearLayout>

astrid/res/values/attrs.xml

@@ -17,6 +17,11 @@
   <attr name="asSeparatorBackground" format="color"/>
   <attr name="asAbTextColor" format="color"/>
   
+  <attr name="asAddButtonImg" format="reference" />
+  <attr name="asMicButtonImg" format="reference" />
+  <attr name="asCameraButtonImg" format="reference" />
+  <attr name="asListsDisclosure" format="reference" />
+
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
     <attr name="completeTags" format="boolean"/>

astrid/res/values/styles.xml

@@ -19,6 +19,10 @@
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
         <item name="asSeparatorBackground">#888888</item>
+        <item name="asAddButtonImg">@drawable/plus_button_gray</item>
+        <item name="asMicButtonImg">@drawable/mic_button_gray</item>
+        <item name="asCameraButtonImg">@drawable/camera_button_gray</item>
+        <item name="asListsDisclosure">@drawable/lists_disclosure_gray</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_background</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@@ -61,6 +65,10 @@
         <item name="asFilterHeaderColor">#ffffff</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480</item>
+        <item name="asAddButtonImg">@drawable/plus_button_red</item>
+        <item name="asMicButtonImg">@drawable/mic_button_red</item>
+        <item name="asCameraButtonImg">@drawable/camera_button_red</item>
+        <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>

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

@@ -989,7 +989,7 @@ public final class TaskEditActivity extends Fragment implements
         MenuItem item;
 
         AstridWrapperActivity activity = (AstridWrapperActivity) getActivity();
-        if (activity instanceof TaskListWrapperActivity && activity.fragmentLayout != AstridWrapperActivity.LAYOUT_DOUBLE) {
+        if (activity instanceof TaskListWrapperActivity && activity.fragmentLayout != AstridWrapperActivity.LAYOUT_DOUBLE || activity instanceof TaskEditWrapperActivity) {
             item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
             item.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

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

@@ -6,12 +6,14 @@ import android.os.Bundle;
 import android.support.v4.app.ActionBar;
 import android.support.v4.app.Fragment;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
@@ -27,12 +29,13 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
 
     public static final String TOKEN_SELECTED_FILTER = "selectedFilter";
     private View listsNav;
+    private ImageView listsNavDisclosure;
     private TextView lists;
 
     private FragmentPopover listsPopover;
     private FragmentPopover editPopover;
 
-    private boolean suppressTaskSave = false;
+    private boolean fromTaskEdit = false;
 
     private final OnClickListener popupMenuClickListener = new OnClickListener() {
         @Override
@@ -48,9 +51,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
             TaskEditActivity tea = getTaskEditFragment();
             if (tea != null) {
                 try {
-                    if (!suppressTaskSave)
+                    if (!fromTaskEdit)
                         tea.save(false);
-                    suppressTaskSave = false;
+                    fromTaskEdit = false;
                 } catch (IllegalStateException e) {
                     // Save during pause, ignore it
                 }
@@ -73,6 +76,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
 		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);
 
 		initializeFragments(actionBar);
@@ -176,6 +180,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
 	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
 	    lists.setTextAppearance(this, textStyle);
 	    listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
+	    TypedValue tv = new TypedValue();
+	    getTheme().resolveAttribute(R.attr.asListsDisclosure, tv, false);
+	    listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : tv.data);
 	}
 
     @Override
@@ -187,10 +194,13 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
         if (savedFilter != null)
             lists.setText(savedFilter.title);
 
+        if (!fromTaskEdit) {
             TaskEditActivity tea = getTaskEditFragment();
             if (tea != null)
                 onBackPressed();
         }
+        fromTaskEdit = false;
+    }
 
     @Override
     protected void onPause() {
@@ -216,10 +226,11 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
             } else {
                 findViewById(R.id.taskedit_fragment_container).setVisibility(View.INVISIBLE);
             }
+            fromTaskEdit = true;
             onPostResume();
         } else {
             if (editPopover != null && editPopover.isShowing()) {
-                suppressTaskSave = true;
+                fromTaskEdit = true;
                 editPopover.dismiss();
             }
         }