yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

迁移AndroidX

Browse Source
This commit is contained in:
oujunhui
2020-04-24 15:14:59 +08:00
parent 511d16e8e8
commit 808ebaf22f
1224 changed files with 2941 additions and 4638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/build.gradle
View File

@@ -7,7 +7,7 @@ android {
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -35,7 +35,7 @@ android {
dependencies {
def supportLibraryVersion = "27.1.1"
def glideVersion = "4.4.0"
def glideVersion = "4.11.0"
def retrofitVersion = "2.3.0"
def okhttp3 = "3.12.0"
def okio = "1.16.0"
@@ -44,7 +44,7 @@ dependencies {
def rxjava = "2.1.7"
def rxjava_android = "2.0.1"
def rxlifecycle = "2.1.0"
def loggerVersion = "2.1.1"
def loggerVersion = "2.2.0"
def qiniu = "7.3.15"
def SmartRefreshLayoutVersion = "1.0.3"
def eventbusVersion = "3.0.0"
@@ -52,14 +52,14 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
api "com.android.support:appcompat-v7:${supportLibraryVersion}"
api "com.android.support:recyclerview-v7:${supportLibraryVersion}"
api "com.android.support:design:${supportLibraryVersion}"
api 'androidx.appcompat:appcompat:1.1.0'
api 'androidx.recyclerview:recyclerview:1.1.0'
api 'com.google.android.material:material:1.1.0'
api "com.squareup.retrofit2:retrofit:${retrofitVersion}"
api "com.squareup.okhttp3:okhttp:${okhttp3}"

4
library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

4
library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.adapters;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.Collection;

2
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;

2
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;

4
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import com.trello.rxlifecycle2.LifecycleProvider;

6
library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library.bindinglist;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.support.v7.widget.RecyclerView;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;

10
library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java
View File

@@ -1,11 +1,11 @@
package com.yizhuan.xchat_android_library.bindinglist;
import android.databinding.ObservableArrayList;
import android.databinding.ObservableList;
import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableList;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.ViewGroup;
import java.lang.ref.WeakReference;

2
library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.list;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.util.AttributeSet;
public class NoScrollingLinearLayoutManager extends LinearLayoutManager {

2
library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.manager;
import android.app.Application;
import android.os.Debug;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* <p> </p>

2
library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_library.service;
import android.app.job.JobParameters;
import android.app.job.JobService;
import android.os.Build;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import com.orhanobut.logger.Logger;

2
library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java
View File

@@ -6,7 +6,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

8
library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java
View File

@@ -17,10 +17,10 @@
package com.yizhuan.xchat_android_library.swipeactivity;
import android.content.Context;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.VelocityTrackerCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.ScrollerCompat;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.VelocityTrackerCompat;
import androidx.core.view.ViewCompat;
import androidx.core.widget.ScrollerCompat;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;

2
library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_library.threadmgr;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.concurrent.ThreadFactory;

2
library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java
View File

@@ -10,7 +10,7 @@ import android.graphics.Bitmap;
import android.graphics.Point;
import android.os.Build;
import android.provider.Settings;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.View;

4
library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper;
@@ -14,7 +14,7 @@ import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper;
* @author jiahui
* @date 2018/1/11
*/
public class DrawableCenterTextView extends android.support.v7.widget.AppCompatTextView {
public class DrawableCenterTextView extends androidx.appcompat.widget.AppCompatTextView {
public DrawableCenterTextView(Context context) {

2
library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java
View File

@@ -4,7 +4,7 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.GradientDrawable;
import android.support.constraint.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintLayout;
import android.util.AttributeSet;
import com.yizhuan.xchat_android_library.R;

2
library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget.decoration;
import android.content.Context;
import android.graphics.Rect;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.View;

14
library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java
View File

@@ -3,13 +3,13 @@ package com.yizhuan.xchat_android_library.widget.xlist;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.OrientationHelper;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.util.Log;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.OrientationHelper;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.View;
/**

13
library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java
View File

@@ -3,16 +3,13 @@ package com.yizhuan.xchat_android_library.widget.xlist;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.OrientationHelper;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.OrientationHelper;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import com.yizhuan.xchat_android_library.R;