Skip to content

Commit 5370e54

Browse files
YvesCheungYvesCheung
committed
Migrate to AndroidX
1 parent 1f7e494 commit 5370e54

27 files changed

+67
-67
lines changed

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.50'
4+
ext.kotlin_version = '1.5.30'
55

66
repositories {
77
google()
88
jcenter()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.0.1'
11+
classpath 'com.android.tools.build:gradle:4.0.2'
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}

‎gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12+
android.enableJetifier=true
13+
android.useAndroidX=true
1214
org.gradle.jvmargs=-Xmx1536m
1315

1416
# When configured, Gradle will run in incubating parallel mode.

‎nestedtouch/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'com.github.dcendents.android-maven'
55
group = 'com.github.YvesCheung'
66

77
android {
8-
compileSdkVersion 26
8+
compileSdkVersion 30
99

1010
defaultConfig {
1111
minSdkVersion 14
12-
targetSdkVersion 26
12+
targetSdkVersion 30
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -24,8 +24,8 @@ android {
2424
}
2525

2626
dependencies {
27-
implementation "com.android.support:support-compat:26.1.0"
28-
implementation "com.android.support:support-core-ui:26.1.0"
27+
implementation 'androidx.core:core:1.0.0'
28+
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
2929
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3030
}
3131
repositories {

‎nestedtouch/src/main/java/mobile/yy/com/nestedtouch/StickyNestedLayout.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package mobile.yy.com.nestedtouch
22

33
import android.annotation.SuppressLint
44
import android.content.Context
5-
import android.support.annotation.IdRes
6-
import android.support.annotation.MainThread
7-
import android.support.annotation.Size
8-
import android.support.annotation.StringRes
9-
import android.support.v4.view.NestedScrollingChild2
10-
import android.support.v4.view.NestedScrollingChildHelper
11-
import android.support.v4.view.NestedScrollingParent2
12-
import android.support.v4.view.NestedScrollingParentHelper
13-
import android.support.v4.view.ViewCompat
14-
import android.support.v4.view.ViewCompat.TYPE_NON_TOUCH
15-
import android.support.v4.view.ViewCompat.TYPE_TOUCH
5+
import androidx.annotation.IdRes
6+
import androidx.annotation.MainThread
7+
import androidx.annotation.Size
8+
import androidx.annotation.StringRes
9+
import androidx.core.view.NestedScrollingChild2
10+
import androidx.core.view.NestedScrollingChildHelper
11+
import androidx.core.view.NestedScrollingParent2
12+
import androidx.core.view.NestedScrollingParentHelper
13+
import androidx.core.view.ViewCompat
14+
import androidx.core.view.ViewCompat.TYPE_NON_TOUCH
15+
import androidx.core.view.ViewCompat.TYPE_TOUCH
1616
import android.util.AttributeSet
1717
import android.util.Log
1818
import android.view.GestureDetector

‎nestedtouchsample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
android {
5-
compileSdkVersion 26
5+
compileSdkVersion 30
66

77
defaultConfig {
88
applicationId "mobile.yy.com.nestedtouchsample"
99
minSdkVersion 14
10-
targetSdkVersion 26
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -22,8 +22,8 @@ android {
2222

2323
dependencies {
2424
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
25-
implementation "com.android.support:recyclerview-v7:26.1.0"
26-
implementation 'com.android.support:appcompat-v7:26.1.0'
25+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
26+
implementation 'androidx.appcompat:appcompat:1.0.0'
2727
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.5.1'
2828
implementation 'com.gxz.pagerslidingtabstrip:library:1.3.1'
2929
implementation project(":nestedtouch")

‎nestedtouchsample/src/main/java/mobile/yy/com/nestedtouchsample/BlankFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package mobile.yy.com.nestedtouchsample
22

33
import android.annotation.SuppressLint
44
import android.os.Bundle
5-
import android.support.v4.app.Fragment
5+
import androidx.fragment.app.Fragment
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup

‎nestedtouchsample/src/main/java/mobile/yy/com/nestedtouchsample/DetailFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package mobile.yy.com.nestedtouchsample
22

33
import android.content.res.Resources
44
import android.os.Bundle
5-
import android.support.v4.app.Fragment
6-
import android.support.v7.widget.LinearLayoutManager
7-
import android.support.v7.widget.RecyclerView
5+
import androidx.fragment.app.Fragment
6+
import androidx.recyclerview.widget.LinearLayoutManager
7+
import androidx.recyclerview.widget.RecyclerView
88
import android.util.TypedValue
99
import android.view.LayoutInflater
1010
import android.view.View

‎nestedtouchsample/src/main/java/mobile/yy/com/nestedtouchsample/MainActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package mobile.yy.com.nestedtouchsample
22

33
import android.os.Bundle
4-
import android.support.v4.app.FragmentManager
5-
import android.support.v4.app.FragmentPagerAdapter
6-
import android.support.v7.app.AppCompatActivity
4+
import androidx.fragment.app.FragmentManager
5+
import androidx.fragment.app.FragmentPagerAdapter
6+
import androidx.appcompat.app.AppCompatActivity
77
import android.view.ViewTreeObserver
88
import android.widget.Toast
99
import com.scwang.smartrefresh.layout.header.ClassicsHeader

‎nestedtouchsample/src/main/java/mobile/yy/com/nestedtouchsample/WebFragment.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package mobile.yy.com.nestedtouchsample
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.app.Fragment
7-
import android.support.v4.view.MotionEventCompat
8-
import android.support.v4.view.NestedScrollingChild
9-
import android.support.v4.view.NestedScrollingChildHelper
10-
import android.support.v4.view.ViewCompat
6+
import androidx.fragment.app.Fragment
7+
import androidx.core.view.MotionEventCompat
8+
import androidx.core.view.NestedScrollingChild
9+
import androidx.core.view.NestedScrollingChildHelper
10+
import androidx.core.view.ViewCompat
1111
import android.util.AttributeSet
1212
import android.view.LayoutInflater
1313
import android.view.MotionEvent

‎nestedtouchsample/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!--StickyNestedLayout会通过id为 stickyContentView 来查找子View-->
5151
<!--如果id不是 stickyContentView-->
5252
<!--也可以通过contentDescription来指定是 stickyContentView -->
53-
<android.support.v4.view.ViewPager
53+
<androidx.viewpager.widget.ViewPager
5454
android:id="@+id/contentView"
5555
android:layout_width="match_parent"
5656
android:layout_height="match_parent"

‎toucheventbus/build.gradle

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ apply plugin: 'com.github.dcendents.android-maven'
33
group = 'com.github.YvesCheung'
44

55
android {
6-
compileSdkVersion 26
7-
8-
6+
compileSdkVersion 30
97

108
defaultConfig {
119
minSdkVersion 14
12-
targetSdkVersion 26
10+
targetSdkVersion 30
1311
versionCode 1
1412
versionName "1.0"
1513

16-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1715

1816
}
1917

@@ -27,7 +25,7 @@ android {
2725
}
2826

2927
dependencies {
30-
implementation 'com.android.support:appcompat-v7:26.1.0'
28+
implementation 'androidx.appcompat:appcompat:1.0.0'
3129
}
3230

3331
tasks.withType(JavaCompile) {

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/AbstractTouchEventHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mobile.yy.com.toucheventbus;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.util.Log;
66
import android.view.MotionEvent;
77

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/AttachToViewTouchEventHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.toucheventbus;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.view.MotionEvent;
55
import android.view.View;
66

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/InterceptClickHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.toucheventbus;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.util.Log;
55
import android.view.MotionEvent;
66
import android.view.View;

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/TouchEventBus.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package mobile.yy.com.toucheventbus;
22

33
import android.app.Activity;
4-
import android.support.annotation.Nullable;
5-
import android.support.annotation.UiThread;
6-
import android.support.v4.app.Fragment;
4+
import androidx.annotation.Nullable;
5+
import androidx.annotation.UiThread;
6+
import androidx.fragment.app.Fragment;
77
import android.util.Log;
88
import android.view.MotionEvent;
99
import android.view.View;

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/TouchEventHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mobile.yy.com.toucheventbus;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.view.MotionEvent;
66

77
import java.util.List;

‎toucheventbus/src/main/java/mobile/yy/com/toucheventbus/TouchViewHolder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.toucheventbus;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44

55
import java.util.HashSet;
66
import java.util.Set;

‎touchsample/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
targetSdkVersion 26
1111
versionCode 1
1212
versionName "1.0"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1414
}
1515
buildTypes {
1616
release {
@@ -21,7 +21,7 @@ android {
2121
}
2222

2323
dependencies {
24-
implementation 'com.android.support:appcompat-v7:26.1.0'
24+
implementation 'androidx.appcompat:appcompat:1.0.0'
2525
implementation project(":toucheventbus")
2626
implementation 'com.gxz.pagerslidingtabstrip:library:1.3.1'
2727
implementation 'io.reactivex.rxjava2:rxjava:2.1.13'

‎touchsample/src/main/java/mobile/yy/com/touchsample/model/Tab.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.touchsample.model
22

3-
import android.support.annotation.ColorInt
3+
import androidx.annotation.ColorInt
44

55
/**
66
* Created by 张宇 on 2018/4/25.

‎touchsample/src/main/java/mobile/yy/com/touchsample/touch/BackgroundImageTouchHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.touchsample.touch
22

3-
import android.support.v4.view.ViewPager
3+
import androidx.viewpager.widget.ViewPager
44
import android.view.MotionEvent
55
import mobile.yy.com.toucheventbus.AttachToViewTouchEventHandler
66
import mobile.yy.com.toucheventbus.TouchEventHandler

‎touchsample/src/main/java/mobile/yy/com/touchsample/touch/TabTouchHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mobile.yy.com.touchsample.touch
22

3-
import android.support.v4.view.ViewPager
3+
import androidx.viewpager.widget.ViewPager
44
import android.view.MotionEvent
55
import mobile.yy.com.toucheventbus.AttachToViewTouchEventHandler
66

‎touchsample/src/main/java/mobile/yy/com/touchsample/ui/BackgroundFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package mobile.yy.com.touchsample.ui
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.app.Fragment
7-
import android.support.v4.view.PagerAdapter
8-
import android.support.v4.view.ViewPager
6+
import androidx.fragment.app.Fragment
7+
import androidx.viewpager.widget.PagerAdapter
8+
import androidx.viewpager.widget.ViewPager
99
import android.view.LayoutInflater
1010
import android.view.View
1111
import android.view.ViewGroup

‎touchsample/src/main/java/mobile/yy/com/touchsample/ui/MainActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package mobile.yy.com.touchsample.ui
22

33
import android.os.Bundle
4-
import android.support.v4.app.FragmentManager
5-
import android.support.v4.app.FragmentPagerAdapter
6-
import android.support.v7.app.AppCompatActivity
4+
import androidx.fragment.app.FragmentManager
5+
import androidx.fragment.app.FragmentPagerAdapter
6+
import androidx.appcompat.app.AppCompatActivity
77
import android.view.MotionEvent
88
import kotlinx.android.synthetic.main.activity_main.*
99
import mobile.yy.com.toucheventbus.TouchEventBus

‎touchsample/src/main/java/mobile/yy/com/touchsample/ui/MainTabFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package mobile.yy.com.touchsample.ui
22

33
import android.annotation.SuppressLint
44
import android.os.Bundle
5-
import android.support.v4.app.FragmentManager
6-
import android.support.v4.app.FragmentPagerAdapter
5+
import androidx.fragment.app.FragmentManager
6+
import androidx.fragment.app.FragmentPagerAdapter
77
import android.view.LayoutInflater
88
import android.view.View
99
import android.view.ViewGroup

‎touchsample/src/main/java/mobile/yy/com/touchsample/util/FragmentEnterHelper.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package mobile.yy.com.touchsample.util
22

33
import android.os.Bundle
4-
import android.support.annotation.CallSuper
5-
import android.support.v4.app.Fragment
4+
import androidx.annotation.CallSuper
5+
import androidx.fragment.app.Fragment
66
import kotlin.properties.Delegates
77
import kotlin.properties.ObservableProperty
88
import kotlin.reflect.KProperty

‎touchsample/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
android:layout_below="@id/mainTitleBar"
4343
android:paddingBottom="200dp" />
4444

45-
<android.support.v4.view.ViewPager
45+
<androidx.viewpager.widget.ViewPager
4646
android:id="@+id/mainViewPager"
4747
android:layout_width="match_parent"
4848
android:layout_height="match_parent"

‎touchsample/src/main/res/layout/fragment_main_tab.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
app:pstsShouldExpand="true"
1414
app:pstsTextSelectedColor="@color/colorAccent" />
1515

16-
<android.support.v4.view.ViewPager
16+
<androidx.viewpager.widget.ViewPager
1717
android:id="@+id/subViewPager"
1818
android:layout_width="match_parent"
1919
android:layout_height="match_parent"

0 commit comments

Comments
 (0)