diff --git a/astrid/res/drawable/taskedit_arrow_up_black.png b/astrid/res/drawable/taskedit_arrow_up_black.png new file mode 100644 index 000000000..0256f373c Binary files /dev/null and b/astrid/res/drawable/taskedit_arrow_up_black.png differ diff --git a/astrid/res/drawable/taskedit_arrow_up_white.png b/astrid/res/drawable/taskedit_arrow_up_white.png new file mode 100644 index 000000000..8cfe18648 Binary files /dev/null and b/astrid/res/drawable/taskedit_arrow_up_white.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_2.png b/astrid/res/drawable/welcome_walkthrough_2.png index dc34c5851..e60ee2b8a 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_2.png and b/astrid/res/drawable/welcome_walkthrough_2.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_3.png b/astrid/res/drawable/welcome_walkthrough_3.png index bf5ecf9e1..a1d7360ef 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_3.png and b/astrid/res/drawable/welcome_walkthrough_3.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_4.png b/astrid/res/drawable/welcome_walkthrough_4.png index 741ff3659..cf157414f 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_4.png and b/astrid/res/drawable/welcome_walkthrough_4.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_5.png b/astrid/res/drawable/welcome_walkthrough_5.png index 8a601fd15..29a921184 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_5.png and b/astrid/res/drawable/welcome_walkthrough_5.png differ diff --git a/astrid/res/layout/taskedit_popover.xml b/astrid/res/layout/taskedit_popover.xml index 014d1ccd0..2a0063ba7 100644 --- a/astrid/res/layout/taskedit_popover.xml +++ b/astrid/res/layout/taskedit_popover.xml @@ -17,8 +17,8 @@ android:layout_width="27dip" android:layout_height="27dip" android:scaleType="fitCenter" - android:layout_marginBottom="-8dip" - android:background="#ff0000"/> + android:layout_marginBottom="-10dip" + android:src="?attr/asTaskEditArrow"/> + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 0ec906f8e..89cdf10be 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -28,6 +28,7 @@ @drawable/menu_button_blue @color/blue_theme_color @drawable/lists_disclosure_blue + @drawable/taskedit_arrow_up_white @drawable/header_blue useLogo|showHome|showTitle @@ -79,6 +80,7 @@ @drawable/menu_button_red @color/red_theme_color @drawable/lists_disclosure_red + @drawable/taskedit_arrow_up_white @drawable/header_red useLogo|showHome|showTitle diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java index 6d6139543..74ab1a79a 100644 --- a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java +++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java @@ -27,7 +27,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider R.drawable.welcome_walkthrough_3, R.drawable.welcome_walkthrough_4, R.drawable.welcome_walkthrough_5, - R.drawable.welcome_walkthrough_6, + //R.drawable.welcome_walkthrough_6, 0 }; private static int[] title = new int[] @@ -37,7 +37,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider R.string.welcome_title_3, R.string.welcome_title_4, R.string.welcome_title_5, - R.string.welcome_title_6, + //R.string.welcome_title_6, R.string.welcome_title_7, }; private static int[] body = new int[] @@ -47,7 +47,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider R.string.welcome_body_3, R.string.welcome_body_4, R.string.welcome_body_5, - R.string.welcome_body_6, + //R.string.welcome_body_6, R.string.welcome_body_7, }; private static int[] layouts = new int[] @@ -57,7 +57,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider R.layout.welcome_walkthrough_page, R.layout.welcome_walkthrough_page, R.layout.welcome_walkthrough_page, - R.layout.welcome_walkthrough_page, + //R.layout.welcome_walkthrough_page, R.layout.welcome_walkthrough_login_page, };