Publish

TellH · Jan 22, 2017 · d09b7b8 · d09b7b8
1 parent c773605
commit d09b7b8
Show file tree

Hide file tree

Showing 26 changed files with 150 additions and 17 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,4 +29,5 @@ dependencies {
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.squareup.picasso:picasso:2.5.2'
     testCompile 'junit:junit:4.12'
+    compile project(':stickyheaderview-rv')
 }
diff --git a/app/src/main/java/tellh/com/recyclerstickyheaderview/ItemHeader.java b/app/src/main/java/tellh/com/recyclerstickyheaderview/ItemHeader.java
@@ -1,5 +1,8 @@
 package tellh.com.recyclerstickyheaderview;
 
+import tellh.com.stickyheaderview_rv.adapter.DataBean;
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+
 /**
  * Created by tlh on 2017/1/22 :)
  */

diff --git a/app/src/main/java/tellh/com/recyclerstickyheaderview/ItemHeaderViewBinder.java b/app/src/main/java/tellh/com/recyclerstickyheaderview/ItemHeaderViewBinder.java
@@ -3,6 +3,9 @@
 import android.view.View;
 import android.widget.TextView;
 
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+import tellh.com.stickyheaderview_rv.adapter.ViewBinder;
+
 /**
  * Created by tlh on 2017/1/22 :)
  */

diff --git a/app/src/main/java/tellh/com/recyclerstickyheaderview/MainActivity.java b/app/src/main/java/tellh/com/recyclerstickyheaderview/MainActivity.java
@@ -14,6 +14,9 @@
 import java.util.Comparator;
 import java.util.List;
 
+import tellh.com.stickyheaderview_rv.adapter.DataBean;
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+
 public class MainActivity extends AppCompatActivity {
     private RecyclerView rv;
     private StickyHeaderViewAdapter adapter;

diff --git a/app/src/main/java/tellh/com/recyclerstickyheaderview/User.java b/app/src/main/java/tellh/com/recyclerstickyheaderview/User.java
@@ -1,5 +1,8 @@
 package tellh.com.recyclerstickyheaderview;
 
+import tellh.com.stickyheaderview_rv.adapter.DataBean;
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+
 public class User extends DataBean {
     private String login;
     private int id;
@@ -49,7 +52,7 @@ public void setShouldSticky(boolean shouldSticky) {
     }
 
     @Override
-    protected boolean shouldSticky() {
+    public boolean shouldSticky() {
         return shouldSticky;
     }
 

diff --git a/app/src/main/java/tellh/com/recyclerstickyheaderview/UserItemViewBinder.java b/app/src/main/java/tellh/com/recyclerstickyheaderview/UserItemViewBinder.java
@@ -6,6 +6,9 @@
 
 import com.squareup.picasso.Picasso;
 
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+import tellh.com.stickyheaderview_rv.adapter.ViewBinder;
+
 /**
  * Created by tlh on 2017/1/22 :)
  */

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="tellh.com.recyclerstickyheaderview.MainActivity">
 
-    <tellh.com.recyclerstickyheaderview.StickyHeaderView
+    <tellh.com.stickyheaderview_rv.StickyHeaderView
         android:id="@+id/stickyHeaderView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -16,5 +16,5 @@
             android:layout_height="match_parent"
             android:background="@android:color/white"
             android:scrollbars="vertical" />
-    </tellh.com.recyclerstickyheaderview.StickyHeaderView>
+    </tellh.com.stickyheaderview_rv.StickyHeaderView>
 </FrameLayout>
diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,9 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        // JitPack
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':stickyheaderview-rv'
diff --git a/stickyheaderview-rv/.gitignore b/stickyheaderview-rv/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/stickyheaderview-rv/build.gradle b/stickyheaderview-rv/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.library'
+// JitPack
+apply plugin: 'com.github.dcendents.android-maven'
+group='com.github.TellH'
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile "com.android.support:recyclerview-v7:25.1.0"
+    testCompile 'junit:junit:4.12'
+}
diff --git a/stickyheaderview-rv/proguard-rules.pro b/stickyheaderview-rv/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\AndroidSDK\AndroidStudio/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/...erview-rv/src/androidTest/java/tellh/com/stickyheaderview_rv/ExampleInstrumentedTest.java b/...erview-rv/src/androidTest/java/tellh/com/stickyheaderview_rv/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package tellh.com.stickyheaderview_rv;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("tellh.com.stickyheaderview_rv.test", appContext.getPackageName());
+    }
+}
diff --git a/stickyheaderview-rv/src/main/AndroidManifest.xml b/stickyheaderview-rv/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="tellh.com.stickyheaderview_rv">
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/...lerstickyheaderview/StickyHeaderView.java → ...stickyheaderview_rv/StickyHeaderView.java b/...lerstickyheaderview/StickyHeaderView.java → ...stickyheaderview_rv/StickyHeaderView.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -14,14 +14,18 @@
 import java.util.List;
 import java.util.Stack;
 
+import tellh.com.stickyheaderview_rv.adapter.DataBean;
+import tellh.com.stickyheaderview_rv.adapter.StickyHeaderViewAdapter;
+import tellh.com.stickyheaderview_rv.adapter.ViewBinder;
+
 /**
  * Created by tlh on 2017/1/21 :)
  */
 
 public class StickyHeaderView extends FrameLayout {
     private static final String TAG = "StickyHeaderView";
-    private FrameLayout mHeaderContainer;
     private boolean hasInit = false;
+    private FrameLayout mHeaderContainer;
     private RecyclerView mRecyclerView;
     private int mHeaderHeight = -1;
     private StickyHeaderViewAdapter adapter;
@@ -77,7 +81,7 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                             return;
                         List<DataBean> displayList = adapter.getDisplayList();
                         if (stickyHeaderPositionStack.isEmpty())
-                            stickyHeaderPositionStack.push(findFirstVisibleStickyHeaderPosition(adapter.displayList, 0));
+                            stickyHeaderPositionStack.push(findFirstVisibleStickyHeaderPosition(displayList, 0));
                         int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
                         int firstVisibleStickyHeaderPosition = findFirstVisibleStickyHeaderPosition(displayList, firstVisibleItemPosition);
                         int currentStickyHeaderPosition = stickyHeaderPositionStack.peek();
@@ -91,14 +95,14 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                         if (firstVisibleStickyHeader == null)
                             return;
                         int headerTop = firstVisibleStickyHeader.getTop();
-                        if (headerTop > 0 && headerTop <= mHeaderHeight) {
+                        if (headerTop > 0 && headerTop <= mHeaderHeight) { //吸顶正在更替的状态
                             mHeaderContainer.setY(-(mHeaderHeight - headerTop));
                             if (firstVisibleStickyHeaderPosition == currentStickyHeaderPosition) {
                                 stickyHeaderPositionStack.pop();
                                 if (!stickyHeaderPositionStack.isEmpty())
                                     updateHeaderView(stickyHeaderPositionStack.peek());
                             }
-                        } else if (headerTop <= 0) {
+                        } else if (headerTop <= 0) {  //吸顶稳定在最上方的状态
                             mHeaderContainer.setY(0);
                             updateHeaderView(firstVisibleItemPosition);
                         }

diff --git a/...om/recyclerstickyheaderview/DataBean.java → ...stickyheaderview_rv/adapter/DataBean.java b/...om/recyclerstickyheaderview/DataBean.java → ...stickyheaderview_rv/adapter/DataBean.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 import android.support.v4.util.SparseArrayCompat;
 
@@ -13,7 +13,7 @@ public final IViewBinder provideViewBinder(StickyHeaderViewAdapter adapter, Spar
         return viewBinder;
     }
 
-    protected boolean shouldSticky() {
+    public boolean shouldSticky() {
         return false;
     }
 }
diff --git a/...recyclerstickyheaderview/IViewBinder.java → ...ckyheaderview_rv/adapter/IViewBinder.java b/...recyclerstickyheaderview/IViewBinder.java → ...ckyheaderview_rv/adapter/IViewBinder.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 import android.view.View;
 

diff --git a/...stickyheaderview/IViewBinderProvider.java → ...rview_rv/adapter/IViewBinderProvider.java b/...stickyheaderview/IViewBinderProvider.java → ...rview_rv/adapter/IViewBinderProvider.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 import android.support.v4.util.SparseArrayCompat;
 

diff --git a/...yclerstickyheaderview/LayoutItemType.java → ...headerview_rv/adapter/LayoutItemType.java b/...yclerstickyheaderview/LayoutItemType.java → ...headerview_rv/adapter/LayoutItemType.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 public interface LayoutItemType {
     int getItemLayoutId(StickyHeaderViewAdapter adapter);

diff --git a/...kyheaderview/StickyHeaderViewAdapter.java → ...w_rv/adapter/StickyHeaderViewAdapter.java b/...kyheaderview/StickyHeaderViewAdapter.java → ...w_rv/adapter/StickyHeaderViewAdapter.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 import android.support.annotation.LayoutRes;
 import android.support.v4.util.SparseArrayCompat;

diff --git a/.../recyclerstickyheaderview/ViewBinder.java → ...ickyheaderview_rv/adapter/ViewBinder.java b/.../recyclerstickyheaderview/ViewBinder.java → ...ickyheaderview_rv/adapter/ViewBinder.java
@@ -1,4 +1,4 @@
-package tellh.com.recyclerstickyheaderview;
+package tellh.com.stickyheaderview_rv.adapter;
 
 import android.support.annotation.IdRes;
 import android.support.v7.widget.RecyclerView;

diff --git a/stickyheaderview-rv/src/main/res/values/strings.xml b/stickyheaderview-rv/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">StickyHeaderView-rv</string>
+</resources>
diff --git a/stickyheaderview-rv/src/test/java/tellh/com/stickyheaderview_rv/ExampleUnitTest.java b/stickyheaderview-rv/src/test/java/tellh/com/stickyheaderview_rv/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package tellh.com.stickyheaderview_rv;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}