v1.0.6

florent37 · Jul 7, 2015 · a933036 · a933036
1 parent 3923f05
commit a933036
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/.idea/libraries/materialviewpager_1_0_6.xml b/.idea/libraries/materialviewpager_1_0_6.xml
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ And have a look on a sample Youtube Video : [Youtube Link](http://www.youtube.co
 
 In your module [![Download](https://api.bintray.com/packages/florent37/maven/MaterialViewPager/images/download.svg)](https://bintray.com/florent37/maven/MaterialViewPager/_latestVersion)
 ```groovy
-compile ('com.github.florent37:materialviewpager:1.0.5.2@aar'){
+compile ('com.github.florent37:materialviewpager:1.0.6@aar'){
     transitive = true
 }
 ```
@@ -495,9 +495,11 @@ And must include @layout/material_view_pager_placeholder as first child
 
 #CHANGELOG
 
-##1.0.5.2
+##1.0.6
 - added attribute transparentToolbar
 - added attribute animatedHeaderImage
+- fixed bug when page is too small to scroll
+- modified HeaderDesign implementation
 
 ##1.0.5
 - smoother toolbar scrolling

diff --git a/materialviewpager/build.gradle b/materialviewpager/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.ben-manes.versions'
 
-version = "1.0.5.3"
+version = "1.0.6"
 
 android {
     compileSdkVersion 22
@@ -106,13 +106,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-task jar(type: Jar) {
-    //from android.sourceSets.main.java
-    from 'build/intermediates/classes/release/'
-}
-
 artifacts {
-    archives jar
     archives javadocJar
     archives sourcesJar
 }

diff --git a/materialviewpager/materialviewpager.iml b/materialviewpager/materialviewpager.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":materialviewpager" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.5.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":materialviewpager" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.6" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -24,9 +24,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:cardview-v7:22.2.0'
 
-    //compile ('com.github.florent37:materialviewpager:1.0.1@aar'){
-    //    transitive=true
-    //}
+    compile ('com.github.florent37:materialviewpager:1.0.6@aar'){
+        transitive=true
+    }
 
     compile project(':materialviewpager')
 }
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -71,6 +71,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.florent37/materialviewpager/1.0.6/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -84,17 +85,19 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
+    <orderEntry type="library" exported="" name="library-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="materialviewpager-1.0.6" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="module" module-name="materialviewpager" exported="" />
+    <orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
   </component>
 </module>