reactnativecomponent · zlwu · Dec 8, 2019 · Dec 8, 2019 · Dec 8, 2019
diff --git a/android/build.gradle b/android/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"

diff --git a/android/chatinput/build.gradle b/android/chatinput/build.gradle
@@ -18,7 +18,7 @@ android {
         targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 2
         versionName "0.1.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -37,7 +37,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
     implementation project(':react-native-imui:emoji')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/ChatInputStyle.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/ChatInputStyle.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 
 

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/ChatInputView.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/ChatInputView.java
@@ -9,7 +9,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.v4.widget.Space;
+import androidx.legacy.widget.Space;
 import android.text.Editable;
 import android.text.Spannable;
 import android.text.TextUtils;

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/Style.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/Style.java
@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 
 public abstract class Style {

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/emoji/EmojiAdapter.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/emoji/EmojiAdapter.java
@@ -4,7 +4,7 @@
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/emoji/EmojiView.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/emoji/EmojiView.java
@@ -9,11 +9,11 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.Toast;

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/model/FileItem.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/model/FileItem.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.chatinput.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.NumberFormat;
 

diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/record/ActionLayout.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/record/ActionLayout.java
@@ -1,9 +1,9 @@
 package cn.jiguang.imui.chatinput.record;
 
 import android.content.Context;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 

diff --git a/android/chatinput/src/main/res/layout/view_chatinput.xml b/android/chatinput/src/main/res/layout/view_chatinput.xml
@@ -18,7 +18,7 @@
         android:layout_marginTop="2dp"
         android:orientation="horizontal">
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:id="@+id/aurora_input_margin_left"
             android:layout_width="@dimen/imui_chat_space"
             android:layout_height="match_parent" />
@@ -37,7 +37,7 @@
                 android:scaleType="fitCenter"
                 android:src="@drawable/nim_message_button_bottom_audio_selector" />
         </FrameLayout>
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="@dimen/imui_chat_space"
             android:layout_height="match_parent" />
         <FrameLayout
@@ -72,7 +72,7 @@
                 android:text="按住 说话"
                 android:visibility="visible" />
         </FrameLayout>
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="@dimen/imui_chat_space"
             android:layout_height="match_parent" />
         <FrameLayout
@@ -89,7 +89,7 @@
                 android:scaleType="fitCenter"
                 android:src="@drawable/nim_message_button_bottom_emoji_selector" />
         </FrameLayout>
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="@dimen/imui_chat_space"
             android:layout_height="match_parent" />
         <RelativeLayout
@@ -143,7 +143,7 @@
             </FrameLayout>
         </RelativeLayout>
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:id="@+id/aurora_input_margin_right"
             android:layout_width="@dimen/imui_chat_space"
             android:layout_height="match_parent" />
@@ -175,4 +175,4 @@
 
         </LinearLayout>
     </cn.jiguang.imui.chatinput.record.ActionLayout>
-</LinearLayout>
+</LinearLayout>
diff --git a/android/emoji/build.gradle b/android/emoji/build.gradle
@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -27,7 +27,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"

diff --git a/android/emoji/src/main/java/dowin/com/emoji/emoji/EViewPager.java b/android/emoji/src/main/java/dowin/com/emoji/emoji/EViewPager.java
@@ -1,7 +1,7 @@
 package dowin.com.emoji.emoji;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 
 /**

diff --git a/android/emoji/src/main/java/dowin/com/emoji/emoji/EmojiManager.java b/android/emoji/src/main/java/dowin/com/emoji/emoji/EmojiManager.java
@@ -8,7 +8,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.util.LruCache;
+import androidx.collection.LruCache;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Xml;

diff --git a/android/emoji/src/main/java/dowin/com/emoji/emoji/EmoticonPickerView.java b/android/emoji/src/main/java/dowin/com/emoji/emoji/EmoticonPickerView.java
@@ -5,7 +5,7 @@
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Handler;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/android/emoji/src/main/java/dowin/com/emoji/emoji/EmoticonView.java b/android/emoji/src/main/java/dowin/com/emoji/emoji/EmoticonView.java
@@ -1,9 +1,9 @@
 package dowin.com.emoji.emoji;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;

diff --git a/android/messagelist/build.gradle b/android/messagelist/build.gradle
@@ -19,7 +19,7 @@ android {
         targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 2
         versionName "0.1.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -33,7 +33,7 @@ dependencies {
     compile project(':react-native-imui:photoViewPagerview')
     implementation 'com.facebook.fresco:fresco:1.13.0'
     implementation 'me.relex:photodraweeview:1.1.3'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/commons/Style.java b/android/messagelist/src/main/java/cn/jiguang/imui/commons/Style.java
@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 
 public abstract class Style {

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/commons/ViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/commons/ViewHolder.java
@@ -1,7 +1,7 @@
 package cn.jiguang.imui.commons;
 
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public abstract class ViewHolder<DATA> extends RecyclerView.ViewHolder {

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/MessageList.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/MessageList.java
@@ -1,9 +1,9 @@
 package cn.jiguang.imui.messages;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 import cn.jiguang.imui.commons.models.IMessage;

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/MessageListStyle.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/MessageListStyle.java
@@ -6,10 +6,10 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 import android.view.WindowManager;
 

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/MsgListAdapter.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/MsgListAdapter.java
@@ -3,9 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.media.MediaPlayer;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/ScrollMoreListener.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/ScrollMoreListener.java
@@ -3,10 +3,10 @@
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-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.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.Log;
 
 public class ScrollMoreListener extends RecyclerView.OnScrollListener {

diff --git a/...essagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AccountNoticeViewHolder.java b/...essagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AccountNoticeViewHolder.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AvatarViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AvatarViewHolder.java
@@ -1,7 +1,7 @@
 package cn.jiguang.imui.messages.viewholder;
 
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;

diff --git a/...messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java b/...messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;

diff --git a/.../messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BaseMessageViewHolder.java b/.../messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BaseMessageViewHolder.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.media.MediaPlayer;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import cn.jiguang.imui.commons.ImageLoader;

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CardViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CardViewHolder.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CustonViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CustonViewHolder.java
@@ -1,7 +1,7 @@
 package cn.jiguang.imui.messages.viewholder;
 
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextPaint;

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/EventViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/EventViewHolder.java
@@ -1,7 +1,7 @@
 package cn.jiguang.imui.messages.viewholder;
 
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LinkViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LinkViewHolder.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/...oid/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LocationViewHolder.java b/...oid/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LocationViewHolder.java
@@ -1,6 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;