diff --git a/android/build.gradle b/android/build.gradle index d337f3d..bcf2c18 100644 --- 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 index 573ec2a..f532f01 100755 --- 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 index a7e3d94..f0c6b45 100755 --- 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 index 115d619..141e0c1 100644 --- 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 index 2739fdf..9ad3db9 100755 --- 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 index 8215c40..663c276 100755 --- 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 index cc5ca96..45d34e6 100755 --- 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 index c58c928..b5186ff 100755 --- 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 index 69fb842..d471d40 100644 --- 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 index 8e6253a..f5cff85 100755 --- 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"> - @@ -37,7 +37,7 @@ android:scaleType="fitCenter" android:src="@drawable/nim_message_button_bottom_audio_selector" /> - - - - @@ -175,4 +175,4 @@ - \ No newline at end of file + diff --git a/android/emoji/build.gradle b/android/emoji/build.gradle index 65cec8a..76e58c1 100644 --- 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 index c233931..b5a9af5 100644 --- 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 index 1622e1d..161b530 100644 --- 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 index ae6d501..bafc438 100644 --- 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 index e56b158..bb38234 100644 --- 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 index 32b08f3..ca9f868 100755 --- 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 index fdf578b..b652603 100755 --- 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 index 7914362..6e332d4 100755 --- 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 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 index 6421173..f60fffc 100755 --- 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 index 05cc55f..eb65b54 100755 --- 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 index 233f2bd..39a0198 100755 --- 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 index cb54b6f..6705a77 100755 --- 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/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AccountNoticeViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AccountNoticeViewHolder.java index 10a0fab..98a4460 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AccountNoticeViewHolder.java +++ b/android/messagelist/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 index 8d3fb43..acbb471 100644 --- 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/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java index 51cf158..eb98985 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java +++ b/android/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/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BaseMessageViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BaseMessageViewHolder.java index e71bac6..a593856 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BaseMessageViewHolder.java +++ b/android/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 index 8d66a67..d67f984 100644 --- 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 index 69a51c3..0947ba0 100755 --- 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 index 911a344..8508eb5 100755 --- 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 index 53f6024..96d1aea 100644 --- 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/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LocationViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LocationViewHolder.java index 8030ae7..dd5d9e3 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/LocationViewHolder.java +++ b/android/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; diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.java index b2de1cd..4d16df0 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.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/PhotoViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/PhotoViewHolder.java index 3c097ed..1035e58 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/PhotoViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/PhotoViewHolder.java @@ -1,7 +1,7 @@ package cn.jiguang.imui.messages.viewholder; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.ImageView; diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java index a1ebf1e..0ee30f6 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.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/RedPacketViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketViewHolder.java index c69a121..4fa91c9 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketViewHolder.java @@ -1,6 +1,6 @@ package cn.jiguang.imui.messages.viewholder; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.TextView; diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java index 094242c..6b33636 100644 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.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/TxtViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TxtViewHolder.java index 0a23198..7f7cd0e 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TxtViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TxtViewHolder.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.style.ImageSpan; import android.util.Log; import android.view.Gravity; diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.java index 7a49e5b..a88a413 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.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/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java index cb02be3..9ecb980 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java @@ -4,7 +4,7 @@ import android.graphics.drawable.AnimationDrawable; import android.media.AudioManager; import android.media.MediaPlayer; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.ImageView; diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/view/ShapeImageView.java b/android/messagelist/src/main/java/cn/jiguang/imui/view/ShapeImageView.java index 42cddf9..51a31be 100755 --- a/android/messagelist/src/main/java/cn/jiguang/imui/view/ShapeImageView.java +++ b/android/messagelist/src/main/java/cn/jiguang/imui/view/ShapeImageView.java @@ -9,7 +9,7 @@ import android.graphics.PorterDuffXfermode; import android.graphics.drawable.shapes.RoundRectShape; import android.graphics.drawable.shapes.Shape; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import java.util.Arrays; @@ -17,7 +17,7 @@ import cn.jiguang.imui.R; -public class ShapeImageView extends android.support.v7.widget.AppCompatImageView { +public class ShapeImageView extends androidx.appcompat.widget.AppCompatImageView { private Paint mPaint; private Shape mShape; diff --git a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/Attacher.java b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/Attacher.java index ded0367..ffaa752 100644 --- a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/Attacher.java +++ b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/Attacher.java @@ -4,11 +4,11 @@ import android.graphics.Matrix; import android.graphics.RectF; import android.os.Build; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.widget.ScrollerCompat; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import androidx.core.view.GestureDetectorCompat; +import androidx.core.view.MotionEventCompat; +import androidx.core.widget.ScrollerCompat; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; diff --git a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/PhotoDraweeView.java b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/PhotoDraweeView.java index 92b0b3c..0e54ace 100644 --- a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/PhotoDraweeView.java +++ b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/PhotoDraweeView.java @@ -5,8 +5,8 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/ScaleDragDetector.java b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/ScaleDragDetector.java index 4feb5a5..1183783 100644 --- a/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/ScaleDragDetector.java +++ b/android/photoViewPagerview/photodraweeview/src/main/java/me/relex/photodraweeview/ScaleDragDetector.java @@ -1,7 +1,7 @@ package me.relex.photodraweeview; import android.content.Context; -import android.support.v4.view.MotionEventCompat; +import androidx.core.view.MotionEventCompat; import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.VelocityTracker; diff --git a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/DraweePagerAdapter.java b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/DraweePagerAdapter.java index db4770c..1e99a74 100644 --- a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/DraweePagerAdapter.java +++ b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/DraweePagerAdapter.java @@ -1,6 +1,6 @@ package com.dowin.imageviewer; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/MultiTouchViewPager.java b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/MultiTouchViewPager.java index 9cbd3f3..d7942d0 100644 --- a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/MultiTouchViewPager.java +++ b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/MultiTouchViewPager.java @@ -1,8 +1,8 @@ package com.dowin.imageviewer; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/PhotoViewPagerViewUtil.java b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/PhotoViewPagerViewUtil.java index 3d7c727..1da7a6a 100644 --- a/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/PhotoViewPagerViewUtil.java +++ b/android/photoViewPagerview/src/main/java/com/dowin/imageviewer/PhotoViewPagerViewUtil.java @@ -7,7 +7,7 @@ import android.graphics.Rect; import android.graphics.drawable.Animatable; import android.net.Uri; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.DisplayMetrics; import android.view.KeyEvent; import android.view.View; diff --git a/android/popuptool/build.gradle b/android/popuptool/build.gradle index 0d5e475..6c82fc3 100644 --- a/android/popuptool/build.gradle +++ b/android/popuptool/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/popuptool/src/main/java/com/adapter/TViewHolder.java b/android/popuptool/src/main/java/com/adapter/TViewHolder.java index cd116f7..4965408 100755 --- a/android/popuptool/src/main/java/com/adapter/TViewHolder.java +++ b/android/popuptool/src/main/java/com/adapter/TViewHolder.java @@ -1,7 +1,7 @@ package com.adapter; import android.content.Context; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; diff --git a/android/popuptool/src/main/java/com/tooltip/ArrowDrawable.java b/android/popuptool/src/main/java/com/tooltip/ArrowDrawable.java index 20785e2..fabd540 100755 --- a/android/popuptool/src/main/java/com/tooltip/ArrowDrawable.java +++ b/android/popuptool/src/main/java/com/tooltip/ArrowDrawable.java @@ -32,7 +32,7 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.view.Gravity; /** diff --git a/android/popuptool/src/main/java/com/tooltip/OnClickListener.java b/android/popuptool/src/main/java/com/tooltip/OnClickListener.java index b9dab09..2f1a35f 100755 --- a/android/popuptool/src/main/java/com/tooltip/OnClickListener.java +++ b/android/popuptool/src/main/java/com/tooltip/OnClickListener.java @@ -24,7 +24,7 @@ package com.tooltip; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Interface definition for a callback to be invoked when a Tooltip is clicked. diff --git a/android/popuptool/src/main/java/com/tooltip/OnLongClickListener.java b/android/popuptool/src/main/java/com/tooltip/OnLongClickListener.java index c9e01ad..dc4c775 100755 --- a/android/popuptool/src/main/java/com/tooltip/OnLongClickListener.java +++ b/android/popuptool/src/main/java/com/tooltip/OnLongClickListener.java @@ -24,7 +24,7 @@ package com.tooltip; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Interface definition for a callback to be invoked when a Tooltip has been clicked and held. diff --git a/android/popuptool/src/main/java/com/tooltip/Tooltip.java b/android/popuptool/src/main/java/com/tooltip/Tooltip.java index 5665b0e..e6bc4d5 100755 --- a/android/popuptool/src/main/java/com/tooltip/Tooltip.java +++ b/android/popuptool/src/main/java/com/tooltip/Tooltip.java @@ -34,14 +34,14 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.DimenRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.annotation.StyleRes; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v4.widget.TextViewCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.annotation.StyleRes; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.widget.TextViewCompat; import android.util.TypedValue; import android.view.Gravity; import android.view.MenuItem; diff --git a/android/popuptool/src/main/java/com/tooltip/TooltipActionView.java b/android/popuptool/src/main/java/com/tooltip/TooltipActionView.java index 938e5d5..a1b182a 100755 --- a/android/popuptool/src/main/java/com/tooltip/TooltipActionView.java +++ b/android/popuptool/src/main/java/com/tooltip/TooltipActionView.java @@ -26,8 +26,8 @@ import android.content.Context; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java index 840ce18..2909b1d 100644 --- a/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java +++ b/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java @@ -12,7 +12,7 @@ import android.os.Build; import android.os.Handler; import android.os.Message; -import android.support.v4.app.ActivityCompat; +import androidx.core.app.ActivityCompat; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/TimerTipView.java b/android/src/main/java/cn/jiguang/imui/messagelist/TimerTipView.java index 084ceb8..9c0c4b4 100644 --- a/android/src/main/java/cn/jiguang/imui/messagelist/TimerTipView.java +++ b/android/src/main/java/cn/jiguang/imui/messagelist/TimerTipView.java @@ -3,9 +3,9 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -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.text.TextUtils; import android.util.AttributeSet; import android.view.View;