版本0.9.10，改为kotlin，支持相对布局

weimingjue · Jul 16, 2021 · 8fb3f82 · 8fb3f82
1 parent 06cbe24
commit 8fb3f82
Show file tree

Hide file tree

Showing 13 changed files with 496 additions and 517 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 # 主要解决AppBarLayout的置顶效果存在的以下问题
-
 1.头部超过一屏回拉会出现明显卡顿
 
 2.惯性滑动无法用手指停下
@@ -91,11 +90,13 @@ allprojects {
 }
 ```
 然后：
-`implementation（或api） 'com.github.weimingjue:sticky:0.9.8'`
+`implementation（或api） 'com.github.weimingjue:sticky:0.9.9'`
 
 ## 说明
 如果没有tag="sticky"则它就是一个可嵌套滑动的view
 
 支持androidX所有view及第三方的View嵌套，不支持ListView
 
+Android5.0及以后可以使用RelativeLayout和ConstantLayout
+
 无需混淆配置
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION
@@ -25,10 +26,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':sticky')
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
     //自己的adapter
-    api 'com.github.weimingjue:BaseAdapter:4.1.3'
+    api 'com.github.weimingjue:BaseAdapter:4.3.0'
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="com.wang.example">
 
     <application
-        android:name=".MyApplication"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/com/wang/example/App.kt b/app/src/main/java/com/wang/example/App.kt
@@ -0,0 +1,24 @@
+package com.wang.example
+
+import android.app.Application
+import android.widget.Toast
+import com.wang.example.App.Companion.app
+
+class App : Application() {
+    companion object {
+        lateinit var app: App
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        app = this;
+    }
+}
+
+fun getApp(): Application {
+    return app
+}
+
+fun CharSequence.toast() {
+    Toast.makeText(getApp(), this, Toast.LENGTH_SHORT).show()
+}
diff --git a/app/src/main/java/com/wang/example/MainActivity.java b/app/src/main/java/com/wang/example/MainActivity.java
diff --git a/app/src/main/java/com/wang/example/MainActivity.kt b/app/src/main/java/com/wang/example/MainActivity.kt
@@ -0,0 +1,29 @@
+package com.wang.example
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import com.wang.adapters.adapter.BaseAdapterRvList
+import com.wang.sticky.StickyNestedScrollLayout
+import java.util.*
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        val rv = findViewById<RecyclerView>(R.id.rv_main)
+        val adapter = BaseAdapterRvList.createAdapter<String>(R.layout.adapter_main)
+        val list = ArrayList<String>()
+        for (i in 0..79) {
+            list.add("第$i")
+        }
+        adapter.setListAndNotifyDataSetChanged(list)
+        rv.adapter = adapter
+
+        val snsl = findViewById<StickyNestedScrollLayout>(R.id.snsl_main)
+        //代码设置
+//        val tv = findViewById<TextView>(R.id.tv_main)
+//        snsl.setChildTag(tv, StickyNestedScrollLayout.TAG_STICKY)
+//        snsl.setChildTag(rv, StickyNestedScrollLayout.TAG_MATCH)
+    }
+}
diff --git a/app/src/main/java/com/wang/example/MyApplication.java b/app/src/main/java/com/wang/example/MyApplication.java
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,46 +11,48 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/tv1"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="1\n2"
-                android:textSize="80sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
+                android:focusableInTouchMode="true"
+                android:focusable="true"
                 android:layout_height="wrap_content"
                 android:text="3\n4"
-                android:textSize="80sp" />
+                android:textSize="80sp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
+                android:id="@+id/tv2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:tag="sticky"
                 android:text="悬浮1"
-                android:textSize="30sp" />
+                android:textSize="30sp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv1" />
 
             <TextView
+                android:id="@+id/tv3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="5\n6"
-                android:textSize="80sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="7\n8\n9"
-                android:textSize="80sp" />
+                android:textSize="80sp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv2" />
 
             <FrameLayout
+                android:id="@+id/tv5"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv3">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -64,18 +66,23 @@
             </FrameLayout>
 
             <TextView
+                android:id="@+id/tv6"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="哈哈"
-                android:textSize="80sp" />
+                android:textSize="80sp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv5" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_main"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:tag="match"
                 app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv6"
                 app:spanCount="2" />
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </com.wang.sticky.StickyNestedScrollLayout>
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.4.32'
     repositories {
         maven { url 'https://jitpack.io' }
         google()
         jcenter()
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,11 +29,11 @@ task clean(type: Delete) {
 }
 ext {
     //用于编译的SDK版本
-    COMPILE_SDK_VERSION = 28
+    COMPILE_SDK_VERSION = 29
 
     //最低支持Android版本
     MIN_SDK_VERSION = 16
 
     //目标版本
-    TARGET_SDK_VERSION = 28
+    TARGET_SDK_VERSION = 29
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 26 13:10:11 CST 2020
+#Tue Apr 27 15:19:57 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/sticky/build.gradle b/sticky/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION
@@ -24,6 +25,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }