Merge pull request #1 from daimajia/master

fixed bugs

Author: jjhesk

.travis.yml

@@ -1,33 +1,25 @@
-language: java
-jdk: oraclejdk7
-env:
-  matrix:
-    - ANDROID_TARGET=android-20  ANDROID_ABI=armeabi-v7a
+language: android
+android:
+  components:
+    # Uncomment the lines below if you want to
+    # use the latest revision of Android SDK Tools
+    # - platform-tools
+    # - tools
 
-before_install:
-  # Install base Android SDK
-  - sudo apt-get update -qq
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
-  - wget http://dl.google.com/android/android-sdk_r23-linux.tgz
-  - tar xzf android-sdk_r23-linux.tgz
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+    # The BuildTools version used by your project
+    - build-tools-22.0.1
 
- # Gradle
-  - wget http://services.gradle.org/distributions/gradle-1.12-bin.zip
-  - unzip gradle-1.12-bin.zip
-  - export GRADLE_HOME=$PWD/gradle-1.12
-  - export PATH=$GRADLE_HOME/bin:$PATH
+    # The SDK version used to compile your project
+    - android-22
 
-  # Install required components
-  # For a full list, run `android list sdk -a --extended`
-  # Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
-  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --all --filter build-tools-20.0.0 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-20 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter sys-img-x86-android-19 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - addon-google_apis-google-19
 
-install:
- - ./gradlew assemble
+    # Specify at least one system image,
+    # if you need to run emulator(s) during your tests
+    - sys-img-armeabi-v7a-android-19
+    - sys-img-x86-android-17
+script: ./gradlew assembleDebug

README.md

@@ -23,7 +23,7 @@ dependencies {
     	compile "com.android.support:support-v4:+"
     	compile 'com.squareup.picasso:picasso:2.3.2'
     	compile 'com.nineoldandroids:library:2.4.0'
-    	compile 'com.daimajia.slider:library:1.1.2@aar'
+    	compile 'com.daimajia.slider:library:1.1.5@aar'
 }
 ```
 

build.gradle

@@ -1,11 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.2.1' 
+}
+
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:1.1.2'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+'
     }
 }

demo/build.gradle

@@ -1,20 +1,19 @@
 apply plugin: 'android-sdk-manager'
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion "20"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 20
+        targetSdkVersion 22
         versionCode 2
         versionName "1.0.1"
     }
     buildTypes {
         release {
-            runProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
@@ -23,7 +22,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:20.+'
+    compile 'com.android.support:appcompat-v7:22.+'
     compile 'com.nineoldandroids:library:2.4.0'
     compile 'com.daimajia.androidanimations:library:1.0.3@aar'
 }

demo/src/main/java/com/daimajia/slider/demo/MainActivity.java

@@ -4,6 +4,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -18,11 +19,12 @@
 import com.daimajia.slider.library.SliderLayout;
 import com.daimajia.slider.library.SliderTypes.BaseSliderView;
 import com.daimajia.slider.library.SliderTypes.TextSliderView;
+import com.daimajia.slider.library.Tricks.ViewPagerEx;
 
 import java.util.HashMap;
 
 
-public class MainActivity extends ActionBarActivity implements BaseSliderView.OnSliderClickListener{
+public class MainActivity extends ActionBarActivity implements BaseSliderView.OnSliderClickListener, ViewPagerEx.OnPageChangeListener{
 
     private SliderLayout mDemoSlider;
 
@@ -54,15 +56,17 @@ protected void onCreate(Bundle savedInstanceState) {
                     .setOnSliderClickListener(this);
 
             //add your extra information
+            textSliderView.bundle(new Bundle());
             textSliderView.getBundle()
-                    .putString("extra",name);
+                        .putString("extra",name);
 
            mDemoSlider.addSlider(textSliderView);
         }
         mDemoSlider.setPresetTransformer(SliderLayout.Transformer.Accordion);
         mDemoSlider.setPresetIndicator(SliderLayout.PresetIndicators.Center_Bottom);
         mDemoSlider.setCustomAnimation(new DescriptionAnimation());
         mDemoSlider.setDuration(4000);
+        mDemoSlider.addOnPageChangeListener(this);
         ListView l = (ListView)findViewById(R.id.transformers);
         l.setAdapter(new TransformerAdapter(this));
         l.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -76,6 +80,13 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
     }
 
+    @Override
+    protected void onStop() {
+        // To prevent a memory leak on rotation, make sure to call stopAutoCycle() on the slider before activity or fragment is destroyed
+        mDemoSlider.stopAutoCycle();
+        super.onStop();
+    }
+
     @Override
     public void onSliderClick(BaseSliderView slider) {
         Toast.makeText(this,slider.getBundle().get("extra") + "",Toast.LENGTH_SHORT).show();
@@ -108,4 +119,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+
+    @Override
+    public void onPageSelected(int position) {
+        Log.d("Slider Demo", "Page Changed: " + position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {}
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Jun 09 09:36:23 CST 2014
+#Sun May 03 23:34:25 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,18 +1,17 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion "20"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 20
-        versionCode 10
-        versionName "1.0.9"
+        targetSdkVersion 22
+        versionCode 15
+        versionName "1.1.5"
     }
     buildTypes {
         release {
-            runProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
@@ -23,9 +22,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:20.+'
-    compile "com.android.support:support-v4:20.0.+"
-    compile 'com.squareup.picasso:picasso:+'
-    compile 'com.nineoldandroids:library:+'
+    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile "com.android.support:support-v4:22.1.1"
+    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.nineoldandroids:library:2.4.0'
 }
-apply from: './gradle-mvn-push.gradle'
+apply from: './gradle-mvn-push.gradle'

library/build.gradle

@@ -104,9 +104,15 @@ afterEvaluate { project ->
         }
     }
 
+
     task androidJavadocs(type: Javadoc) {
-        source = android.sourceSets.main
-        classpath += project.files(android.getBootClasspath() .join(File.pathSeparator))
+        source = android.sourceSets.main.java.srcDirs
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        options.links("http://docs.oracle.com/javase/7/docs/api/");
+        options.linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
+        failOnError = false
     }
 
     task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
@@ -116,12 +122,12 @@ afterEvaluate { project ->
 
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
-        from android.sourceSets.main
+        from android.sourceSets.main.java.sourceFiles
     }
 
     artifacts {
         archives androidSourcesJar
         archives androidJavadocsJar
-        archives apklib 
+        archives apklib
     }
-}
+}

library/gradle-mvn-push.gradle

@@ -328,7 +328,7 @@ public void setViewPager(ViewPagerEx pager){
             throw new IllegalStateException("Viewpager does not have adapter instance");
         }
         mPager = pager;
-        mPager.setOnPageChangeListener(this);
+        mPager.addOnPageChangeListener(this);
         ((InfinitePagerAdapter)mPager.getAdapter()).getRealAdapter().registerDataSetObserver(dataChangeObserver);
     }
 
@@ -444,11 +444,6 @@ private void setItemAsSelected(int position){
 
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        if(mItemCount == 0){
-            return;
-        }
-        int n = position % mItemCount;
-        setItemAsSelected(n - 1);
     }
 
     public IndicatorVisibility getIndicatorVisibility(){
@@ -457,7 +452,10 @@ public IndicatorVisibility getIndicatorVisibility(){
 
     @Override
     public void onPageSelected(int position) {
-
+         if(mItemCount == 0){
+            return;
+        }
+        setItemAsSelected(position-1);
     }
     @Override
     public void onPageScrollStateChanged(int state) {