Merge branch 'develop'

Iojjj · Iojjj · commit 7925c15df38a · 2016-02-22T11:48:40.000+02:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ All you need to do is:
 First, add gradle dependency with command:<br>
 ```groovy
 dependencies {
-    compile 'com.cleveroad:slidingtutorial:0.9.2'
+    compile 'com.cleveroad:slidingtutorial:0.9.3'
 }
 ``` 
 
@@ -116,20 +116,21 @@ public class CustomPresentationPagerFragment extends PresentationPagerFragment {
     }
     
     @Override
-	protected boolean onSkipButtonClicked(View skipButton) {
-		// your own behavior goes here
-		// ...
-		// return true to consume click event, false otherwise
-		return true;
-	}
+    protected boolean onSkipButtonClicked() {
+        // your own behavior goes here
+        // ...
+        // return true to consume click event, false otherwise
+        return true;
+    }
 }
 ```
 
 ## Changelog
 
 | Version | Changes                         |
 | --- | --- |
-| v.0.9.2 | Added onSkipButtonClciked method and SimplePagerFragment |
+| v.0.9.3 | Fixed issue with wrong page showed at startup if pages count not equals 3 |
+| v.0.9.2 | Added onSkipButtonClicked method and SimplePagerFragment |
 | v.0.9.1 | Added infinite scroll behavior  |
 | v.0.9   | First public release            |
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=0.9.2
-VERSION_CODE=3
+VERSION_NAME=0.9.3
+VERSION_CODE=4
 GROUP=com.cleveroad
 
 POM_DESCRIPTION=Sliding tutorial is simple library that help other developers easy create great tutotial
diff --git a/lib/src/main/java/com/cleveroad/slidingtutorial/PresentationPagerFragment.java b/lib/src/main/java/com/cleveroad/slidingtutorial/PresentationPagerFragment.java
@@ -74,7 +74,9 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 		viewPager.setAdapter(new PresentationAdapter(getChildFragmentManager()));
 		if (isInfiniteScrollEnabled()) {
-			viewPager.setCurrentItem(Integer.MAX_VALUE / 2);
+			int pos = Integer.MAX_VALUE / 2;
+			pos -= pos % getPagesCount();
+			viewPager.setCurrentItem(pos);
 		}
 		indicator.setViewPager(new ViewPagerWrapper(getContext(), viewPager), getPagesCount());
 		viewPager.addOnPageChangeListener(this);
@@ -104,7 +106,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
 		}
 		int nextColorPosition = position + 1;
 		if (nextColorPosition >= getPagesCount()) {
-			nextColorPosition = 0;
+			nextColorPosition %= getPagesCount();
 		}
 		if (position < (viewPager.getAdapter().getCount() - 1)) {
 			viewPager.setBackgroundColor((Integer) argbEvaluator.evaluate(positionOffset, getPageColor(position), getPageColor(nextColorPosition)));
diff --git a/sample/src/main/java/com/cleveroad/slidingtutorial/sample/CustomPresentationPagerFragment.java b/sample/src/main/java/com/cleveroad/slidingtutorial/sample/CustomPresentationPagerFragment.java
@@ -13,11 +13,12 @@ public class CustomPresentationPagerFragment extends SimplePagerFragment {
 
 	@Override
 	protected int getPagesCount() {
-		return 3;
+		return 6;
 	}
 
 	@Override
 	protected PageFragment getPage(int position) {
+		position %= 3;
 		if (position == 0)
 			return new FirstCustomPageFragment();
 		if (position == 1)
@@ -36,6 +37,12 @@ protected int getPageColor(int position) {
 			return ContextCompat.getColor(getContext(), android.R.color.holo_green_dark);
 		if (position == 2)
 			return ContextCompat.getColor(getContext(), android.R.color.holo_blue_dark);
+		if (position == 3)
+			return ContextCompat.getColor(getContext(), android.R.color.holo_red_dark);
+		if (position == 4)
+			return ContextCompat.getColor(getContext(), android.R.color.holo_purple);
+		if (position == 5)
+			return ContextCompat.getColor(getContext(), android.R.color.darker_gray);
 		return Color.TRANSPARENT;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ public void onViewCreated(View view, Bundle savedInstanceState) {`
`74`	`74`	`super.onViewCreated(view, savedInstanceState);`
`75`	`75`	`viewPager.setAdapter(new PresentationAdapter(getChildFragmentManager()));`
`76`	`76`	`if (isInfiniteScrollEnabled()) {`
`77`		`- viewPager.setCurrentItem(Integer.MAX_VALUE / 2);`
	`77`	`+ int pos = Integer.MAX_VALUE / 2;`
	`78`	`+ pos -= pos % getPagesCount();`
	`79`	`+ viewPager.setCurrentItem(pos);`
`78`	`80`	`}`
`79`	`81`	`indicator.setViewPager(new ViewPagerWrapper(getContext(), viewPager), getPagesCount());`
`80`	`82`	`viewPager.addOnPageChangeListener(this);`
`@@ -104,7 +106,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse`
`104`	`106`	`}`
`105`	`107`	`int nextColorPosition = position + 1;`
`106`	`108`	`if (nextColorPosition >= getPagesCount()) {`
`107`		`- nextColorPosition = 0;`
	`109`	`+ nextColorPosition %= getPagesCount();`
`108`	`110`	`}`
`109`	`111`	`if (position < (viewPager.getAdapter().getCount() - 1)) {`
`110`	`112`	`viewPager.setBackgroundColor((Integer) argbEvaluator.evaluate(positionOffset, getPageColor(position), getPageColor(nextColorPosition)));`