diff --git a/.travis.yml b/.travis.yml index 452e48d..89baa8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,24 @@ android: # - tools # The BuildTools version used by your project - - build-tools-22.0.1 + - build-tools-26.0.2 # The SDK version used to compile your project - - android-22 + - android-26 # Additional components - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - - addon-google_apis-google-19 + - extra-android-support # 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 + - sys-img-x86-android-26 + - sys-img-armeabi-v7a-android-17 + + # Licenses + # - 'android-sdk-license-.+' + # - 'google-gdk-license-.+' + script: ./gradlew assembleDebug diff --git a/build.gradle b/build.gradle index 49166ee..45cfaf6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,26 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +// Version compatibility +// https://developer.android.com/studio/releases/gradle-plugin#3-0-0 task wrapper(type: Wrapper) { - gradleVersion = '2.2.1' + gradleVersion = '4.1' } buildscript { repositories { mavenCentral() + google() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.2' - classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { mavenCentral() + google() + jcenter() } } diff --git a/demo/build.gradle b/demo/build.gradle index de31b19..b31b876 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,16 +1,16 @@ -apply plugin: 'android-sdk-manager' +//apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 19 + targetSdkVersion 28 versionCode 2 - versionName "1.0.1" + versionName "1.1.0" } buildTypes { release { @@ -20,9 +20,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':library') - compile 'com.android.support:appcompat-v7:22.+' - compile 'com.nineoldandroids:library:2.4.0' - compile 'com.daimajia.androidanimations:library:1.0.3@aar' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':library') + implementation 'com.android.support:appcompat-v7:26.0.1' + implementation 'com.nineoldandroids:library:2.4.0' + implementation 'com.daimajia.androidanimations:library:1.0.3@aar' } diff --git a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java index 8037dcf..304b864 100644 --- a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java +++ b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -24,7 +24,7 @@ import java.util.HashMap; -public class MainActivity extends ActionBarActivity implements BaseSliderView.OnSliderClickListener, ViewPagerEx.OnPageChangeListener{ +public class MainActivity extends AppCompatActivity implements BaseSliderView.OnSliderClickListener, ViewPagerEx.OnPageChangeListener{ private SliderLayout mDemoSlider; @@ -32,7 +32,7 @@ public class MainActivity extends ActionBarActivity implements BaseSliderView.On protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mDemoSlider = (SliderLayout)findViewById(R.id.slider); + mDemoSlider = findViewById(R.id.slider); HashMap url_maps = new HashMap(); url_maps.put("Hannibal", "http://static2.hypable.com/wp-content/uploads/2013/12/hannibal-season-2-release-date.jpg"); @@ -67,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) { mDemoSlider.setCustomAnimation(new DescriptionAnimation()); mDemoSlider.setDuration(4000); mDemoSlider.addOnPageChangeListener(this); - ListView l = (ListView)findViewById(R.id.transformers); + ListView l = findViewById(R.id.transformers); l.setAdapter(new TransformerAdapter(this)); l.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 918e0f3..1287834 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun May 03 23:34:25 CST 2015 +#Wed Jun 20 19:50:50 EAT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index b2e8cc6..103fad1 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 19 + targetSdkVersion 26 versionCode 15 - versionName "1.1.5" + versionName "1.2.1" } buildTypes { release { @@ -21,10 +21,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - 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' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:26.0.1' + implementation "com.android.support:support-v4:26.0.1" + implementation 'com.squareup.picasso:picasso:2.71828' + implementation 'com.android.support:exifinterface:26.0.1' + implementation 'com.android.support:animated-vector-drawable:26.0.1' } apply from: './gradle-mvn-push.gradle' diff --git a/library/src/main/java/com/daimajia/slider/library/Animations/DescriptionAnimation.java b/library/src/main/java/com/daimajia/slider/library/Animations/DescriptionAnimation.java index 6c03d99..b062adb 100644 --- a/library/src/main/java/com/daimajia/slider/library/Animations/DescriptionAnimation.java +++ b/library/src/main/java/com/daimajia/slider/library/Animations/DescriptionAnimation.java @@ -1,11 +1,10 @@ package com.daimajia.slider.library.Animations; +import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; import android.view.View; import com.daimajia.slider.library.R; -import com.nineoldandroids.animation.ObjectAnimator; -import com.nineoldandroids.animation.ValueAnimator; -import com.nineoldandroids.view.ViewHelper; /** * A demo class to show how to use {@link com.daimajia.slider.library.Animations.BaseAnimationInterface} @@ -49,7 +48,7 @@ public void onNextItemAppear(View view) { View descriptionLayout = view.findViewById(R.id.description_layout); if(descriptionLayout!=null){ - float layoutY = ViewHelper.getY(descriptionLayout); + float layoutY = descriptionLayout.getY(); view.findViewById(R.id.description_layout).setVisibility(View.VISIBLE); ValueAnimator animator = ObjectAnimator.ofFloat( descriptionLayout,"y",layoutY + descriptionLayout.getHeight(), diff --git a/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java b/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java index 8ad1d35..ce0ff6a 100644 --- a/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java +++ b/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java @@ -2,6 +2,7 @@ import android.content.Context; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -24,6 +25,7 @@ public abstract class BaseSliderView { protected Context mContext; private Bundle mBundle; + private String TAG = "BaseSliderView.java"; /** * Error place holder image. @@ -207,7 +209,8 @@ public void onClick(View v) { mLoadListener.onStart(me); } - Picasso p = (mPicasso != null) ? mPicasso : Picasso.with(mContext); + //Picasso p = (mPicasso != null) ? mPicasso : Picasso.with(mContext); + Picasso p = (mPicasso != null) ? mPicasso : Picasso.get(); RequestCreator rq = null; if(mUrl!=null){ rq = p.load(mUrl); @@ -252,14 +255,29 @@ public void onSuccess() { } @Override - public void onError() { + public void onError(Exception e) { + + Log.e(TAG,"Picasso error: "+e); + if(mLoadListener != null){ mLoadListener.onEnd(false,me); } if(v.findViewById(R.id.loading_bar) != null){ v.findViewById(R.id.loading_bar).setVisibility(View.INVISIBLE); } + } + + /* + @Override + public void onError() { + if(mLoadListener != null){ + mLoadListener.onEnd(false,me); + } + if(v.findViewById(R.id.loading_bar) != null){ + v.findViewById(R.id.loading_bar).setVisibility(View.INVISIBLE); + } + } */ }); } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/AccordionTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/AccordionTransformer.java index e159b9b..8620aae 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/AccordionTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/AccordionTransformer.java @@ -5,14 +5,12 @@ */ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class AccordionTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { - ViewHelper.setPivotX(view,position < 0 ? 0 : view.getWidth()); - ViewHelper.setScaleX(view,position < 0 ? 1f + position : 1f - position); + view.setPivotX(position < 0 ? 0 : view.getWidth()); + view.setScaleX(position < 0 ? 1f + position : 1f - position); } } \ No newline at end of file diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/BackgroundToForegroundTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/BackgroundToForegroundTransformer.java index d5e1572..55f42fd 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/BackgroundToForegroundTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/BackgroundToForegroundTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class BackgroundToForegroundTransformer extends BaseTransformer { @Override @@ -12,11 +10,11 @@ protected void onTransform(View view, float position) { final float width = view.getWidth(); final float scale = min(position < 0 ? 1f : Math.abs(1f - position), 0.5f); - ViewHelper.setScaleX(view,scale); - ViewHelper.setScaleY(view,scale); - ViewHelper.setPivotX(view,width*0.5f); - ViewHelper.setPivotY(view,height*0.5f); - ViewHelper.setTranslationX(view,position < 0 ? width * position : -width * position * 0.25f); + view.setScaleX(scale); + view.setScaleY(scale); + view.setPivotX(width*0.5f); + view.setPivotY(height*0.5f); + view.setTranslationX(position < 0 ? width * position : -width * position * 0.25f); } private static final float min(float val, float min) { diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/BaseTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/BaseTransformer.java index c1a78b9..b91003d 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/BaseTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/BaseTransformer.java @@ -4,7 +4,6 @@ import com.daimajia.slider.library.Animations.BaseAnimationInterface; import com.daimajia.slider.library.Tricks.ViewPagerEx; -import com.nineoldandroids.view.ViewHelper; import java.util.ArrayList; import java.util.HashMap; @@ -72,26 +71,26 @@ protected boolean isPagingEnabled() { protected void onPreTransform(View view, float position) { final float width = view.getWidth(); - ViewHelper.setRotationX(view,0); - ViewHelper.setRotationY(view,0); - ViewHelper.setRotation(view,0); - ViewHelper.setScaleX(view,1); - ViewHelper.setScaleY(view,1); - ViewHelper.setPivotX(view,0); - ViewHelper.setPivotY(view,0); - ViewHelper.setTranslationY(view,0); - ViewHelper.setTranslationX(view,isPagingEnabled() ? 0f : -width * position); + view.setRotationX(0); + view.setRotationY(0); + view.setRotation(0); + view.setScaleX(1); + view.setScaleY(1); + view.setPivotX(0); + view.setPivotY(0); + view.setTranslationY(0); + view.setTranslationX(isPagingEnabled() ? 0f : -width * position); if (hideOffscreenPages()) { - ViewHelper.setAlpha(view,position <= -1f || position >= 1f ? 0f : 1f); + view.setAlpha(position <= -1f || position >= 1f ? 0f : 1f); } else { - ViewHelper.setAlpha(view,1f); + view.setAlpha(1f); } if(mCustomAnimationInterface != null){ if(h.containsKey(view) == false || h.get(view).size() == 1){ if(position > -1 && position < 1){ if(h.get(view) == null){ - h.put(view,new ArrayList()); + h.put(view, new ArrayList()); } h.get(view).add(position); if(h.get(view).size() == 2){ diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/CubeInTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/CubeInTransformer.java index 8a8c382..53aff61 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/CubeInTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/CubeInTransformer.java @@ -2,16 +2,14 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class CubeInTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { // Rotate the fragment on the left or right edge - ViewHelper.setPivotX(view,position > 0 ? 0 : view.getWidth()); - ViewHelper.setPivotY(view,0); - ViewHelper.setRotation(view,-90f * position); + view.setPivotX(position > 0 ? 0 : view.getWidth()); + view.setPivotY(0); + view.setRotation(-90f * position); } @Override diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/DepthPageTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/DepthPageTransformer.java index c72e0da..505e3db 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/DepthPageTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/DepthPageTransformer.java @@ -1,8 +1,7 @@ package com.daimajia.slider.library.Transformers; -import android.view.View; -import com.nineoldandroids.view.ViewHelper; +import android.view.View; public class DepthPageTransformer extends BaseTransformer { @@ -11,16 +10,16 @@ public class DepthPageTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { if (position <= 0f) { - ViewHelper.setTranslationX(view,0f); - ViewHelper.setScaleX(view,1f); - ViewHelper.setScaleY(view,1f); + view.setTranslationX(0f); + view.setScaleX(1f); + view.setScaleY(1f); } else if (position <= 1f) { final float scaleFactor = MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position)); - ViewHelper.setAlpha(view,1-position); - ViewHelper.setPivotY(view,0.5f * view.getHeight()); - ViewHelper.setTranslationX(view,view.getWidth() * - position); - ViewHelper.setScaleX(view,scaleFactor); - ViewHelper.setScaleY(view,scaleFactor); + view.setAlpha(1-position); + view.setPivotY(0.5f * view.getHeight()); + view.setTranslationX(view.getWidth() * - position); + view.setScaleX(scaleFactor); + view.setScaleY(scaleFactor); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/FadeTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/FadeTransformer.java index c202ab3..35e4aa9 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/FadeTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/FadeTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - /** * Created by realandylawton on 11/22/13. */ @@ -14,19 +12,19 @@ protected void onTransform(View view, float position) { // Page is not an immediate sibling, just make transparent if(position < -1 || position > 1) { - ViewHelper.setAlpha(view,0.6f); + view.setAlpha(0.6f); } // Page is sibling to left or right else if (position <= 0 || position <= 1) { // Calculate alpha. Position is decimal in [-1,0] or [0,1] float alpha = (position <= 0) ? position + 1 : 1 - position; - ViewHelper.setAlpha(view,alpha); + view.setAlpha(alpha); } // Page is active, make fully visible else if (position == 0) { - ViewHelper.setAlpha(view,1); + view.setAlpha(1); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/FlipHorizontalTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/FlipHorizontalTransformer.java index ada24aa..85d3147 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/FlipHorizontalTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/FlipHorizontalTransformer.java @@ -2,17 +2,15 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class FlipHorizontalTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { final float rotation = 180f * position; - ViewHelper.setAlpha(view,rotation > 90f || rotation < -90f ? 0 : 1); - ViewHelper.setPivotY(view,view.getHeight()*0.5f); - ViewHelper.setPivotX(view,view.getWidth() * 0.5f); - ViewHelper.setRotationY(view,rotation); + view.setAlpha(rotation > 90f || rotation < -90f ? 0 : 1); + view.setPivotY(view.getHeight()*0.5f); + view.setPivotX(view.getWidth() * 0.5f); + view.setRotationY(rotation); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/FlipPageViewTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/FlipPageViewTransformer.java index 31b0cf1..7784ad4 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/FlipPageViewTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/FlipPageViewTransformer.java @@ -4,7 +4,6 @@ import android.view.View; import com.daimajia.slider.library.Tricks.ViewPagerEx; -import com.nineoldandroids.view.ViewHelper; public class FlipPageViewTransformer extends BaseTransformer { @@ -31,19 +30,19 @@ private void setVisibility(View page, float position) { private void setTranslation(View view) { ViewPagerEx viewPager = (ViewPagerEx) view.getParent(); int scroll = viewPager.getScrollX() - view.getLeft(); - ViewHelper.setTranslationX(view,scroll); + view.setTranslationX(scroll); } private void setSize(View view, float position, float percentage) { - ViewHelper.setScaleX(view,(position != 0 && position != 1) ? percentage : 1); - ViewHelper.setScaleY(view,(position != 0 && position != 1) ? percentage : 1); + view.setScaleX((position != 0 && position != 1) ? percentage : 1); + view.setScaleY((position != 0 && position != 1) ? percentage : 1); } private void setRotation(View view, float position, float percentage) { if (position > 0) { - ViewHelper.setRotationY(view,-180 * (percentage + 1)); + view.setRotationY(-180 * (percentage + 1)); } else { - ViewHelper.setRotationY(view,180 * (percentage + 1)); + view.setRotationY(180 * (percentage + 1)); } } } \ No newline at end of file diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/ForegroundToBackgroundTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/ForegroundToBackgroundTransformer.java index 7f53c98..c46c4d0 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/ForegroundToBackgroundTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/ForegroundToBackgroundTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class ForegroundToBackgroundTransformer extends BaseTransformer { @Override @@ -12,11 +10,11 @@ protected void onTransform(View view, float position) { final float width = view.getWidth(); final float scale = min(position > 0 ? 1f : Math.abs(1f + position), 0.5f); - ViewHelper.setScaleX(view,scale); - ViewHelper.setScaleY(view,scale); - ViewHelper.setPivotX(view,width * 0.5f); - ViewHelper.setPivotY(view,height * 0.5f); - ViewHelper.setTranslationX(view,position > 0 ? width * position : -width * position * 0.25f); + view.setScaleX(scale); + view.setScaleY(scale); + view.setPivotX(width * 0.5f); + view.setPivotY(height * 0.5f); + view.setTranslationX(position > 0 ? width * position : -width * position * 0.25f); } private static final float min(float val, float min) { diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/RotateDownTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/RotateDownTransformer.java index a88bc22..bae8aff 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/RotateDownTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/RotateDownTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class RotateDownTransformer extends BaseTransformer { private static final float ROT_MOD = -15f; @@ -14,9 +12,9 @@ protected void onTransform(View view, float position) { final float height = view.getHeight(); final float rotation = ROT_MOD * position * -1.25f; - ViewHelper.setPivotX(view,width * 0.5f); - ViewHelper.setPivotY(view,height); - ViewHelper.setRotation(view,rotation); + view.setPivotX(width * 0.5f); + view.setPivotY(height); + view.setRotation(rotation); } @Override diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/RotateUpTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/RotateUpTransformer.java index 2619f3a..9e22d94 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/RotateUpTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/RotateUpTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class RotateUpTransformer extends BaseTransformer { private static final float ROT_MOD = -15f; @@ -13,10 +11,10 @@ protected void onTransform(View view, float position) { final float width = view.getWidth(); final float rotation = ROT_MOD * position; - ViewHelper.setPivotX(view,width * 0.5f); - ViewHelper.setPivotY(view,0f); - ViewHelper.setTranslationX(view,0f); - ViewHelper.setRotation(view,rotation); + view.setPivotX(width * 0.5f); + view.setPivotY(0f); + view.setTranslationX(0f); + view.setRotation(rotation); } @Override diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/StackTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/StackTransformer.java index 495d7a2..14e47b1 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/StackTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/StackTransformer.java @@ -2,13 +2,11 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class StackTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { - ViewHelper.setTranslationX(view,position < 0 ? 0f : -view.getWidth() * position); + view.setTranslationX(position < 0 ? 0f : -view.getWidth() * position); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/TabletTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/TabletTransformer.java index e2fb6ce..205de33 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/TabletTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/TabletTransformer.java @@ -4,8 +4,6 @@ import android.graphics.Matrix; import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class TabletTransformer extends BaseTransformer { private static final Matrix OFFSET_MATRIX = new Matrix(); @@ -16,10 +14,10 @@ public class TabletTransformer extends BaseTransformer { protected void onTransform(View view, float position) { final float rotation = (position < 0 ? 30f : -30f) * Math.abs(position); - ViewHelper.setTranslationX(view,getOffsetXForRotation(rotation, view.getWidth(), view.getHeight())); - ViewHelper.setPivotX(view,view.getWidth() * 0.5f); - ViewHelper.setPivotY(view,0); - ViewHelper.setRotationY(view,rotation); + view.setTranslationX(getOffsetXForRotation(rotation, view.getWidth(), view.getHeight())); + view.setPivotX(view.getWidth() * 0.5f); + view.setPivotY(0); + view.setRotationY(rotation); } protected static final float getOffsetXForRotation(float degrees, int width, int height) { diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomInTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomInTransformer.java index 4bacbc0..cbc2ab7 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomInTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomInTransformer.java @@ -2,18 +2,16 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class ZoomInTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { final float scale = position < 0 ? position + 1f : Math.abs(1f - position); - ViewHelper.setScaleX(view,scale); - ViewHelper.setScaleY(view,scale); - ViewHelper.setPivotX(view,view.getWidth() * 0.5f); - ViewHelper.setPivotY(view,view.getHeight() * 0.5f); - ViewHelper.setAlpha(view,position < -1f || position > 1f ? 0f : 1f - (scale - 1f)); + view.setScaleX(scale); + view.setScaleY(scale); + view.setPivotX(view.getWidth() * 0.5f); + view.setPivotY(view.getHeight() * 0.5f); + view.setAlpha(position < -1f || position > 1f ? 0f : 1f - (scale - 1f)); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutSlideTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutSlideTransformer.java index 3a2ba81..64ccf27 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutSlideTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutSlideTransformer.java @@ -2,8 +2,6 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class ZoomOutSlideTransformer extends BaseTransformer { private static final float MIN_SCALE = 0.85f; @@ -19,21 +17,21 @@ protected void onTransform(View view, float position) { final float horzMargin = view.getWidth() * (1 - scaleFactor) / 2; // Center vertically - ViewHelper.setPivotY(view,0.5f * height); + view.setPivotY(0.5f * height); if (position < 0) { - ViewHelper.setTranslationX(view,horzMargin - vertMargin / 2); + view.setTranslationX(horzMargin - vertMargin / 2); } else { - ViewHelper.setTranslationX(view,-horzMargin + vertMargin / 2); + view.setTranslationX(-horzMargin + vertMargin / 2); } // Scale the page down (between MIN_SCALE and 1) - ViewHelper.setScaleX(view,scaleFactor); - ViewHelper.setScaleY(view,scaleFactor); + view.setScaleX(scaleFactor); + view.setScaleY(scaleFactor); // Fade the page relative to its size. - ViewHelper.setAlpha(view,MIN_ALPHA + (scaleFactor - MIN_SCALE) / (1 - MIN_SCALE) * (1 - MIN_ALPHA)); + view.setAlpha(MIN_ALPHA + (scaleFactor - MIN_SCALE) / (1 - MIN_SCALE) * (1 - MIN_ALPHA)); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutTransformer.java index d5c33ec..b79b9b2 100644 --- a/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutTransformer.java +++ b/library/src/main/java/com/daimajia/slider/library/Transformers/ZoomOutTransformer.java @@ -2,21 +2,19 @@ import android.view.View; -import com.nineoldandroids.view.ViewHelper; - public class ZoomOutTransformer extends BaseTransformer { @Override protected void onTransform(View view, float position) { final float scale = 1f + Math.abs(position); - ViewHelper.setScaleX(view,scale); - ViewHelper.setScaleY(view,scale); - ViewHelper.setPivotX(view,view.getWidth() * 0.5f); - ViewHelper.setPivotY(view,view.getWidth() * 0.5f); - ViewHelper.setAlpha(view,position < -1f || position > 1f ? 0f : 1f - (scale - 1f)); + view.setScaleX(scale); + view.setScaleY(scale); + view.setPivotX(view.getWidth() * 0.5f); + view.setPivotY(view.getWidth() * 0.5f); + view.setAlpha(position < -1f || position > 1f ? 0f : 1f - (scale - 1f)); if(position < -0.9){ //-0.9 to prevent a small bug - ViewHelper.setTranslationX(view,view.getWidth() * position); + view.setTranslationX(view.getWidth() * position); } } diff --git a/library/src/main/java/com/daimajia/slider/library/Tricks/ViewPagerEx.java b/library/src/main/java/com/daimajia/slider/library/Tricks/ViewPagerEx.java index 8927d26..434e6ec 100644 --- a/library/src/main/java/com/daimajia/slider/library/Tricks/ViewPagerEx.java +++ b/library/src/main/java/com/daimajia/slider/library/Tricks/ViewPagerEx.java @@ -15,7 +15,6 @@ import android.support.v4.os.ParcelableCompat; import android.support.v4.os.ParcelableCompatCreatorCallbacks; import android.support.v4.view.AccessibilityDelegateCompat; -import android.support.v4.view.KeyEventCompat; import android.support.v4.view.MotionEventCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.VelocityTrackerCompat; @@ -388,8 +387,8 @@ void initViewPager() { if (ViewCompat.getImportantForAccessibility(this) == ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO) { - ViewCompat.setImportantForAccessibility(this, - ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES); + ViewCompat.setImportantForAccessibility(this, + ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES); } } @@ -839,7 +838,7 @@ void smoothScrollTo(int x, int y, int velocity) { duration = Math.min(duration, MAX_SETTLE_DURATION); mScroller.startScroll(sx, sy, dx, dy, duration); - ViewCompat.postInvalidateOnAnimation(this); + ViewCompat.postInvalidateOnAnimation(this); } ItemInfo addNewItem(int position, int index) { @@ -1636,7 +1635,7 @@ public void computeScroll() { } // Keep on drawing until the animation has finished. - ViewCompat.postInvalidateOnAnimation(this); + ViewCompat.postInvalidateOnAnimation(this); return; } @@ -1774,7 +1773,7 @@ private void completeScroll(boolean postEvents) { } if (needPopulate) { if (postEvents) { - ViewCompat.postOnAnimation(this, mEndScrollRunnable); + ViewCompat.postOnAnimation(this, mEndScrollRunnable); } else { mEndScrollRunnable.run(); } @@ -1789,8 +1788,8 @@ private void enableLayers(boolean enable) { final int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { final int layerType = enable ? - ViewCompat.LAYER_TYPE_HARDWARE : ViewCompat.LAYER_TYPE_NONE; - ViewCompat.setLayerType(getChildAt(i), layerType, null); + ViewCompat.LAYER_TYPE_HARDWARE : ViewCompat.LAYER_TYPE_NONE; + ViewCompat.setLayerType(getChildAt(i), layerType, null); } } @@ -1884,7 +1883,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) { if (mIsBeingDragged) { // Scroll to follow the motion event if (performDrag(x)) { - ViewCompat.postInvalidateOnAnimation(this); + ViewCompat.postInvalidateOnAnimation(this); } } break; @@ -2059,7 +2058,7 @@ public boolean onTouchEvent(MotionEvent ev) { break; } if (needsInvalidate) { - ViewCompat.postInvalidateOnAnimation(this); + ViewCompat.postInvalidateOnAnimation(this); } return true; } @@ -2222,7 +2221,7 @@ public void draw(Canvas canvas) { if (needsInvalidate) { // Keep animating - ViewCompat.postInvalidateOnAnimation(this); + ViewCompat.postInvalidateOnAnimation(this); } } @@ -2512,17 +2511,6 @@ public boolean executeKeyEvent(KeyEvent event) { case KeyEvent.KEYCODE_DPAD_RIGHT: handled = arrowScroll(FOCUS_RIGHT); break; - case KeyEvent.KEYCODE_TAB: - if (Build.VERSION.SDK_INT >= 11) { - // The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD - // before Android 3.0. Ignore the tab key on those devices. - if (KeyEventCompat.hasNoModifiers(event)) { - handled = arrowScroll(FOCUS_FORWARD); - } else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) { - handled = arrowScroll(FOCUS_BACKWARD); - } - } - break; } } return handled;