Merge pull request smarteist#131 from smarteist/dev

Dev

Author: smarteist

app/src/main/java/com/smarteist/imageslider/MainActivity.java

@@ -38,12 +38,13 @@ protected void onCreate(Bundle savedInstanceState) {
  sliderView.setIndicatorSelectedColor(Color.WHITE);
  sliderView.setIndicatorUnselectedColor(Color.GRAY);
  sliderView.setScrollTimeInSec(3);
- sliderView.setAutoCycle(false);
+ sliderView.setAutoCycle(true);
+ sliderView.startAutoCycle();
 
  sliderView.setOnIndicatorClickListener(new DrawController.ClickListener() {
  @Override
  public void onIndicatorClicked(int position) {
- sliderView.setCurrentPagePosition(position);
+ sliderView.slideToPreviousPosition();
  }
  });
 

autoimageslider/src/main/java/com/smarteist/autoimageslider/SliderPager.java

@@ -101,7 +101,7 @@ public float getInterpolation(float t) {
  }
  };
 
- private final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>();
+ private final ArrayList<ItemInfo> mItems = new ArrayList<>();
  private final ItemInfo mTempItem = new ItemInfo();
 
  private final Rect mTempRect = new Rect();
@@ -351,7 +351,7 @@ void initSliderPager() {
  setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
  setFocusable(true);
  final Context context = getContext();
- mScroller = new Scroller(context, sInterpolator);
+ mScroller = new OwnScroller(context, DEFAULT_SCROLL_DURATION, sInterpolator);
  final ViewConfiguration configuration = ViewConfiguration.get(context);
  final float density = context.getResources().getDisplayMetrics().density;
 
@@ -875,11 +875,9 @@ protected boolean verifyDrawable(Drawable who) {
 
  public void setScrollDuration(int millis, Interpolator interpolator) {
  if (interpolator != null) {
- OwnScroller ownScroller = new OwnScroller(getContext(), millis, interpolator);
- mScroller = ownScroller;
+ mScroller = new OwnScroller(getContext(), millis, interpolator);
  } else {
- OwnScroller ownScroller = new OwnScroller(getContext(), millis);
- mScroller = ownScroller;
+ mScroller = new OwnScroller(getContext(), millis);
  }
  }
 
@@ -1409,7 +1407,7 @@ public String toString() {
  + " position=" + position + "}";
  }
 
- public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+ public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.ClassLoaderCreator<SavedState>() {
  @Override
  public SavedState createFromParcel(Parcel in, ClassLoader loader) {
  return new SavedState(in, loader);
@@ -3109,7 +3107,7 @@ class OwnScroller extends Scroller {
  private int durationScrollMillis;
 
  OwnScroller(Context context, int durationScroll) {
- super(context, new DecelerateInterpolator());
+ super(context, sInterpolator);
  this.durationScrollMillis = durationScroll;
  }
 

autoimageslider/src/main/java/com/smarteist/autoimageslider/SliderView.java

@@ -131,9 +131,7 @@ private void setUpAttributes(@NonNull Context context, AttributeSet attrs) {
  setIndicatorRadius(indicatorRadius);
  setIndicatorPadding(indicatorPadding);
  setIndicatorMargin(indicatorMargin);
- if(R.styleable.SliderView_sliderIndicatorMargin == null){
- setIndicatorMarginCustom(indicatorMarginLeft,indicatorMarginTop,indicatorMarginRight,indicatorMarginBottom);
- }
+ setIndicatorMarginCustom(indicatorMarginLeft, indicatorMarginTop, indicatorMarginRight, indicatorMarginBottom);
  setIndicatorGravity(indicatorGravity);
  setIndicatorMargins(indicatorMarginLeft, indicatorMarginTop, indicatorMarginRight, indicatorMarginBottom);
  setIndicatorUnselectedColor(indicatorUnselectedColor);
@@ -200,6 +198,7 @@ public void setSliderAdapter(@NonNull SliderViewAdapter pagerAdapter) {
  //setup with indicator
  mPagerIndicator.setCount(getAdapterItemsCount());
  mPagerIndicator.setDynamicCount(true);
+ setCurrentPagePosition(0);
  }
 
  /**
@@ -210,9 +209,7 @@ public void setSliderAdapter(@NonNull SliderViewAdapter pagerAdapter, boolean in
  this.mIsInfiniteAdapter = infiniteAdapter;
  if (!infiniteAdapter) {
  this.mPagerAdapter = pagerAdapter;
- //registerAdapterDataObserver();
  mSliderPager.setAdapter(pagerAdapter);
- //setup with indicator
  mPagerIndicator.setCount(getAdapterItemsCount());
  mPagerIndicator.setDynamicCount(true);
  } else {
@@ -588,8 +585,8 @@ public void setIndicatorMargin(int margin) {
  layoutParams.setMargins(margin, margin, margin, margin);
  mPagerIndicator.setLayoutParams(layoutParams);
  }
- 
- public void setIndicatorMarginCustom(int left,int top,int right,int bottom) {
+
+ public void setIndicatorMarginCustom(int left, int top, int right, int bottom) {
  FrameLayout.LayoutParams layoutParams = (LayoutParams) mPagerIndicator.getLayoutParams();
  layoutParams.setMargins(left, top, right, bottom);
  mPagerIndicator.setLayoutParams(layoutParams);