diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 60db822..880d0dc --- a/README.md +++ b/README.md @@ -20,10 +20,9 @@ You can easily load images from an internet URL, drawable, or file. And there ar ```groovy 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.squareup.picasso:picasso:2.4.0' + compile 'com.nineoldandroids:library:2.4.0' + compile 'com.daimajia.slider:library:1.1.2@aar' } ``` diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 2d50cf7..a637f24 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.0.0' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+' } } diff --git a/demo/.gitignore b/demo/.gitignore old mode 100644 new mode 100755 diff --git a/demo/build.gradle b/demo/build.gradle old mode 100644 new mode 100755 index b227c58..d3fac89 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,21 +1,20 @@ -apply plugin: 'android-sdk-manager' -apply plugin: 'android' +apply plugin: 'com.android.application' android { - compileSdkVersion 20 - buildToolsVersion "20" + compileSdkVersion 21 + buildToolsVersion "21.1.2" defaultConfig { minSdkVersion 8 - targetSdkVersion 20 + targetSdkVersion 21 versionCode 2 versionName "1.0.1" } buildTypes { release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } @@ -23,7 +22,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':library') - compile 'com.android.support:appcompat-v7:20.+' - compile 'com.nineoldandroids:library:2.4.0' - compile 'com.daimajia.androidanimations:library:1.0.3@aar' + compile 'com.android.support:appcompat-v7:21.0.3' } diff --git a/demo/proguard-rules.txt b/demo/proguard-rules.txt old mode 100644 new mode 100755 diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/assets/nemo.jpg b/demo/src/main/assets/nemo.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/assets/toystory.jpg b/demo/src/main/assets/toystory.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/assets/up.jpg b/demo/src/main/assets/up.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/assets/wall.jpg b/demo/src/main/assets/wall.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/java/com/daimajia/slider/demo/ChildAnimationExample.java b/demo/src/main/java/com/daimajia/slider/demo/ChildAnimationExample.java old mode 100644 new mode 100755 diff --git a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java old mode 100644 new mode 100755 index c150044..211de33 --- a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java +++ b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java @@ -32,13 +32,13 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); mDemoSlider = (SliderLayout)findViewById(R.id.slider); - HashMap url_maps = new HashMap(); + HashMap url_maps = new HashMap<>(); url_maps.put("Hannibal", "http://static2.hypable.com/wp-content/uploads/2013/12/hannibal-season-2-release-date.jpg"); url_maps.put("Big Bang Theory", "http://tvfiles.alphacoders.com/100/hdclearart-10.png"); url_maps.put("House of Cards", "http://cdn3.nflximg.net/images/3093/2043093.jpg"); url_maps.put("Game of Thrones", "http://images.boomsbeat.com/data/images/full/19640/game-of-thrones-season-4-jpg.jpg"); - HashMap file_maps = new HashMap(); + HashMap file_maps = new HashMap<>(); file_maps.put("Hannibal",R.drawable.hannibal); file_maps.put("Big Bang Theory",R.drawable.bigbang); file_maps.put("House of Cards",R.drawable.house); @@ -59,10 +59,12 @@ protected void onCreate(Bundle savedInstanceState) { mDemoSlider.addSlider(textSliderView); } + mDemoSlider.setPresetTransformer(SliderLayout.Transformer.Accordion); mDemoSlider.setPresetIndicator(SliderLayout.PresetIndicators.Center_Bottom); mDemoSlider.setCustomAnimation(new DescriptionAnimation()); mDemoSlider.setDuration(4000); + ListView l = (ListView)findViewById(R.id.transformers); l.setAdapter(new TransformerAdapter(this)); l.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -72,8 +74,6 @@ public void onItemClick(AdapterView parent, View view, int position, long id) Toast.makeText(MainActivity.this, ((TextView) view).getText().toString(), Toast.LENGTH_SHORT).show(); } }); - - } @Override @@ -106,6 +106,7 @@ public boolean onOptionsItemSelected(MenuItem item) { startActivity(browserIntent); break; } + return super.onOptionsItemSelected(item); } } diff --git a/demo/src/main/java/com/daimajia/slider/demo/TransformerAdapter.java b/demo/src/main/java/com/daimajia/slider/demo/TransformerAdapter.java old mode 100644 new mode 100755 index 0142c2b..0681f34 --- a/demo/src/main/java/com/daimajia/slider/demo/TransformerAdapter.java +++ b/demo/src/main/java/com/daimajia/slider/demo/TransformerAdapter.java @@ -35,7 +35,7 @@ public long getItemId(int position) { @Override public View getView(int position, View convertView, ViewGroup parent) { - TextView t = (TextView)LayoutInflater.from(mContext).inflate(R.layout.item,null); + TextView t = (TextView)LayoutInflater.from(mContext).inflate(R.layout.item, parent, false); t.setText(getItem(position).toString()); return t; } diff --git a/demo/src/main/res/drawable-hdpi/bigbang.jpg b/demo/src/main/res/drawable-hdpi/bigbang.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/bird.png b/demo/src/main/res/drawable-hdpi/bird.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/d1.png b/demo/src/main/res/drawable-hdpi/d1.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/game_of_thrones.jpg b/demo/src/main/res/drawable-hdpi/game_of_thrones.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/hannibal.jpg b/demo/src/main/res/drawable-hdpi/hannibal.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/house.jpg b/demo/src/main/res/drawable-hdpi/house.jpg old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-hdpi/ic_launcher.png b/demo/src/main/res/drawable-hdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-mdpi/ic_launcher.png b/demo/src/main/res/drawable-mdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-xhdpi/ic_launcher.png b/demo/src/main/res/drawable-xhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/drawable-xxhdpi/ic_launcher.png b/demo/src/main/res/drawable-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/layout/item.xml b/demo/src/main/res/layout/item.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/menu/main.xml b/demo/src/main/res/menu/main.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/values-w820dp/dimens.xml b/demo/src/main/res/values-w820dp/dimens.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/values/dimens.xml b/demo/src/main/res/values/dimens.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index 94e85da..9545fbf --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 09 09:36:23 CST 2014 +#Fri Jan 16 01:35:16 BRT 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 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/library/.gitignore b/library/.gitignore old mode 100644 new mode 100755 diff --git a/library/build.gradle b/library/build.gradle old mode 100644 new mode 100755 index 5d9aa29..29f1149 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,21 +1,16 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { - compileSdkVersion 20 - buildToolsVersion "20" + compileSdkVersion 21 + buildToolsVersion "21.1.2" defaultConfig { minSdkVersion 8 - targetSdkVersion 20 + targetSdkVersion 21 versionCode 10 versionName "1.0.9" } - buildTypes { - release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } + lintOptions { abortOnError false } @@ -23,9 +18,10 @@ 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:21.0.3' + compile "com.android.support:support-v4:21.0.3" + compile 'com.squareup.picasso:picasso:2.4.0' + compile 'com.nineoldandroids:library:2.4.0' + compile 'com.daimajia.androidanimations:library:1.0.3@aar' } apply from: './gradle-mvn-push.gradle' \ No newline at end of file diff --git a/library/gradle-mvn-push.gradle b/library/gradle-mvn-push.gradle old mode 100644 new mode 100755 diff --git a/library/gradle.properties b/library/gradle.properties old mode 100644 new mode 100755 diff --git a/library/proguard-rules.txt b/library/proguard-rules.txt old mode 100644 new mode 100755 diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Animations/BaseAnimationInterface.java b/library/src/main/java/com/daimajia/slider/library/Animations/BaseAnimationInterface.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java b/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java b/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java old mode 100644 new mode 100755 index 238564c..84a1dfb --- a/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java +++ b/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java @@ -19,7 +19,7 @@ public class SliderAdapter extends PagerAdapter implements BaseSliderView.ImageL public SliderAdapter(Context context){ mContext = context; - mImageContents = new ArrayList(); + mImageContents = new ArrayList<>(); } public void addSlider(T slider){ @@ -95,7 +95,7 @@ public void onStart(BaseSliderView target) { */ @Override public void onEnd(boolean result, BaseSliderView target) { - if(target.isErrorDisappear() == false || result == true){ + if(!target.isErrorDisappear() || result){ return; } for (BaseSliderView slider: mImageContents){ diff --git a/library/src/main/java/com/daimajia/slider/library/SliderLayout.java b/library/src/main/java/com/daimajia/slider/library/SliderLayout.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/SliderTypes/DefaultSliderView.java b/library/src/main/java/com/daimajia/slider/library/SliderTypes/DefaultSliderView.java old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/SliderTypes/TextSliderView.java b/library/src/main/java/com/daimajia/slider/library/SliderTypes/TextSliderView.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Transformers/DefaultTransformer.java b/library/src/main/java/com/daimajia/slider/library/Transformers/DefaultTransformer.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Tricks/FixedSpeedScroller.java b/library/src/main/java/com/daimajia/slider/library/Tricks/FixedSpeedScroller.java old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Tricks/InfinitePagerAdapter.java b/library/src/main/java/com/daimajia/slider/library/Tricks/InfinitePagerAdapter.java old mode 100644 new mode 100755 diff --git a/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java b/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/library/src/main/res/drawable/indicator_corner_bg.xml b/library/src/main/res/drawable/indicator_corner_bg.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/layout/indicator_layout.xml b/library/src/main/res/layout/indicator_layout.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/layout/render_type_default.xml b/library/src/main/res/layout/render_type_default.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/layout/render_type_text.xml b/library/src/main/res/layout/render_type_text.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/layout/slider_layout.xml b/library/src/main/res/layout/slider_layout.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755