diff --git a/README.md b/README.md index 8d5cccc..b14fc16 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ you can scan the qrcode for download demo apk In your build.gradle: ``` dependencies { - implementation 'com.ethanhua:skeleton:1.1.2' + implementation 'com.ethanhua:skeleton:2.0.0' implementation 'io.supercharge:shimmerlayout:2.1.0' } ``` diff --git a/build.gradle b/build.gradle index 7233b3b..a09ab09 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index aac7c9b..53328d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,7 @@ org.gradle.jvmargs=-Xmx1536m # 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 + +#androidx +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1bd79e..5337740 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index ac5057d..147f84f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { - minSdkVersion 15 - targetSdkVersion 26 - versionCode 10 - versionName "1.1.2" + minSdkVersion 23 + targetSdkVersion 28 + versionCode 11 + versionName "2.0.0" } buildTypes { release { @@ -19,15 +19,16 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'io.supercharge:shimmerlayout:2.1.0' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + testImplementation 'junit:junit:4.12' } publish { userOrg = 'ethanhua' groupId = 'com.ethanhua' artifactId = 'skeleton' - publishVersion = '1.1.2' + publishVersion = '2.0.0' bintrayUser = 'ethanhua' bintrayKey = '' desc = 'a library provider a easy way to show skeleton loading view' diff --git a/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java index 39b3609..5d37e84 100644 --- a/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java +++ b/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java @@ -1,11 +1,11 @@ package com.ethanhua.skeleton; -import android.support.annotation.ArrayRes; -import android.support.annotation.ColorRes; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; /** * Created by ethanhua on 2017/7/29. diff --git a/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java b/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java index 33c28ca..34f8390 100644 --- a/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java +++ b/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java @@ -1,10 +1,11 @@ package com.ethanhua.skeleton; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by ethanhua on 2017/7/29. */ diff --git a/library/src/main/java/com/ethanhua/skeleton/Skeleton.java b/library/src/main/java/com/ethanhua/skeleton/Skeleton.java index 714f641..37f5323 100644 --- a/library/src/main/java/com/ethanhua/skeleton/Skeleton.java +++ b/library/src/main/java/com/ethanhua/skeleton/Skeleton.java @@ -1,8 +1,9 @@ package com.ethanhua.skeleton; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by ethanhua on 2017/7/29. */ diff --git a/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java b/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java index 3f076f9..aa94056 100644 --- a/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java +++ b/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java @@ -1,10 +1,11 @@ package com.ethanhua.skeleton; -import android.support.annotation.IntRange; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.annotation.IntRange; +import androidx.recyclerview.widget.RecyclerView; + import io.supercharge.shimmerlayout.ShimmerLayout; /** diff --git a/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java index 87226ba..71e21f9 100644 --- a/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java +++ b/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java @@ -1,9 +1,9 @@ package com.ethanhua.skeleton; -import android.support.annotation.ColorRes; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorRes; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/library/src/test/java/com/ethanhua/skeleton/ExampleUnitTest.java b/library/src/test/java/com/ethanhua/skeleton/ExampleUnitTest.java index df90d02..562912a 100644 --- a/library/src/test/java/com/ethanhua/skeleton/ExampleUnitTest.java +++ b/library/src/test/java/com/ethanhua/skeleton/ExampleUnitTest.java @@ -1,9 +1,6 @@ package com.ethanhua.skeleton; - - -import static junit.framework.Assert.assertEquals; - +import static org.junit.Assert.assertEquals; /** * Example local unit test, which will execute on the development machine (host). @@ -12,6 +9,6 @@ */ public class ExampleUnitTest { public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); + assertEquals(4, 2 + 2, 0); } } \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 381f0b5..e8f1d08 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { applicationId "com.ethanhua.skeleton.sample" - minSdkVersion 15 - targetSdkVersion 26 - versionCode 6 - versionName "1.0.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + minSdkVersion 23 + targetSdkVersion 28 + versionCode 7 + versionName "2.0.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -20,14 +20,14 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) //implementation project(':library') - implementation 'com.ethanhua:skeleton:1.1.2' + implementation 'com.ethanhua:skeleton:2.0.0' implementation 'io.supercharge:shimmerlayout:2.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' } diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java index 2f3c514..4c7f5d4 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java @@ -2,9 +2,10 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; + public class MainActivity extends AppCompatActivity { @Override diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java index 3957db6..7193271 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java @@ -3,11 +3,12 @@ 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.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.SkeletonScreen; diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java index f577326..ac96e06 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java @@ -1,10 +1,11 @@ package com.ethanhua.skeleton.sample; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; + import com.ethanhua.skeleton.ViewReplacer; public class StatusViewActivity extends AppCompatActivity { diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java index 07ed28c..4df4b63 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java @@ -4,11 +4,12 @@ import android.content.Intent; import android.os.Bundle; import android.os.Message; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.SkeletonScreen; import com.ethanhua.skeleton.sample.adapter.TopicAdapter; diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java index ec856be..faa3586 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java @@ -1,9 +1,10 @@ package com.ethanhua.skeleton.sample.adapter; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.ethanhua.skeleton.sample.R; /** diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java index 810510d..d4f77c8 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java @@ -1,9 +1,10 @@ package com.ethanhua.skeleton.sample.adapter; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.ethanhua.skeleton.sample.R; /** diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java index e99c005..a016fc2 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java @@ -1,9 +1,10 @@ package com.ethanhua.skeleton.sample.adapter; -import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + public class SimpleRcvViewHolder extends RecyclerView.ViewHolder { private final SparseArray views = new SparseArray<>(); diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java index cc954bd..f33251d 100644 --- a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java +++ b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java @@ -1,9 +1,10 @@ package com.ethanhua.skeleton.sample.adapter; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.ethanhua.skeleton.sample.R; /** diff --git a/sample/src/main/res/layout/activity_recyclerview.xml b/sample/src/main/res/layout/activity_recyclerview.xml index dbaca04..c6d1c84 100644 --- a/sample/src/main/res/layout/activity_recyclerview.xml +++ b/sample/src/main/res/layout/activity_recyclerview.xml @@ -7,7 +7,7 @@ android:background="@android:color/white" android:orientation="vertical"> - diff --git a/sample/src/main/res/layout/activity_status_view.xml b/sample/src/main/res/layout/activity_status_view.xml index 2ae3cf4..904e53c 100644 --- a/sample/src/main/res/layout/activity_status_view.xml +++ b/sample/src/main/res/layout/activity_status_view.xml @@ -1,5 +1,5 @@ - - + diff --git a/sample/src/main/res/layout/activity_view.xml b/sample/src/main/res/layout/activity_view.xml index 59b1713..beca33f 100644 --- a/sample/src/main/res/layout/activity_view.xml +++ b/sample/src/main/res/layout/activity_view.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/sample/src/main/res/layout/activity_view_skeleton.xml b/sample/src/main/res/layout/activity_view_skeleton.xml index 29d0bd5..64fea55 100644 --- a/sample/src/main/res/layout/activity_view_skeleton.xml +++ b/sample/src/main/res/layout/activity_view_skeleton.xml @@ -1,5 +1,5 @@ - - + diff --git a/sample/src/main/res/layout/item_news.xml b/sample/src/main/res/layout/item_news.xml index 1b04e7c..4561f45 100644 --- a/sample/src/main/res/layout/item_news.xml +++ b/sample/src/main/res/layout/item_news.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/sample/src/main/res/layout/item_skeleton_news.xml b/sample/src/main/res/layout/item_skeleton_news.xml index 58774fe..f9fe9f0 100644 --- a/sample/src/main/res/layout/item_skeleton_news.xml +++ b/sample/src/main/res/layout/item_skeleton_news.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/sample/src/main/res/layout/item_title_more.xml b/sample/src/main/res/layout/item_title_more.xml index 21e6bdc..a558af9 100644 --- a/sample/src/main/res/layout/item_title_more.xml +++ b/sample/src/main/res/layout/item_title_more.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/sample/src/main/res/layout/item_topic.xml b/sample/src/main/res/layout/item_topic.xml index 75e0549..6a6bd0e 100644 --- a/sample/src/main/res/layout/item_topic.xml +++ b/sample/src/main/res/layout/item_topic.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file