+ added SimplePagerFragment

Iojjj · Iojjj · commit 1b869c1363ca · 2016-02-15T11:20:44.000+02:00
+ added onSkipButtonClicked method
diff --git a/lib/src/main/java/com/cleveroad/slidingtutorial/PresentationPagerFragment.java b/lib/src/main/java/com/cleveroad/slidingtutorial/PresentationPagerFragment.java
@@ -86,7 +86,9 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 	@Override
 	public void onClick(View v) {
 		if (v.getId() == getButtonSkipResId()) {
-			removeFragmentFromScreen();
+			if (!onSkipButtonClicked()) {
+				removeFragmentFromScreen();
+			}
 		}
 	}
 
@@ -187,6 +189,14 @@ protected boolean isInfiniteScrollEnabled() {
 	@ColorInt
 	protected abstract int getPageColor(int position);
 
+	/**
+	 * Called when user pressed Skip button. Default behavior: remove presentation fragment.
+	 * @return true if you consumed click listener and implemented your own behavior, false otherwise
+	 */
+	protected boolean onSkipButtonClicked() {
+		return false;
+	}
+
 	/**
 	 * Implementation of {@link FragmentPagerAdapter} that in addition add empty last fragment.
 	 */
@@ -225,7 +235,7 @@ public int getCount() {
 	 * Implementation of {@link android.support.v4.view.ViewPager.PageTransformer} that dispatch
 	 * transform page event whenever a visible/attached page is scrolled.
 	 */
-	class FragmentTransformer implements ViewPager.PageTransformer {
+	private class FragmentTransformer implements ViewPager.PageTransformer {
 
 		public void transformPage(View view, float position) {
 			Object obj = view.getTag(R.id.page_fragment);
diff --git a/lib/src/main/java/com/cleveroad/slidingtutorial/SimplePagerFragment.java b/lib/src/main/java/com/cleveroad/slidingtutorial/SimplePagerFragment.java
@@ -0,0 +1,27 @@
+package com.cleveroad.slidingtutorial;
+
+/**
+ * Simple implementation of {@link PresentationPagerFragment}
+ */
+public abstract class SimplePagerFragment extends PresentationPagerFragment {
+
+	@Override
+	public int getLayoutResId() {
+		return R.layout.fragment_presentation;
+	}
+
+	@Override
+	public int getViewPagerResId() {
+		return R.id.viewPager;
+	}
+
+	@Override
+	public int getIndicatorResId() {
+		return R.id.indicator;
+	}
+
+	@Override
+	public int getButtonSkipResId() {
+		return R.id.tvSkip;
+	}
+}
diff --git a/lib/src/main/res/layout/fragment_presentation.xml b/lib/src/main/res/layout/fragment_presentation.xml
@@ -31,10 +31,10 @@
             android:layout_marginRight="10dp"
             android:fontFamily="sans-serif-light"
             android:padding="10dp"
-            android:text="Skip"
+            android:text="@string/skip"
             android:textColor="@android:color/white"
             android:textSize="21sp"
-            tools:ignore="HardcodedText,UnusedAttribute"/>
+            tools:ignore="UnusedAttribute"/>
 
         <com.cleveroad.slidingtutorial.CirclePageIndicator
             android:id="@+id/indicator"
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">SlidingTutorialLibrary</string>
+    <string name="skip">Skip</string>
 </resources>
diff --git a/sample/src/main/java/com/cleveroad/slidingtutorial/sample/CustomPresentationPagerFragment.java b/sample/src/main/java/com/cleveroad/slidingtutorial/sample/CustomPresentationPagerFragment.java
@@ -3,31 +3,12 @@
 import android.graphics.Color;
 import android.support.annotation.ColorInt;
 import android.support.v4.content.ContextCompat;
+import android.widget.Toast;
 
 import com.cleveroad.slidingtutorial.PageFragment;
-import com.cleveroad.slidingtutorial.PresentationPagerFragment;
+import com.cleveroad.slidingtutorial.SimplePagerFragment;
 
-public class CustomPresentationPagerFragment extends PresentationPagerFragment {
-
-	@Override
-	public int getLayoutResId() {
-		return R.layout.fragment_presentation;
-	}
-
-	@Override
-	public int getViewPagerResId() {
-		return R.id.viewPager;
-	}
-
-	@Override
-	public int getIndicatorResId() {
-		return R.id.indicator;
-	}
-
-	@Override
-	public int getButtonSkipResId() {
-		return R.id.tvSkip;
-	}
+public class CustomPresentationPagerFragment extends SimplePagerFragment {
 
 	@Override
 	protected int getPagesCount() {
@@ -61,4 +42,10 @@ protected int getPageColor(int position) {
 	protected boolean isInfiniteScrollEnabled() {
 		return true;
 	}
+
+	@Override
+	protected boolean onSkipButtonClicked() {
+		Toast.makeText(getContext(), "Skip button clicked", Toast.LENGTH_SHORT).show();
+		return true;
+	}
 }
