Little changes and optimization.

Author: smarteist

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

@@ -6,9 +6,9 @@ class CircularSliderHandle implements ViewPager.OnPageChangeListener {
 
     private CurrentPageListener currentPageListener;
     private ViewPager mViewPager;
-    private boolean mIsEndOfCycle = false;
     private int mCurrentPosition;
     private int mPreviousPosition;
+    private boolean mIsEndOfCycle;
 
     CircularSliderHandle(final ViewPager viewPager) {
         this.mViewPager = viewPager;
@@ -29,26 +29,22 @@ public void onPageSelected(final int position) {
     @Override
     public void onPageScrollStateChanged(int state) {
 
-        int itemsCount = getAdapterItemsCount();
-
         if (state == ViewPager.SCROLL_STATE_IDLE) {
 
             if (mPreviousPosition == mCurrentPosition && !mIsEndOfCycle) {
 
                 if (mCurrentPosition == 0) {
-                    mViewPager.setCurrentItem(itemsCount - 1);
-                    mIsEndOfCycle = true;
-
+                    mViewPager.setCurrentItem(getAdapterItemsCount() - 1);
                 } else {
                     mViewPager.setCurrentItem(0);
-                    mIsEndOfCycle = true;
                 }
 
+                mIsEndOfCycle = true;
             } else {
                 mIsEndOfCycle = false;
             }
 
-            mPreviousPosition = mViewPager.getCurrentItem();
+            mPreviousPosition = mCurrentPosition;
         }
 
     }

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

@@ -3,15 +3,12 @@
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.os.Handler;
-
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-
 import com.smarteist.autoimageslider.IndicatorView.PageIndicatorView;
 import com.smarteist.autoimageslider.IndicatorView.animation.type.AnimationType;
 import com.smarteist.autoimageslider.IndicatorView.draw.controller.DrawController;
@@ -42,8 +39,8 @@
 public class SliderView extends FrameLayout {
 
     private final Handler mHandler = new Handler();
-    private boolean isAutoCycle = true;
-    private int scrollTimeInSec = 2;
+    private boolean mIsAutoCycle = true;
+    private int mScrollTimeInSec = 2;
     private CircularSliderHandle mCircularSliderHandle;
     private PageIndicatorView mPagerIndicator;
     private DataSetObserver mDataSetObserver;
@@ -119,23 +116,23 @@ public PagerAdapter getSliderAdapter() {
     }
 
     public boolean isAutoCycle() {
-        return isAutoCycle;
+        return mIsAutoCycle;
     }
 
     public void setAutoCycle(boolean autoCycle) {
-        this.isAutoCycle = autoCycle;
-        if (!isAutoCycle && mSliderRunnable != null) {
+        this.mIsAutoCycle = autoCycle;
+        if (!mIsAutoCycle && mSliderRunnable != null) {
             mHandler.removeCallbacks(mSliderRunnable);
             mSliderRunnable = null;
         }
     }
 
     public int getScrollTimeInSec() {
-        return scrollTimeInSec;
+        return mScrollTimeInSec;
     }
 
     public void setScrollTimeInSec(int time) {
-        scrollTimeInSec = time;
+        mScrollTimeInSec = time;
     }
 
     public void setSliderTransformAnimation(SliderAnimations animation) {
@@ -310,7 +307,7 @@ public void run() {
 
                 try {
                     // check is on auto scroll mode
-                    if (!isAutoCycle) {
+                    if (!mIsAutoCycle) {
                         return;
                     }
 
@@ -325,14 +322,14 @@ public void run() {
                     }
 
                 } finally {
-                    mHandler.postDelayed(this, scrollTimeInSec * 1000);
+                    mHandler.postDelayed(this, mScrollTimeInSec * 1000);
                 }
 
             }
         };
 
         //Run the loop for the first time
-        mHandler.postDelayed(mSliderRunnable, scrollTimeInSec * 1000);
+        mHandler.postDelayed(mSliderRunnable, mScrollTimeInSec * 1000);
     }
 
     public int getSliderIndicatorRadius() {

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

@@ -1,5 +1,6 @@
 package com.smarteist.autoimageslider;
 
+import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,8 +22,9 @@ public ViewHolder(View itemView) {
 
     private Queue<VH> destroyedItems = new LinkedList<>();
 
+    @NonNull
     @Override
-    public final Object instantiateItem(ViewGroup container, int position) {
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
         VH viewHolder = destroyedItems.poll();
 
         if (viewHolder != null) {
@@ -39,13 +41,13 @@ public final Object instantiateItem(ViewGroup container, int position) {
     }
 
     @Override
-    public final void destroyItem(ViewGroup container, int position, Object object) {
+    public final void destroyItem(ViewGroup container, int position, @NonNull Object object) {
         container.removeView(((VH) object).itemView);
         destroyedItems.add((VH) object);
     }
 
     @Override
-    public final boolean isViewFromObject(View view, Object object) {
+    public final boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
         return ((VH) object).itemView == view;
     }