android x 分支

app/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion 34
+    buildToolsVersion "34.0.0"
 
     defaultConfig {
         applicationId "com.sobot.moduletest"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         //添加此行
@@ -30,8 +30,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 
     implementation project(':sobot_common')
     implementation project(':sobot_widget')
@@ -47,6 +47,6 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.4.0'
 
     //添加此行
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
 
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:supportsRtl="true">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize|touchscreen|navigation|locale|fontScale|uiMode|screenLayout|smallestScreenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/sobot/moduletest/MyApp.java

 package com.sobot.moduletest;
 
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 
 import com.sobot.common.utils.SobotCommonApi;
 import com.sobot.widget.SobotWidgetApi;

app/src/main/res/layout/activity_main.xml

@@ -34,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

gradle.properties

@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

sobot_common/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 14
@@ -32,15 +32,11 @@ dependencies {
 //    api project(':sobot_network')
 //    api project(':sobot_gson')
 
+
     api 'com.sobot.library:utils:1.1.3'
-    api 'com.sobot.library:picture:1.1.5'
+    api 'com.sobot.library:picture_x:1.1.5'
     api 'com.sobot.library:net:1.2.0'
     api 'com.sobot.library:gson:1.1.1'
-
-//    api 'com.sobot.library:utils:1.1.3'
-//    api 'com.sobot.library:picture_x:1.1.5'
-//    api 'com.sobot.library:net:1.2.0'
-//    api 'com.sobot.library:gson:1.1.1'
 }
 
 

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -11,8 +11,7 @@ task androidSourcesJar(type: Jar) {
 
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
-    PUBLISH_ARTIFACT_ID = 'sobotcommon'            //项目名
-//    PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
+    PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
     PUBLISH_VERSION = '1.4.3'                    //版本号
 }
 

sobot_gson/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 14

sobot_network/build.gradle

 apply plugin: 'com.android.library'
 
 android {
-    buildToolsVersion = "29.0.3"
-    compileSdkVersion = 29
+    compileSdkVersion = 33
 
     defaultConfig {
         minSdkVersion 14

sobot_pictureframe/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 14
@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.android.support:support-v4:28.0.0'
+    compileOnly 'androidx.legacy:legacy-support-v4:1.0.0'
     compileOnly 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compileOnly 'com.github.bumptech.glide:glide:3.8.0'
     compileOnly 'com.squareup.picasso:picasso:2.5.2'

sobot_pictureframe/sobot-picture-publish-mavencentral.gradle

@@ -11,8 +11,7 @@ task androidSourcesJar(type: Jar) {
 
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
-    PUBLISH_ARTIFACT_ID = 'picture'            //项目名
-    //PUBLISH_ARTIFACT_ID = 'picture_x'            //项目名
+    PUBLISH_ARTIFACT_ID = 'picture_x'            //项目名
     PUBLISH_VERSION = '1.1.5'                    //版本号
 }
 

sobot_pictureframe/src/main/java/com/sobot/pictureframe/SobotFrescoImageLoader.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 

sobot_pictureframe/src/main/java/com/sobot/pictureframe/SobotGlideImageLoader.java

@@ -2,7 +2,7 @@ package com.sobot.pictureframe;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 import android.text.TextUtils;
 import android.widget.ImageView;
 

sobot_pictureframe/src/main/java/com/sobot/pictureframe/SobotUILImageLoader.java

@@ -2,7 +2,7 @@ package com.sobot.pictureframe;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 import android.view.View;
 import android.widget.ImageView;
 

sobot_utils/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 14

sobot_widget/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 17
@@ -12,8 +12,8 @@ android {
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
-    compileOnly 'com.android.support:recyclerview-v7:28.0.0'
+    compileOnly 'androidx.appcompat:appcompat:1.0.0'
+    compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
     api 'com.sobot.library:utils:1.1.3'
 }
 

sobot_widget/sobot-widget-publish-mavencentral.gradle

@@ -11,14 +11,11 @@ task androidSourcesJar(type: Jar) {
 
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
-    PUBLISH_ARTIFACT_ID = 'widget'            //项目名
-//    PUBLISH_ARTIFACT_ID = 'widget_x'            //项目名
+    PUBLISH_ARTIFACT_ID = 'widget_x'            //项目名
     PUBLISH_VERSION = '1.1.3'                    //版本号
 }
 
 
-
-
 ext["signing.keyId"] = ''
 ext["signing.password"] = ''
 ext["signing.secretKeyRingFile"] = ''

sobot_widget/src/main/java/android/arch/lifecycle/ExternalLiveData.java → sobot_widget/src/main/java/androidx/lifecycle/ExternalLiveData.java

-package android.arch.lifecycle;
+package androidx.lifecycle;
 
-import static android.arch.lifecycle.Lifecycle.State.CREATED;
-import static android.arch.lifecycle.Lifecycle.State.DESTROYED;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+import static androidx.lifecycle.Lifecycle.State.CREATED;
+import static androidx.lifecycle.Lifecycle.State.DESTROYED;
+
+/**
+ * Created by liaohailiang on 2019/3/7.
+ */
 public class ExternalLiveData<T> extends MutableLiveData<T> {
 
     public static final int START_VERSION = LiveData.START_VERSION;
 
     @Override
-    public void observe(@NonNull LifecycleOwner owner, @NonNull Observer<T> observer) {
+    public void observe(@NonNull LifecycleOwner owner, @NonNull Observer<? super T> observer) {
         if (owner.getLifecycle().getCurrentState() == DESTROYED) {
             // ignore
             return;
@@ -54,7 +58,7 @@ public class ExternalLiveData<T> extends MutableLiveData<T> {
 
     class ExternalLifecycleBoundObserver extends LifecycleBoundObserver {
 
-        ExternalLifecycleBoundObserver(@NonNull LifecycleOwner owner, Observer<T> observer) {
+        ExternalLifecycleBoundObserver(@NonNull LifecycleOwner owner, Observer<? super T> observer) {
             super(owner, observer);
         }
 

sobot_widget/src/main/java/com/sobot/widget/image/photoview/SobotPhotoView.java

@@ -20,7 +20,7 @@ import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 

sobot_widget/src/main/java/com/sobot/widget/livedatabus/SobotLiveEventBus.java

 package com.sobot.widget.livedatabus;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.livedatabus.core.Config;
 import com.sobot.widget.livedatabus.core.LiveEvent;

sobot_widget/src/main/java/com/sobot/widget/livedatabus/core/Config.java

 package com.sobot.widget.livedatabus.core;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.livedatabus.logger.Logger;
 import com.sobot.widget.livedatabus.utils.AppUtils;

sobot_widget/src/main/java/com/sobot/widget/livedatabus/core/LiveEventBusCore.java

 package com.sobot.widget.livedatabus.core;
 
+import static android.content.Context.RECEIVER_EXPORTED;
+
+import android.annotation.SuppressLint;
 import android.app.Application;
-import android.arch.lifecycle.ExternalLiveData;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Observer;
+
+import androidx.lifecycle.ExternalLiveData;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.sobot.widget.livedatabus.ipc.consts.IpcConst;
 import com.sobot.widget.livedatabus.ipc.core.ProcessorManager;
@@ -94,6 +101,7 @@ public final class LiveEventBusCore {
      * first of all, call config to get the Config instance
      * then, call the method of Config to config LiveEventBus
      * call this method in Application.onCreate
+     *
      * @return Config
      */
     public Config config() {
@@ -115,6 +123,7 @@ public final class LiveEventBusCore {
         this.logger.setEnable(enable);
     }
 
+    @SuppressLint("WrongConstant")
     void registerReceiver() {
         if (isRegisterReceiver) {
             return;
@@ -124,6 +133,13 @@ public final class LiveEventBusCore {
             IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(IpcConst.ACTION);
             application.registerReceiver(receiver, intentFilter);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                application.registerReceiver(receiver, intentFilter, RECEIVER_EXPORTED);
+            }
+            // api <= 32
+            else {
+                application.registerReceiver(receiver, intentFilter);
+            }
             isRegisterReceiver = true;
         }
     }
@@ -448,7 +464,7 @@ public final class LiveEventBusCore {
             }
 
             @Override
-            public void removeObserver(@NonNull Observer<T> observer) {
+            public void removeObserver(@NonNull Observer<? super T> observer) {
                 super.removeObserver(observer);
                 if (autoClear() && !liveData.hasObservers()) {
                     LiveEventBusCore.get().bus.remove(key);

sobot_widget/src/main/java/com/sobot/widget/livedatabus/core/Observable.java

 package com.sobot.widget.livedatabus.core;
 
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.Observer;
-import android.support.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Observer;
+import androidx.annotation.NonNull;
 
 public interface Observable<T> {
 

sobot_widget/src/main/java/com/sobot/widget/livedatabus/utils/AppUtils.java

@@ -7,7 +7,7 @@ import android.app.Application;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 

sobot_widget/src/main/java/com/sobot/widget/loading/SobotLoadingLayout.java

@@ -21,8 +21,8 @@ import android.app.Fragment;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/SobotRefreshLayout.java

@@ -24,15 +24,15 @@ import android.graphics.Paint;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.NestedScrollingChildHelper;
-import android.support.v4.view.NestedScrollingParent;
-import android.support.v4.view.NestedScrollingParentHelper;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.NestedScrollingParent;
+import androidx.core.view.NestedScrollingParentHelper;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/api/RefreshComponent.java

 package com.sobot.widget.refresh.layout.api;
 
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
-import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import static android.support.annotation.RestrictTo.Scope.SUBCLASSES;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.annotation.RestrictTo.Scope.SUBCLASSES;
 
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import android.view.View;
 
 import com.sobot.widget.refresh.layout.constant.SpinnerStyle;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/api/RefreshContent.java

 package com.sobot.widget.refresh.layout.api;
 
 import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 import android.view.View;
 

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/api/RefreshFooter.java

 package com.sobot.widget.refresh.layout.api;
 
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
-import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import static android.support.annotation.RestrictTo.Scope.SUBCLASSES;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.annotation.RestrictTo.Scope.SUBCLASSES;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 /**
  * 刷新底部

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/api/RefreshKernel.java

 package com.sobot.widget.refresh.layout.api;
 
 import android.animation.ValueAnimator;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.sobot.widget.refresh.layout.constant.RefreshState;
 
@@ -37,7 +39,7 @@ public interface RefreshKernel {
 
     /**
      * 移动视图到指定位置
-     * moveSpinner 的取名来自 谷歌官方的 {@link android.support.v4.widget.SwipeRefreshLayout}
+     * moveSpinner 的取名来自 谷歌官方的 {@link SwipeRefreshLayout}
      * @param spinner 位置 (px)
      * @param isDragging true 手指正在拖动 false 回弹动画执行
      * @return RefreshKernel
@@ -46,7 +48,7 @@ public interface RefreshKernel {
 
     /**
      * 执行动画使视图位移到指定的 位置
-     * moveSpinner 的取名来自 谷歌官方的 {@link android.support.v4.widget.SwipeRefreshLayout}
+     * moveSpinner 的取名来自 谷歌官方的 {@link SwipeRefreshLayout}
      * @param endSpinner 指定的结束位置 (px)
      * @return ValueAnimator 如果没有执行动画 null
      */

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/api/RefreshLayout.java

 package com.sobot.widget.refresh.layout.api;
 
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/drawable/ProgressDrawable.java

@@ -7,7 +7,7 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * 旋转动画

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/footer/ArrowDrawable.java

@@ -4,7 +4,7 @@ import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.drawable.PaintDrawable;
 

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/footer/ClassicsAbstract.java

@@ -7,11 +7,11 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/footer/ClassicsFooter.java

@@ -2,8 +2,8 @@ package com.sobot.widget.refresh.layout.footer;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/header/ClassicsHeader.java

@@ -6,11 +6,11 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.TypedArray;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/DefaultRefreshFooterCreator.java

 package com.sobot.widget.refresh.layout.listener;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshFooter;
 import com.sobot.widget.refresh.layout.api.RefreshLayout;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/DefaultRefreshHeaderCreator.java

 package com.sobot.widget.refresh.layout.listener;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshHeader;
 import com.sobot.widget.refresh.layout.api.RefreshLayout;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/DefaultRefreshInitializer.java

 package com.sobot.widget.refresh.layout.listener;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshLayout;
 

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/OnLoadMoreListener.java

 package com.sobot.widget.refresh.layout.listener;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshLayout;
 

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/OnRefreshListener.java

 package com.sobot.widget.refresh.layout.listener;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshLayout;
 

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/listener/OnStateChangedListener.java

 package com.sobot.widget.refresh.layout.listener;
 
 
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
-import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import static android.support.annotation.RestrictTo.Scope.SUBCLASSES;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.annotation.RestrictTo.Scope.SUBCLASSES;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.sobot.widget.refresh.layout.api.RefreshLayout;
 import com.sobot.widget.refresh.layout.constant.RefreshState;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/simple/SimpleComponent.java

@@ -4,9 +4,9 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/simple/SimpleMultiListener.java

 package com.sobot.widget.refresh.layout.simple;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sobot.widget.refresh.layout.api.RefreshFooter;
 import com.sobot.widget.refresh.layout.api.RefreshHeader;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/util/SmartUtil.java

@@ -6,13 +6,13 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import android.content.res.Resources;
 import android.graphics.PointF;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.view.NestedScrollingChild;
-import android.support.v4.view.NestedScrollingParent;
-import android.support.v4.view.ScrollingView;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingParent;
+import androidx.core.view.ScrollingView;
+import androidx.viewpager.widget.ViewPager;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;

sobot_widget/src/main/java/com/sobot/widget/refresh/layout/wrapper/RefreshContentWrapper.java

@@ -9,10 +9,10 @@ import static com.sobot.widget.refresh.layout.util.SmartUtil.scrollListBy;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
-import android.support.v4.view.NestedScrollingChild;
-import android.support.v4.view.NestedScrollingParent;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingParent;
+import androidx.viewpager.widget.ViewPager;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/base/SobotBaseActivity.java

@@ -12,10 +12,10 @@ import android.hardware.Camera;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.LocaleList;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/BaseRecyclerAdapter.java

@@ -16,8 +16,8 @@
 package com.sobot.widget.ui.calenderview;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/BaseView.java

@@ -19,7 +19,7 @@ package com.sobot.widget.ui.calenderview;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/CalendarLayout.java

@@ -26,8 +26,8 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/CalendarView.java

@@ -20,9 +20,9 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/CalendarViewDelegate.java

@@ -18,7 +18,7 @@ package com.sobot.widget.ui.calenderview;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/MonthViewPager.java

@@ -17,9 +17,9 @@ package com.sobot.widget.ui.calenderview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/WeekViewPager.java

@@ -17,9 +17,9 @@ package com.sobot.widget.ui.calenderview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/YearRecyclerView.java

@@ -16,9 +16,9 @@
 package com.sobot.widget.ui.calenderview;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/YearView.java

@@ -20,7 +20,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/YearViewAdapter.java

@@ -16,7 +16,7 @@
 package com.sobot.widget.ui.calenderview;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/YearViewPager.java

@@ -17,9 +17,9 @@ package com.sobot.widget.ui.calenderview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.MotionEvent;

sobot_widget/src/main/java/com/sobot/widget/ui/provider/SobotFileProvider.java

 package com.sobot.widget.ui.provider;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class SobotFileProvider extends FileProvider {
 }

sobot_widget/src/main/java/com/sobot/widget/ui/rich/EmailSpan.java

@@ -2,7 +2,7 @@ package com.sobot.widget.ui.rich;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.v4.app.ShareCompat;
+import androidx.core.app.ShareCompat;
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.view.View;

sobot_widget/src/main/java/com/sobot/widget/ui/statusbar/SobotStatusBarUtils.java

@@ -5,8 +5,8 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IdRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;

sobot_widget/src/main/java/com/sobot/widget/ui/statusbar/StatusBarView.java

@@ -2,7 +2,7 @@ package com.sobot.widget.ui.statusbar;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

sobot_widget/src/main/java/com/sobot/widget/ui/utils/SobotResourceUtils.java

@@ -3,7 +3,7 @@ package com.sobot.widget.ui.utils;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Environment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;

sobot_widget/src/main/java/com/sobot/widget/ui/utils/SobotWidgetUtils.java

@@ -10,8 +10,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.FileProvider;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.FileProvider;
 
 import com.sobot.utils.SobotIOUtils;
 import com.sobot.widget.ui.SobotBaseConstant;