androidx

YvesCheung · May 24, 2019 · 04b05b0 · 04b05b0
1 parent 143d2c5
commit 04b05b0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-23'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0' //not compat androidx yet.
 
-    implementation project(":lib")
-//    implementation 'com.github.YvesCheung:SlidableLayout:1.0.0'
+    //implementation project(":lib")
+    implementation 'com.github.YvesCheung:SlidableLayout:1.0.0'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -11,3 +11,5 @@ 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
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compileOnly "com.android.support:support-fragment:28.0.0"
+    implementation "androidx.fragment:fragment:1.0.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 

diff --git a/lib/src/main/java/com/yy/mobile/widget/SlidableLayout.kt b/lib/src/main/java/com/yy/mobile/widget/SlidableLayout.kt
@@ -5,12 +5,6 @@ import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.view.NestedScrollingChild2
-import android.support.v4.view.NestedScrollingChildHelper
-import android.support.v4.view.ViewCompat
-import android.support.v4.view.ViewCompat.TYPE_NON_TOUCH
 import android.util.AttributeSet
 import android.util.Log
 import android.view.GestureDetector
@@ -22,6 +16,12 @@ import android.view.ViewGroup
 import android.view.animation.Interpolator
 import android.widget.FrameLayout
 import android.widget.Scroller
+import androidx.core.view.NestedScrollingChild2
+import androidx.core.view.NestedScrollingChildHelper
+import androidx.core.view.ViewCompat
+import androidx.core.view.ViewCompat.TYPE_NON_TOUCH
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import kotlin.LazyThreadSafetyMode.NONE
 
 /**