Merge pull request smarteist#144 from smarteist/dev

Dev

Author: smarteist

.gitignore

@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild

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

@@ -2,6 +2,7 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -40,10 +41,11 @@ protected void onCreate(Bundle savedInstanceState) {
  sliderView.setAutoCycle(true);
  sliderView.startAutoCycle();
 
+
  sliderView.setOnIndicatorClickListener(new DrawController.ClickListener() {
  @Override
  public void onIndicatorClicked(int position) {
- sliderView.setCurrentPagePosition(position);
+ Log.i("GGG", "onIndicatorClicked: " + sliderView.getCurrentPagePosition());
  }
  });
 

autoimageslider/build.gradle

@@ -15,7 +15,7 @@ ext {
  siteUrl = 'https://github.com/smarteist'
  gitUrl = 'https://github.com/smarteist/android-image-slider.git'
 
- libraryVersion = '1.3.8'
+ libraryVersion = '1.3.9'
  organization = 'smarteistbintray' // if you push to organization's repository.
  developerId = 'smarteist'
  developerName = 'Ali Hosseini'
@@ -34,7 +34,7 @@ android {
  minSdkVersion 15
  targetSdkVersion 29
  versionCode 5
- versionName "1.3.8"
+ versionName "1.3.9"
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -57,7 +57,7 @@ configurations {
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  //noinspection GradleCompatible
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
  testImplementation 'junit:junit:4.12'
  androidTestImplementation 'androidx.test:runner:1.2.0'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

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

@@ -436,11 +436,7 @@ public void setCurrentPagePosition(int position) {
  public int getCurrentPagePosition() {
 
  if (getSliderAdapter() != null) {
- if (mIsInfiniteAdapter) {
- return getSliderPager().getCurrentItem() % mPagerAdapter.getCount();
- } else {
- return getSliderPager().getCurrentItem();
- }
+ return getSliderPager().getCurrentItem() ;
  } else {
  throw new NullPointerException("Adapter not set");
  }

build.gradle

@@ -8,7 +8,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:4.0.0'
  classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 28 00:46:48 IRDT 2019
+#Thu Jun 11 18:51:38 IRDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip