hide next button at the end

astrid/res/layout/welcome_walkthrough.xml

@@ -5,46 +5,47 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-	<RelativeLayout
-	  android:layout_width="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"/>
-	    
-	    <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>
+        <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:paddingRight="10dip"
+                android:shadowRadius="2"
+                android:shadowDy="1"
+                android:shadowColor="@android:color/white" />  
+        </RelativeLayout>
   </RelativeLayout>
 </LinearLayout>

astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java

@@ -67,7 +67,13 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
             images[images.length - 1] = R.drawable.welcome_walkthrough_1;
             body[body.length - 1] = R.string.welcome_body_7_return;
         }
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+        super.setPrimaryItem(container, position, object);
 
+        parent.onPageChanged(container, position);
     }
 
 
@@ -97,7 +103,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
         }
 
         ((ViewPager) pager).addView(pageView, 0);
-        parent.pageScrolled(position, pageView);
+        parent.instantiatePage(position);
         return pageView;
     }
 

astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java

@@ -56,15 +56,20 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
     protected int getTitleResource() {
         return 0;
     }
-    public void pageScrolled(int position, View view){
-        currentView = view;
-        currentPage = position;
+
+    public void instantiatePage(int position){
         if (position == mAdapter.getCount()-1) {
             initializeUI();
         }
     }
 
+    public void onPageChanged(View view, int position) {
+        currentPage = position;
+        currentView = view;
+        findViewById(R.id.next).setVisibility(
+                position == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
 
+    }
 
     @Override
     protected void initializeUI() {