Merge pull request Cleveroad#5 from Cleveroad/develop

Alexander Vlasov · Alexander Vlasov · commit e129e8f75ba1 · 2016-02-15T11:41:06.000+02:00
Develop
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ public class CustomPresentationPagerFragment extends PresentationPagerFragment {
     }
     
     @Override
-	protected boolean onSkipButtonClicked() {
+	protected boolean onSkipButtonClicked(View skipButton) {
 		// your own behavior goes here
 		// ...
 		// return true to consume click event, false otherwise
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,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 	@Override
 	public void onClick(View v) {
 		if (v.getId() == getButtonSkipResId()) {
-			if (!onSkipButtonClicked()) {
+			if (!onSkipButtonClicked(v)) {
 				removeFragmentFromScreen();
 			}
 		}
@@ -191,9 +191,10 @@ protected boolean isInfiniteScrollEnabled() {
 
 	/**
 	 * Called when user pressed Skip button. Default behavior: remove presentation fragment.
+	 * @param skipButton skip button
 	 * @return true if you consumed click listener and implemented your own behavior, false otherwise
 	 */
-	protected boolean onSkipButtonClicked() {
+	protected boolean onSkipButtonClicked(View skipButton) {
 		return false;
 	}
 
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,6 +3,7 @@
 import android.graphics.Color;
 import android.support.annotation.ColorInt;
 import android.support.v4.content.ContextCompat;
+import android.view.View;
 import android.widget.Toast;
 
 import com.cleveroad.slidingtutorial.PageFragment;
@@ -44,7 +45,7 @@ protected boolean isInfiniteScrollEnabled() {
 	}
 
 	@Override
-	protected boolean onSkipButtonClicked() {
+	protected boolean onSkipButtonClicked(View skipButton) {
 		Toast.makeText(getContext(), "Skip button clicked", Toast.LENGTH_SHORT).show();
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public class CustomPresentationPagerFragment extends PresentationPagerFragment {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`
`119`		`- protected boolean onSkipButtonClicked() {`
	`119`	`+ protected boolean onSkipButtonClicked(View skipButton) {`
`120`	`120`	`// your own behavior goes here`
`121`	`121`	`// ...`
`122`	`122`	`// return true to consume click event, false otherwise`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {`
`86`	`86`	`@Override`
`87`	`87`	`public void onClick(View v) {`
`88`	`88`	`if (v.getId() == getButtonSkipResId()) {`
`89`		`- if (!onSkipButtonClicked()) {`
	`89`	`+ if (!onSkipButtonClicked(v)) {`
`90`	`90`	`removeFragmentFromScreen();`
`91`	`91`	`}`
`92`	`92`	`}`
`@@ -191,9 +191,10 @@ protected boolean isInfiniteScrollEnabled() {`
`191`	`191`
`192`	`192`	`/**`
`193`	`193`	`* Called when user pressed Skip button. Default behavior: remove presentation fragment.`
	`194`	`+ * @param skipButton skip button`
`194`	`195`	`* @return true if you consumed click listener and implemented your own behavior, false otherwise`
`195`	`196`	`*/`
`196`		`- protected boolean onSkipButtonClicked() {`
	`197`	`+ protected boolean onSkipButtonClicked(View skipButton) {`
`197`	`198`	`return false;`
`198`	`199`	`}`
`199`	`200`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import android.graphics.Color;`
`4`	`4`	`import android.support.annotation.ColorInt;`
`5`	`5`	`import android.support.v4.content.ContextCompat;`
	`6`	`+import android.view.View;`
`6`	`7`	`import android.widget.Toast;`
`7`	`8`
`8`	`9`	`import com.cleveroad.slidingtutorial.PageFragment;`
`@@ -44,7 +45,7 @@ protected boolean isInfiniteScrollEnabled() {`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`@Override`
`47`		`- protected boolean onSkipButtonClicked() {`
	`48`	`+ protected boolean onSkipButtonClicked(View skipButton) {`
`48`	`49`	`Toast.makeText(getContext(), "Skip button clicked", Toast.LENGTH_SHORT).show();`
`49`	`50`	`return true;`
`50`	`51`	`}`