From 5f43eda03a78b95e1eb7239eb6dbab22b94f3f5c Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 10 Feb 2012 17:33:08 -0800
Subject: [PATCH] Restyled the next button in welcome walkthrough

---
 astrid/res/layout/welcome_walkthrough.xml     | 67 +++++++++++--------
 .../layout/welcome_walkthrough_login_page.xml |  2 +-
 .../res/layout/welcome_walkthrough_page.xml   | 55 ++++-----------
 .../welcome/tutorial/ViewPagerAdapter.java    | 36 ----------
 4 files changed, 53 insertions(+), 107 deletions(-)

diff --git a/astrid/res/layout/welcome_walkthrough.xml b/astrid/res/layout/welcome_walkthrough.xml
index 48265dd26..77db7f47b 100755
--- a/astrid/res/layout/welcome_walkthrough.xml
+++ b/astrid/res/layout/welcome_walkthrough.xml
@@ -1,37 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-    <!-- xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator.sample"  -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
+    android:layout_height="fill_parent">
 
 	<RelativeLayout
 	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  >
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        />
-    <com.viewpagerindicator.CirclePageIndicator
-        android:id="@+id/indicator"
-        android:padding="15dip"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_alignBottom="@id/pager"
-        android:background="#00000000"
-    	style="@style/CustomCirclePageIndicator"
-        />
-<!-- 
-        app:radius="10dp"
-        app:fillColor="#FF888888"
-        app:strokeColor="#FF000000"
-        app:strokeWidth="2dp" -->
-        
+	  android:layout_height="fill_parent">
+    
+	    <android.support.v4.view.ViewPager
+	        android:id="@+id/pager"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_weight="1"/>
+	    
+	    <RelativeLayout 
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="horizontal"
+	        android:layout_alignParentBottom="true"
+	        android:paddingTop="3dip"
+	        android:paddingBottom="3dip"
+	        android:background="#55000000"
+	        android:gravity="center_vertical">
+		    <com.viewpagerindicator.CirclePageIndicator
+		        android:id="@+id/indicator"
+		        android:padding="15dip"
+		        android:layout_height="wrap_content"
+		        android:layout_width="fill_parent"
+		        android:background="#00000000"
+		    	style="@style/CustomCirclePageIndicator"/>
+	        <TextView
+	            android:id="@+id/next"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_alignParentRight="true"
+	            android:layout_centerVertical="true"
+	            android:layout_marginRight="5dip"
+	            android:text="@string/welcome_next"
+	            android:textColor="#444444"
+	            android:textSize="20dip"
+	            android:textStyle="bold"
+	            android:shadowRadius="2"
+	            android:shadowDy="1"
+	            android:shadowColor="@android:color/white" />  
+	    </RelativeLayout>
   </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml
index f5d7da4d5..5eee9e866 100644
--- a/astrid/res/layout/welcome_walkthrough_login_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_login_page.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingLeft="4dip"
     android:paddingRight="4dip"
-    android:background="@drawable/welcome_walkthrough_fabric"
+    android:background="#d0d0d0"
     android:orientation="vertical">
 
     <TextView
diff --git a/astrid/res/layout/welcome_walkthrough_page.xml b/astrid/res/layout/welcome_walkthrough_page.xml
index 8d47b3022..7dcadf6ff 100644
--- a/astrid/res/layout/welcome_walkthrough_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_page.xml
@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" 
-    android:background="@drawable/welcome_walkthrough_fabric">
+    android:background="#d0d0d0">
 
     <TextView
         android:id="@+id/welcome_walkthrough_title"
@@ -25,50 +25,19 @@
         android:layout_weight="1"
         android:src="@drawable/welcome_walkthrough_1" 
         android:scaleType="fitCenter"/>
-    
-    <LinearLayout
+        
+    <TextView
+        android:id="@+id/welcome_walkthrough_body"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_marginBottom="75dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
-            android:layout_marginLeft="3dip"
-            android:src="@drawable/icn_arrow_left"
-            android:scaleType="fitCenter"/>
-        
-	    <TextView
-	        android:id="@+id/welcome_walkthrough_body"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:gravity="center_horizontal"
-	        android:text="Hello"
-	        android:textColor="#444444"
-	        android:textSize="20dip"
-	        android:textStyle="bold"
-	        android:shadowRadius="2"
-	        android:shadowDy="1"
-	        android:shadowColor="@android:color/white" />
-	    
-	    <ImageView
-            android:id="@+id/next"
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
-            android:layout_marginRight="3dip"
-            android:gravity="center_horizontal"
-            android:src="@drawable/icn_arrow_right"
-            android:scaleType="fitCenter"/>
-	    
-    </LinearLayout>
-
+        android:gravity="center_horizontal"
+        android:text="Hello"
+        android:textColor="#444444"
+        android:textSize="20dip"
+        android:textStyle="bold"
+        android:shadowRadius="2"
+        android:shadowDy="1"
+        android:shadowColor="@android:color/white" />
 
 </LinearLayout>
\ 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 af517936e..cd632f27c 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
@@ -7,7 +7,6 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.ImageView;
@@ -86,41 +85,6 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
                 WindowManager.LayoutParams.MATCH_PARENT,
                 WindowManager.LayoutParams.MATCH_PARENT));
 
-        View back = pageView.findViewById(R.id.back);
-        View next = pageView.findViewById(R.id.next);
-
-        if (back != null) {
-            back.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (v.getVisibility() == View.VISIBLE) {
-                        ((ViewPager) pager).setCurrentItem(position -1, true);
-                    }
-                }
-            });
-
-            if (position == 0) {
-                back.setVisibility(View.INVISIBLE);
-            }
-        }
-
-        if (next != null) {
-            next.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (v.getVisibility() == View.VISIBLE) {
-                        ((ViewPager) pager).setCurrentItem(position + 1, true);
-                    }
-                }
-            });
-
-            if (position == layouts.length - 1) {
-                next.setVisibility(View.INVISIBLE);
-            }
-        }
-
-
-
         if (pageView.findViewById(R.id.welcome_walkthrough_image) != null) {
             ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image);
             imageView.setImageResource(images[position]);