diff --git a/astrid/res/layout/welcome_walkthrough_page.xml b/astrid/res/layout/welcome_walkthrough_page.xml index bf7f876a6..df39d88bc 100644 --- a/astrid/res/layout/welcome_walkthrough_page.xml +++ b/astrid/res/layout/welcome_walkthrough_page.xml @@ -2,59 +2,43 @@ + android:orientation="vertical" + android:background="@drawable/welcome_walkthrough_fabric"> - + - - + android:layout_weight="1" + android:src="@drawable/welcome_walkthrough_1" + android:scaleType="fitCenter"/> - - - - + - \ No newline at end of file diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index d553783b5..7bec95f29 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -72,12 +72,7 @@ $D $T - Disable - - - - Accept EULA to get started! - + Disable diff --git a/astrid/res/values/strings-welcome.xml b/astrid/res/values/strings-welcome.xml new file mode 100644 index 000000000..c336a4a04 --- /dev/null +++ b/astrid/res/values/strings-welcome.xml @@ -0,0 +1,22 @@ + + + + Accept EULA to get started! + + Welcome to Astrid! + Make lists + Share lists + Divvy up tasks + Provide details + Discover + Login + + The perfect personal\nto-do list that works great\nwith friends + Perfect for any list:\nto read, to watch, to buy,\nto visit, to do! + Share lists\nwith friends, housemates,\nor your sweetheart! + Never wonder who\'s\nbringing dessert! + Tap to add notes,\nset reminders,\nand much more! + Additional features,\nproductivity tips, and\nsuggestions from friends + Login + + \ No newline at end of file diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java index 2acc66bc8..a02244fa2 100644 --- a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java +++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java @@ -26,25 +26,25 @@ public class ViewPagerAdapter extends PagerAdapter R.drawable.welcome_walkthrough_6, R.drawable.welcome_screen }; - private static String[] title = new String[] + private static int[] title = new int[] { - "Welcome to Astrid!", - "Make lists", - "Share lists", - "Divvy up tasks", - "Provide details", - "Discover", - "Login" + R.string.welcome_title_1, + R.string.welcome_title_2, + R.string.welcome_title_3, + R.string.welcome_title_4, + R.string.welcome_title_5, + R.string.welcome_title_6, + R.string.welcome_title_7, }; - private static String[] body = new String[] + private static int[] body = new int[] { - "The perfect personal\nto-do list that works great\nwith friends", - "Perfect for any list:\nto read, to watch, to buy,\nto visit, to do!", - "Share lists\nwith friends, housemates,\nor your sweetheart!", - "Never wonder who's\nbringing dessert!", - "Tap to add notes,\nset reminders,\nand much more!", - "Additional features,\nproductivity tips, and\nsuggestions from friends", - "Login" + R.string.welcome_body_1, + R.string.welcome_body_2, + R.string.welcome_body_3, + R.string.welcome_body_4, + R.string.welcome_body_5, + R.string.welcome_body_6, + R.string.welcome_body_7, }; private static int[] layouts = new int[] { @@ -83,8 +83,6 @@ public class ViewPagerAdapter extends PagerAdapter if (position != getCount()-1){ ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image); imageView.setImageResource(images[position]); - ImageView fabricImage = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_fabric); - fabricImage.setScaleType(ImageView.ScaleType.FIT_XY); TextView titleView = (TextView) pageView.findViewById(R.id.welcome_walkthrough_title); titleView.setText(title[position]);