Merge branch 'emanuelet-master'

Author: jacob-tabak

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,10 +19,11 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 22
-    buildToolsVersion = '22.0.1'
+    compileSdkVersion = 23
+    buildToolsVersion = '23.0.2'
+    supportLibsVersion = '23.1.1'
     targetSdkVersion = 22
-    minSdkVersion = 14
+    minSdkVersion = 11
     versionCode = 12
     versionName = "0.4.2"
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ 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-2.9-all.zip

library/build.gradle

@@ -17,7 +17,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:recyclerview-v7:22.2.0'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
 }
 
 apply from: 'gradle-maven-push.gradle'

library/src/main/java/com/timehop/stickyheadersrecyclerview/StickyRecyclerHeadersDecoration.java

@@ -154,5 +154,6 @@ public View getHeaderView(RecyclerView parent, int position) {
    */
   public void invalidateHeaders() {
     mHeaderProvider.invalidate();
+    mHeaderRects.clear();
   }
 }

sample/build.gradle

@@ -1,9 +1,11 @@
 apply plugin: 'com.android.application'
 
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion as Integer
     buildToolsVersion rootProject.ext.buildToolsVersion as String
 
+
     defaultConfig {
         applicationId "com.timehop.stickyheadersrecyclerview.sample"
         minSdkVersion rootProject.ext.minSdkVersion as Integer
@@ -19,4 +21,5 @@ android {
 
 dependencies {
     compile project(':library')
+    compile "com.android.support:appcompat-v7:${rootProject.supportLibsVersion}"
 }

sample/src/main/java/com/timehop/stickyheadersrecyclerview/sample/MainActivity.java

@@ -1,11 +1,11 @@
 package com.timehop.stickyheadersrecyclerview.sample;
 
-import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -22,7 +22,7 @@
 
 import java.security.SecureRandom;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -76,7 +76,7 @@ public void run() {
           @Override
           public void onHeaderClick(View header, int position, long headerId) {
             Toast.makeText(MainActivity.this, "Header position: " + position + ", id: " + headerId,
-                    Toast.LENGTH_SHORT).show();
+                Toast.LENGTH_SHORT).show();
           }
         });
     recyclerView.addOnItemTouchListener(touchListener);

sample/src/main/res/layout/activity_main.xml

@@ -1,31 +1,31 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:paddingTop="18dp">
+    tools:context=".MainActivity">
 
     <LinearLayout
         android:id="@+id/buttons_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingBottom="18dp"
+        android:paddingTop="18dp">
 
         <Button
             android:id="@+id/button_update"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/button_update"/>
+            android:text="@string/button_update" />
 
         <ToggleButton
             android:id="@+id/button_is_reverse"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textOff="@string/button_reverse"
-            android:textOn="@string/button_reverse"/>
+            android:textOn="@string/button_reverse" />
 
     </LinearLayout>
 
@@ -34,11 +34,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/buttons_container"
-        android:layout_margin="18dp"
-        android:padding="16dp"
         android:background="#ffbef0ff"
-        android:saveEnabled="false"
         android:clipToPadding="true"
-        />
+        android:padding="16dp"
+        android:saveEnabled="false" />
 
 </RelativeLayout>

sample/src/main/res/layout/view_header.xml

@@ -8,7 +8,7 @@
     android:layout_height="wrap_content"
     android:padding="16dp"
     android:background="#001F3F"
-    android:textSize="32sp"
+    android:textSize="28sp"
     android:textStyle="bold"
     android:textColor="@android:color/white"
     tools:text="Animals starting with A"

sample/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
     </style>