迁移至Androidx

donkingliang · Apr 25, 2019 · f33e642 · f33e642
1 parent 2be2fe8
commit f33e642
Show file tree

Hide file tree

Showing 23 changed files with 106 additions and 81 deletions.
diff --git a/README.md b/README.md
@@ -361,7 +361,7 @@ BaseViewHolder是可以通用的，在普通的Adapter中也可以使用，可
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
-
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.donkingliang.groupedadapterdemo"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.1"
     }
@@ -25,9 +23,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile project(":groupedadapter")
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation project(":groupedadapter")
 }
diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/BindingActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/BindingActivity.java
@@ -3,20 +3,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.donkingliang.groupedadapter.adapter.GroupedRecyclerViewAdapter;
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.R;
 import com.donkingliang.groupedadapterdemo.adapter.BindingAdapter;
-import com.donkingliang.groupedadapterdemo.adapter.GroupedListAdapter;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 使用DataBinding的列表
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/ExpandableActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/ExpandableActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +12,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 可展开、收起的列表。
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/Grid1Activity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/Grid1Activity.java
@@ -3,9 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +13,10 @@
 import com.donkingliang.groupedadapter.layoutmanger.GroupedGridLayoutManager;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
 
 /**
  * 子项为Grid布局的分组列表。给RecyclerView的LayoutManager

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/Grid2Activity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/Grid2Activity.java
@@ -3,9 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +13,10 @@
 import com.donkingliang.groupedadapter.layoutmanger.GroupedGridLayoutManager;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 子项为Grid布局的分组列表，而且可以修改各个子项的SpanSize。
  * 给RecyclerView的LayoutManager设置为{@link GroupedGridLayoutManager}

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/GroupedListActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/GroupedListActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.donkingliang.groupedadapterdemo.R;
@@ -15,6 +11,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 分组的列表
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/MainActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/MainActivity.java
@@ -1,11 +1,12 @@
 package com.donkingliang.groupedadapterdemo.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.donkingliang.groupedadapterdemo.R;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class MainActivity extends AppCompatActivity implements View.OnClickListener{
 
     @Override

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/NoFooterActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/NoFooterActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -16,6 +12,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 没有组尾的分组列表。
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/NoHeaderActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/NoHeaderActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +12,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 没有组头的分组列表。
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/StickyActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/StickyActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -18,6 +14,11 @@
 import com.donkingliang.groupedadapterdemo.adapter.NoFooterAdapter;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 没有组头的分组列表。
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/VariousActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/VariousActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +12,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 头、尾和子项都支持多种类型的分组列表
  */

diff --git a/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/VariousChildActivity.java b/app/src/main/java/com/donkingliang/groupedadapterdemo/activity/VariousChildActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +12,11 @@
 import com.donkingliang.groupedadapter.holder.BaseViewHolder;
 import com.donkingliang.groupedadapterdemo.model.GroupModel;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * 多种子项类型的分组列表
  */

diff --git a/app/src/main/res/layout/activity_group_list.xml b/app/src/main/res/layout/activity_group_list.xml
@@ -15,9 +15,15 @@
         android:textColor="@android:color/white"
         android:textSize="22sp" />
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rv_list"
+    <com.donkingliang.groupedadapter.widget.StickyHeaderLayout
+        android:id="@+id/sticky_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </com.donkingliang.groupedadapter.widget.StickyHeaderLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_sticky_list.xml b/app/src/main/res/layout/activity_sticky_list.xml
@@ -20,7 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +19,10 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Apr 24 18:09:51 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/groupedadapter/build.gradle b/groupedadapter/build.gradle
@@ -3,12 +3,10 @@ apply plugin: 'com.android.library'
 group='com.github.donkingliang' // 指定group，com.github.<用户名>
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
-
+    compileSdkVersion 28
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.1"
     }
@@ -26,10 +24,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    //compileOnly
-    provided 'com.android.support:recyclerview-v7:25.3.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
 //---------------------------------------------