Merge pull request #12 from yqritc/fix/update-support-libs

Update the versions of libraries

README.md

@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.yqritc:recyclerview-flexibledivider:1.2.4'
+    compile 'com.yqritc:recyclerview-flexibledivider:1.2.5'
 }
 ```
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -1,11 +1,11 @@
-VERSION_NAME=1.2.4
-VERSION_CODE=8
+VERSION_NAME=1.2.5
+VERSION_CODE=9
 GROUP=com.yqritc
 ARTIFACT_ID=recyclerview-flexibledivider
 
-COMPILE_SDK_VERSION=21
-BUILD_TOOLS_VERSION=21.1.2
-TARGET_SDK_VERSION=21
+COMPILE_SDK_VERSION=22
+BUILD_TOOLS_VERSION=22
+TARGET_SDK_VERSION=22
 MIN_SDK_VERSION=9
 
 POM_DESCRIPTION=Android library providing simple way to control divider items of RecyclerView

library/build.gradle

@@ -13,8 +13,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.android.support:recyclerview-v7:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:recyclerview-v7:22.2.0'
 }
 
 android.libraryVariants.all { variant ->

library/src/main/java/com/yqritc/recyclerviewflexibledivider/FlexibleDividerDecoration.java

@@ -86,7 +86,7 @@ public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state)
         int childCount = mShowLastDivider ? parent.getChildCount() : parent.getChildCount() - 1;
         for (int i = 0; i < childCount; i++) {
             View child = parent.getChildAt(i);
-            int childPosition = parent.getChildPosition(child);
+            int childPosition = parent.getChildAdapterPosition(child);
 
             if (childPosition < lastChildPosition) {
                 // Avoid remaining divider when animation starts
@@ -125,7 +125,7 @@ public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state)
 
     @Override
     public void getItemOffsets(Rect rect, View v, RecyclerView parent, RecyclerView.State state) {
-        int position = parent.getChildPosition(v);
+        int position = parent.getChildAdapterPosition(v);
         setItemOffsets(rect, position, parent);
     }
 
@@ -145,7 +145,7 @@ public interface VisibilityProvider {
          * @param parent   RecyclerView
          * @return True if the divider at position should be hidden
          */
-        public boolean shouldHideDivider(int position, RecyclerView parent);
+        boolean shouldHideDivider(int position, RecyclerView parent);
     }
 
     /**
@@ -160,7 +160,7 @@ public interface PaintProvider {
          * @param parent   RecyclerView
          * @return Paint instance
          */
-        public Paint dividerPaint(int position, RecyclerView parent);
+        Paint dividerPaint(int position, RecyclerView parent);
     }
 
     /**
@@ -175,7 +175,7 @@ public interface ColorProvider {
          * @param parent   RecyclerView
          * @return Color value
          */
-        public int dividerColor(int position, RecyclerView parent);
+        int dividerColor(int position, RecyclerView parent);
     }
 
     /**
@@ -190,7 +190,7 @@ public interface DrawableProvider {
          * @param parent   RecyclerView
          * @return Drawable instance
          */
-        public Drawable drawableProvider(int position, RecyclerView parent);
+        Drawable drawableProvider(int position, RecyclerView parent);
     }
 
     /**
@@ -206,7 +206,7 @@ public interface SizeProvider {
          * @param parent   RecyclerView
          * @return Size of divider
          */
-        public int dividerSize(int position, RecyclerView parent);
+        int dividerSize(int position, RecyclerView parent);
     }
 
     public static class Builder<T extends Builder> {

library/src/main/java/com/yqritc/recyclerviewflexibledivider/HorizontalDividerItemDecoration.java

@@ -72,7 +72,7 @@ public interface MarginProvider {
          * @param parent   RecyclerView
          * @return left margin
          */
-        public int dividerLeftMargin(int position, RecyclerView parent);
+        int dividerLeftMargin(int position, RecyclerView parent);
 
         /**
          * Returns right margin of divider.
@@ -81,7 +81,7 @@ public interface MarginProvider {
          * @param parent   RecyclerView
          * @return right margin
          */
-        public int dividerRightMargin(int position, RecyclerView parent);
+        int dividerRightMargin(int position, RecyclerView parent);
     }
 
     public static class Builder extends FlexibleDividerDecoration.Builder<Builder> {

library/src/main/java/com/yqritc/recyclerviewflexibledivider/VerticalDividerItemDecoration.java

@@ -72,7 +72,7 @@ public interface MarginProvider {
          * @param parent   RecyclerView
          * @return top margin
          */
-        public int dividerTopMargin(int position, RecyclerView parent);
+        int dividerTopMargin(int position, RecyclerView parent);
 
         /**
          * Returns bottom margin of divider.
@@ -81,7 +81,7 @@ public interface MarginProvider {
          * @param parent   RecyclerView
          * @return bottom margin
          */
-        public int dividerBottomMargin(int position, RecyclerView parent);
+        int dividerBottomMargin(int position, RecyclerView parent);
     }
 
     public static class Builder extends FlexibleDividerDecoration.Builder<Builder> {

sample/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile project(':library')
-//    compile 'com.yqritc:recyclerview-flexibledivider:1.2.4'
-    compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.android.support:recyclerview-v7:22.0.0'
+//    compile 'com.yqritc:recyclerview-flexibledivider:1.2.5'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:recyclerview-v7:22.2.0'
 }

sample/src/main/java/com/yqritc/recyclerviewflexibledivider/sample/ComplexActivity.java

@@ -5,7 +5,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
@@ -14,7 +14,7 @@
 import android.view.View;
 
 
-public class ComplexActivity extends ActionBarActivity {
+public class ComplexActivity extends AppCompatActivity {
 
     public static void startActivity(Activity activity) {
         Intent intent = new Intent(activity, ComplexActivity.class);

sample/src/main/java/com/yqritc/recyclerviewflexibledivider/sample/DrawableActivity.java

@@ -5,15 +5,15 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
 
-public class DrawableActivity extends ActionBarActivity {
+public class DrawableActivity extends AppCompatActivity {
 
     public static void startActivity(Activity activity) {
         Intent intent = new Intent(activity, DrawableActivity.class);

sample/src/main/java/com/yqritc/recyclerviewflexibledivider/sample/PaintActivity.java

@@ -8,7 +8,7 @@
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
@@ -17,7 +17,7 @@
 import android.view.View;
 
 
-public class PaintActivity extends ActionBarActivity {
+public class PaintActivity extends AppCompatActivity {
 
     public static void startActivity(Activity activity) {
         Intent intent = new Intent(activity, PaintActivity.class);

sample/src/main/java/com/yqritc/recyclerviewflexibledivider/sample/SimpleActivity.java

@@ -5,15 +5,15 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
 
-public class SimpleActivity extends ActionBarActivity {
+public class SimpleActivity extends AppCompatActivity {
 
     public static void startActivity(Activity activity) {
         Intent intent = new Intent(activity, SimpleActivity.class);