Merge pull request #18 from ditclear/androidx

migrate to androidx
ditclear · Jun 27, 2019 · b150806 · b150806
2 parents 03c5c4d + afebc35
commit b150806
Show file tree

Hide file tree

Showing 84 changed files with 324 additions and 349 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -60,16 +60,15 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:design:' + rootProject.supportLibVersion
-    implementation 'com.android.support:cardview-v7:' + rootProject.supportLibVersion
-    implementation 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion
-    implementation 'com.android.support:palette-v7:' + rootProject.supportLibVersion
-    implementation 'com.android.support:support-dynamic-animation:' + rootProject.supportLibVersion
-    implementation 'com.android.support:customtabs:' + rootProject.supportLibVersion
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
     //ViewModel
-    implementation "android.arch.lifecycle:extensions:" + rootProject.archLifecycleVersion
-    implementation "android.arch.lifecycle:viewmodel:" + rootProject.archLifecycleVersion
-    kapt "android.arch.lifecycle:compiler:" + rootProject.archLifecycleVersion
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0-rc01'
+    kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0-rc01'
     //kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //aspectj
@@ -90,9 +89,9 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
     implementation 'com.google.code.gson:gson:2.8.2'
     //room
-    implementation 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion
-    implementation 'android.arch.persistence.room:rxjava2:' + rootProject.archRoomVersion
-    kapt "android.arch.persistence.room:compiler:" + rootProject.archRoomVersion
+    implementation 'androidx.room:room-runtime:2.0.0-rc01'
+    implementation 'androidx.room:room-rxjava2:2.0.0-rc01'
+    kapt 'androidx.room:room-compiler:2.0.0-rc01'
     // roomigrant
     implementation 'com.github.MatrixDev.Roomigrant:RoomigrantLib:0.1.1'
     kapt 'com.github.MatrixDev.Roomigrant:RoomigrantCompiler:0.1.1'
@@ -107,7 +106,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.4'
     //////////ui test//////////////////
-    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'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     })

diff --git a/app/src/androidTest/java/com/ditclear/paonet/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/ditclear/paonet/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.ditclear.paonet
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/main/java/com/ditclear/paonet/PaoApp.kt b/app/src/main/java/com/ditclear/paonet/PaoApp.kt
@@ -1,7 +1,7 @@
 package com.ditclear.paonet
 
 import android.app.Application
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider
 import com.ditclear.paonet.di.appModule
 import com.ditclear.paonet.helper.SpUtil
 import com.ditclear.paonet.helper.network.NetMgr

diff --git a/app/src/main/java/com/ditclear/paonet/helper/MDHelper.kt b/app/src/main/java/com/ditclear/paonet/helper/MDHelper.kt
@@ -1,7 +1,7 @@
 package com.ditclear.paonet.helper
 
-import android.support.animation.DynamicAnimation
-import android.support.animation.FlingAnimation
+import androidx.dynamicanimation.animation.DynamicAnimation
+import androidx.dynamicanimation.animation.FlingAnimation
 import android.view.View
 
 /**

diff --git a/app/src/main/java/com/ditclear/paonet/helper/Navigator.kt b/app/src/main/java/com/ditclear/paonet/helper/Navigator.kt
@@ -5,10 +5,10 @@ import android.app.ActivityOptions
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.ColorRes
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.app.ActivityOptionsCompat
-import android.support.v4.content.ContextCompat
+import androidx.annotation.ColorRes
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.core.app.ActivityOptionsCompat
+import androidx.core.content.ContextCompat
 import android.view.ContextThemeWrapper
 import android.view.View
 import com.ditclear.paonet.R

diff --git a/app/src/main/java/com/ditclear/paonet/helper/SystemBarHelper.java b/app/src/main/java/com/ditclear/paonet/helper/SystemBarHelper.java
@@ -9,10 +9,10 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.core.view.ViewCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/Utils.kt b/app/src/main/java/com/ditclear/paonet/helper/Utils.kt
@@ -1,7 +1,7 @@
 package com.ditclear.paonet.helper
 
 import android.content.Context
-import android.support.v4.os.ResultReceiver
+import android.os.ResultReceiver
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import org.jsoup.Jsoup

diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/BaseViewAdapter.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/BaseViewAdapter.kt
@@ -1,9 +1,9 @@
 package com.ditclear.paonet.helper.adapter.recyclerview
 
 import android.content.Context
-import android.databinding.ObservableList
-import android.databinding.ViewDataBinding
-import android.support.v7.widget.RecyclerView
+import androidx.databinding.ObservableList
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.DecelerateInterpolator
@@ -15,7 +15,7 @@ import com.ditclear.paonet.helper.adapter.recyclerview.animators.ScaleInItemAnim
  *
  * Created by ditclear on 2017/10/30.
  */
-abstract class BaseViewAdapter<T>(context: Context, private val list: ObservableList<T>) : RecyclerView.Adapter<BindingViewHolder<ViewDataBinding>>() {
+abstract class BaseViewAdapter<T>(context: Context, private val list: ObservableList<T>) : androidx.recyclerview.widget.RecyclerView.Adapter<BindingViewHolder<ViewDataBinding>>() {
 
     protected val mLayoutInflater: LayoutInflater = LayoutInflater.from(context)
 

diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/BindingViewHolder.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/BindingViewHolder.kt
@@ -1,6 +1,6 @@
 package com.ditclear.paonet.helper.adapter.recyclerview
 
-import android.databinding.ViewDataBinding
-import android.support.v7.widget.RecyclerView
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
 
-class BindingViewHolder<out T : ViewDataBinding>(val binding: T) : RecyclerView.ViewHolder(binding.root)
+class BindingViewHolder<out T : ViewDataBinding>(val binding: T) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root)
diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/ItemClickPresenter.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/ItemClickPresenter.kt
@@ -1,6 +1,6 @@
 package com.ditclear.paonet.helper.adapter.recyclerview
 
-import android.databinding.ViewDataBinding
+import androidx.databinding.ViewDataBinding
 import android.view.View
 
 

diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/MultiTypeAdapter.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/MultiTypeAdapter.kt
@@ -1,12 +1,12 @@
 package com.ditclear.paonet.helper.adapter.recyclerview
 
 import android.content.Context
-import android.databinding.DataBindingUtil
-import android.databinding.ObservableArrayList
-import android.databinding.ObservableList
-import android.databinding.ViewDataBinding
-import android.support.annotation.LayoutRes
-import android.support.v4.util.ArrayMap
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ObservableArrayList
+import androidx.databinding.ObservableList
+import androidx.databinding.ViewDataBinding
+import androidx.annotation.LayoutRes
+import androidx.collection.ArrayMap
 import android.view.ViewGroup
 
 /**
@@ -18,7 +18,7 @@ class MultiTypeAdapter(context: Context, list: ObservableArrayList<Any>, val mul
 
     protected var mCollectionViewType: MutableList<Int> = mutableListOf()
 
-    private val mItemTypeToLayoutMap = ArrayMap<Int, Int>()
+    private val mItemTypeToLayoutMap = androidx.collection.ArrayMap<Int, Int>()
 
     init {
         list.addOnListChangedCallback(object : ObservableList.OnListChangedCallback<ObservableList<Any>>() {

diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/SingleTypeAdapter.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/recyclerview/SingleTypeAdapter.kt
@@ -1,9 +1,9 @@
 package com.ditclear.paonet.helper.adapter.recyclerview
 
 import android.content.Context
-import android.databinding.DataBindingUtil
-import android.databinding.ObservableList
-import android.databinding.ViewDataBinding
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ObservableList
+import androidx.databinding.ViewDataBinding
 import android.view.ViewGroup
 
 

diff --git a/app/src/main/java/com/ditclear/paonet/helper/adapter/viewpager/AbstractPagerAdapter.kt b/app/src/main/java/com/ditclear/paonet/helper/adapter/viewpager/AbstractPagerAdapter.kt
@@ -1,25 +1,25 @@
 package com.ditclear.paonet.helper.adapter.viewpager
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
 
 /**
  * 页面描述：fragment PagerAdapter
  *
  * Created by ditclear on 2017/9/30.
  */
 
-abstract class AbstractPagerAdapter(fm: FragmentManager, var title: Array<String>) : FragmentStatePagerAdapter(fm) {
-    var list :MutableList<Fragment?> = mutableListOf()
+abstract class AbstractPagerAdapter(fm: androidx.fragment.app.FragmentManager, var title: Array<String>) : androidx.fragment.app.FragmentStatePagerAdapter(fm) {
+    var list :MutableList<androidx.fragment.app.Fragment?> = mutableListOf()
 
     init {
         title.iterator().forEach { list.add(null) }
     }
 
     override fun getCount(): Int = title.size
 
-    abstract override fun getItem(pos: Int): Fragment?
+    abstract override fun getItem(pos: Int): androidx.fragment.app.Fragment?
 
     override fun getPageTitle(position: Int): CharSequence = title[position]
 

diff --git a/app/src/main/java/com/ditclear/paonet/helper/annotation/ArticleType.java b/app/src/main/java/com/ditclear/paonet/helper/annotation/ArticleType.java
@@ -9,7 +9,7 @@
 import static com.ditclear.paonet.helper.annotation.ArticleType.PROGRAME;
 import static com.ditclear.paonet.helper.annotation.ArticleType.RECOMMAND;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/annotation/CodeType.java b/app/src/main/java/com/ditclear/paonet/helper/annotation/CodeType.java
@@ -41,7 +41,7 @@
 import static com.ditclear.paonet.helper.annotation.CodeType.VIEW_TRANSITION;
 import static com.ditclear.paonet.helper.annotation.CodeType.WEBVIEW;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/annotation/EmptyState.java b/app/src/main/java/com/ditclear/paonet/helper/annotation/EmptyState.java
@@ -7,7 +7,7 @@
 import static com.ditclear.paonet.helper.annotation.EmptyState.EMPTY_SEARCH;
 import static com.ditclear.paonet.helper.annotation.EmptyState.NORMAL;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/annotation/ItemType.java b/app/src/main/java/com/ditclear/paonet/helper/annotation/ItemType.java
@@ -4,7 +4,7 @@
 import static com.ditclear.paonet.helper.annotation.ItemType.HEADER;
 import static com.ditclear.paonet.helper.annotation.ItemType.ITEM;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/annotation/ToastType.java b/app/src/main/java/com/ditclear/paonet/helper/annotation/ToastType.java
@@ -5,7 +5,7 @@
 import static com.ditclear.paonet.helper.annotation.ToastType.SUCCESS;
 import static com.ditclear.paonet.helper.annotation.ToastType.WARNING;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 /**
  * 页面描述：ToastType

diff --git a/app/src/main/java/com/ditclear/paonet/helper/binds/ImageBinds.java b/app/src/main/java/com/ditclear/paonet/helper/binds/ImageBinds.java
@@ -1,6 +1,6 @@
 package com.ditclear.paonet.helper.binds;
 
-import android.databinding.BindingAdapter;
+import androidx.databinding.BindingAdapter;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;

diff --git a/app/src/main/java/com/ditclear/paonet/helper/binds/NormalBind.kt b/app/src/main/java/com/ditclear/paonet/helper/binds/NormalBind.kt
@@ -1,12 +1,12 @@
 package com.ditclear.paonet.helper.binds
 
-import android.databinding.BindingAdapter
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.content.ContextCompat
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.PagerSnapHelper
-import android.support.v7.widget.RecyclerView
+import androidx.databinding.BindingAdapter
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.core.content.ContextCompat
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.PagerSnapHelper
+import androidx.recyclerview.widget.RecyclerView
 import android.view.Gravity
 import android.view.View
 import android.widget.ImageView
@@ -51,12 +51,12 @@ fun bindVisibility(v: View, visible: Boolean) {
 }
 
 @BindingAdapter(value = ["loadMore","loadMorePresenter"])
-fun bindLoadMore(v: RecyclerView, vm: PagedViewModel?,presenter: Presenter) {
-    v.layoutManager = LinearLayoutManager(v.context)
-    v.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+fun bindLoadMore(v: androidx.recyclerview.widget.RecyclerView, vm: PagedViewModel?, presenter: Presenter) {
+    v.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(v.context)
+    v.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
+        override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
             super.onScrolled(recyclerView, dx, dy)
-            if (recyclerView.layoutManager is LinearLayoutManager) {
+            if (recyclerView.layoutManager is androidx.recyclerview.widget.LinearLayoutManager) {
                 //表示是否能向上滚动，false表示已经滚动到底部
                 //防止多次拉取同样的数据
                 if (!recyclerView.canScrollVertically(1)) {
@@ -72,20 +72,20 @@ fun bindLoadMore(v: RecyclerView, vm: PagedViewModel?,presenter: Presenter) {
 }
 
 @BindingAdapter(value = ["onRefresh"])
-fun bindOnRefresh(v: SwipeRefreshLayout, presenter: Presenter) {
+fun bindOnRefresh(v: androidx.swiperefreshlayout.widget.SwipeRefreshLayout, presenter: Presenter) {
     v.setOnRefreshListener { presenter.loadData(true) }
 }
 
 @BindingAdapter(value = ["vertical"], requireAll = false)
-fun bindSlider(v: RecyclerView, vertical: Boolean = true) {
+fun bindSlider(v: androidx.recyclerview.widget.RecyclerView, vertical: Boolean = true) {
 
     if (vertical) {
-        v.layoutManager = LinearLayoutManager(v.context, LinearLayoutManager.VERTICAL, false)
+        v.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(v.context, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
     } else {
         if (v.onFlingListener == null) {
-            PagerSnapHelper().attachToRecyclerView(v)
+            androidx.recyclerview.widget.PagerSnapHelper().attachToRecyclerView(v)
         }
-        v.layoutManager = LinearLayoutManager(v.context, LinearLayoutManager.HORIZONTAL, false)
+        v.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(v.context, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
     }
 }