diff --git a/astrid/res/drawable/camera_button_gray.png b/astrid/res/drawable/camera_button_gray.png
new file mode 100644
index 000000000..1541e783f
Binary files /dev/null and b/astrid/res/drawable/camera_button_gray.png differ
diff --git a/astrid/res/drawable/camera_button_red.png b/astrid/res/drawable/camera_button_red.png
new file mode 100644
index 000000000..04b4f01b8
Binary files /dev/null and b/astrid/res/drawable/camera_button_red.png differ
diff --git a/astrid/res/drawable/list_disclosure.png b/astrid/res/drawable/list_disclosure.png
deleted file mode 100644
index e2399eb9e..000000000
Binary files a/astrid/res/drawable/list_disclosure.png and /dev/null differ
diff --git a/astrid/res/drawable/lists_disclosure_gray.png b/astrid/res/drawable/lists_disclosure_gray.png
new file mode 100644
index 000000000..7d9674aba
Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_gray.png differ
diff --git a/astrid/res/drawable/lists_disclosure_red.png b/astrid/res/drawable/lists_disclosure_red.png
new file mode 100644
index 000000000..67b399fdd
Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_red.png differ
diff --git a/astrid/res/drawable/lists_disclosure_white.png b/astrid/res/drawable/lists_disclosure_white.png
new file mode 100644
index 000000000..0821eaa38
Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_white.png differ
diff --git a/astrid/res/drawable/menu.png b/astrid/res/drawable/menu.png
new file mode 100644
index 000000000..322034549
Binary files /dev/null and b/astrid/res/drawable/menu.png differ
diff --git a/astrid/res/drawable/mic_button_gray.png b/astrid/res/drawable/mic_button_gray.png
new file mode 100644
index 000000000..13c86b391
Binary files /dev/null and b/astrid/res/drawable/mic_button_gray.png differ
diff --git a/astrid/res/drawable/mic_button_red.png b/astrid/res/drawable/mic_button_red.png
new file mode 100644
index 000000000..e1718190d
Binary files /dev/null and b/astrid/res/drawable/mic_button_red.png differ
diff --git a/astrid/res/drawable/plus_button_gray.png b/astrid/res/drawable/plus_button_gray.png
new file mode 100644
index 000000000..303ebd5e7
Binary files /dev/null and b/astrid/res/drawable/plus_button_gray.png differ
diff --git a/astrid/res/drawable/plus_button_red.png b/astrid/res/drawable/plus_button_red.png
new file mode 100644
index 000000000..9badd2388
Binary files /dev/null and b/astrid/res/drawable/plus_button_red.png differ
diff --git a/astrid/res/layout-large-land/task_list_activity.xml b/astrid/res/layout-large-land/task_list_activity.xml
deleted file mode 100644
index 0e635f0bd..000000000
--- a/astrid/res/layout-large-land/task_list_activity.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 634360112..1395ea4c7 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -1,34 +1,50 @@
-
-
-
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 108ca27d2..d5479ef0a 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -117,13 +117,14 @@
+ style="@style/Content">
@@ -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"/>
+ android:capitalize="sentences"/>
+ android:background="?attr/asAddButtonImg"
+ android:scaleType="center"/>
\ No newline at end of file
diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/res/layout/task_list_activity.xml
index 539016f54..adbe00e20 100644
--- a/astrid/res/layout/task_list_activity.xml
+++ b/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">
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index d23b16d44..e56c94d58 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -16,6 +16,11 @@
+
+
+
+
+
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 18f1e324f..29d7f4778 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -19,6 +19,10 @@
- @drawable/edit_titlebar
- @drawable/ios_fabric_480_dark
- #888888
+ - @drawable/plus_button_gray
+ - @drawable/mic_button_gray
+ - @drawable/camera_button_gray
+ - @drawable/lists_disclosure_gray
- @drawable/header_background
- useLogo|showHome|showTitle
@@ -61,6 +65,10 @@
- #ffffff
- @drawable/edit_titlebar_white
- @drawable/ios_fabric_480
+ - @drawable/plus_button_red
+ - @drawable/mic_button_red
+ - @drawable/camera_button_red
+ - @drawable/lists_disclosure_red
- @android:color/white
- useLogo|showHome|showTitle
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 27c7613cd..bdc7d0f97 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/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);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index d6a6af53d..a420c29bd 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/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,9 +194,12 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
if (savedFilter != null)
lists.setText(savedFilter.title);
- TaskEditActivity tea = getTaskEditFragment();
- if (tea != null)
- onBackPressed();
+ if (!fromTaskEdit) {
+ TaskEditActivity tea = getTaskEditFragment();
+ if (tea != null)
+ onBackPressed();
+ }
+ fromTaskEdit = false;
}
@Override
@@ -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();
}
}