diff --git a/app/build.gradle b/app/build.gradle index 6d9f20ab76..fafc733ba3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,14 +38,8 @@ android { } } - /** - * 只支持两种架构，减少apk大小，有疑问请参考： - * https://developer.android.com/ndk/guides/abis.html - * http://allenfeng.com/2016/11/06/what-you-should-know-about-android-abi-and-so/ - * （为了性能考虑，armeabi可以考虑替换成armeabi-v7a[需要先收集用户设备情况]） - */ ndk { - abiFilters "armeabi", "x86" + abiFilters "armeabi-v7a", "x86" } // 由于app只针对中文用户，所以仅保留zh资源，其他删掉 @@ -134,7 +128,6 @@ android { buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\"" buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\"" - } // internal test dev host internal { @@ -199,14 +192,14 @@ dependencies { debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}" debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}" - implementation "com.android.support:multidex:${multidex}" - implementation "com.android.support:design:${androidSupport}" - implementation "com.android.support:support-v4:${androidSupport}" - implementation "com.android.support:appcompat-v7:${androidSupport}" - implementation "com.android.support:cardview-v7:${androidSupport}" - implementation "com.android.support:support-annotations:${androidSupport}" - implementation "com.android.support:percent:${androidSupport}" - implementation "com.android.support.constraint:constraint-layout:${constraintLayout}" + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.percentlayout:percentlayout:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "com.kyleduo.switchbutton:library:${switchButton}" implementation "com.facebook.fresco:fresco:${fresco}" @@ -249,17 +242,17 @@ dependencies { implementation "pub.devrel:easypermissions:${easypermissions}" // mvvm - implementation "android.arch.lifecycle:runtime:${archLifecycleVersion}" - kapt "android.arch.lifecycle:compiler:${archLifecycleVersion}" - implementation "android.arch.lifecycle:extensions:${archLifecycleVersion}" - implementation "android.arch.persistence.room:runtime:${archRoomVersion}" - kapt "android.arch.persistence.room:compiler:${archRoomVersion}" - implementation "android.arch.persistence.room:rxjava2:${archRoomVersion}" + implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0' + kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + implementation 'androidx.room:room-runtime:2.0.0' + kapt 'androidx.room:room-compiler:2.0.0' + implementation 'androidx.room:room-rxjava2:2.0.0' - implementation 'com.google.android:flexbox:0.2.2' + implementation 'com.google.android:flexbox:1.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - kapt 'com.android.databinding:compiler:3.1.3' + kapt 'androidx.databinding:databinding-compiler:3.4.1' implementation 'com.contrarywind:Android-PickerView:4.1.3' diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 267678b12d..fc425a3adb 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -222,4 +222,7 @@ ### 广点通 -dontwarn com.qq.gdt.action.** --keep class com.qq.gdt.action.** {*;} \ No newline at end of file +-keep class com.qq.gdt.action.** {*;} + +### AndroidX +-keep class androidx.core.app.CoreComponentFactory { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 78c2162a9e..934caccace 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -422,7 +422,7 @@ android:theme = "@android:style/Theme.Translucent.NoTitleBar" > diff --git a/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java b/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java index 53c6596ea2..315b2ae793 100644 --- a/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java +++ b/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java @@ -8,9 +8,10 @@ import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.RectF; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; +import androidx.core.content.ContextCompat; + public class ProgressBarCircularIndeterminate extends CustomView { final static String ANDROIDXML = "http://schemas.android.com/apk/res/android"; diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index e1513ca175..69cef17925 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,12 +1,12 @@ package com.gh.base; import android.app.Activity; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.Window; diff --git a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java index 9815410f87..cee8f425b7 100644 --- a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java +++ b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java @@ -2,10 +2,10 @@ package com.gh.base; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.gh.base.adapter.FragmentAdapter; diff --git a/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java b/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java index 03e442f619..c3445c6901 100644 --- a/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java +++ b/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java @@ -1,6 +1,6 @@ package com.gh.base; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/gh/base/BaseToolBarActivity.java b/app/src/main/java/com/gh/base/BaseToolBarActivity.java index aaafde9935..a0010d5a76 100644 --- a/app/src/main/java/com/gh/base/BaseToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseToolBarActivity.java @@ -1,10 +1,10 @@ package com.gh.base; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v7.widget.Toolbar; +import androidx.annotation.DrawableRes; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt index 682714978c..da079301f1 100644 --- a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt +++ b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt @@ -9,7 +9,7 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.v4.app.NotificationCompat +import androidx.core.app.NotificationCompat import android.text.TextUtils import android.view.View import com.gh.common.notifier.Notifier diff --git a/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java b/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java index 217441b4ba..3d54128ac1 100644 --- a/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java +++ b/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java @@ -1,9 +1,9 @@ package com.gh.base.adapter; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java b/app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java index e8a5740422..278c6776c2 100644 --- a/app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java +++ b/app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java @@ -1,8 +1,8 @@ package com.gh.base.adapter; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java b/app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java index 8f5502e4ae..0e67ca7b67 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java @@ -1,11 +1,11 @@ package com.gh.base.fragment; import android.app.Dialog; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; import android.view.KeyEvent; import com.gh.common.util.ClickUtils; diff --git a/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java b/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java index ced453abcf..19c86d6ccf 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java @@ -2,9 +2,9 @@ package com.gh.base.fragment; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java index e7f80077ad..3cb00dc6d1 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java @@ -1,15 +1,15 @@ package com.gh.base.fragment; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java index 42282f76e6..caf653df8f 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java @@ -2,11 +2,11 @@ package com.gh.base.fragment; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.gh.base.adapter.FragmentAdapter; diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java index 08f0e2f408..2bc925c8be 100755 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java @@ -11,12 +11,12 @@ package com.gh.base.fragment; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.gh.gamecenter.normal.NormalFragment; diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java index c715ec3a1f..9daeb12bfb 100755 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java @@ -10,9 +10,9 @@ package com.gh.base.fragment; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; +import androidx.annotation.IdRes; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.Checkable; diff --git a/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java b/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java index afffab1808..97a4f694b7 100644 --- a/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java +++ b/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java @@ -1,8 +1,8 @@ package com.gh.base.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/common/TimeElapsedHelper.kt b/app/src/main/java/com/gh/common/TimeElapsedHelper.kt index 23214c31c5..a48bf69e15 100644 --- a/app/src/main/java/com/gh/common/TimeElapsedHelper.kt +++ b/app/src/main/java/com/gh/common/TimeElapsedHelper.kt @@ -3,8 +3,8 @@ package com.gh.common import android.app.Activity import android.app.Application import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager import com.halo.assistant.HaloApp import java.util.concurrent.Executors @@ -61,19 +61,19 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) { fragment?.fragmentManager?.registerFragmentLifecycleCallbacks( object : FragmentManager.FragmentLifecycleCallbacks() { - override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) { + override fun onFragmentResumed(fm: FragmentManager, f: Fragment) { if (f === fragment) { resumeCounting() } } - override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) { + override fun onFragmentPaused(fm: FragmentManager, f: Fragment) { if (f === fragment) { pauseCounting() } } - override fun onFragmentViewDestroyed(fm: FragmentManager?, f: Fragment?) { + override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) { if (f === fragment) { fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this) } diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index bf8ca41e55..2e2c813e1f 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -3,7 +3,7 @@ package com.gh.common.constant; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.gh.common.util.GsonUtils; diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 33ae957ca3..69519f693f 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -1,9 +1,6 @@ package com.gh.common.databind; import android.content.Intent; -import android.databinding.BindingAdapter; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -12,6 +9,10 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; +import androidx.databinding.BindingAdapter; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.OnViewClickListener; import com.gh.common.constant.Config; diff --git a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt index b6bef310ef..0ad6eed89d 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt @@ -1,6 +1,6 @@ package com.gh.common.exposure -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.exposure.meta.Meta import com.gh.common.util.GsonUtils import java.util.* diff --git a/app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt b/app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt index 744b6a5470..9bd3cad34d 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt @@ -1,9 +1,9 @@ package com.gh.common.exposure -import android.arch.persistence.room.Database -import android.arch.persistence.room.Room -import android.arch.persistence.room.RoomDatabase -import android.arch.persistence.room.TypeConverters +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters import android.content.Context @TypeConverters(ExposureConverters::class) diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt b/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt index d79c43c7cb..24b3d0b657 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt @@ -1,7 +1,7 @@ package com.gh.common.exposure import android.os.Parcelable -import android.support.annotation.Keep +import androidx.annotation.Keep import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index 757599796f..eb2673625d 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -1,9 +1,9 @@ package com.gh.common.exposure -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.PrimaryKey import android.os.Parcelable -import android.support.annotation.Keep +import androidx.annotation.Keep import com.gh.common.exposure.meta.Meta import com.gh.common.exposure.meta.MetaUtil import com.gh.common.exposure.time.TimeUtil diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt b/app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt index 0228616da8..03c16aa0f9 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt @@ -1,6 +1,6 @@ package com.gh.common.exposure -import android.arch.persistence.room.* +import androidx.room.* @Dao interface ExposureEventDao { diff --git a/app/src/main/java/com/gh/common/exposure/ExposureListener.kt b/app/src/main/java/com/gh/common/exposure/ExposureListener.kt index 2d3cc281e1..42330b795c 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureListener.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureListener.kt @@ -1,9 +1,9 @@ package com.gh.common.exposure -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.reactivex.functions.Consumer /** @@ -18,11 +18,11 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy init { fragment.fragmentManager?.registerFragmentLifecycleCallbacks( object : FragmentManager.FragmentLifecycleCallbacks() { - override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) { + override fun onFragmentResumed(fm: FragmentManager, f: Fragment) { throttleBus = ExposureThrottleBus(Consumer { commitExposure(it) }, Consumer(Throwable::printStackTrace)) } - override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) { + override fun onFragmentPaused(fm: FragmentManager, f: Fragment) { visibleState?.let { commitExposure(it) } throttleBus?.clear() } diff --git a/app/src/main/java/com/gh/common/exposure/ExposureSource.kt b/app/src/main/java/com/gh/common/exposure/ExposureSource.kt index 4ed3aaac33..79ce264bcb 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureSource.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureSource.kt @@ -1,7 +1,7 @@ package com.gh.common.exposure import android.os.Parcelable -import android.support.annotation.Keep +import androidx.annotation.Keep import kotlinx.android.parcel.Parcelize @Keep diff --git a/app/src/main/java/com/gh/common/exposure/meta/Meta.kt b/app/src/main/java/com/gh/common/exposure/meta/Meta.kt index 2fe1e74f43..7ba07a8506 100644 --- a/app/src/main/java/com/gh/common/exposure/meta/Meta.kt +++ b/app/src/main/java/com/gh/common/exposure/meta/Meta.kt @@ -1,7 +1,7 @@ package com.gh.common.exposure.meta import android.os.Parcelable -import android.support.annotation.Keep +import androidx.annotation.Keep import kotlinx.android.parcel.Parcelize @Keep diff --git a/app/src/main/java/com/gh/common/history/HistoryDatabase.kt b/app/src/main/java/com/gh/common/history/HistoryDatabase.kt index b2865bc4e3..e005f71f49 100644 --- a/app/src/main/java/com/gh/common/history/HistoryDatabase.kt +++ b/app/src/main/java/com/gh/common/history/HistoryDatabase.kt @@ -1,9 +1,9 @@ package com.gh.common.history -import android.arch.persistence.room.Database -import android.arch.persistence.room.Room -import android.arch.persistence.room.RoomDatabase -import android.arch.persistence.room.TypeConverters +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters import com.gh.gamecenter.entity.HistoryGameEntity import com.gh.gamecenter.entity.NewsEntity import com.gh.gamecenter.qa.entity.AnswerEntity diff --git a/app/src/main/java/com/gh/common/im/ImHintHelper.kt b/app/src/main/java/com/gh/common/im/ImHintHelper.kt index 970b9ccdc1..44ffe43a78 100644 --- a/app/src/main/java/com/gh/common/im/ImHintHelper.kt +++ b/app/src/main/java/com/gh/common/im/ImHintHelper.kt @@ -1,7 +1,7 @@ package com.gh.common.im import android.app.Activity -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/gh/common/im/ImHintView.kt b/app/src/main/java/com/gh/common/im/ImHintView.kt index 4ff7689565..688c9537e4 100644 --- a/app/src/main/java/com/gh/common/im/ImHintView.kt +++ b/app/src/main/java/com/gh/common/im/ImHintView.kt @@ -3,7 +3,7 @@ package com.gh.common.im import android.app.Activity import android.content.Context import android.os.Build -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.util.AttributeSet import android.util.DisplayMetrics import android.util.TypedValue diff --git a/app/src/main/java/com/gh/common/im/ImReceiver.kt b/app/src/main/java/com/gh/common/im/ImReceiver.kt index 42b0544407..1720207cb0 100644 --- a/app/src/main/java/com/gh/common/im/ImReceiver.kt +++ b/app/src/main/java/com/gh/common/im/ImReceiver.kt @@ -8,7 +8,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Build -import android.support.v4.app.NotificationCompat +import androidx.core.app.NotificationCompat import com.gh.base.CurrentActivityHolder import com.gh.gamecenter.R import com.m7.imkfsdk.chat.ChatActivity diff --git a/app/src/main/java/com/gh/common/notifier/Notifier.kt b/app/src/main/java/com/gh/common/notifier/Notifier.kt index 52eb84650a..f443c4905e 100644 --- a/app/src/main/java/com/gh/common/notifier/Notifier.kt +++ b/app/src/main/java/com/gh/common/notifier/Notifier.kt @@ -1,7 +1,7 @@ package com.gh.common.notifier import android.app.Activity -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.view.View import android.view.ViewGroup import com.gh.common.util.SPUtils diff --git a/app/src/main/java/com/gh/common/notifier/NotifierView.kt b/app/src/main/java/com/gh/common/notifier/NotifierView.kt index 531cce6532..9ed52cdc37 100644 --- a/app/src/main/java/com/gh/common/notifier/NotifierView.kt +++ b/app/src/main/java/com/gh/common/notifier/NotifierView.kt @@ -5,7 +5,7 @@ import android.app.Activity import android.content.Context import android.graphics.Path import android.os.Build -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.text.TextUtils import android.util.AttributeSet import android.util.DisplayMetrics diff --git a/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt b/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt index a58856e043..5db53d7e29 100644 --- a/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt +++ b/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt @@ -22,7 +22,7 @@ import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.ValueAnimator import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.view.MotionEvent import android.view.VelocityTracker import android.view.View diff --git a/app/src/main/java/com/gh/common/util/Animator.kt b/app/src/main/java/com/gh/common/util/Animator.kt index 13de589560..3497607dcb 100644 --- a/app/src/main/java/com/gh/common/util/Animator.kt +++ b/app/src/main/java/com/gh/common/util/Animator.kt @@ -17,7 +17,7 @@ package com.gh.common.util import android.animation.Animator -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.view.ViewPropertyAnimator /** diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index aae229785d..f77f5d8420 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -4,7 +4,7 @@ import android.app.Dialog; import android.content.ClipboardManager; import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.view.Window; diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 97aa10159d..e33f479dd7 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -9,8 +9,8 @@ import android.content.pm.PackageInfo; import android.graphics.Bitmap; import android.graphics.Color; import android.os.Handler; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.text.Spanned; import android.text.TextPaint; diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index b1470cb555..379515b25a 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -3,10 +3,10 @@ package com.gh.common.util; import android.content.Context; import android.graphics.Color; import android.os.Message; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index 4ae2d48801..8c62cb0d0b 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -1,11 +1,11 @@ package com.gh.common.util -import android.arch.lifecycle.* +import androidx.lifecycle.* import android.content.ClipboardManager import android.content.Context -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity -import android.support.v4.view.ViewPager +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.viewpager.widget.ViewPager import android.text.Html import android.text.Spanned import android.view.View @@ -19,7 +19,7 @@ import java.net.URI /** * 创建以 activity 为观察者上下文的 viewModel */ -inline fun FragmentActivity.viewModelProvider( +inline fun androidx.fragment.app.FragmentActivity.viewModelProvider( provider: ViewModelProvider.Factory? = null ) = ViewModelProviders.of(this, provider).get(VM::class.java) @@ -27,7 +27,7 @@ inline fun FragmentActivity.viewModelProvider( /** * 创建以 activity 为观察者上下文的 viewModel */ -inline fun Fragment.viewModelProviderFromParent( +inline fun androidx.fragment.app.Fragment.viewModelProviderFromParent( provider: ViewModelProvider.Factory? = null ) = ViewModelProviders.of(requireActivity(), provider).get(VM::class.java) @@ -35,7 +35,7 @@ inline fun Fragment.viewModelProviderFromParent( /** * 创建以 fragment 为观察者上下文的 viewModel */ -inline fun Fragment.viewModelProvider( +inline fun androidx.fragment.app.Fragment.viewModelProvider( provider: ViewModelProvider.Factory? = null ) = ViewModelProviders.of(this, provider).get(VM::class.java) @@ -45,10 +45,10 @@ inline fun Fragment.viewModelProvider( * ViewPager Extensions * */ -fun ViewPager.doOnPageSelected(action: (position: Int) -> Unit) = addOnPageChangeListener(onSelected = action) +fun androidx.viewpager.widget.ViewPager.doOnPageSelected(action: (position: Int) -> Unit) = addOnPageChangeListener(onSelected = action) -fun ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = null) { - val listener = object : ViewPager.OnPageChangeListener { +fun androidx.viewpager.widget.ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = null) { + val listener = object : androidx.viewpager.widget.ViewPager.OnPageChangeListener { override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { // Do nothing. } @@ -78,7 +78,7 @@ fun LiveData.observeNonNull(owner: LifecycleOwner, callback: (T) -> Unit /** * Login related extensions */ -fun Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) { +fun androidx.fragment.app.Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) { requireContext().ifLogin(entrance, action) } diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index 98cad2a621..351e71ce68 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -2,7 +2,7 @@ package com.gh.common.util; import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java index 0008f48a54..5553d9d666 100644 --- a/app/src/main/java/com/gh/common/util/GameViewUtils.java +++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java @@ -3,7 +3,7 @@ package com.gh.common.util; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.util.TypedValue; import android.view.View; diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt index 60a6db52ab..8b048ac3f9 100644 --- a/app/src/main/java/com/gh/common/util/ImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt @@ -7,8 +7,8 @@ import android.graphics.drawable.Animatable import android.graphics.drawable.ColorDrawable import android.net.Uri import android.os.Build -import android.support.annotation.DrawableRes -import android.support.v4.content.ContextCompat +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat import com.facebook.common.executors.CallerThreadExecutor import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.controller.BaseControllerListener diff --git a/app/src/main/java/com/gh/common/util/IntentUtils.java b/app/src/main/java/com/gh/common/util/IntentUtils.java index 0df85ae856..09a517e05e 100644 --- a/app/src/main/java/com/gh/common/util/IntentUtils.java +++ b/app/src/main/java/com/gh/common/util/IntentUtils.java @@ -4,7 +4,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.gamecenter.category.CategoryListActivity; import com.gh.gamecenter.entity.CategoryEntity; diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 878d90898f..03e8f3c519 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -5,7 +5,7 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.pm.PackageInfo; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index 63f58dbcfa..671edb3457 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -11,9 +11,9 @@ import android.graphics.Matrix; import android.net.Uri; import android.os.Bundle; import android.os.Environment; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.KeyEvent; import android.view.View; diff --git a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt index 8ac5a07e2b..2d35ee6deb 100644 --- a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt @@ -3,7 +3,7 @@ package com.gh.common.util import android.app.Dialog import android.content.Context import android.graphics.Color -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.view.Window import android.widget.LinearLayout import android.widget.TextView diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index 3d6f16cf01..30d8d6f3bd 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -11,7 +11,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.text.TextUtils; import com.g00fy2.versioncompare.Version; diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java index ed9eb72a48..395548a4ec 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.Handler; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; import android.text.TextUtils; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/common/util/RunningUtils.java b/app/src/main/java/com/gh/common/util/RunningUtils.java index 01d3a7ecf1..905096fd52 100644 --- a/app/src/main/java/com/gh/common/util/RunningUtils.java +++ b/app/src/main/java/com/gh/common/util/RunningUtils.java @@ -6,7 +6,7 @@ import android.app.ActivityManager.RunningAppProcessInfo; import android.app.ActivityManager.RunningTaskInfo; import android.content.ComponentName; import android.content.Context; -import android.support.annotation.RequiresPermission; +import androidx.annotation.RequiresPermission; import java.util.List; diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 50dc218167..a8a33f6dd7 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -11,8 +11,6 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.KeyEvent; @@ -25,6 +23,9 @@ import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.facebook.common.references.CloseableReference; import com.facebook.datasource.DataSource; import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber; @@ -350,7 +351,7 @@ public class ShareUtils { canvas.drawBitmap(bgBitmap, 0, 0, null); canvas.drawBitmap(result, (result.getHeight() - result.getWidth()) / 2, (result.getHeight() - result.getWidth()) / 2, null); - canvas.save(Canvas.ALL_SAVE_FLAG); + canvas.save(); canvas.restore(); return newmap; diff --git a/app/src/main/java/com/gh/common/util/TagUtils.java b/app/src/main/java/com/gh/common/util/TagUtils.java index bd7278b165..ede2ff6f78 100644 --- a/app/src/main/java/com/gh/common/util/TagUtils.java +++ b/app/src/main/java/com/gh/common/util/TagUtils.java @@ -3,7 +3,7 @@ package com.gh.common.util; import android.content.Context; import android.content.SharedPreferences; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import com.gh.gamecenter.entity.TagEntity; import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java index 6a6927ac0b..5bbf718552 100644 --- a/app/src/main/java/com/gh/common/util/TimestampUtils.java +++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java @@ -1,6 +1,6 @@ package com.gh.common.util; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.text.TextUtils; import com.gh.common.constant.Constants; diff --git a/app/src/main/java/com/gh/common/util/UrlFilterUtils.java b/app/src/main/java/com/gh/common/util/UrlFilterUtils.java index 2a896fb526..1b6acec2e0 100644 --- a/app/src/main/java/com/gh/common/util/UrlFilterUtils.java +++ b/app/src/main/java/com/gh/common/util/UrlFilterUtils.java @@ -1,6 +1,6 @@ package com.gh.common.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.lightgame.config.CommonDebug; diff --git a/app/src/main/java/com/gh/common/view/AbstractSwipeRefreshHeader.java b/app/src/main/java/com/gh/common/view/AbstractSwipeRefreshHeader.java index dc168e9eab..772e4810bd 100644 --- a/app/src/main/java/com/gh/common/view/AbstractSwipeRefreshHeader.java +++ b/app/src/main/java/com/gh/common/view/AbstractSwipeRefreshHeader.java @@ -5,10 +5,10 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/gh/common/view/CardLinearLayout.java b/app/src/main/java/com/gh/common/view/CardLinearLayout.java index e546b44d94..f557571fc5 100644 --- a/app/src/main/java/com/gh/common/view/CardLinearLayout.java +++ b/app/src/main/java/com/gh/common/view/CardLinearLayout.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java index e218b11818..c94f333a2f 100644 --- a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java +++ b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java index d7b868fb4b..89d2134f8b 100644 --- a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java +++ b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java @@ -1,7 +1,7 @@ package com.gh.common.view; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/gh/common/view/CropImageZoomView.java b/app/src/main/java/com/gh/common/view/CropImageZoomView.java index 21d1c7199d..62e0aa6ba7 100644 --- a/app/src/main/java/com/gh/common/view/CropImageZoomView.java +++ b/app/src/main/java/com/gh/common/view/CropImageZoomView.java @@ -6,7 +6,7 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 2fb023c16a..7969e1325d 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -2,10 +2,10 @@ package com.gh.common.view; import android.app.Dialog; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.text.TextUtils; import android.view.Gravity; import android.view.KeyEvent; diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index 8b23a746ba..cb36fbfc54 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -10,8 +10,8 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.RectF; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/app/src/main/java/com/gh/common/view/EmptyDrawable.java b/app/src/main/java/com/gh/common/view/EmptyDrawable.java index 80c229bc6d..22171c0848 100644 --- a/app/src/main/java/com/gh/common/view/EmptyDrawable.java +++ b/app/src/main/java/com/gh/common/view/EmptyDrawable.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * 一个空的类 主要是用来回调 onLevelChange(加载进度)的内容 diff --git a/app/src/main/java/com/gh/common/view/ExpendTextView.java b/app/src/main/java/com/gh/common/view/ExpendTextView.java index 935e40b433..fcc025a1fd 100644 --- a/app/src/main/java/com/gh/common/view/ExpendTextView.java +++ b/app/src/main/java/com/gh/common/view/ExpendTextView.java @@ -2,7 +2,7 @@ package com.gh.common.view; import android.content.Context; import android.os.Build; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.Layout; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -14,7 +14,7 @@ import android.view.View; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -public class ExpendTextView extends android.support.v7.widget.AppCompatTextView { +public class ExpendTextView extends androidx.appcompat.widget.AppCompatTextView { private CharSequence mSnapshotText; diff --git a/app/src/main/java/com/gh/common/view/FixAppBarLayoutBehavior.java b/app/src/main/java/com/gh/common/view/FixAppBarLayoutBehavior.java index 5671deaf7f..d92bd4034f 100644 --- a/app/src/main/java/com/gh/common/view/FixAppBarLayoutBehavior.java +++ b/app/src/main/java/com/gh/common/view/FixAppBarLayoutBehavior.java @@ -1,9 +1,9 @@ package com.gh.common.view; import android.content.Context; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.ViewCompat; +import com.google.android.material.appbar.AppBarLayout; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/gh/common/view/Gh_ViewPager.java b/app/src/main/java/com/gh/common/view/Gh_ViewPager.java index 1cbbccdead..9fa49779d5 100644 --- a/app/src/main/java/com/gh/common/view/Gh_ViewPager.java +++ b/app/src/main/java/com/gh/common/view/Gh_ViewPager.java @@ -1,7 +1,7 @@ package com.gh.common.view; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/common/view/GridDivider.java b/app/src/main/java/com/gh/common/view/GridDivider.java index bbc6760599..a82f725681 100644 --- a/app/src/main/java/com/gh/common/view/GridDivider.java +++ b/app/src/main/java/com/gh/common/view/GridDivider.java @@ -5,7 +5,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/gh/common/view/HorizontalItemDecoration.java b/app/src/main/java/com/gh/common/view/HorizontalItemDecoration.java index b914455e61..185df73c46 100644 --- a/app/src/main/java/com/gh/common/view/HorizontalItemDecoration.java +++ b/app/src/main/java/com/gh/common/view/HorizontalItemDecoration.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java index f43b6fbd65..e715920b00 100644 --- a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java +++ b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -public class MessageSpannableTextView extends android.support.v7.widget.AppCompatTextView { +public class MessageSpannableTextView extends androidx.appcompat.widget.AppCompatTextView { private OnSpannableClickListener mSpannableClickListener; diff --git a/app/src/main/java/com/gh/common/view/NestedRecyclerView.kt b/app/src/main/java/com/gh/common/view/NestedRecyclerView.kt index 99744a2504..2bdded884b 100644 --- a/app/src/main/java/com/gh/common/view/NestedRecyclerView.kt +++ b/app/src/main/java/com/gh/common/view/NestedRecyclerView.kt @@ -2,13 +2,13 @@ package com.gh.common.view import android.content.Context import android.os.Build -import android.support.v4.view.NestedScrollingParent -import android.support.v7.widget.RecyclerView +import androidx.core.view.NestedScrollingParent +import androidx.recyclerview.widget.RecyclerView import android.util.AttributeSet import android.view.MotionEvent import android.view.View -open class NestedRecyclerView : RecyclerView, NestedScrollingParent { +open class NestedRecyclerView : androidx.recyclerview.widget.RecyclerView, NestedScrollingParent { private var nestedScrollTarget: View? = null private var nestedScrollTargetIsBeingDragged = false diff --git a/app/src/main/java/com/gh/common/view/PlayerView.kt b/app/src/main/java/com/gh/common/view/PlayerView.kt index 562da55a56..3c03f3d7f4 100644 --- a/app/src/main/java/com/gh/common/view/PlayerView.kt +++ b/app/src/main/java/com/gh/common/view/PlayerView.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE import android.os.Handler -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager import android.util.AttributeSet import android.view.View import android.widget.ImageView +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager import cn.jzvd.* import com.gh.common.observer.MuteCallback import com.gh.common.observer.VolumeObserver @@ -276,13 +276,13 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet } } - fun observeVolume(fragment: Fragment?) { + fun observeVolume(fragment: androidx.fragment.app.Fragment?) { fragment?.context?.applicationContext?.contentResolver?.registerContentObserver( android.provider.Settings.System.CONTENT_URI, true, volumeObserver) fragment?.fragmentManager?.registerFragmentLifecycleCallbacks( - object : FragmentManager.FragmentLifecycleCallbacks() { - override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) { + object : androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks() { + override fun onFragmentPaused(fm: FragmentManager, f: Fragment) { if (f === fragment) { fragment.context?.applicationContext?.contentResolver?.unregisterContentObserver(volumeObserver) fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this) diff --git a/app/src/main/java/com/gh/common/view/RecyclerViewExtended.java b/app/src/main/java/com/gh/common/view/RecyclerViewExtended.java index b925a009f1..183e195454 100644 --- a/app/src/main/java/com/gh/common/view/RecyclerViewExtended.java +++ b/app/src/main/java/com/gh/common/view/RecyclerViewExtended.java @@ -1,7 +1,7 @@ package com.gh.common.view; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/gh/common/view/SpacingItemDecoration.kt b/app/src/main/java/com/gh/common/view/SpacingItemDecoration.kt index 74a6ea530b..1b67d7b836 100644 --- a/app/src/main/java/com/gh/common/view/SpacingItemDecoration.kt +++ b/app/src/main/java/com/gh/common/view/SpacingItemDecoration.kt @@ -1,8 +1,8 @@ package com.gh.common.view import android.graphics.Rect -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView class SpacingItemDecoration( var onlyDecorateTheFirstItem: Boolean = false, @@ -14,13 +14,13 @@ class SpacingItemDecoration( var bottom: Int = 0) : RecyclerView.ItemDecoration() { - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) { + override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { if (onlyDecorateTheFirstItem) { if (parent.getChildAdapterPosition(view) == 0) outRect.set(left, top, right, bottom) } else { if (parent.getChildAdapterPosition(view) == 0 && notDecorateTheFirstItem) { outRect.set(0, 0, 0, 0) - } else if (parent.getChildAdapterPosition(view) == parent.adapter.itemCount - 1 && notDecorateTheLastItem) { + } else if (parent.getChildAdapterPosition(view) == parent.adapter!!.itemCount - 1 && notDecorateTheLastItem) { outRect.set(0, 0, 0, 0) } else { outRect.set(left, top, right, bottom) diff --git a/app/src/main/java/com/gh/common/view/SwipeLayout.java b/app/src/main/java/com/gh/common/view/SwipeLayout.java index 074b94c8c8..ea2188b4ac 100644 --- a/app/src/main/java/com/gh/common/view/SwipeLayout.java +++ b/app/src/main/java/com/gh/common/view/SwipeLayout.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; +import androidx.annotation.Nullable; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.Gravity; diff --git a/app/src/main/java/com/gh/common/view/SwipeRefreshHeader.java b/app/src/main/java/com/gh/common/view/SwipeRefreshHeader.java index c47ac93721..08934009ac 100644 --- a/app/src/main/java/com/gh/common/view/SwipeRefreshHeader.java +++ b/app/src/main/java/com/gh/common/view/SwipeRefreshHeader.java @@ -2,8 +2,8 @@ package com.gh.common.view; 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.LayoutInflater; diff --git a/app/src/main/java/com/gh/common/view/TabIndicatorView.java b/app/src/main/java/com/gh/common/view/TabIndicatorView.java index c2e7062308..f0ecc6c45e 100644 --- a/app/src/main/java/com/gh/common/view/TabIndicatorView.java +++ b/app/src/main/java/com/gh/common/view/TabIndicatorView.java @@ -5,9 +5,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPager; +import com.google.android.material.tabs.TabLayout; +import androidx.core.view.ViewCompat; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/common/view/VerticalItemDecoration.java b/app/src/main/java/com/gh/common/view/VerticalItemDecoration.java index 3cbf9a3c21..e01f330542 100644 --- a/app/src/main/java/com/gh/common/view/VerticalItemDecoration.java +++ b/app/src/main/java/com/gh/common/view/VerticalItemDecoration.java @@ -4,8 +4,8 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/common/view/VerticalViewPager.kt b/app/src/main/java/com/gh/common/view/VerticalViewPager.kt index 87094f7e6c..c7e1fc3cfa 100644 --- a/app/src/main/java/com/gh/common/view/VerticalViewPager.kt +++ b/app/src/main/java/com/gh/common/view/VerticalViewPager.kt @@ -1,13 +1,13 @@ package com.gh.common.view import android.content.Context -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.util.AttributeSet import android.view.MotionEvent import android.view.View class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) - : ViewPager(context, attrs) { + : androidx.viewpager.widget.ViewPager(context, attrs) { init { // The majority of the magic happens here @@ -16,7 +16,7 @@ class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: Attri overScrollMode = View.OVER_SCROLL_NEVER } - private inner class VerticalPageTransformer : ViewPager.PageTransformer { + private inner class VerticalPageTransformer : androidx.viewpager.widget.ViewPager.PageTransformer { override fun transformPage(view: View, position: Float) { if (position < -1) { // [-Infinity,-1) // This page is way off-screen to the left. diff --git a/app/src/main/java/com/gh/common/view/WelcomeDialog.kt b/app/src/main/java/com/gh/common/view/WelcomeDialog.kt index 14a816a52c..37f5a8f7d0 100644 --- a/app/src/main/java/com/gh/common/view/WelcomeDialog.kt +++ b/app/src/main/java/com/gh/common/view/WelcomeDialog.kt @@ -1,6 +1,6 @@ package com.gh.common.view -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.os.Bundle import android.preference.PreferenceManager import android.view.LayoutInflater diff --git a/app/src/main/java/com/gh/common/view/WrapContentDraweeView.kt b/app/src/main/java/com/gh/common/view/WrapContentDraweeView.kt index b351ab3f6d..be1abb21b0 100644 --- a/app/src/main/java/com/gh/common/view/WrapContentDraweeView.kt +++ b/app/src/main/java/com/gh/common/view/WrapContentDraweeView.kt @@ -3,7 +3,7 @@ package com.gh.common.view import android.content.Context import android.graphics.drawable.Animatable import android.net.Uri -import android.support.annotation.Nullable +import androidx.annotation.Nullable import android.util.AttributeSet import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder import com.facebook.drawee.controller.BaseControllerListener diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/BaseDrawable.java b/app/src/main/java/com/gh/common/view/materialratingbar/BaseDrawable.java index a2fd8b374d..ad1cfe1ac5 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/BaseDrawable.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/BaseDrawable.java @@ -14,9 +14,9 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -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; abstract class BaseDrawable extends Drawable implements TintableDrawable { diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/ClipDrawableCompat.java b/app/src/main/java/com/gh/common/view/materialratingbar/ClipDrawableCompat.java index a32d42274c..ba4ca799a1 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/ClipDrawableCompat.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/ClipDrawableCompat.java @@ -9,8 +9,8 @@ import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.graphics.drawable.ClipDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; class ClipDrawableCompat extends ClipDrawable implements TintableDrawable { diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingBar.java b/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingBar.java index 1b76d6870e..c4105ef434 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingBar.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingBar.java @@ -12,8 +12,8 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.os.Build; -import android.support.annotation.Nullable; -import android.support.v7.widget.TintTypedArray; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.TintTypedArray; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingDrawable.java b/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingDrawable.java index 6870d6459c..1fb37c6e91 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingDrawable.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/MaterialRatingDrawable.java @@ -11,7 +11,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.support.v7.content.res.AppCompatResources; +import androidx.appcompat.content.res.AppCompatResources; import android.view.Gravity; import com.gh.common.view.materialratingbar.internal.ThemeUtils; diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/TileDrawable.java b/app/src/main/java/com/gh/common/view/materialratingbar/TileDrawable.java index b349fec756..d98c77b2a7 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/TileDrawable.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/TileDrawable.java @@ -8,7 +8,7 @@ package com.gh.common.view.materialratingbar; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class TileDrawable extends BaseDrawable { diff --git a/app/src/main/java/com/gh/common/view/materialratingbar/TintableDrawable.java b/app/src/main/java/com/gh/common/view/materialratingbar/TintableDrawable.java index c552fc0c9e..4bef685944 100644 --- a/app/src/main/java/com/gh/common/view/materialratingbar/TintableDrawable.java +++ b/app/src/main/java/com/gh/common/view/materialratingbar/TintableDrawable.java @@ -9,9 +9,9 @@ import android.content.res.ColorStateList; import android.graphics.ColorFilter; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -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; /** * A {@code Drawable} that is tintable. diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 37d0e953ea..1b78be042f 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -8,8 +8,8 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v4.util.ArrayMap; +import androidx.annotation.Nullable; +import androidx.collection.ArrayMap; import android.text.TextUtils; import com.gh.common.exposure.ExposureEvent; diff --git a/app/src/main/java/com/gh/download/DownloadNotification.java b/app/src/main/java/com/gh/download/DownloadNotification.java index 10de4c1850..ad61bab54c 100644 --- a/app/src/main/java/com/gh/download/DownloadNotification.java +++ b/app/src/main/java/com/gh/download/DownloadNotification.java @@ -7,7 +7,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.gh.common.util.AppDebugConfig; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index ec942a284a..463b1fd912 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.AboutFragment; diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index cd8ba1b8f5..dfdfe7fd9f 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -11,7 +11,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Html; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index 338e9ed164..4775071fb4 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -2,7 +2,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.halo.assistant.fragment.ApkCleanerFragment; diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index e60541217c..b80b612b83 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.collection.CollectionWrapperFragment; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index d9eca5eb7c..f82443d514 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.myconcern.MyConcernFragment; diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 2badbf7c7f..da76872dde 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Message; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.MenuItem; import android.widget.ImageView; diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index 66b16d96c6..ba4164d9a7 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -9,10 +9,10 @@ import android.os.Handler; import android.os.Message; import android.os.Parcelable; import android.preference.PreferenceManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index d1f641dcba..6a41930ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -7,11 +7,11 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 0ec214516d..c8d1111510 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.game.GameNewsSearchFragment; diff --git a/app/src/main/java/com/gh/gamecenter/InstallActivity.java b/app/src/main/java/com/gh/gamecenter/InstallActivity.java index 4aadc1a0f6..933c6c908c 100644 --- a/app/src/main/java/com/gh/gamecenter/InstallActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InstallActivity.java @@ -1,14 +1,14 @@ package com.gh.gamecenter; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 6f2d72797e..1ed3eaa893 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.kaifu.KaiFuWrapperFragment; diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index d9d50d5d6f..5913cb54d5 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -3,9 +3,9 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 54b2cf4585..852c822a3c 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.libao.LibaoFragment; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 92ea53324d..b7f6329947 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -5,9 +5,9 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Message; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 7ef1151056..00049dda5d 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.fragment.LoginFragment; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index ee6f4df639..d0bbe640f3 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.annotation.SuppressLint; import android.app.Dialog; import android.app.NotificationManager; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -16,7 +16,7 @@ import android.os.Handler; import android.os.Message; import android.os.SystemClock; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 4f2a722941..fa1a630f87 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -8,10 +8,10 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.view.MotionEventCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.MenuItem; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 2056d75330..e956b7ff2a 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index a3189a08be..0aa75c3b8c 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.view.MenuItem; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt index 518ddfa4f3..faac2259e9 100644 --- a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt @@ -1,12 +1,12 @@ package com.gh.gamecenter -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity import com.gh.common.util.DataUtils import com.gh.common.util.EntranceUtils @@ -92,7 +92,7 @@ class PersonalHomeActivity : ListActivity(context) { - var recyclerView: RecyclerView? = null + var recyclerView: androidx.recyclerview.widget.RecyclerView? = null var expandStatusMap: HashMap = HashMap() private var sixteenDp: Int = 0 - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { if (sixteenDp == 0) sixteenDp = DisplayUtils.dip2px(parent.context, 16f) return CategoryViewHolder(DataBindingUtil.inflate((parent.context as Activity).layoutInflater, R.layout.item_category, parent, false)) } @@ -32,7 +32,7 @@ class CategoryDirectoryAdapter(context: Context, var categoryTitle: String) return mEntityList.size } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is CategoryViewHolder -> { holder.binding.category = mEntityList[position] @@ -48,7 +48,7 @@ class CategoryDirectoryAdapter(context: Context, var categoryTitle: String) } } - internal class CategoryViewHolder(var binding: ItemCategoryBinding) : RecyclerView.ViewHolder(binding.root) { + internal class CategoryViewHolder(var binding: ItemCategoryBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) { fun bindCategory(category: CategoryEntity, expandableStatusMap: HashMap, isExpended: Boolean, diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt index 418627cf15..b9c7656d71 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.category -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.graphics.Color import android.os.Bundle -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen @@ -72,7 +72,7 @@ class CategoryDirectoryFragment : ListFragment(), OnTitleClickListener { lateinit var mNoData: View private var mCategoryAdapter: CategoryListAdapter? = null - private var mLayoutManager: LinearLayoutManager? = null + private var mLayoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null private var mId: String? = "" private var mName: String? = "" @@ -44,7 +42,7 @@ class CategoryListFragment : BaseFragment(), OnTitleClickListener { private var mTitle: String? = "" private var mListOrder: String? = "" // 列表排序 最新/最热 - private var mExposureListener: ExposureListener? = null + private lateinit var mExposureListener: ExposureListener private var mIsOrder: Boolean = false private var mScrollTop = false @@ -97,9 +95,9 @@ class CategoryListFragment : BaseFragment(), OnTitleClickListener { mRvSubject.adapter = mCategoryAdapter } - mLayoutManager = LinearLayoutManager(context) + mLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(context) - (mRvSubject.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false + (mRvSubject.itemAnimator as androidx.recyclerview.widget.DefaultItemAnimator).supportsChangeAnimations = false mRvSubject.addItemDecoration(VerticalItemDecoration(context, 8F, true)) mRvSubject.setHasFixedSize(true) mRvSubject.layoutManager = mLayoutManager @@ -111,12 +109,12 @@ class CategoryListFragment : BaseFragment(), OnTitleClickListener { mRvSubject.addOnScrollListener(mExposureListener) mRvSubject.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { super.onScrollStateChanged(recyclerView, newState) val position = mLayoutManager!!.findFirstCompletelyVisibleItemPosition() if (mScrollTop && position == 0 && newState == RecyclerView.SCROLL_STATE_IDLE) { mScrollTop = false - EventBus.getDefault().post(EBReuse(CategoryListFragment.OPEN_APPBAR)) + EventBus.getDefault().post(EBReuse(OPEN_APPBAR)) } if (!mCategoryAdapter!!.isRemove && mCategoryAdapter!!.isLoaded && newState == RecyclerView.SCROLL_STATE_IDLE @@ -125,11 +123,11 @@ class CategoryListFragment : BaseFragment(), OnTitleClickListener { } } - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) val position = mLayoutManager!!.findFirstCompletelyVisibleItemPosition() if (position == 0 && Math.abs(dy) > 10) { - EventBus.getDefault().post(EBReuse(CategoryListFragment.OPEN_APPBAR)) + EventBus.getDefault().post(EBReuse(OPEN_APPBAR)) } } }) @@ -248,7 +246,7 @@ class CategoryListFragment : BaseFragment(), OnTitleClickListener { override fun onTitleClick() { if (mLayoutManager!!.findFirstCompletelyVisibleItemPosition() == 0 || mCategoryAdapter!!.itemCount == 0) { - EventBus.getDefault().post(EBReuse(CategoryListFragment.OPEN_APPBAR)) + EventBus.getDefault().post(EBReuse(OPEN_APPBAR)) } else { mLayoutManager!!.smoothScrollToPosition(mRvSubject, null, 0) mScrollTop = true diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt index 5fb0bdb5bf..1dad22b9de 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt @@ -3,12 +3,6 @@ package com.gh.gamecenter.category import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.design.widget.AppBarLayout -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentTransaction -import android.support.v7.widget.DefaultItemAnimator -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView import android.text.TextUtils import android.view.MotionEvent import android.view.View @@ -23,13 +17,14 @@ import com.gh.gamecenter.adapter.SubjectTypeAdapter import com.gh.gamecenter.entity.CategoryEntity import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.normal.ToolbarController +import com.google.android.material.appbar.AppBarLayout import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSelectTypeListener { @BindView(R.id.subject_type_list) - lateinit var mSubjectRv: RecyclerView + lateinit var mSubjectRv: androidx.recyclerview.widget.RecyclerView @BindView(R.id.subject_appbar) lateinit var mAppbar: AppBarLayout @BindView(R.id.subject_tabbar_hottest) @@ -57,8 +52,8 @@ class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSel transaction.commitAllowingStateLoss() } - private fun alterFragment(transaction: FragmentTransaction, fmTag: String) { - var fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(fmTag) + private fun alterFragment(transaction: androidx.fragment.app.FragmentTransaction, fmTag: String) { + var fragmentByTag: androidx.fragment.app.Fragment? = childFragmentManager.findFragmentByTag(fmTag) try { if (fragmentByTag != null) { transaction.show(fragmentByTag) @@ -104,7 +99,7 @@ class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSel mListOrder = "download:-1" // 设置标题 - val layoutManager = object : GridLayoutManager(context, 4) { + val layoutManager = object : androidx.recyclerview.widget.GridLayoutManager(context, 4) { override fun canScrollVertically(): Boolean { return false } @@ -114,7 +109,7 @@ class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSel mSubjectRv.layoutManager = layoutManager if (mSubCategoryList.size > 1) { - (mSubjectRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false + (mSubjectRv.itemAnimator as androidx.recyclerview.widget.DefaultItemAnimator).supportsChangeAnimations = false val titleList = arrayListOf() for (subCategory in mSubCategoryList) { subCategory.name?.let { titleList.add(it) } @@ -125,7 +120,7 @@ class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSel mType = arguments?.getString(EntranceUtils.KEY_CATEGORY_INIT_TITLE) loadData() - mAppbar.addOnOffsetChangedListener { appBarLayout, verticalOffset -> + mAppbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> if (!TextUtils.isEmpty(mName)) { val totalScrollRange = appBarLayout.totalScrollRange if (Math.abs(verticalOffset) < totalScrollRange / 2) { @@ -138,7 +133,7 @@ class CategoryListTabFragment : BaseFragment(), SubjectTypeAdapter.OnSel } } } - } + }) } fun onTouchEvent(motionEvent: MotionEvent) { diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListWrapperFragment.kt index 51e2b735bd..f898752dd9 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryListWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListWrapperFragment.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.category import android.os.Bundle -import android.support.v4.view.ViewPager import android.view.MotionEvent import android.view.View import android.widget.LinearLayout +import androidx.viewpager.widget.ViewPager import butterknife.BindView import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R @@ -48,7 +48,7 @@ class CategoryListWrapperFragment : NormalFragment() { val clone = arguments?.clone() as Bundle mTabFragment = CategoryListTabFragment() mTabFragment?.arguments = clone - transaction.add(R.id.subject_tiled, mTabFragment) + transaction.add(R.id.subject_tiled, mTabFragment!!) transaction.commitAllowingStateLoss() } diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index 31b6e98759..2f061b770d 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.collection; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index 4c92d66b73..f33b4df4d8 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.collection; import android.content.Context; import android.graphics.Paint; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java index 3b712ad52f..4a4df586b2 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.collection; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.support.annotation.NonNull; +import androidx.lifecycle.LiveData; +import androidx.annotation.NonNull; import com.gh.common.history.HistoryDatabase; import com.gh.gamecenter.baselist.ListViewModel; diff --git a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java index 6104cf1cf2..34139061d6 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.collection; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.gh.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt index c380d57c53..260518b1e2 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.collection import android.content.Context import android.graphics.Paint -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -29,7 +29,7 @@ class CommunityArticleAdapter(context: Context, return ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -46,7 +46,7 @@ class CommunityArticleAdapter(context: Context, override fun getItemCount(): Int = if (mEntityList.size == 0) 0 else mEntityList.size + 1 - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is CollectionCommunityArticleViewHolder) { val path = "我的收藏-文章" val entity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt index af018558be..8cf27583f2 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.collection -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import com.gh.common.util.CollectionUtils import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java index 7b7bc2f46e..f8adc22861 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.collection; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java index cb84d9893a..2c23804a30 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java +++ b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.db; import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import com.gh.gamecenter.db.info.AskSearchHistoryInfo; import com.gh.gamecenter.db.info.DataCollectionInfo; diff --git a/app/src/main/java/com/gh/gamecenter/db/GameTrendsDao.java b/app/src/main/java/com/gh/gamecenter/db/GameTrendsDao.java index 7c5035c26d..eb16399355 100644 --- a/app/src/main/java/com/gh/gamecenter/db/GameTrendsDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/GameTrendsDao.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.db; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.gh.gamecenter.db.info.GameTrendsInfo; import com.j256.ormlite.dao.Dao; diff --git a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.kt b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.kt index 5c23e07e2c..2746a66fdf 100644 --- a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.discover -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.view.View import android.view.ViewGroup import android.widget.LinearLayout diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt index 86cc7dbc98..176a709391 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.download import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.widget.TextView @@ -33,7 +33,7 @@ class DownloadFragment : BaseFragment_TabLayout() { lateinit var mDownloadNumber: TextView lateinit var mUpdateNumber: TextView - override fun initFragmentList(fragments: MutableList) { + override fun initFragmentList(fragments: MutableList) { fragments.add(GameDownloadFragment()) fragments.add(GameUpdateFragment()) fragments.add(FileSendFragment()) diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 650a9dbfcf..bb0a9bf210 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -4,10 +4,10 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.Message; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 97bf40ed4a..53bf99811d 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -6,10 +6,10 @@ import android.content.pm.PackageInfo; import android.graphics.Bitmap; import android.graphics.Color; import android.os.Message; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 7e005d5cc6..52c6149936 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.download; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -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.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 393146d141..351454b098 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.download; import android.app.Activity; import android.graphics.Color; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/entity/AuthConverter.kt b/app/src/main/java/com/gh/gamecenter/entity/AuthConverter.kt index 830dffd44f..fb6425abde 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/AuthConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/AuthConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.google.gson.Gson class AuthConverter { diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt index 11fb2c3f60..3f6ac21958 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable -import android.support.v4.util.ArrayMap +import androidx.collection.ArrayMap import com.gh.common.constant.Config import com.gh.gamecenter.game.data.GameSubjectData import com.google.gson.annotations.SerializedName @@ -108,7 +108,7 @@ data class GameEntity( var isRelated: Boolean = false) : Parcelable { @IgnoredOnParcel - private var entryMap: ArrayMap? = ArrayMap() + private var entryMap: androidx.collection.ArrayMap? = androidx.collection.ArrayMap() @IgnoredOnParcel var gameLocation: GameLocation? = null @@ -172,11 +172,11 @@ data class GameEntity( this.apkNormal = apkNormal } - fun getEntryMap(): ArrayMap { + fun getEntryMap(): androidx.collection.ArrayMap { return entryMap!! } - fun setEntryMap(entryMap: ArrayMap?) { + fun setEntryMap(entryMap: androidx.collection.ArrayMap?) { if (entryMap != null) { this.entryMap = entryMap } diff --git a/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt index 8a889eb489..bae6c856f2 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName @Entity diff --git a/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt index 1683972f4b..61bec2d6e7 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.Entity +import androidx.room.Entity @Entity data class IdCardEntity( diff --git a/app/src/main/java/com/gh/gamecenter/entity/IdCardTypeConverter.kt b/app/src/main/java/com/gh/gamecenter/entity/IdCardTypeConverter.kt index a4bdf790b7..42f274f062 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/IdCardTypeConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/IdCardTypeConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.google.gson.Gson class IdCardTypeConverter { diff --git a/app/src/main/java/com/gh/gamecenter/entity/KaiFuCalendarEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/KaiFuCalendarEntity.kt index 2e1070ace6..9064bc745b 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/KaiFuCalendarEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/KaiFuCalendarEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.entity -import android.databinding.BaseObservable -import android.databinding.Bindable +import androidx.databinding.BaseObservable +import androidx.databinding.Bindable import android.os.Parcel import android.os.Parcelable import com.gh.gamecenter.BR diff --git a/app/src/main/java/com/gh/gamecenter/entity/LoginTokenEntity.java b/app/src/main/java/com/gh/gamecenter/entity/LoginTokenEntity.java index ffd6e471a0..82c1327b39 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LoginTokenEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/LoginTokenEntity.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.entity; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.PrimaryKey; -import android.arch.persistence.room.TypeConverters; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.PrimaryKey; +import androidx.room.TypeConverters; +import androidx.annotation.NonNull; import com.gh.gamecenter.user.TokenTypeConverter; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.kt index d5f3642d25..88997ca43d 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.PrimaryKey import android.os.Parcel import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/gh/gamecenter/entity/SignEntity.java b/app/src/main/java/com/gh/gamecenter/entity/SignEntity.java index baa6c47fbe..a3670dda82 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SignEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/SignEntity.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.entity; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.PrimaryKey; -import android.arch.persistence.room.TypeConverters; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.PrimaryKey; +import androidx.room.TypeConverters; +import androidx.annotation.NonNull; import com.gh.gamecenter.room.converter.SignDataConverter; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/gh/gamecenter/entity/TokenEntity.java b/app/src/main/java/com/gh/gamecenter/entity/TokenEntity.java index 5e729bee58..e2e8be3c3d 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/TokenEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/TokenEntity.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.entity; -import android.arch.persistence.room.Entity; +import androidx.room.Entity; /** * Created by khy on 29/11/17. diff --git a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt index 88d2c3223c..5d63baf665 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.entity -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey -import android.arch.persistence.room.TypeConverters -import android.support.annotation.NonNull +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.TypeConverters +import androidx.annotation.NonNull import com.google.gson.annotations.SerializedName /** diff --git a/app/src/main/java/com/gh/gamecenter/fragment/GameWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameWrapperFragment.java index 119475c4c4..ddd522e1f8 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/GameWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameWrapperFragment.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.gh.base.fragment.BaseFragment; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index ddbf50efb9..bee1299649 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -1,14 +1,14 @@ package com.gh.gamecenter.fragment; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Message; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index d5c9f2c9b8..02e682e1a1 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 5fa9a3a778..7fdde40bcd 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.fragment; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt index 68fb885247..1fd809fca7 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -1,14 +1,14 @@ package com.gh.gamecenter.game -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.graphics.Bitmap import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.widget.DefaultItemAnimator -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.core.content.ContextCompat +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.DefaultItemAnimator +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen import com.facebook.common.references.CloseableReference @@ -52,9 +52,9 @@ class GameFragment : NormalFragment() { private var mListAdapter: GameFragmentAdapter? = null - private var mLayoutManager: LinearLayoutManager? = null + private var mLayoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null - private var mExposureListener: ExposureListener? = null + private lateinit var mExposureListener: ExposureListener private var mBlockData: SubjectRecommendEntity? = null @@ -136,7 +136,7 @@ class GameFragment : NormalFragment() { adapter = mListAdapter } mBinding?.gameList?.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { super.onScrollStateChanged(recyclerView, newState) if (mLayoutManager!!.findLastVisibleItemPosition() == mListAdapter!!.itemCount - 1 && RecyclerView.SCROLL_STATE_IDLE == newState) mViewModel?.getSubjectList(false) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index f64ee50ed5..7b575d7bac 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -2,10 +2,10 @@ package com.gh.gamecenter.game import android.content.Context import android.graphics.drawable.Animatable -import android.support.v7.widget.DefaultItemAnimator -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.DefaultItemAnimator +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.view.View import android.view.ViewGroup @@ -44,7 +44,7 @@ import java.util.* import kotlin.collections.ArrayList class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: String) - : BaseRecyclerAdapter(context), IExposable { + : BaseRecyclerAdapter(context), IExposable { private val mPluginPosition = 1 @@ -91,7 +91,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: return ItemViewType.LOADING } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.GAME_SLIDE -> { val displayMetrics = mContext.resources.displayMetrics.widthPixels @@ -122,7 +122,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is GameHeadViewHolder -> bindHeadView(holder, position) is GamePluginViewHolder -> bindPluginView(holder, position) @@ -142,8 +142,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: var subjectAdapter = binding.horizontalRv.adapter if (subjectAdapter == null) { subjectAdapter = GameHorizontalAdapter(mContext, subjectEntity!!) - (binding.horizontalRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false - binding.horizontalRv.layoutManager = GridLayoutManager(mContext, 4) + (binding.horizontalRv.itemAnimator as androidx.recyclerview.widget.DefaultItemAnimator).supportsChangeAnimations = false + binding.horizontalRv.layoutManager = androidx.recyclerview.widget.GridLayoutManager(mContext, 4) binding.horizontalRv.adapter = subjectAdapter } else { (subjectAdapter as GameHorizontalAdapter).checkResetData(subjectEntity!!) @@ -433,8 +433,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: if (adapter == null) { adapter = GamePluginAdapter(mContext, pluginList) adapter.openList(mIsOpenPluginList) - (holder.mPluginRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false - holder.mPluginRv.layoutManager = LinearLayoutManager(mContext) + (holder.mPluginRv.itemAnimator as androidx.recyclerview.widget.DefaultItemAnimator).supportsChangeAnimations = false + holder.mPluginRv.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) holder.mPluginRv.adapter = adapter } else { (adapter as GamePluginAdapter).openList(mIsOpenPluginList) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt index 803c2d0e73..32d4957dab 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt @@ -2,9 +2,9 @@ package com.gh.gamecenter.game import android.annotation.SuppressLint import android.app.Application -import android.arch.lifecycle.* +import androidx.lifecycle.* import android.preference.PreferenceManager -import android.support.v4.util.ArrayMap +import androidx.collection.ArrayMap import android.text.TextUtils import com.gh.common.TimeElapsedHelper import com.gh.common.constant.Constants @@ -37,7 +37,7 @@ class GameViewModel(application: Application, var blockData: SubjectRecommendEnt private var mSmartSubject: SubjectEntity? = null // 插件化 private val mItemDataListCache: MutableList = ArrayList() - private val mSubjectChangedMap: ArrayMap> = ArrayMap() // 存储换一换的数据 + private val mSubjectChangedMap: androidx.collection.ArrayMap> = androidx.collection.ArrayMap() // 存储换一换的数据 private var mSubjectPage = 1 // 专题分页 private var mIsLoading = false diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index 7165568be8..909b924582 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.gamedetail; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; import android.text.Layout; import android.view.MenuItem; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt index afc3e7e0a8..a05de7fcf7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.gamedetail import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.common.history.HistoryHelper import com.gh.common.util.ApkActiveUtils import com.gh.common.util.ConcernUtils diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 14ba5243f0..d91678ef5c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.gamedetail.desc import android.content.Context -import android.databinding.DataBindingUtil -import android.support.v4.app.Fragment -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.databinding.DataBindingUtil +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.view.View import android.view.ViewGroup @@ -29,10 +29,10 @@ import com.lightgame.adapter.BaseRecyclerAdapter import org.greenrobot.eventbus.EventBus class DescAdapter(context: Context, - private val mFragment: Fragment, + private val mFragment: androidx.fragment.app.Fragment, private val mEntrance: String, private val mViewModel: DescViewModel) - : BaseRecyclerAdapter(context) { + : BaseRecyclerAdapter(context) { companion object { const val INFO = 1 @@ -81,7 +81,7 @@ class DescAdapter(context: Context, notifyDataSetChanged() } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { INFO -> { val view = mLayoutInflater.inflate(R.layout.gamedetail_item_plugin, parent, false) @@ -128,7 +128,7 @@ class DescAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is GameDetailBasicViewHolder -> initBasicInfoViewHolder(holder, mDescItemList[position]) is GameDetailPluginViewHolder -> initPluginViewHolder(holder, mDescItemList[position]) @@ -190,7 +190,7 @@ class DescAdapter(context: Context, private fun bindCommentsViewHolder(viewHolder: GameDetailCommentsViewHolder, comments: ArrayList?) { val commentsAdapter = DescCommentsAdapter(mContext, mViewModel, mEntrance) viewHolder.binding.recyclerview.adapter = commentsAdapter - viewHolder.binding.recyclerview.layoutManager = LinearLayoutManager(mContext) + viewHolder.binding.recyclerview.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) viewHolder.binding.tvAll.setOnClickListener { EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING)) MtaHelper.onEvent("游戏详情_新", "玩家评论_点击全部", gameName) @@ -259,8 +259,8 @@ class DescAdapter(context: Context, val tips = descItemData.basicInfo?.info val tag = descItemData.basicInfo?.infoTag - val layoutManager = GridLayoutManager(mContext, 3) - layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { + val layoutManager = androidx.recyclerview.widget.GridLayoutManager(mContext, 3) + layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return if (tips!!.title != null) { if (position == 0) 3 else 1 @@ -285,9 +285,9 @@ class DescAdapter(context: Context, val tips = descItemData.plugin?.tips val tag = descItemData.plugin?.tagList - val linearLayoutManager = LinearLayoutManager(mContext) - val layoutManager = GridLayoutManager(mContext, 3) - layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { + val linearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) + val layoutManager = androidx.recyclerview.widget.GridLayoutManager(mContext, 3) + layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return if (!TextUtils.isEmpty(tips?.content)) { if (position == 0) 3 else 1 @@ -324,7 +324,7 @@ class DescAdapter(context: Context, viewHolder.introGallery.isNestedScrollingEnabled = false if (viewHolder.introGallery.adapter == null) { viewHolder.introGallery.setHasFixedSize(true) - viewHolder.introGallery.layoutManager = LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false) + viewHolder.introGallery.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false) viewHolder.introGallery.adapter = GameGalleryAdapter(mContext, mFragment, descItemData.intro!!.video, @@ -380,7 +380,7 @@ class DescAdapter(context: Context, private fun initGameTagViewHolder(holder: GameDetailGameTagViewHolder, descItemData: DescItemData) { if (holder.gametagRv.adapter == null) { holder.gametagRv.setHasFixedSize(true) - holder.gametagRv.layoutManager = LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false) + holder.gametagRv.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false) holder.gametagRv.addItemDecoration(HorizontalItemDecoration(mContext, 8, descItemData.gameTag!!.size)) holder.gametagRv.adapter = GameDetailGameTagAdapter(mContext, descItemData.gameTag) } @@ -413,9 +413,9 @@ class DescAdapter(context: Context, class GameDetailBasicViewHolder(view: View) : GameDetailPluginViewHolder(view) - class GameDetailUpdateContentViewHolder(var binding: GamedetailItemUpdateContentBinding) : RecyclerView.ViewHolder(binding.root) + class GameDetailUpdateContentViewHolder(var binding: GamedetailItemUpdateContentBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) - class GameDetailRecommendImageViewHolder(var binding: GamedetailItemImageBinding) : RecyclerView.ViewHolder(binding.root) + class GameDetailRecommendImageViewHolder(var binding: GamedetailItemImageBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) - class GameDetailCommentsViewHolder(var binding: GamedetailItemCommentsBinding) : RecyclerView.ViewHolder(binding.root) + class GameDetailCommentsViewHolder(var binding: GamedetailItemCommentsBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index 448ec92915..4b7a254a52 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.gamedetail.desc import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.Constants @@ -27,7 +27,7 @@ class DescCommentsAdapter(context: Context, return ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View = mLayoutInflater.inflate(R.layout.rating_comment_item, parent, false) return RatingCommentItemViewHolder(RatingCommentItemBinding.bind(view)) } @@ -36,7 +36,7 @@ class DescCommentsAdapter(context: Context, return comments.size } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is RatingCommentItemViewHolder) { val commentData = comments[position] holder.setContent(commentData, mEntrance, path) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt index ca0fb6b024..aaaa19c3ce 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt @@ -1,12 +1,12 @@ package com.gh.gamecenter.gamedetail.desc -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.DefaultItemAnimator -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.DefaultItemAnimator +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import cn.jzvd.Jzvd import cn.jzvd.JzvdMgr @@ -91,7 +91,7 @@ class DescFragment : BaseFragment() { mRecyclerView.adapter = mAdapter mRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) val position = layoutManager!!.findFirstCompletelyVisibleItemPosition() if (position == 0 && Math.abs(dy) > 10) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt index 958448466c..1aacc23126 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt @@ -2,10 +2,10 @@ package com.gh.gamecenter.gamedetail.desc import android.annotation.SuppressLint import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.text.TextUtils import com.gh.common.repository.RemenkapaiRepository import com.gh.common.util.ApkActiveUtils diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java index 2fc73eb2f9..65ba7abc6c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.gamedetail.desc; import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailPluginAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailPluginAdapter.java index 9a44314087..336d0c285c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailPluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailPluginAdapter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.gamedetail.desc; import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt index 262a4a347a..51b746d5fe 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt @@ -2,10 +2,10 @@ package com.gh.gamecenter.gamedetail.desc import android.app.Activity import android.content.Context -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.os.Build -import android.support.v4.app.Fragment -import android.support.v7.widget.RecyclerView +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.view.LayoutInflater import android.view.View @@ -25,11 +25,11 @@ import kotlinx.android.synthetic.main.player_view.view.* import java.util.* class GameGalleryAdapter(var context: Context, - private val mFragment: Fragment, + private val mFragment: androidx.fragment.app.Fragment, private val mVideo: String? = "", private val mGallery: ArrayList, private val mGameName: String, - private val mEntrance: String) : RecyclerView.Adapter() { + private val mEntrance: String) : androidx.recyclerview.widget.RecyclerView.Adapter() { var mLayoutInflater: LayoutInflater = (context as Activity).layoutInflater @@ -38,7 +38,7 @@ class GameGalleryAdapter(var context: Context, const val VIDEO = 224 } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { VIDEO -> { VideoViewHolder(DataBindingUtil.inflate(mLayoutInflater, R.layout.gallery_video_item, parent, false)) @@ -53,7 +53,7 @@ class GameGalleryAdapter(var context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is GameGalleryViewHolder -> { ImageUtils.display(holder.screenshotIv, mGallery[position]) @@ -99,6 +99,6 @@ class GameGalleryAdapter(var context: Context, lateinit var screenshotIv: SimpleDraweeView } - class VideoViewHolder(var binding: GalleryVideoItemBinding) : RecyclerView.ViewHolder(binding.root) + class VideoViewHolder(var binding: GalleryVideoItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt index 2d6f8455f7..ddff42602c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.gamedetail.fuli import android.content.Context import android.graphics.Color import android.preference.PreferenceManager -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.text.TextUtils import android.view.View @@ -35,7 +35,7 @@ import java.util.* class FuLiAdapter(context: Context, private val mListListener: OnListClickListener?, private val mFuLiViewModel: FuLiViewModel?, - private val mEntrance: String) : BaseRecyclerAdapter(context) { + private val mEntrance: String) : BaseRecyclerAdapter(context) { var itemList: List? = null private var isOpenLiBaoList: Boolean = false private var isOpenToolList: Boolean = false @@ -60,7 +60,7 @@ class FuLiAdapter(context: Context, return super.getItemViewType(position) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View when (viewType) { 1 -> { @@ -113,7 +113,7 @@ class FuLiAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is GameDetailNoticeViewHolder) { initNoticeViewHolder(holder.mvNotice, position) } else if (holder is GameDetailNewsViewHolder) { @@ -147,7 +147,7 @@ class FuLiAdapter(context: Context, answerItemHint.visibility = View.VISIBLE } - answerItemList.layoutManager = LinearLayoutManager(mContext) + answerItemList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) answerItemList.adapter = GameDetailAnswerAdapter(mContext, mFuLiViewModel?.game?.name, itemList?.get(position)?.answer!!, mEntrance) answerItemMore.setOnClickListener { answerItemHint.visibility = View.GONE @@ -187,7 +187,7 @@ class FuLiAdapter(context: Context, } viewHolder.gamedetailPluginTitle.text = "游戏工具" - viewHolder.gameDetailPluginRv.layoutManager = LinearLayoutManager(mContext) + viewHolder.gameDetailPluginRv.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) val adapter = GameDetailToolsAdapter(mContext, mFuLiViewModel?.game?.name, tools, isOpenToolList) viewHolder.gameDetailPluginRv.adapter = adapter @@ -268,7 +268,7 @@ class FuLiAdapter(context: Context, } else { viewHolder.openList.visibility = View.VISIBLE } - viewHolder.libaoRv.layoutManager = LinearLayoutManager(mContext) + viewHolder.libaoRv.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mContext) viewHolder.libaoRv.adapter = GameLibaoGalleryAdapter(mContext, liBao, isOpenLiBaoList, mFuLiViewModel?.game?.name, mListListener) viewHolder.openList.setOnClickListener { @@ -324,7 +324,7 @@ class FuLiAdapter(context: Context, val adapter = GameDetailKaiFuAdapter(mContext, serverEntity.calendar, binding, mFuLiViewModel?.game, mFuLiViewModel?.gameDetail?.me) binding.kaifuRv.isNestedScrollingEnabled = false - binding.kaifuRv.layoutManager = GridLayoutManager(mContext, 7) + binding.kaifuRv.layoutManager = androidx.recyclerview.widget.GridLayoutManager(mContext, 7) binding.kaifuRv.addItemDecoration(GridDivider(mContext, 1, 7, Color.BLACK)) binding.kaifuRv.adapter = adapter adapter.showKaiFuDetail(false) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index c70e43d0c5..72d2b77494 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -1,14 +1,14 @@ package com.gh.gamecenter.gamedetail.fuli import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.text.TextUtils import android.view.View +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.base.fragment.BaseFragment @@ -118,7 +118,7 @@ class FuLiFragment : BaseFragment() { mViewSkeletonScreen = Skeleton.bind(game_detail_skeleton).shimmer(false).load(R.layout.fragment_gamedongtai_skeleton).show() mAdapter = FuLiAdapter(context!!, this, mFuLiViewModel, mEntrance) mRecyclerView.adapter = mAdapter - layoutManager = object : LinearLayoutManager(context) { + layoutManager = object : androidx.recyclerview.widget.LinearLayoutManager(context) { override fun canScrollVertically(): Boolean { return isCanScroll } @@ -126,7 +126,7 @@ class FuLiFragment : BaseFragment() { mRecyclerView.layoutManager = layoutManager mRecyclerView.addItemDecoration(VerticalItemDecoration(context, 8F, true)) mRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) val position = layoutManager!!.findFirstCompletelyVisibleItemPosition() if (position == 0 && Math.abs(dy) > 10) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt index b4196ba897..1d076f8294 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.gamedetail.fuli import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.text.TextUtils import com.gh.common.constant.Config import com.gh.common.util.LibaoUtils diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java index fc3577bd3c..824b74e10a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java @@ -6,9 +6,9 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java index 248e7fd121..0ae7c4db68 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.gamedetail.fuli.tools; import android.content.Context; import android.content.Intent; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.gh.common.constant.Config; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt index 82f05658f7..41f6ece298 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamedetail.rating import android.app.Activity import android.content.Context import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.Constants @@ -49,7 +49,7 @@ class RatingAdapter(context: Context, } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_HEADER -> { @@ -75,7 +75,7 @@ class RatingAdapter(context: Context, return index } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is RatingItemViewHolder -> holder.binding.run { ratingData?.serviceComment?.isServiceComment = true diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index ac848c135c..7874f7e2bd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.gamedetail.rating -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.view.View import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.fromHtml diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt index 49fffcf3a9..a9b2fc8951 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt @@ -1,12 +1,12 @@ package com.gh.gamecenter.gamedetail.rating import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Intent -import android.databinding.BindingAdapter +import androidx.databinding.BindingAdapter import android.os.Bundle -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.ProgressBar import com.gh.common.util.EntranceUtils @@ -38,7 +38,7 @@ class RatingFragment : ListFragment() { } } - override fun getItemDecoration(): RecyclerView.ItemDecoration? { + override fun getItemDecoration(): androidx.recyclerview.widget.RecyclerView.ItemDecoration? { return null } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index 9cbe9903ed..845a978e96 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -1,12 +1,12 @@ package com.gh.gamecenter.gamedetail.rating -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.text.Editable import android.text.TextWatcher import android.view.View @@ -142,7 +142,7 @@ class RatingReplyActivity : ListActivity { @@ -112,7 +112,7 @@ class RatingReplyAdapter(context: Context, return if (mEntityList.size > 0) mEntityList.size + 1 else 0 } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is RatingReplyHeadItemViewHolder -> { val game = mEntityList[position].game!! diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt index 1be80e0efd..102849cd56 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.gamedetail.rating import android.app.Application -import android.arch.lifecycle.LiveData -import android.arch.lifecycle.MediatorLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.LiveData +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.base.fragment.WaitingDialogFragment import com.gh.common.util.ApkActiveUtils import com.gh.common.util.ErrorHelper diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt index 3f0feb6d22..097ca38940 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.gamedetail.rating import android.app.Application -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.os.Build import android.text.TextUtils import com.gh.common.AppExecutor diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt index fb17207a33..1e9e0b7109 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.history import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -50,7 +50,7 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa return ItemViewType.GAME_NORMAL } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.GAME_NORMAL -> { GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false))) @@ -65,7 +65,7 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa return if (mEntityList == null || mEntityList.isEmpty()) return 0 else mEntityList.size + 1 } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is GameItemViewHolder -> { val gameEntity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt index f37321f6f7..b4cc423fad 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.history import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.gh.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.R import com.gh.gamecenter.collection.AnswerFragment @@ -17,7 +17,7 @@ class HistoryWrapperFragment : BaseFragment_TabLayout() { tabTitleList.add(getString(R.string.main_game)) } - override fun initFragmentList(fragments: MutableList) { + override fun initFragmentList(fragments: MutableList) { fragments.add(AnswerFragment.getInstance(AnswerFragment.Type.HISTORY)) fragments.add(CommunityArticleFragment.getInstance(CommunityArticleFragment.Type.HISTORY)) fragments.add(ArticleFragment.getInstance(ArticleFragment.Type.HISTORY)) diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index 19ce32aaac..c3c13154b1 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.Html; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index a72b5bf0d5..8c00b4641e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -3,11 +3,11 @@ package com.gh.gamecenter.info; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java index 21c63a18cb..8342146939 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.info; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java index 67326e729a..735ce32770 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoToolWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoToolWrapperFragment.java index 711a58af07..41781ea538 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoToolWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoToolWrapperFragment.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.info; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.gh.base.fragment.BaseFragment; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java index efa2ee523c..46ffde2295 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.support.annotation.NonNull; +import androidx.lifecycle.LiveData; +import androidx.annotation.NonNull; import com.gh.common.constant.Config; import com.gh.common.util.UrlFilterUtils; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java index f218da6e8c..89926aec2d 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java b/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java index 5d2e8ccf68..a4e21091be 100644 --- a/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java +++ b/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.info; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MediatorLiveData; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MediatorLiveData; import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java index 3ed4c76fc5..bd3ed2bd8f 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.info; 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; diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java index 1ad62b05ac..84baba1155 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.support.annotation.NonNull; +import androidx.lifecycle.LiveData; +import androidx.annotation.NonNull; import com.gh.common.constant.Config; import com.gh.common.util.UrlFilterUtils; diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java index c8d981e3d7..565129ed6c 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.info; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index e3b3fb22d9..25fd61337c 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -2,9 +2,9 @@ package com.gh.gamecenter.info; import android.app.Dialog; import android.content.Intent; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java index 6b19bd2b90..40d8835c78 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.kaifu; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.widget.CheckedTextView; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java index 456aced72f..a2f24fe22e 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java @@ -3,9 +3,9 @@ package com.gh.gamecenter.kaifu; import android.app.Dialog; import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.SparseArray; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index 90d201bfbb..d96602c0af 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.kaifu; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.LinearSmoothScroller; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java index e080c5730d..58a97c0254 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.kaifu; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt index 62472b660d..7f5725bf5e 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt @@ -1,12 +1,12 @@ package com.gh.gamecenter.kaifu.add import android.app.Activity -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.SpannableString import android.text.Spanned import android.text.method.LinkMovementMethod @@ -49,7 +49,7 @@ class AddKaiFuActivity : BaseActivity() { mViewModel?.initData(intent.getParcelableExtra(KaiFuCalendarEntity.TAG) , intent.getParcelableArrayListExtra(EntranceUtils.KEY_KAIFU_LIST) , intent.getStringExtra(EntranceUtils.KEY_GAMEID)) - mViewModel?.postResult?.observe(this, android.arch.lifecycle.Observer { it -> + mViewModel?.postResult?.observe(this, androidx.lifecycle.Observer { it -> if (it == null) { toast(R.string.post_failure_hint) } else { diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt index 300a1e3bc3..4322760677 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.kaifu.add import android.app.Activity import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData import android.text.TextUtils import com.gh.common.util.DialogUtils import com.gh.common.util.GsonUtils diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt index cec71e9d4f..37d6942bcd 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.kaifu.patch import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt index 51c71d4dc7..1c2abc32ed 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.kaifu.patch import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.R import com.gh.gamecenter.entity.KaiFuCalendarEntity import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/kotterknife/kotterknife.kt b/app/src/main/java/com/gh/gamecenter/kotterknife/kotterknife.kt index f37cbd290c..891d6bc2a6 100644 --- a/app/src/main/java/com/gh/gamecenter/kotterknife/kotterknife.kt +++ b/app/src/main/java/com/gh/gamecenter/kotterknife/kotterknife.kt @@ -4,12 +4,12 @@ import android.app.Activity import android.app.Dialog import android.app.DialogFragment import android.app.Fragment -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty -import android.support.v4.app.DialogFragment as SupportDialogFragment -import android.support.v4.app.Fragment as SupportFragment +import androidx.fragment.app.DialogFragment as SupportDialogFragment +import androidx.fragment.app.Fragment as SupportFragment public fun View.bindView(id: Int) : ReadOnlyProperty = required(id, viewFinder) diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java index e444a6cb73..d9e6de5e69 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java @@ -5,7 +5,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadNotification; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index ded6861e72..0ecb7312b3 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.libao; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.view.KeyEvent; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 6fec61eb94..86e3126cca 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.libao; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index cfa6426110..324698050a 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.libao; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index f6210c37b4..84c9c29a67 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.libao; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index c308e284dc..e06e9fedc2 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.libao; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java index 4b05e39850..18f22c75ad 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -3,10 +3,10 @@ package com.gh.gamecenter.libao; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index be392ddd2e..4a2be44ec7 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.libao; import android.content.Context; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 0a1633bb21..04abcd4098 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.libao 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 @@ -30,7 +30,7 @@ import java.util.* */ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListener, listListener: OnListClickListener, - entrance: String?) : BaseRecyclerAdapter(context) { + entrance: String?) : BaseRecyclerAdapter(context) { private val mCallBackListener: OnRequestCallBackListener = callBackListener private val mListListener: OnListClickListener = listListener @@ -141,7 +141,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View when (viewType) { ItemViewType.LOADING -> { @@ -155,7 +155,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is LibaoNormalViewHolder) { initLibaoViewHolder(holder, position) } else if (holder is FooterViewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index a9395c58f9..e6e155662f 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -2,12 +2,12 @@ package com.gh.gamecenter.libao; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index a0942ce06b..7969ce75f8 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.libao -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.view.View import android.view.ViewGroup @@ -26,7 +26,7 @@ import java.util.* */ class LibaoSearchAdapter(fragment: LibaoSearchFragment, callBackListener: OnRequestCallBackListener, - entrance: String?) : BaseRecyclerAdapter(fragment.context) { + entrance: String?) : BaseRecyclerAdapter(fragment.context) { private val mFragment: LibaoSearchFragment = fragment private val mCallBackListener: OnRequestCallBackListener = callBackListener @@ -144,7 +144,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View when (viewType) { ItemViewType.LOADING -> { @@ -158,7 +158,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is LibaoNormalViewHolder) { initLibaoViewHolder(holder, position) } else if (holder is FooterViewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index 5f706b1878..23add2db06 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.libao; import android.content.Intent; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index 3428e6aed1..31bdfe5055 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.manager; import android.content.SharedPreferences; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.gh.common.PushManager; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java index 9b64209cda..249609bcfe 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.message; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.gh.common.util.MtaHelper; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 50b5d913e3..aa49f99ce2 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.message; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java index 5da6a0432a..2b5d0b470b 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.message; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index bdab1cd9f3..cd7974a705 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputFilter; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 761f2ee885..65a137c2ac 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.message; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.gh.common.util.MtaHelper; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 9a3996b60e..11c57edde9 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.message; import android.content.Context; import android.content.Intent; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; import android.view.View; import com.gh.base.BaseActivity; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java index d43d8b9afa..1b1b561177 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.message; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java index c051eee345..78a60db856 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.message; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt index b213e8173a..9f88edae10 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.message import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.MessageEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt index 2284649313..0e93ff4f72 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.message -import android.arch.lifecycle.MediatorLiveData +import androidx.lifecycle.MediatorLiveData import com.gh.gamecenter.entity.MessageUnreadEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java index cd9f8864b0..8f73af94e3 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.message; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.MediatorLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; -import android.support.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.MediatorLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; +import androidx.annotation.NonNull; import com.gh.gamecenter.entity.MessageUnreadEntity; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java b/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java index aeabaf7136..eb7324a525 100644 --- a/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java +++ b/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.mvvm; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MediatorLiveData; -import android.support.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MediatorLiveData; +import androidx.annotation.Nullable; import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/gamecenter/mvvm/Resource.java b/app/src/main/java/com/gh/gamecenter/mvvm/Resource.java index cfeb74eae6..21ae5a3ed1 100644 --- a/app/src/main/java/com/gh/gamecenter/mvvm/Resource.java +++ b/app/src/main/java/com/gh/gamecenter/mvvm/Resource.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.mvvm; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import retrofit2.HttpException; diff --git a/app/src/main/java/com/gh/gamecenter/mvvm/SingleLiveEvent.java b/app/src/main/java/com/gh/gamecenter/mvvm/SingleLiveEvent.java index f82c50c1cb..c28356d617 100644 --- a/app/src/main/java/com/gh/gamecenter/mvvm/SingleLiveEvent.java +++ b/app/src/main/java/com/gh/gamecenter/mvvm/SingleLiveEvent.java @@ -1,59 +1,59 @@ -package com.gh.gamecenter.mvvm; - -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.Observer; -import android.support.annotation.MainThread; -import android.support.annotation.Nullable; -import android.util.Log; - -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * A lifecycle-aware observable that sends only new updates after subscription, used for events like - * navigation and Snackbar messages. - *

- * This avoids a common problem with events: on configuration change (like rotation) an update - * can be emitted if the observer is active. This LiveData only calls the observable if there's an - * explicit call to setValue() or call(). - *

- * Note that only one observer is going to be notified of changes. - */ -public class SingleLiveEvent extends MutableLiveData { - - private static final String TAG = "SingleLiveEvent"; - - private final AtomicBoolean mPending = new AtomicBoolean(false); - - @MainThread - public void observe(LifecycleOwner owner, final Observer observer) { - - if (hasActiveObservers()) { - Log.w(TAG, "Multiple observers registered but only one will be notified of changes."); - } - - // Observe the internal MutableLiveData - super.observe(owner, new Observer() { - @Override - public void onChanged(@Nullable T t) { - if (mPending.compareAndSet(true, false)) { - observer.onChanged(t); - } - } - }); - } - - @MainThread - public void setValue(@Nullable T t) { - mPending.set(true); - super.setValue(t); - } - - /** - * Used for cases where T is Void, to make calls cleaner. - */ - @MainThread - public void call() { - setValue(null); - } -} \ No newline at end of file +//package com.gh.gamecenter.mvvm; +// +//import androidx.lifecycle.LifecycleOwner; +//import androidx.lifecycle.MutableLiveData; +//import androidx.lifecycle.Observer; +//import androidx.annotation.MainThread; +//import androidx.annotation.Nullable; +//import android.util.Log; +// +//import java.util.concurrent.atomic.AtomicBoolean; +// +///** +// * A lifecycle-aware observable that sends only new updates after subscription, used for events like +// * navigation and Snackbar messages. +// *

+// * This avoids a common problem with events: on configuration change (like rotation) an update +// * can be emitted if the observer is active. This LiveData only calls the observable if there's an +// * explicit call to setValue() or call(). +// *

+// * Note that only one observer is going to be notified of changes. +// */ +//public class SingleLiveEvent extends MutableLiveData { +// +// private static final String TAG = "SingleLiveEvent"; +// +// private final AtomicBoolean mPending = new AtomicBoolean(false); +// +// @MainThread +// public void observe(LifecycleOwner owner, final Observer observer) { +// +// if (hasActiveObservers()) { +// Log.w(TAG, "Multiple observers registered but only one will be notified of changes."); +// } +// +// // Observe the internal MutableLiveData +// super.observe(owner, new Observer() { +// @Override +// public void onChanged(@Nullable T t) { +// if (mPending.compareAndSet(true, false)) { +// observer.onChanged(t); +// } +// } +// }); +// } +// +// @MainThread +// public void setValue(@Nullable T t) { +// mPending.set(true); +// super.setValue(t); +// } +// +// /** +// * Used for cases where T is Void, to make calls cleaner. +// */ +// @MainThread +// public void call() { +// setValue(null); +// } +//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index cca26e92e9..36381e1f36 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -7,9 +7,9 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.net.Uri; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.Layout; import android.text.TextUtils; import android.view.Gravity; diff --git a/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java b/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java index 556f02c692..36d1f7fc5c 100644 --- a/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.normal; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.MenuRes; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.IdRes; +import androidx.annotation.MenuRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import android.view.MenuItem; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java index e7c4aa9c0f..72255827ab 100644 --- a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java +++ b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.normal; -import android.support.annotation.IdRes; -import android.support.annotation.MenuRes; -import android.support.annotation.StringRes; +import androidx.annotation.IdRes; +import androidx.annotation.MenuRes; +import androidx.annotation.StringRes; import android.view.MenuItem; /** diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index a334e82202..8447602833 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.packagehelper import android.annotation.SuppressLint -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.MutableLiveData import android.preference.PreferenceManager import android.text.TextUtils import com.gh.common.util.* diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageViewModel.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageViewModel.kt index eedea2f84d..387c288ee8 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.packagehelper import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.text.TextUtils import com.gh.gamecenter.entity.GameInstall import com.gh.gamecenter.entity.GameUpdateEntity diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 27cb134314..6a3fe0d871 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -1,14 +1,14 @@ package com.gh.gamecenter.personal; import android.annotation.SuppressLint; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt index 3e4fe629f8..917378caed 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.personalhome import android.content.Context import android.graphics.Color -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -32,7 +32,7 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -50,7 +50,7 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + ListAdapter.FOOTER_ITEM_COUNT } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is FollowersOrFansViewHolder) { val entity = mEntityList[position] holder.binding.entity = entity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt index b7c5acc2bc..8bfd042148 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.personalhome -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.os.Bundle import com.gh.common.util.EntranceUtils import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt index aeac42e659..1703d19b39 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.personalhome import android.app.Application -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.FollowersOrFansEntity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt index b2d8e3780a..47999afb41 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt @@ -2,9 +2,9 @@ package com.gh.gamecenter.personalhome import android.content.Context import android.graphics.Color -import android.support.constraint.ConstraintSet -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.constraintlayout.widget.ConstraintSet +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import android.widget.TextView @@ -60,7 +60,7 @@ class PersonalHomeAdapter(context: Context, } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_HEADER -> { @@ -78,7 +78,7 @@ class PersonalHomeAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is PersonalTopViewHolder -> { holder.binding.run { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeViewModel.kt index 2095017a45..d70b14bca2 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.personalhome import android.app.Application -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerActivity.kt index fb8fa2f56e..414793e2b2 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerActivity.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.personalhome.answer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerAdapter.kt index 3fcec47008..382f0d9e20 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/answer/PersonalAnswerAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.personalhome.answer import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -21,7 +21,7 @@ class PersonalAnswerAdapter(context: Context, return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -35,7 +35,7 @@ class PersonalAnswerAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is AnswerViewHolder -> { val entity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionActivity.kt index e0ea437c24..0cc0495d51 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionActivity.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.personalhome.question -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionAdapter.kt index a05f69b313..8db6106165 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/question/PersonalQuestionAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.personalhome.question import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -20,7 +20,7 @@ class PersonalQuestionAdapter(context: Context, return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -34,7 +34,7 @@ class PersonalQuestionAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is AskQuestionsNewViewHolder -> { val questions = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt index 8ed67df844..9131f1603d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt @@ -3,14 +3,11 @@ package com.gh.gamecenter.qa import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.content.SharedPreferences import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.v4.app.Fragment import android.text.TextUtils import android.view.Gravity import android.view.LayoutInflater @@ -19,6 +16,8 @@ import android.view.ViewGroup import android.widget.CheckedTextView import android.widget.ImageView import android.widget.TextView +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import butterknife.BindView import butterknife.OnClick import com.gh.base.adapter.FragmentAdapter @@ -275,7 +274,7 @@ class AskFragment : BaseFragment() { @SuppressLint("ClickableViewAccessibility") private fun initViewPager() { - val fragmentList = ArrayList() + val fragmentList = ArrayList() mRecommendsFragment = AskRecommendWrapperFragment() fragmentList.add(mAskFollowFragment) fragmentList.add(mRecommendsFragment) @@ -372,11 +371,11 @@ class AskFragment : BaseFragment() { mLoading.visibility = View.GONE mCommunitiesSelectLayout.visibility = View.VISIBLE mCommunitiesSelectFragment = CommunitiesSelectWrapperFragment() - childFragmentManager.beginTransaction().replace(R.id.communities_select_layout, mCommunitiesSelectFragment).commitNowAllowingStateLoss() + childFragmentManager.beginTransaction().replace(R.id.communities_select_layout, mCommunitiesSelectFragment!!).commitNowAllowingStateLoss() } private fun hideCommunitySelectFragmentAndShowCommunityWithHint() { - childFragmentManager.beginTransaction().remove(mCommunitiesSelectFragment).commitNowAllowingStateLoss() + childFragmentManager.beginTransaction().remove(mCommunitiesSelectFragment!!).commitNowAllowingStateLoss() showHintDialog() mCommunitiesSelectFragment = null } diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt index 62ebf0c5e8..d2244f4df2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData import android.text.TextUtils import com.gh.gamecenter.entity.ResultEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java index 48eba701b6..b346500b86 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.answer.detail; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.NormalActivity; diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerViewModel.kt index acde7ef46f..8dcab847d4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerViewModel.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.answer.detail -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel /** * 这是一个 activity 级别的 viewModel 它的子 fragment 可以共享它 diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index bcf9e860c1..c5f4a08308 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.qa.answer.detail import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent -import android.databinding.BindingAdapter -import android.databinding.DataBindingUtil +import androidx.databinding.BindingAdapter +import androidx.databinding.DataBindingUtil import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.TextUtils import android.view.Gravity import android.view.LayoutInflater diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragmentStatePagerAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragmentStatePagerAdapter.kt index bc8d0edfe7..ee4797b6b7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragmentStatePagerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragmentStatePagerAdapter.kt @@ -1,16 +1,16 @@ package com.gh.gamecenter.qa.answer.detail -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter -class AnswerDetailFragmentStatePagerAdapter(fm: FragmentManager, +class AnswerDetailFragmentStatePagerAdapter(fm: androidx.fragment.app.FragmentManager, private val mCreateNewAnswerDetailFragment: (answerId: String) -> AnswerDetailFragment) - : FragmentStatePagerAdapter(fm) { + : androidx.fragment.app.FragmentStatePagerAdapter(fm) { var answerIdList = arrayListOf() - override fun getItem(position: Int): Fragment { + override fun getItem(position: Int): androidx.fragment.app.Fragment { return mCreateNewAnswerDetailFragment.invoke(answerIdList[position]) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java index 0e7175bbe2..bbe4985796 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.answer.detail; 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; diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java index db81d78a29..05ce2e860f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.answer.detail; 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; diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt index 5c851b7060..b75a54479f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.answer.detail import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.LiveData -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import android.text.Html import com.gh.common.history.HistoryHelper import com.gh.common.util.* diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt index 22b06a6b47..c4c3159f14 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.answer.edit import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt index be6ef8f5e5..250ff272aa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.qa.answer.edit import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MediatorLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.content.Intent import android.text.TextUtils import com.gh.base.fragment.WaitingDialogFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java index 1b22378a00..c20f31ce42 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.answer.fold; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java index 409d757f2c..fbe07f1fb9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.answer.fold; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt index 800e7b55c3..f208cb9bf8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.article import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -23,7 +23,7 @@ class MyArticleAdapter(context: Context, return ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -41,7 +41,7 @@ class MyArticleAdapter(context: Context, return if (mEntityList.size == 0) 0 else mEntityList.size + 1 } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is ArticleViewHolder) { val entity = mEntityList[position] holder.binding.data = entity diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt index 350bc5cc62..904319b1c0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.article import android.app.Activity -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle import android.view.MenuItem diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index c21215e591..fb70d66cf3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.qa.article.detail import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Lifecycle -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.TextUtils import android.view.* import android.view.animation.LinearInterpolator diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt index 94af0c9d63..34e0df7c9c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.article.detail import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.LiveData -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import com.gh.common.util.CollectionUtils import com.gh.common.util.ErrorHelper import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt index 2c3d91fd21..d3413ed5cd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.article.draft 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 @@ -25,7 +25,7 @@ class ArticleDraftAdapter(context: Context return oldItem == newItem } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -39,7 +39,7 @@ class ArticleDraftAdapter(context: Context } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is ArticleDraftViewHolder) { val entity = mEntityList[position] holder.binding.data = entity diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt index 7039f25551..6b8ac61617 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.article.draft import android.app.Activity -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index ad45ff66af..2741d45fa2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -2,16 +2,16 @@ package com.gh.gamecenter.qa.article.edit import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.Message -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.text.InputFilter import android.text.TextUtils @@ -343,12 +343,12 @@ class ArticleEditActivity : BaseRichEditorActivity() { private fun showSelectGameDialog() { val selectGameDialog = Dialog(this) val view = View.inflate(this, R.layout.dialog_article_game, null) - val recyclerView = view.findViewById(R.id.dialog_game_list) + val recyclerView = view.findViewById(R.id.dialog_game_list) val back = view.findViewById(R.id.dialog_back) val loading = view.findViewById(R.id.dialog_loading) back.setOnClickListener { _ -> selectGameDialog.cancel() } - recyclerView.layoutManager = GridLayoutManager(this, 4) + recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 4) recyclerView.adapter = ArticleSelectGameAdapter(this, loading) { mViewModel?.mSelectCommunityData = CommunityEntity(it.id!!, it.name!!) setGameName() diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index 653ec139fc..2735ed3b58 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.article.edit import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MediatorLiveData -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.MutableLiveData import android.content.Intent import android.text.TextUtils import com.gh.base.fragment.WaitingDialogFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt index d6b38296d0..67194ee9ed 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.qa.article.edit import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.TextUtils import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt index 11adb30020..8c88874219 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt @@ -1,13 +1,13 @@ package com.gh.gamecenter.qa.column import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.gh.base.fragment.BaseFragment import com.gh.common.view.GridDivider @@ -18,11 +18,11 @@ import kotterknife.bindView class AskColumnFragment : BaseFragment() { - private val mColumnList by bindView(R.id.ask_column_list) + private val mColumnList by bindView(R.id.ask_column_list) private var mViewModel: AskColumnViewModel? = null - private var mLayoutManager: GridLayoutManager? = null + private var mLayoutManager: androidx.recyclerview.widget.GridLayoutManager? = null private var mAdapter: AskColumnAdapter? = null @@ -53,7 +53,7 @@ class AskColumnFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) mAdapter = AskColumnAdapter(this.context!!) - mLayoutManager = GridLayoutManager(context, 2) + mLayoutManager = androidx.recyclerview.widget.GridLayoutManager(context, 2) mColumnList.addItemDecoration(GridDivider(context, 2, 7, ContextCompat.getColor(context!!, R.color.cutting_line))) mColumnList.layoutManager = mLayoutManager mColumnList.adapter = mAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java index 1135657b5e..074a865636 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.column; -import android.arch.lifecycle.MutableLiveData; +import androidx.lifecycle.MutableLiveData; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt index cd16d176d7..9cd3c0749b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.column import android.app.Application -import android.arch.lifecycle.* +import androidx.lifecycle.* import android.text.TextUtils import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AskTagGroupsEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt index 246d0f94c5..da57fd405f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.qa.column.detail import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.design.widget.AppBarLayout -import android.support.v4.app.Fragment +import com.google.android.material.appbar.AppBarLayout +import androidx.fragment.app.Fragment import android.view.MenuItem import android.view.View import android.view.ViewGroup @@ -156,7 +156,7 @@ class AskColumnDetailActivity : BaseActivity() { private fun initViewPager() { // set fragment - val fragmentList = ArrayList() + val fragmentList = ArrayList() fragmentList.add(HotFragment()) fragmentList.add(RecommendsFragment()) fragmentList.add(UnansweredFragment()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt index 36023b36d8..3cf8d001fc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.column.detail.hot import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import com.gh.common.constant.ItemViewType import com.gh.common.util.ImageUtils @@ -26,7 +26,7 @@ class HotAdapter(context: Context, return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.ITEM_FOOTER -> { FooterViewHolder(mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)) @@ -41,7 +41,7 @@ class HotAdapter(context: Context, return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + ListAdapter.FOOTER_ITEM_COUNT } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is AskQuestionsRecommendsViewHolder) { val answerEntity = mEntityList[position] if ("community_article" == answerEntity.type) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotFragment.kt index 78eea97ae0..57104a8b34 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.column.detail.hot -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.view.View import com.gh.common.util.EntranceUtils import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt index 245195b483..17170d412a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.column.detail.hot import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.qa.entity.AnswerEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt index 230a296340..c6d1e82ffc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.column.detail.recommends import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import com.gh.common.constant.ItemViewType import com.gh.common.util.ImageUtils @@ -26,7 +26,7 @@ class RecommendsAdapter(context: Context, return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.ITEM_FOOTER -> { FooterViewHolder(mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)) @@ -41,7 +41,7 @@ class RecommendsAdapter(context: Context, return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + ListAdapter.FOOTER_ITEM_COUNT } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is AskQuestionsRecommendsViewHolder) { val answerEntity = mEntityList[position] if ("community_article" == answerEntity.type) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt index 95cdacaed8..4d91179973 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.column.detail.recommends -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.view.View import com.gh.common.util.EntranceUtils import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt index ca99b5aaa8..c05e6778e8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.column.detail.recommends import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.qa.entity.AnswerEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt index af8682753e..3eba6a6481 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.column.detail.unanswered import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import com.gh.common.constant.ItemViewType import com.gh.gamecenter.R @@ -21,7 +21,7 @@ class UnansweredAdapter(context: Context, return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.ITEM_FOOTER -> { FooterViewHolder(mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)) @@ -36,7 +36,7 @@ class UnansweredAdapter(context: Context, return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + ListAdapter.FOOTER_ITEM_COUNT } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is AskQuestionsNewViewHolder) { val questions = mEntityList[position] holder.initAskQuestionsNewViewHolder(questions) diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt index 2e1f2f309e..384ebd723e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.column.detail.unanswered -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.view.View import com.gh.common.util.EntranceUtils import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt index e1fe948538..9f20c4a27f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.column.detail.unanswered import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.qa.entity.AskTagGroupsEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java index 78f1970bdc..f738ff2572 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.column.order; import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.gh.common.util.ImageUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java index 4e7364e84a..dd4a6d8d7d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java @@ -1,17 +1,17 @@ package com.gh.gamecenter.qa.column.order; import android.app.Service; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; import android.os.Vibrator; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.view.GestureDetectorCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentAdapter.java index 2675b66741..6e3cde55ce 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.comment; 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; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentConversationFragment.java b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentConversationFragment.java index dd4f910bc8..014cf047b8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentConversationFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentConversationFragment.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.qa.comment; import android.annotation.SuppressLint; import android.app.Application; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java index 38f38db9d7..51dd53611d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java @@ -4,14 +4,14 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.Application; import android.app.Dialog; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputFilter; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentViewModel.java index 6c8328a601..8fa2f405de 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentViewModel.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.qa.comment; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.gh.common.util.PostCommentUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt index f7c0bef0a9..8fe8962c42 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.draft import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.gamecenter.qa.article.draft.ArticleDraftFragment import com.gh.gamecenter.qa.myqa.MyDraftFragment @@ -15,7 +15,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { setNavigationTitle("我的草稿") } - override fun initFragmentList(fragments: MutableList) { + override fun initFragmentList(fragments: MutableList) { fragments.add(MyDraftFragment()) fragments.add(ArticleDraftFragment()) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerAdapter.kt index 2919a0fd9a..cbde0e098f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.app.Activity import android.content.Context import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -29,7 +29,7 @@ class AnswerAdapter(context: Context, private val mEntrance: String?) : ListAdap return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -44,7 +44,7 @@ class AnswerAdapter(context: Context, private val mEntrance: String?) : ListAdap } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (getItemViewType(position)) { ItemViewType.ITEM_BODY -> { val answerViewHolder = holder as AnswerViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleAdapter.kt index 0bfcb1a3cb..51d92b7468 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.app.Activity import android.content.Context import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -20,7 +20,7 @@ class ArticleAdapter(context: Context, private val mEntrance: String?) : ListAda return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -35,7 +35,7 @@ class ArticleAdapter(context: Context, private val mEntrance: String?) : ListAda } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (getItemViewType(position)) { ItemViewType.ITEM_BODY -> { val articleHolder = holder as CollectionCommunityArticleViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt index 02f818235b..33f91100c7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt @@ -1,23 +1,23 @@ package com.gh.gamecenter.qa.editor -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Message -import android.support.design.widget.AppBarLayout import android.text.Editable import android.text.TextWatcher import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText import android.widget.TextView +import androidx.lifecycle.ViewModelProviders import com.gh.common.constant.Config import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListActivity import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.retrofit.RetrofitManager +import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp import com.lightgame.utils.Util_System_Keyboard import io.reactivex.Observable @@ -59,12 +59,12 @@ class GameActivity : ListActivity>() noneText.text = "搜索结果为空" mListLoading.visibility = View.GONE mListRefresh.isEnabled = false - appBar.addOnOffsetChangedListener { appBarLayout, verticalOffset -> + appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> val totalScrollRange = appBarLayout.totalScrollRange if (totalScrollRange == -verticalOffset) { Util_System_Keyboard.hideSoftKeyboard(this) } - } + }) searchEt.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameAdapter.kt index 899cf34e1d..0f9489d861 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.app.Activity import android.content.Context import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.gamecenter.R @@ -18,7 +18,7 @@ class GameAdapter(context: Context) : ListAdapter(context) { super.setListData(updateData) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false))) } @@ -26,7 +26,7 @@ class GameAdapter(context: Context) : ListAdapter(context) { return mEntityList.size } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is GameItemViewHolder) { val entity = mEntityList[position] holder.binding.game = entity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt index c2ec2c18b6..9a665d5b69 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { @@ -15,7 +15,7 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { setNavigationTitle("插入回答") } - override fun initFragmentList(fragments: MutableList?) { + override fun initFragmentList(fragments: MutableList?) { mFragment = LinkFragment() fragments?.add(mFragment) fragments?.add(AnswerFragment()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt index 5dbffe6a67..14a2a082d5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout class InsertArticleWrapperActivity : BaseActivity_TabLayout() { @@ -15,7 +15,7 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { setNavigationTitle("插入文章") } - override fun initFragmentList(fragments: MutableList?) { + override fun initFragmentList(fragments: MutableList?) { mFragment = LinkFragment() fragments?.add(mFragment) fragments?.add(ArticleFragment()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LinkFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LinkFragment.kt index 191de34739..de7526942e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LinkFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LinkFragment.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.editor import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle import android.view.View diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LinkViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LinkViewModel.kt index a4629db001..449c342014 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LinkViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LinkViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.editor import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MediatorLiveData -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.MutableLiveData import com.gh.base.fragment.WaitingDialogFragment import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt index 54c0ecb067..370476e2ef 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.qa.entity -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey -import android.arch.persistence.room.TypeConverters +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.TypeConverters import android.os.Parcel import android.os.Parcelable -import android.support.annotation.NonNull +import androidx.annotation.NonNull import com.gh.gamecenter.entity.UserEntity import com.gh.gamecenter.room.converter.AnswerUserConverter import com.gh.gamecenter.room.converter.ListStringConverter diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt index 9a578412c4..146ca64d8d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.entity -import android.arch.persistence.room.Entity -import android.arch.persistence.room.Ignore -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.PrimaryKey import android.os.Parcelable import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.UserEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt index 28f9d41507..c5ba9fdd17 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.follow import android.content.Context -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.RecyclerView +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -32,7 +32,7 @@ class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel) } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -46,7 +46,7 @@ class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel) } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is PersonalItemViewHolder -> { val historyEntity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt index 9b6e941fcb..dc7fb5f4c8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.qa.follow -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v4.widget.NestedScrollView -import android.support.v7.widget.LinearLayoutManager +import androidx.core.content.ContextCompat +import androidx.core.widget.NestedScrollView +import androidx.recyclerview.widget.LinearLayoutManager import android.text.TextUtils import android.view.View import android.widget.LinearLayout @@ -217,7 +217,7 @@ class AskFollowFragment : ListFragment 5) { mListRv.scrollToPosition(5) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt index 828dd16cbb..cef95f4020 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.qa.follow import android.app.Activity import android.content.Context -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.graphics.Point import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -37,7 +37,7 @@ class AskFollowMoreDialog : BaseDialogFragment() { tv_title.text = type recyclerview.adapter = AskFollowMoreAdapter(requireContext(), userList) - recyclerview.layoutManager = LinearLayoutManager(recyclerview.context) + recyclerview.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(recyclerview.context) } private fun getScreenWidth(activity: Activity): Int { @@ -47,8 +47,8 @@ class AskFollowMoreDialog : BaseDialogFragment() { } class AskFollowMoreAdapter(var context: Context, var list: ArrayList) - : RecyclerView.Adapter() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + : androidx.recyclerview.widget.RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return ItemViewHolder(DataBindingUtil.inflate((context as Activity).layoutInflater, R.layout.item_ask_follow_more, parent, false)) } @@ -56,7 +56,7 @@ class AskFollowMoreDialog : BaseDialogFragment() { return list.size } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { (holder as ItemViewHolder).run { binding.user = list[position] binding.ivIcon.setOnClickListener { @@ -68,7 +68,7 @@ class AskFollowMoreDialog : BaseDialogFragment() { } } - class ItemViewHolder(var binding: ItemAskFollowMoreBinding) : RecyclerView.ViewHolder(binding.root) + class ItemViewHolder(var binding: ItemAskFollowMoreBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt index c01a229aa7..e73ebacda3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.qa.follow import android.annotation.SuppressLint import android.app.Application -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.PersonalEntity import com.gh.gamecenter.entity.PersonalHistoryEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java index c9af03ae69..7786a85267 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.myqa; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java index 7f216aeb69..d571037936 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.myqa; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java index 24f30864fc..af367f2e22 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.myqa; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.gh.base.fragment.BaseFragment_TabLayout; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyDraftAdapter.java index 335207ca23..a10e53d84a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyDraftAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyDraftAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.myqa; 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; diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java index 3c37a86a22..8b9238a2a6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.myqa; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyAdapter.java index 42281b788d..3856cc027c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.newest; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java index 9d862ce658..2adc39cff4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.newest; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import com.gh.common.util.CheckLoginUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java index f3c40d6f67..3dbe19ee61 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java @@ -1,14 +1,14 @@ package com.gh.gamecenter.qa.newest; import android.app.Activity; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java index b88d10511f..d05ace6740 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.qa.questions.detail; import android.content.Context; import android.graphics.Paint; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java index 06b3a0ece3..08e05f7cab 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java @@ -3,9 +3,9 @@ package com.gh.gamecenter.qa.questions.detail; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java index fbfba211f8..835d4c0d57 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java @@ -2,18 +2,18 @@ package com.gh.gamecenter.qa.questions.detail; import android.app.Activity; import android.app.Dialog; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt index 49b219015f..eb0e3e2cd3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.questions.detail import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListHeadViewModel diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index bc45d05729..3b7951fd3e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.qa.questions.edit import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.os.Bundle -import android.support.v7.widget.GridLayoutManager +import androidx.recyclerview.widget.GridLayoutManager import android.text.Editable import android.text.TextWatcher import android.view.KeyEvent @@ -156,7 +156,7 @@ class QuestionEditActivity : BaseActivity() { // Pic List val picAdapter = QuestionsEditPicAdapter(this, mViewModel) - mBinding.suggestPicRv.layoutManager = object : GridLayoutManager(this, 5) { + mBinding.suggestPicRv.layoutManager = object : androidx.recyclerview.widget.GridLayoutManager(this, 5) { override fun canScrollVertically(): Boolean { return true } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt index 8a2efb1cdc..f23fcbfddf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.questions.edit import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MediatorLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MediatorLiveData import android.net.Uri import android.provider.MediaStore import android.text.TextUtils diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index cc4faf1dc3..2d2146fd2d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.qa.questions.edit import android.app.Activity import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.TextUtils import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt index 5dcfe724b6..c9e7097999 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.questions.edit.manager import android.app.Activity -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryAdapter.kt index b9ea5219b6..49a9386594 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.edit.manager import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -25,7 +25,7 @@ class HistoryAdapter(context: Context, } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return if (viewType == ItemViewType.ITEM_FOOTER) { view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false) @@ -39,7 +39,7 @@ class HistoryAdapter(context: Context, override fun getItemCount(): Int = if (mEntityList.isEmpty()) 0 else mEntityList.size + TOP_ITEM_COUNT - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is FooterViewHolder) { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) } else if (holder is HistoryItemViewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailActivity.kt index 2e2021d030..ee78a51409 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.edit.manager -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.graphics.Color diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt index 4ececee3e0..f18b0539be 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.edit.manager import android.app.Application -import android.arch.lifecycle.* +import androidx.lifecycle.* import com.gh.base.fragment.WaitingDialogFragment import com.gh.gamecenter.R import com.gh.gamecenter.qa.entity.QuestionHistoryDetailEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/pic/QuestionsEditPicAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/pic/QuestionsEditPicAdapter.kt index a6ee126ac0..0860d36d7d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/pic/QuestionsEditPicAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/pic/QuestionsEditPicAdapter.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.content.Context import android.content.pm.ActivityInfo import android.net.Uri -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.util.* @@ -22,18 +22,18 @@ import java.util.* /** * Created by khy on 5/05/18. */ -class QuestionsEditPicAdapter(context: Context, viewModel: QuestionEditViewModel) : BaseRecyclerAdapter(context) { +class QuestionsEditPicAdapter(context: Context, viewModel: QuestionEditViewModel) : BaseRecyclerAdapter(context) { private val mViewModel: QuestionEditViewModel = viewModel private var picList: MutableList = ArrayList() private var mAgreePostPic: Boolean = false - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.suggest_pic_item, parent, false) return SuggestPicViewHolder(view) } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is SuggestPicViewHolder) { if (position == itemCount - 1 && picList.size < QuestionEditViewModel.PIC_MAX_AMOUNT) { holder.delete.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt index 7479ed83c6..7fd47866ef 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.edit.tip import android.content.Context -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.text.Html import android.text.TextUtils import android.view.LayoutInflater diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt index 685cc3e7e3..6395c0952d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.invite import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.base.OnListClickListener @@ -35,7 +35,7 @@ class QuestionsInviteAdapter(context: Context, } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -59,7 +59,7 @@ class QuestionsInviteAdapter(context: Context, } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (getItemViewType(position)) { ItemViewType.ITEM_FOOTER -> { val footerViewHolder = holder as FooterViewHolder @@ -95,5 +95,5 @@ class QuestionsInviteAdapter(context: Context, } } - class HeaderHolder(var binding: QuestioninviteHeaderItemBinding) : RecyclerView.ViewHolder(binding.root) + class HeaderHolder(var binding: QuestioninviteHeaderItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt index 33fdc9886a..6718708ee9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.questions.invite import android.os.Bundle -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.gh.common.util.* import com.gh.common.view.VerticalItemDecoration @@ -57,7 +57,7 @@ class QuestionsInviteFragment : ListFragment() { private val mAppBar by bindView(R.id.recommend_subject_bar) - private val mSubjectViewPager by bindView(R.id.ask_recommends_subject_vp) + private val mSubjectViewPager by bindView(R.id.ask_recommends_subject_vp) private val mChangeBtn by bindView(R.id.ask_recommend_change) val refreshLayout by bindView(R.id.refresh_layout) @@ -214,7 +214,7 @@ class AskRecommendWrapperFragment : BaseFragment() { transaction.commitAllowingStateLoss() } - private fun alterFragment(transaction: FragmentTransaction, cls: Class): T? { + private fun alterFragment(transaction: androidx.fragment.app.FragmentTransaction, cls: Class): T? { val findFragmentByTag = childFragmentManager.findFragmentByTag(cls.simpleName) var fragmentByTag: T? = if (findFragmentByTag != null) { findFragmentByTag as T diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java index c4560ffd2c..9d80e2884d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.recommends; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectViewHolder.java index 56d61e672a..ab7614ec55 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.recommends; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.gh.base.BaseRecyclerViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt index 8be3da5bde..c8a7d403c2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.qa.recommends import android.content.Context import android.graphics.Color -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.view.ViewGroup import com.gh.common.util.MtaHelper import com.gh.gamecenter.PersonalHomeActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt index a3d6ede63d..7027f7e471 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.recommends.newest import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import com.gh.common.constant.ItemViewType @@ -27,7 +27,7 @@ class RecommendNewestAdapter(context: Context) : ListAdapter(conte return ItemViewType.ITEM_BODY } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -45,7 +45,7 @@ class RecommendNewestAdapter(context: Context) : ListAdapter(conte return if (mEntityList.size > 0 || mIsOver) mEntityList.size + ListAdapter.FOOTER_ITEM_COUNT else 0 } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (getItemViewType(position)) { ItemViewType.ITEM_BODY -> { val viewHolder = holder as AskQuestionsRecommendsViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt index bac3e53e66..e73a7b47b9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.recommends.newest import android.app.Activity -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import com.gh.common.view.DumbRefreshLayout import com.gh.common.view.VerticalItemDecoration import com.gh.gamecenter.baselist.ListFragment @@ -33,7 +33,7 @@ class RecommendNewestFragment : ListFragment) : BaseAskSearchAdapter(context, entrance, path, viewModel) { - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.ask_search_item, parent, false) return AskSearchNormalItemViewHolder(view) } - override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is AskSearchNormalItemViewHolder) { val entity = mEntityList[position] if (entity.images.isNotEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt index ac18039995..b52991b654 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.search.artilce -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.text.TextUtils import com.gh.common.util.EntranceUtils import com.gh.common.util.UrlFilterUtils diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt index c2d042ef94..d26fc3cbc0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.search.base 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 @@ -60,7 +60,7 @@ abstract class BaseAskSearchAdapter(context: Context, return "$mSearchKey" } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view: View return when (viewType) { ItemViewType.ITEM_FOOTER -> { @@ -73,9 +73,9 @@ abstract class BaseAskSearchAdapter(context: Context, } } - abstract fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder + abstract fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is FooterViewHolder) { holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) @@ -84,7 +84,7 @@ abstract class BaseAskSearchAdapter(context: Context, } } - abstract fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) + abstract fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) override fun getItemViewType(position: Int): Int { return if (position == itemCount - 1) ItemViewType.ITEM_FOOTER else ItemViewType.ITEM_BODY diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt index 272dde33aa..b4fc34fe89 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.qa.search.history -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.View import butterknife.OnClick import com.gh.base.fragment.BaseFragment @@ -16,8 +16,8 @@ import kotterknife.bindView class HistoryFragment : BaseFragment() { - private val mRecyclerView by bindView(R.id.search_history_list) - private val mHotRecyclerView by bindView(R.id.search_hot_rv) + private val mRecyclerView by bindView(R.id.search_history_list) + private val mHotRecyclerView by bindView(R.id.search_hot_rv) private val mHistoryContainer by bindView(R.id.search_history_container) private val mCleanBtn by bindView(R.id.search_history_clean) private val mHotContainer by bindView(R.id.search_hot_container) @@ -43,12 +43,12 @@ class HistoryFragment : BaseFragment() { mHotContainer.visibility = View.GONE } }) - mRecyclerView.layoutManager = object : GridLayoutManager(activity, 2) { + mRecyclerView.layoutManager = object : androidx.recyclerview.widget.GridLayoutManager(activity, 2) { override fun canScrollVertically(): Boolean { return false } } - mHotRecyclerView.layoutManager = object : GridLayoutManager(activity, 2) { + mHotRecyclerView.layoutManager = object : androidx.recyclerview.widget.GridLayoutManager(activity, 2) { override fun canScrollVertically(): Boolean { return false } diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt index d677cfeb8c..681f77a761 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.search.history import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.CommunityHotSearch import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt index ab7da0e443..b60b195caa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.search.hottest import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.view.View import android.view.ViewGroup @@ -48,7 +48,7 @@ class HottestAdapter(context: Context, } } - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { COLUMN_TYPE -> { val view = mLayoutInflater.inflate(R.layout.community_search_columm_item, parent, false) @@ -65,7 +65,7 @@ class HottestAdapter(context: Context, } } - override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { when (holder) { is AskSearchNormalItemViewHolder -> { if (getItemViewType(position) == ARTICLE_TYPE) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt index 5539e7c79d..227fbb4d67 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.search.hottest -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.text.TextUtils import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.baselist.NormalListViewModel diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt index 8d959bf466..babff0526e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.search.newest import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.view.View import android.view.ViewGroup @@ -30,12 +30,12 @@ class NewestAdapter(context: Context, } } - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.ask_search_item, parent, false) return AskSearchNormalItemViewHolder(view) } - override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (getItemViewType(position) == HottestAdapter.ANSWER_TYPE) { holder as AskSearchNormalItemViewHolder val searchEntity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt index 3e9ece23d4..123a3dca0a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.search.newest -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.text.TextUtils import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.baselist.NormalListViewModel diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt index c1b8094ded..c17454ab55 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.search.question import android.content.Context -import android.databinding.DataBindingUtil -import android.support.v7.widget.RecyclerView +import androidx.databinding.DataBindingUtil +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.view.ViewGroup import com.gh.common.util.NumberUtils @@ -22,12 +22,12 @@ class QuestionAdapter(context: Context, return oldItem?.id == newItem?.id } - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.ask_search_question_item, parent, false) return AskSearchQuestionItemViewHolder(DataBindingUtil.bind(view)!!) } - override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is AskSearchQuestionItemViewHolder) { val entity = mEntityList[position] holder.binding.questionsTitle.text = Html.fromHtml(replayKeyword(entity.title)) diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt index 6e7c2bd9c6..d0e147d522 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.search.question -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProviders import android.text.TextUtils import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.baselist.NormalListViewModel diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt index eb20da6d9b..414bf3c4f6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.search.user import android.content.Context import android.graphics.Color -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import com.gh.common.util.DialogUtils import com.gh.common.util.ifLogin @@ -28,12 +28,12 @@ class UserAdapter(context: Context, return oldItem == newItem } - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.followers_or_fans_item, parent, false) return FollowersOrFansViewHolder(FollowersOrFansItemBinding.bind(view)) } - override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is FollowersOrFansViewHolder) { val entity = mEntityList[position] holder.binding.entity = entity diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt index 791ee1f226..2cb8efdf17 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.search.user -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.os.Bundle import android.text.TextUtils import com.gh.common.util.UrlFilterUtils diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt index 2c9940b51c..0697158c09 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.search.user import android.app.Application -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.OnDataObservable diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt index 116f436c4c..221d88d93a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt @@ -1,13 +1,13 @@ package com.gh.gamecenter.qa.select import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.gh.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.R class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { - override fun initFragmentList(fragments: MutableList) { + override fun initFragmentList(fragments: MutableList) { fragments.add(OpenedFragment()) val element = VotingFragment() element.arguments = arguments diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt index 8bee976781..502e9c2fa7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.qa.select import android.app.Activity import android.content.Context -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.Gravity import android.view.View import android.view.ViewGroup @@ -30,7 +30,7 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis return oldItem?.id.equals(newItem!!.id) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.ITEM_BODY -> { OpenedViewHolder(AskSelectCommunityOpenedItemBinding.bind(mLayoutInflater @@ -43,7 +43,7 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis } } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is OpenedViewHolder) { val entity = mEntityList[position] val isSelect = if (mContext is MainActivity) false else mCommunityId == entity.id diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt index 09a49e51eb..21747d7c10 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt @@ -2,10 +2,10 @@ package com.gh.gamecenter.qa.select import android.graphics.Color import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.gh.common.view.GridDivider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment @@ -50,7 +50,7 @@ class OpenedFragment : ListFragment() { mListRv.layoutManager = mGridLayoutManager mListRv.setBackgroundColor(Color.WHITE) mListRv.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { if (mGridLayoutManager!!.findLastVisibleItemPosition() == provideListAdapter().itemCount - 1 && RecyclerView.SCROLL_STATE_IDLE == newState) mListViewModel.load(LoadType.NORMAL) diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java index 59a133927f..17231a81bc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java @@ -5,8 +5,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java index 66df800248..6b69f0fe2a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.select; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java index 9f304c6132..0b90fb7536 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.qa.select; import android.app.Dialog; import android.os.Bundle; -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.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.Window; import android.widget.ProgressBar; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java index 3856db6d54..f9d4a6db9d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.select; import android.app.Application; -import android.arch.lifecycle.MutableLiveData; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.lifecycle.MutableLiveData; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.gh.common.util.PackageUtils; import com.gh.common.util.UrlFilterUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java index 9aacb7363d..8ebb8ea6a5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.subject; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java index 50a878448f..bff4517301 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.subject; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewModel.java index f9fc0941b8..da12102c1b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewModel.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.qa.subject; import android.app.Application; -import android.arch.lifecycle.MediatorLiveData; -import android.arch.lifecycle.MutableLiveData; -import android.support.annotation.NonNull; +import androidx.lifecycle.MediatorLiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.annotation.NonNull; import com.gh.gamecenter.baselist.ListHeadViewModel; import com.gh.gamecenter.baselist.LoadType; diff --git a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java index ca90abfebe..57dc462ea6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java +++ b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.tags; -import android.arch.lifecycle.MutableLiveData; +import androidx.lifecycle.MutableLiveData; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java index aa8db82f71..66df1c1773 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.qa.tags; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; -import android.support.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; +import androidx.annotation.NonNull; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/qa/tags/AskTagPagerFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/tags/AskTagPagerFragmentAdapter.java index 96ebbbc411..6963f02d19 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/tags/AskTagPagerFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/tags/AskTagPagerFragmentAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.tags; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import com.gh.gamecenter.qa.newest.AskQuestionsNewBodyFragment; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java index f1c39c4f0b..479d1e32eb 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.gh.common.util.RunningUtils; import com.gh.gamecenter.DownloadManagerActivity; diff --git a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt index 622beccb41..e3505066cd 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt +++ b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.support.annotation.Keep +import androidx.annotation.Keep import com.gh.base.GHUmengNotificationService import com.gh.common.PushManager import com.gh.common.util.DirectUtils diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java index d28b820119..7608aaf15d 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.retrofit; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.gh.common.util.AppDebugConfig; import com.gh.gamecenter.user.ApiResponse; diff --git a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java index 0df8b37ebf..64bd9326d4 100644 --- a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java +++ b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.room; -import android.arch.persistence.db.SupportSQLiteDatabase; -import android.arch.persistence.room.Database; -import android.arch.persistence.room.Room; -import android.arch.persistence.room.RoomDatabase; -import android.arch.persistence.room.migration.Migration; +import androidx.sqlite.db.SupportSQLiteDatabase; +import androidx.room.Database; +import androidx.room.Room; +import androidx.room.RoomDatabase; +import androidx.room.migration.Migration; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.SignEntity; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java index a16f16fb36..c0ee63d7ed 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import com.gh.gamecenter.entity.UserEntity; import com.google.gson.Gson; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt index a419aaf8d7..3f65e2665e 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject import com.gh.gamecenter.entity.CommunityEntity diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt index ff8c3b6d78..14413842c0 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject import com.gh.gamecenter.qa.entity.Count diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java index 2450f7a289..44724601b1 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import com.google.gson.Gson; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java index 52bf915a66..5d24245375 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import com.gh.gamecenter.qa.entity.Questions; import com.google.gson.Gson; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java index 082bc8651d..a5e83ed6d6 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import com.gh.gamecenter.entity.SignEntity; import com.google.gson.Gson; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt index 772971d4dd..29d2d14577 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt index 7dfade774a..43b5602468 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject import com.gh.gamecenter.entity.TagStyleEntity diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt index fa8723d3a7..49e5c399df 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject import com.gh.gamecenter.entity.ThumbnailEntity diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt index e36fac1f8f..7e89b1e27e 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.gh.common.util.toJson import com.gh.common.util.toObject import com.gh.gamecenter.qa.entity.TimeEntity diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/AnswerDao.java b/app/src/main/java/com/gh/gamecenter/room/dao/AnswerDao.java index 8167857179..fba5d02169 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/AnswerDao.java +++ b/app/src/main/java/com/gh/gamecenter/room/dao/AnswerDao.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.room.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Update; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; +import androidx.room.Update; import com.gh.gamecenter.qa.entity.AnswerEntity; diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/AnswerHistoryDao.kt b/app/src/main/java/com/gh/gamecenter/room/dao/AnswerHistoryDao.kt index cc49884ac3..cfb144ef15 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/AnswerHistoryDao.kt +++ b/app/src/main/java/com/gh/gamecenter/room/dao/AnswerHistoryDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.dao -import android.arch.persistence.room.* +import androidx.room.* import com.gh.gamecenter.qa.entity.AnswerEntity import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/ArticleHistoryDao.kt b/app/src/main/java/com/gh/gamecenter/room/dao/ArticleHistoryDao.kt index 79383e74df..6bbd91664f 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/ArticleHistoryDao.kt +++ b/app/src/main/java/com/gh/gamecenter/room/dao/ArticleHistoryDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.dao -import android.arch.persistence.room.* +import androidx.room.* import com.gh.gamecenter.qa.entity.ArticleEntity import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/GameDao.kt b/app/src/main/java/com/gh/gamecenter/room/dao/GameDao.kt index 4996714a65..93e7ba4747 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/GameDao.kt +++ b/app/src/main/java/com/gh/gamecenter/room/dao/GameDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.dao -import android.arch.persistence.room.* +import androidx.room.* import com.gh.gamecenter.entity.HistoryGameEntity import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/NewsHistoryDao.kt b/app/src/main/java/com/gh/gamecenter/room/dao/NewsHistoryDao.kt index e151ea045f..223fb099e9 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/NewsHistoryDao.kt +++ b/app/src/main/java/com/gh/gamecenter/room/dao/NewsHistoryDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.dao -import android.arch.persistence.room.* +import androidx.room.* import com.gh.gamecenter.entity.NewsEntity import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/SignDao.java b/app/src/main/java/com/gh/gamecenter/room/dao/SignDao.java index 876c86c1cb..826759d71f 100644 --- a/app/src/main/java/com/gh/gamecenter/room/dao/SignDao.java +++ b/app/src/main/java/com/gh/gamecenter/room/dao/SignDao.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.room.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Update; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.Query; +import androidx.room.Update; import com.gh.gamecenter.entity.SignEntity; -import static android.arch.persistence.room.OnConflictStrategy.REPLACE; +import static androidx.room.OnConflictStrategy.REPLACE; /** * Created by khy on 17/04/18. diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index b3e96bf234..98d5bdaa92 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -2,12 +2,12 @@ package com.gh.gamecenter.search; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableString; import android.text.Spanned; import android.text.TextPaint; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 0b9cf8c4b4..47138c0a95 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.search; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.util.SparseArray; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index 64542a93c6..bc4d2f8dc4 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -2,12 +2,12 @@ package com.gh.gamecenter.search; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableString; import android.text.Spanned; import android.text.TextPaint; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 1bd644a6b7..0bfcb54c72 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.search; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.util.SparseArray; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java index a704f46018..a7e9289694 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.search; import android.os.Bundle; -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.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java index f49ce8dac4..ae67a26b2b 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java @@ -1,9 +1,9 @@ package com.gh.gamecenter.search; import android.content.Context; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt index d5c4f7f0e5..bf1bdc8a56 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.subject -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.View import com.gh.base.BaseActivity import com.gh.common.util.DataUtils @@ -59,7 +59,7 @@ class SubjectActivity : BaseActivity() { private fun initContentView(entity: SubjectSettingEntity) { val transaction = supportFragmentManager.beginTransaction() - val fragment: Fragment = if ("tile" == entity.typeEntity.layout) { + val fragment: androidx.fragment.app.Fragment = if ("tile" == entity.typeEntity.layout) { SubjectTileFragment() } else { SubjectTabFragment() diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt index 77cc01f2ba..e9a1e3ce21 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.subject import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.util.SparseArray import android.view.View @@ -65,7 +65,7 @@ class SubjectAdapter(context: Context, return ItemViewType.GAME_NORMAL } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return when (viewType) { ItemViewType.GAME_NORMAL -> { GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false))) @@ -83,7 +83,7 @@ class SubjectAdapter(context: Context, return if (mEntityList == null || mEntityList.isEmpty()) return 0 else mEntityList.size + 1 } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { if (holder is GameItemViewHolder) { val gameEntity = mEntityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt index 546f417c27..ac9a74e14c 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -1,9 +1,9 @@ -package com.gh.gamecenter.subject.refactor +package com.gh.gamecenter.subject -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.common.exposure.ExposureListener @@ -16,8 +16,6 @@ import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.subject.SubjectAdapter -import com.gh.gamecenter.subject.SubjectListViewModel import com.halo.assistant.HaloApp import com.lightgame.OnTitleClickListener import com.lightgame.download.DataWatcher @@ -33,7 +31,7 @@ class SubjectListFragment : ListFragment(), On private lateinit var mSkeleton: ViewSkeletonScreen - private var mExposureListener: ExposureListener? = null + private lateinit var mExposureListener: ExposureListener private var mAdapter: SubjectAdapter? = null private var mScrollTop = false @@ -65,7 +63,7 @@ class SubjectListFragment : ListFragment(), On // 与外部Appbar交互 mListRv.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { super.onScrollStateChanged(recyclerView, newState) val position = mLayoutManager.findFirstCompletelyVisibleItemPosition() if (mScrollTop && position == 0 && newState == RecyclerView.SCROLL_STATE_IDLE) { @@ -74,7 +72,7 @@ class SubjectListFragment : ListFragment(), On } } - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) val position = mLayoutManager.findFirstCompletelyVisibleItemPosition() if (position == 0 && Math.abs(dy) > 10) { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt index 5ebf08b72c..7b05f69a42 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.subject import android.app.Application -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt index 6d630793bb..b8b94a92d4 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.subject import android.app.Application -import android.arch.lifecycle.AndroidViewModel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import android.text.TextUtils import com.gh.common.constant.Config import com.gh.gamecenter.entity.SubjectData diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index 3f415269d9..b1fdd74bb1 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -1,15 +1,13 @@ package com.gh.gamecenter.subject.tab import android.os.Bundle -import android.support.design.widget.TabLayout -import android.support.v4.app.Fragment -import android.support.v4.view.ViewPager +import com.google.android.material.tabs.TabLayout import android.view.View import com.gh.base.fragment.BaseFragment import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectData -import com.gh.gamecenter.subject.refactor.SubjectListFragment +import com.gh.gamecenter.subject.SubjectListFragment import com.lightgame.adapter.BaseFragmentPagerAdapter import kotterknife.bindView import java.util.* @@ -17,7 +15,7 @@ import java.util.* class SubjectTabFragment : BaseFragment() { private val mTabLayout by bindView(R.id.subject_tab) - private val mViewPager by bindView(R.id.subject_viewpager) + private val mViewPager by bindView(R.id.subject_viewpager) override fun getLayoutId(): Int { return R.layout.fragment_subject_tab @@ -31,7 +29,7 @@ class SubjectTabFragment : BaseFragment() { if (tagList.size > 1) { mTabLayout.visibility = View.VISIBLE } - val fragments = ArrayList() + val fragments = ArrayList() for (tag in tagList) { mTabLayout.addTab(mTabLayout.newTab().setText(tag)) val element = SubjectListFragment() diff --git a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt index 4a0da02415..96ddf1ae8a 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt @@ -1,11 +1,6 @@ package com.gh.gamecenter.subject.tile import android.os.Bundle -import android.support.design.widget.AppBarLayout -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentTransaction -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView import android.text.TextUtils import android.view.MotionEvent import android.view.View @@ -18,19 +13,20 @@ import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.normal.ToolbarController -import com.gh.gamecenter.subject.refactor.SubjectListFragment +import com.gh.gamecenter.subject.SubjectListFragment +import com.google.android.material.appbar.AppBarLayout import kotterknife.bindView import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode class SubjectTileFragment : BaseFragment() { - companion object { - private const val OPEN_APPBAR = "openAppBar" - } + companion object { + private const val OPEN_APPBAR = "openAppBar" + } private val mAppbar by bindView(R.id.subject_appbar) - private val mTypeList by bindView(R.id.subject_type_list) + private val mTypeList by bindView(R.id.subject_type_list) private val mBarHottest by bindView(R.id.subject_tabbar_hottest) private val mBarNewest by bindView(R.id.subject_tabbar_newest) @@ -50,7 +46,7 @@ class SubjectTileFragment : BaseFragment() { mSubjectData?.listOrder = "" // 初始化顶部类型列表 - val layoutManager = object : GridLayoutManager(context, 4) { + val layoutManager = object : androidx.recyclerview.widget.GridLayoutManager(context, 4) { override fun canScrollVertically(): Boolean { return false } @@ -66,7 +62,7 @@ class SubjectTileFragment : BaseFragment() { } // Appbar 交互 - mAppbar.addOnOffsetChangedListener { appBarLayout, verticalOffset -> + mAppbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> if (!TextUtils.isEmpty(mSubjectData?.subjectName)) { val totalScrollRange = appBarLayout.totalScrollRange if (Math.abs(verticalOffset) < totalScrollRange / 2) { @@ -79,7 +75,7 @@ class SubjectTileFragment : BaseFragment() { } } } - } + }) loadData() } @@ -126,8 +122,8 @@ class SubjectTileFragment : BaseFragment() { transaction.commitAllowingStateLoss() } - private fun alterFragment(transaction: FragmentTransaction, fmTag: String) { - var fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(fmTag) + private fun alterFragment(transaction: androidx.fragment.app.FragmentTransaction, fmTag: String) { + var fragmentByTag: androidx.fragment.app.Fragment? = childFragmentManager.findFragmentByTag(fmTag) try { if (fragmentByTag != null) { transaction.show(fragmentByTag) diff --git a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt index 3299021689..8bf2523730 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.subject.tile import android.content.Context import android.graphics.Color -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.view.Gravity import android.view.View @@ -63,7 +63,7 @@ class SubjectTypeListAdapter(context: Context, return mGameType.size } - inner class SubjectTypeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + inner class SubjectTypeViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { val type: TextView = (itemView as RelativeLayout).getChildAt(0) as TextView } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index 13c52ad1b1..1c14c633d2 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.suggest; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/gh/gamecenter/user/LoginTokenDao.java b/app/src/main/java/com/gh/gamecenter/user/LoginTokenDao.java index 62ceb12d2a..32674308db 100644 --- a/app/src/main/java/com/gh/gamecenter/user/LoginTokenDao.java +++ b/app/src/main/java/com/gh/gamecenter/user/LoginTokenDao.java @@ -1,15 +1,15 @@ package com.gh.gamecenter.user; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Delete; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Update; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.Query; +import androidx.room.Update; import com.gh.gamecenter.entity.LoginTokenEntity; -import static android.arch.persistence.room.OnConflictStrategy.REPLACE; +import static androidx.room.OnConflictStrategy.REPLACE; /** * Created by khy on 29/11/17. diff --git a/app/src/main/java/com/gh/gamecenter/user/TokenTypeConverter.java b/app/src/main/java/com/gh/gamecenter/user/TokenTypeConverter.java index 832ca8bd57..b4986b37a9 100644 --- a/app/src/main/java/com/gh/gamecenter/user/TokenTypeConverter.java +++ b/app/src/main/java/com/gh/gamecenter/user/TokenTypeConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.user; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import com.gh.gamecenter.entity.TokenEntity; import com.google.gson.Gson; diff --git a/app/src/main/java/com/gh/gamecenter/user/UserInfoDao.java b/app/src/main/java/com/gh/gamecenter/user/UserInfoDao.java index f64e1a73ad..5b35bf38af 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserInfoDao.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserInfoDao.java @@ -1,15 +1,15 @@ package com.gh.gamecenter.user; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Delete; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Update; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.Query; +import androidx.room.Update; import com.gh.gamecenter.entity.UserInfoEntity; -import static android.arch.persistence.room.OnConflictStrategy.REPLACE; +import static androidx.room.OnConflictStrategy.REPLACE; /** * Created by khy on 29/11/17. diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java index 7af7f43e96..fba3d975df 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.user; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MediatorLiveData; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MediatorLiveData; import android.content.Context; import android.content.SharedPreferences; import android.os.Build; diff --git a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java b/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java index 2bf384f64c..f9584171d7 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java @@ -1,11 +1,11 @@ package com.gh.gamecenter.user; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; -import android.support.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.gh.gamecenter.entity.UserInfoEntity; diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index fea6120265..5c63609b7f 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -1,13 +1,13 @@ package com.halo.assistant; import android.app.Application; -import android.arch.lifecycle.ProcessLifecycleOwner; +import androidx.lifecycle.ProcessLifecycleOwner; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.collection.ArrayMap; import android.text.TextUtils; import com.danikula.videocache.HttpProxyCacheServer; diff --git a/app/src/main/java/com/halo/assistant/ProcessorLifeCycleOwner.kt b/app/src/main/java/com/halo/assistant/ProcessorLifeCycleOwner.kt index 565a6b8d8b..0f3f855cf4 100644 --- a/app/src/main/java/com/halo/assistant/ProcessorLifeCycleOwner.kt +++ b/app/src/main/java/com/halo/assistant/ProcessorLifeCycleOwner.kt @@ -1,8 +1,8 @@ package com.halo.assistant -import android.arch.lifecycle.Lifecycle -import android.arch.lifecycle.LifecycleObserver -import android.arch.lifecycle.OnLifecycleEvent +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleObserver +import androidx.lifecycle.OnLifecycleEvent import android.content.Intent import android.os.Build import com.gh.common.util.ServiceUtils diff --git a/app/src/main/java/com/halo/assistant/TinkerAppLike.java b/app/src/main/java/com/halo/assistant/TinkerAppLike.java index 8a1ea48fdc..c87308d944 100644 --- a/app/src/main/java/com/halo/assistant/TinkerAppLike.java +++ b/app/src/main/java/com/halo/assistant/TinkerAppLike.java @@ -5,7 +5,7 @@ import android.app.Application; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import com.gh.common.constant.Config; import com.gh.gamecenter.BuildConfig; diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java index adcf1f4f81..9a325bac42 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -3,7 +3,7 @@ package com.halo.assistant.fragment; import android.content.Intent; import android.os.Bundle; import android.os.Message; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ProgressBar; diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index 4639c39b01..2cfaee7c93 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -1,12 +1,12 @@ package com.halo.assistant.fragment; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index c87f1c1b16..29cf217e65 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -9,8 +9,8 @@ import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java index 8bd739fd58..64339018ae 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -2,8 +2,8 @@ package com.halo.assistant.fragment; import android.app.Dialog; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.Window; diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java index 48d8edf8b1..df0ce167dc 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java index 80b327ab73..e94e2d3bb5 100644 --- a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java @@ -2,8 +2,8 @@ package com.halo.assistant.fragment.comment; import android.app.Dialog; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputFilter; import android.text.TextWatcher; @@ -12,7 +12,6 @@ import android.widget.EditText; import android.widget.TextView; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.ClickUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ErrorHelper; @@ -26,7 +25,6 @@ import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.MessageEntity; import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.utils.Util_System_Keyboard; -import com.lightgame.utils.Utils; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java index 6d9a004ff5..06257aecce 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java @@ -1,11 +1,11 @@ package com.halo.assistant.fragment.game; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 269f90e48d..a18b436452 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -2,8 +2,8 @@ package com.halo.assistant.fragment.game; import android.os.Bundle; import android.os.Handler; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java index 60987e5f92..4957bf41ad 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java @@ -1,7 +1,7 @@ package com.halo.assistant.fragment.game; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java index b55af6c6af..e4d4d6932d 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java @@ -1,6 +1,6 @@ package com.halo.assistant.fragment.game; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index 6f5059e09a..ba35bf9db7 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -1,7 +1,7 @@ package com.halo.assistant.fragment.myconcern; import android.content.Context; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index 28bece36dc..94ea3a95d2 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -1,9 +1,9 @@ package com.halo.assistant.fragment.myconcern; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java index 67c2b4031d..db03fd0e58 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java @@ -2,7 +2,7 @@ package com.halo.assistant.fragment.myconcern; import android.content.Context; import android.graphics.Color; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java index f0bdb487f2..cad9eba561 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java @@ -1,8 +1,8 @@ package com.halo.assistant.fragment.user; import android.app.Dialog; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.SharedPreferences; @@ -11,7 +11,7 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index be13ccf171..7c54b37020 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -1,12 +1,12 @@ package com.halo.assistant.fragment.user; import android.app.Dialog; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; import com.gh.common.util.DialogUtils; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java index 4b85fce451..cf661e1541 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java @@ -1,11 +1,11 @@ package com.halo.assistant.fragment.user; import android.app.Dialog; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.InputFilter; import android.text.TextUtils; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java index c4dd169add..f33805d320 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java @@ -1,9 +1,9 @@ package com.halo.assistant.fragment.user; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java index d9e1fc421f..0d3c5dbddb 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java @@ -1,7 +1,7 @@ package com.halo.assistant.fragment.user.region; 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; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java index 348e2f9477..2668df9384 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java @@ -1,9 +1,9 @@ package com.halo.assistant.fragment.user.region; import android.os.Bundle; -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.view.View; import android.widget.RelativeLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java index 365d0acc3e..7a845ef67b 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java @@ -1,7 +1,7 @@ package com.halo.assistant.fragment.user.region; 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; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java index eacc674214..13abd8cf0a 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java @@ -1,9 +1,9 @@ package com.halo.assistant.fragment.user.region; import android.os.Bundle; -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 com.gh.base.fragment.BaseFragment; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/res/layout/activity_article_detail.xml b/app/src/main/res/layout/activity_article_detail.xml index 29ed72d28c..a8519bfdec 100644 --- a/app/src/main/res/layout/activity_article_detail.xml +++ b/app/src/main/res/layout/activity_article_detail.xml @@ -26,7 +26,7 @@ android:background="@android:color/white" android:visibility="visible"> - @@ -181,7 +181,7 @@ android:orientation="horizontal" /> - + diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml index 08a32d34e8..406fbef1ec 100644 --- a/app/src/main/res/layout/activity_ask_column_detail.xml +++ b/app/src/main/res/layout/activity_ask_column_detail.xml @@ -22,11 +22,11 @@ - - - + - + diff --git a/app/src/main/res/layout/activity_asktab_order.xml b/app/src/main/res/layout/activity_asktab_order.xml index e4b7866101..54610e203b 100644 --- a/app/src/main/res/layout/activity_asktab_order.xml +++ b/app/src/main/res/layout/activity_asktab_order.xml @@ -17,7 +17,7 @@ android:textSize = "11sp" /> - - - - - + - - + - + - diff --git a/app/src/main/res/layout/activity_kc_select_game.xml b/app/src/main/res/layout/activity_kc_select_game.xml index a77ff6485c..ec2110d674 100644 --- a/app/src/main/res/layout/activity_kc_select_game.xml +++ b/app/src/main/res/layout/activity_kc_select_game.xml @@ -10,7 +10,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - - - - + - @@ -40,6 +40,6 @@ android:layout_height = "wrap_content" android:visibility = "invisible" app:layout_constraintBottom_toBottomOf = "parent" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index d2194ce8c2..ad928fe84b 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -14,7 +14,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent"> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_plugin.xml b/app/src/main/res/layout/activity_plugin.xml index ea2d186561..14c70a724d 100644 --- a/app/src/main/res/layout/activity_plugin.xml +++ b/app/src/main/res/layout/activity_plugin.xml @@ -10,7 +10,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index 8ab927d2e9..39cdf88ceb 100644 --- a/app/src/main/res/layout/activity_questions_edit.xml +++ b/app/src/main/res/layout/activity_questions_edit.xml @@ -74,7 +74,7 @@ android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "13sp" /> - - - - + - - diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index ff00baf2aa..1fd246f86f 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -263,7 +263,7 @@ android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "14sp" /> - - - - - - + - - + - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_answer_item.xml b/app/src/main/res/layout/ask_answer_item.xml index a774fd961e..f35535587c 100644 --- a/app/src/main/res/layout/ask_answer_item.xml +++ b/app/src/main/res/layout/ask_answer_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_questions_hot_item.xml b/app/src/main/res/layout/ask_questions_hot_item.xml index 5e98b74916..52e127ed45 100644 --- a/app/src/main/res/layout/ask_questions_hot_item.xml +++ b/app/src/main/res/layout/ask_questions_hot_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_recommend_body.xml b/app/src/main/res/layout/ask_recommend_body.xml index 2c3e8de333..d4977b27d5 100644 --- a/app/src/main/res/layout/ask_recommend_body.xml +++ b/app/src/main/res/layout/ask_recommend_body.xml @@ -1,11 +1,11 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_recommend_change.xml b/app/src/main/res/layout/ask_recommend_change.xml index 9191488a3e..dcc075078d 100644 --- a/app/src/main/res/layout/ask_recommend_change.xml +++ b/app/src/main/res/layout/ask_recommend_change.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/ask_recommends_concern_list_item.xml b/app/src/main/res/layout/ask_recommends_concern_list_item.xml index 6e841cd217..fea01254ca 100644 --- a/app/src/main/res/layout/ask_recommends_concern_list_item.xml +++ b/app/src/main/res/layout/ask_recommends_concern_list_item.xml @@ -10,7 +10,7 @@ type = "com.gh.gamecenter.qa.entity.SuggestedFollowEntity" /> - - + diff --git a/app/src/main/res/layout/ask_recommends_item_concern.xml b/app/src/main/res/layout/ask_recommends_item_concern.xml index 1ff1c336cd..a1d1a17cdc 100644 --- a/app/src/main/res/layout/ask_recommends_item_concern.xml +++ b/app/src/main/res/layout/ask_recommends_item_concern.xml @@ -1,7 +1,7 @@ - @@ -30,12 +30,12 @@ android:src = "@drawable/ask_recommends_concern_delete" app:layout_constraintRight_toRightOf = "parent" /> - - + diff --git a/app/src/main/res/layout/ask_recommends_subject.xml b/app/src/main/res/layout/ask_recommends_subject.xml index 8a0521fc5f..a929878b78 100644 --- a/app/src/main/res/layout/ask_recommends_subject.xml +++ b/app/src/main/res/layout/ask_recommends_subject.xml @@ -7,7 +7,7 @@ android:clipChildren = "false" app:layout_scrollFlags = "scroll|enterAlwaysCollapsed" > - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_item.xml b/app/src/main/res/layout/ask_search_item.xml index 6b8fa78e60..caaaa4dbfc 100644 --- a/app/src/main/res/layout/ask_search_item.xml +++ b/app/src/main/res/layout/ask_search_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_question_item.xml b/app/src/main/res/layout/ask_search_question_item.xml index cb0a1f29a3..65c4d19821 100644 --- a/app/src/main/res/layout/ask_search_question_item.xml +++ b/app/src/main/res/layout/ask_search_question_item.xml @@ -2,7 +2,7 @@ - @@ -33,6 +33,6 @@ app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintTop_toBottomOf = "@id/questions_title" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_select_community_opened_item.xml b/app/src/main/res/layout/ask_select_community_opened_item.xml index 5ae739a100..39d72b23e7 100644 --- a/app/src/main/res/layout/ask_select_community_opened_item.xml +++ b/app/src/main/res/layout/ask_select_community_opened_item.xml @@ -14,7 +14,7 @@ - @@ -71,5 +71,5 @@ app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintLeft_toRightOf = "@id/ask_selectgame_item_icon" app:layout_constraintTop_toBottomOf = "@id/ask_selectgame_item_name" /> - + diff --git a/app/src/main/res/layout/ask_selectgame_item.xml b/app/src/main/res/layout/ask_selectgame_item.xml index 8f6f5b808a..baf7f7b397 100644 --- a/app/src/main/res/layout/ask_selectgame_item.xml +++ b/app/src/main/res/layout/ask_selectgame_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ask_subject_item.xml b/app/src/main/res/layout/ask_subject_item.xml index a0d02c7b89..f53a04d596 100644 --- a/app/src/main/res/layout/ask_subject_item.xml +++ b/app/src/main/res/layout/ask_subject_item.xml @@ -8,7 +8,7 @@ type = "com.gh.gamecenter.qa.entity.AnswerEntity" /> - - + diff --git a/app/src/main/res/layout/ask_subject_top_item.xml b/app/src/main/res/layout/ask_subject_top_item.xml index e3443fb9f6..f27da523db 100644 --- a/app/src/main/res/layout/ask_subject_top_item.xml +++ b/app/src/main/res/layout/ask_subject_top_item.xml @@ -9,7 +9,7 @@ type = "com.gh.gamecenter.qa.entity.AskSubjectEntity" /> - @@ -64,6 +64,6 @@ android:textColor = "@color/title" android:textSize = "11sp" app:layout_constraintTop_toBottomOf = "@+id/ask_subject_top_des" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/collection_comunity_article_item.xml b/app/src/main/res/layout/collection_comunity_article_item.xml index fdb5869c7f..96e25436de 100644 --- a/app/src/main/res/layout/collection_comunity_article_item.xml +++ b/app/src/main/res/layout/collection_comunity_article_item.xml @@ -11,7 +11,7 @@ type = "com.gh.gamecenter.qa.entity.ArticleEntity" /> - - + diff --git a/app/src/main/res/layout/community_article_item.xml b/app/src/main/res/layout/community_article_item.xml index 052664acf2..fceb3ef8d5 100644 --- a/app/src/main/res/layout/community_article_item.xml +++ b/app/src/main/res/layout/community_article_item.xml @@ -8,7 +8,7 @@ type = "com.gh.gamecenter.qa.entity.ArticleEntity" /> - - + diff --git a/app/src/main/res/layout/community_search_columm_item.xml b/app/src/main/res/layout/community_search_columm_item.xml index 147e3addff..6fa283fe4b 100644 --- a/app/src/main/res/layout/community_search_columm_item.xml +++ b/app/src/main/res/layout/community_search_columm_item.xml @@ -9,7 +9,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/community_search_history_item.xml b/app/src/main/res/layout/community_search_history_item.xml index 4d4b90acfd..6574d14dc9 100644 --- a/app/src/main/res/layout/community_search_history_item.xml +++ b/app/src/main/res/layout/community_search_history_item.xml @@ -8,7 +8,7 @@ type = "String" /> - - + diff --git a/app/src/main/res/layout/community_search_hot_item.xml b/app/src/main/res/layout/community_search_hot_item.xml index 8b0189fd05..34a7a2421b 100644 --- a/app/src/main/res/layout/community_search_hot_item.xml +++ b/app/src/main/res/layout/community_search_hot_item.xml @@ -14,7 +14,7 @@ - @@ -56,6 +56,6 @@ app:layout_constraintLeft_toLeftOf = "@id/title" app:layout_constraintTop_toBottomOf = "@id/title" /> - + diff --git a/app/src/main/res/layout/community_search_special_columm_item.xml b/app/src/main/res/layout/community_search_special_columm_item.xml index b93fd5b1ed..5e881c079e 100644 --- a/app/src/main/res/layout/community_search_special_columm_item.xml +++ b/app/src/main/res/layout/community_search_special_columm_item.xml @@ -9,7 +9,7 @@ - - + diff --git a/app/src/main/res/layout/dialog_article_game.xml b/app/src/main/res/layout/dialog_article_game.xml index b61c047be9..18fee99009 100644 --- a/app/src/main/res/layout/dialog_article_game.xml +++ b/app/src/main/res/layout/dialog_article_game.xml @@ -38,7 +38,7 @@ android:layout_width = "match_parent" android:layout_height = "300dp" > - - diff --git a/app/src/main/res/layout/dialog_strategy_select_game.xml b/app/src/main/res/layout/dialog_strategy_select_game.xml index 116047fc13..9519e94d7c 100644 --- a/app/src/main/res/layout/dialog_strategy_select_game.xml +++ b/app/src/main/res/layout/dialog_strategy_select_game.xml @@ -38,7 +38,7 @@ android:text = "@string/concern_game_favor" android:textColor = "@color/title" /> - - - - diff --git a/app/src/main/res/layout/fm_install.xml b/app/src/main/res/layout/fm_install.xml index 3516207924..4484ae90e5 100644 --- a/app/src/main/res/layout/fm_install.xml +++ b/app/src/main/res/layout/fm_install.xml @@ -3,7 +3,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - diff --git a/app/src/main/res/layout/fm_search.xml b/app/src/main/res/layout/fm_search.xml index 298bd2f254..695bcee1ae 100644 --- a/app/src/main/res/layout/fm_search.xml +++ b/app/src/main/res/layout/fm_search.xml @@ -6,7 +6,7 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - - - - - + diff --git a/app/src/main/res/layout/fragment_answer_comment_conversation.xml b/app/src/main/res/layout/fragment_answer_comment_conversation.xml index 2df0cd4908..4558ef5cdc 100644 --- a/app/src/main/res/layout/fragment_answer_comment_conversation.xml +++ b/app/src/main/res/layout/fragment_answer_comment_conversation.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools"> - @@ -30,7 +30,7 @@ android:visibility="gone" tools:visibility="visible"/> - - + - @@ -249,7 +249,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/time_tv" /> - + - @@ -212,7 +212,7 @@ android:background="@color/background" app:layout_constraintLeft_toLeftOf="@id/answer_detail_usericon_container" app:layout_constraintTop_toBottomOf="@id/answer_detail_usericon_container" /> - + @@ -276,7 +276,7 @@ - - + - - - - - + - - @@ -101,7 +101,7 @@ app:layout_constraintTop_toTopOf = "parent" tools:visibility = "visible" /> - + - + diff --git a/app/src/main/res/layout/fragment_ask_column.xml b/app/src/main/res/layout/fragment_ask_column.xml index bf8f2d2a77..34f0bfc539 100644 --- a/app/src/main/res/layout/fragment_ask_column.xml +++ b/app/src/main/res/layout/fragment_ask_column.xml @@ -1,12 +1,12 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask_follow.xml b/app/src/main/res/layout/fragment_ask_follow.xml index ce8ecfddc1..3448242041 100644 --- a/app/src/main/res/layout/fragment_ask_follow.xml +++ b/app/src/main/res/layout/fragment_ask_follow.xml @@ -52,7 +52,7 @@ - @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask_questions.xml b/app/src/main/res/layout/fragment_ask_questions.xml index f1a3821792..8eecda8b4c 100644 --- a/app/src/main/res/layout/fragment_ask_questions.xml +++ b/app/src/main/res/layout/fragment_ask_questions.xml @@ -15,7 +15,7 @@ android:layout_height = "2dp" android:layout_alignParentBottom = "true" /> - - diff --git a/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml b/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml index bc739e879d..0cf27eb60a 100644 --- a/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml +++ b/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml @@ -14,12 +14,12 @@ android:layout_width = "match_parent" android:layout_height = "40dp" /> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask_search.xml b/app/src/main/res/layout/fragment_ask_search.xml index 516504bf01..7cc014690f 100644 --- a/app/src/main/res/layout/fragment_ask_search.xml +++ b/app/src/main/res/layout/fragment_ask_search.xml @@ -31,17 +31,17 @@ - - - + - - - - - + - - - - - + - @@ -48,7 +48,7 @@ - - - - - - - + - - - - - - + - - - - + - - - + - - - + - - - - + - + - diff --git a/app/src/main/res/layout/fragment_kaifu_vp.xml b/app/src/main/res/layout/fragment_kaifu_vp.xml index 44a0761e27..f4350ed0e7 100644 --- a/app/src/main/res/layout/fragment_kaifu_vp.xml +++ b/app/src/main/res/layout/fragment_kaifu_vp.xml @@ -3,7 +3,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - diff --git a/app/src/main/res/layout/fragment_libao.xml b/app/src/main/res/layout/fragment_libao.xml index 5f465a7844..b0b2690b58 100644 --- a/app/src/main/res/layout/fragment_libao.xml +++ b/app/src/main/res/layout/fragment_libao.xml @@ -24,7 +24,7 @@ android:layout_height = "35dp" android:orientation = "horizontal" > - - - - - - - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_libao2.xml b/app/src/main/res/layout/fragment_libao2.xml index 4fc65f3715..841672f957 100644 --- a/app/src/main/res/layout/fragment_libao2.xml +++ b/app/src/main/res/layout/fragment_libao2.xml @@ -3,16 +3,16 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - + - - - + - @@ -24,7 +24,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - @@ -66,14 +66,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -131,14 +131,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -196,14 +196,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -261,14 +261,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -326,14 +326,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -391,14 +391,14 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -456,7 +456,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - - - - + - - - + - - - + - @@ -13,7 +13,7 @@ android:layout_height = "wrap_content" android:orientation = "vertical" > - - + - - @@ -118,7 +118,7 @@ android:background="@color/background" app:layout_constraintTop_toBottomOf="@id/answer_detail_title_rl" /> - - + - - + - + diff --git a/app/src/main/res/layout/fragment_questions_edit.xml b/app/src/main/res/layout/fragment_questions_edit.xml index de8b4e99e0..b698f1a221 100644 --- a/app/src/main/res/layout/fragment_questions_edit.xml +++ b/app/src/main/res/layout/fragment_questions_edit.xml @@ -51,7 +51,7 @@ android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "13sp" /> - - - + diff --git a/app/src/main/res/layout/fragment_questionsdetail.xml b/app/src/main/res/layout/fragment_questionsdetail.xml index e3a0354bb6..06484e3f48 100644 --- a/app/src/main/res/layout/fragment_questionsdetail.xml +++ b/app/src/main/res/layout/fragment_questionsdetail.xml @@ -1,22 +1,22 @@ - - - - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_questionsdetail_fold.xml b/app/src/main/res/layout/fragment_questionsdetail_fold.xml index 9cfb401ddb..d884b1c42e 100644 --- a/app/src/main/res/layout/fragment_questionsdetail_fold.xml +++ b/app/src/main/res/layout/fragment_questionsdetail_fold.xml @@ -3,17 +3,17 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - + - diff --git a/app/src/main/res/layout/fragment_subject.xml b/app/src/main/res/layout/fragment_subject.xml index 103a92a668..53d1e78db0 100644 --- a/app/src/main/res/layout/fragment_subject.xml +++ b/app/src/main/res/layout/fragment_subject.xml @@ -3,7 +3,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - diff --git a/app/src/main/res/layout/fragment_subject_tiled.xml b/app/src/main/res/layout/fragment_subject_tiled.xml index a8c8bfb1f1..79f53a247e 100644 --- a/app/src/main/res/layout/fragment_subject_tiled.xml +++ b/app/src/main/res/layout/fragment_subject_tiled.xml @@ -1,11 +1,11 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_wrapper.xml b/app/src/main/res/layout/fragment_subject_wrapper.xml index e1d694f098..6a853d1268 100644 --- a/app/src/main/res/layout/fragment_subject_wrapper.xml +++ b/app/src/main/res/layout/fragment_subject_wrapper.xml @@ -5,7 +5,7 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - - diff --git a/app/src/main/res/layout/fragment_tablayout_viewpager.xml b/app/src/main/res/layout/fragment_tablayout_viewpager.xml index e1a9681a8b..a9848c679d 100644 --- a/app/src/main/res/layout/fragment_tablayout_viewpager.xml +++ b/app/src/main/res/layout/fragment_tablayout_viewpager.xml @@ -17,7 +17,7 @@ android:layout_height = "2dp" android:layout_alignParentBottom = "true" /> - - - - + - - - + - - @@ -72,14 +72,14 @@ app:layout_constraintStart_toEndOf="@+id/view10" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -140,14 +140,14 @@ app:layout_constraintStart_toEndOf="@+id/viewqe" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -208,14 +208,14 @@ app:layout_constraintStart_toEndOf="@+id/viewwr" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -276,14 +276,14 @@ app:layout_constraintStart_toEndOf="@+id/viewet" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -344,14 +344,14 @@ app:layout_constraintStart_toEndOf="@+id/viewry" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -412,14 +412,14 @@ app:layout_constraintStart_toEndOf="@+id/viewtu" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -480,7 +480,7 @@ app:layout_constraintStart_toEndOf="@+id/viewyy" app:layout_constraintTop_toTopOf="parent" /> - + diff --git a/app/src/main/res/layout/game_download_dialog.xml b/app/src/main/res/layout/game_download_dialog.xml index 607e0d5be4..e3fd308f2b 100644 --- a/app/src/main/res/layout/game_download_dialog.xml +++ b/app/src/main/res/layout/game_download_dialog.xml @@ -63,7 +63,7 @@ android:layout_width = "match_parent" android:layout_height = "wrap_content" > - - - - + diff --git a/app/src/main/res/layout/game_horizontal_list.xml b/app/src/main/res/layout/game_horizontal_list.xml index 3512377a12..11f560a1a8 100644 --- a/app/src/main/res/layout/game_horizontal_list.xml +++ b/app/src/main/res/layout/game_horizontal_list.xml @@ -1,19 +1,19 @@ - - - + diff --git a/app/src/main/res/layout/game_news_type_item.xml b/app/src/main/res/layout/game_news_type_item.xml index fd314cca6e..30120b8710 100644 --- a/app/src/main/res/layout/game_news_type_item.xml +++ b/app/src/main/res/layout/game_news_type_item.xml @@ -4,7 +4,7 @@ android:layout_height = "wrap_content" android:orientation = "vertical" > - - diff --git a/app/src/main/res/layout/game_subject_item.xml b/app/src/main/res/layout/game_subject_item.xml index b86a0205c4..d3c75e41a0 100644 --- a/app/src/main/res/layout/game_subject_item.xml +++ b/app/src/main/res/layout/game_subject_item.xml @@ -10,7 +10,7 @@ type = "com.gh.gamecenter.entity.SubjectEntity" /> - @@ -94,12 +94,12 @@ android:background = "@color/cutting_line" app:layout_constraintTop_toBottomOf = "@id/subject_head" /> - - + diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index b8564643e5..2d7b97ba5b 100644 --- a/app/src/main/res/layout/gamedetail_body.xml +++ b/app/src/main/res/layout/gamedetail_body.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/gamedetail_calendar_item.xml b/app/src/main/res/layout/gamedetail_calendar_item.xml index 8f0c60b819..669265781a 100644 --- a/app/src/main/res/layout/gamedetail_calendar_item.xml +++ b/app/src/main/res/layout/gamedetail_calendar_item.xml @@ -1,5 +1,5 @@ - @@ -37,4 +37,4 @@ android:background = "@drawable/kaifu_item_hint" app:layout_constraintRight_toRightOf = "parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/gamedetail_item_answer.xml b/app/src/main/res/layout/gamedetail_item_answer.xml index bf90822f68..309c7e88eb 100644 --- a/app/src/main/res/layout/gamedetail_item_answer.xml +++ b/app/src/main/res/layout/gamedetail_item_answer.xml @@ -39,7 +39,7 @@ android:textSize = "14sp" /> - diff --git a/app/src/main/res/layout/gamedetail_item_comments.xml b/app/src/main/res/layout/gamedetail_item_comments.xml index edcdda2fdb..2a3d44bfe6 100644 --- a/app/src/main/res/layout/gamedetail_item_comments.xml +++ b/app/src/main/res/layout/gamedetail_item_comments.xml @@ -36,7 +36,7 @@ android:textSize="14sp" /> - - - diff --git a/app/src/main/res/layout/gamedetail_item_kaifu.xml b/app/src/main/res/layout/gamedetail_item_kaifu.xml index 996c11b2bc..7a440a7c6c 100644 --- a/app/src/main/res/layout/gamedetail_item_kaifu.xml +++ b/app/src/main/res/layout/gamedetail_item_kaifu.xml @@ -114,7 +114,7 @@ android:layout_marginBottom = "10dp" android:layout_marginTop = "12dp" > - diff --git a/app/src/main/res/layout/gamedetail_item_libao_rv.xml b/app/src/main/res/layout/gamedetail_item_libao_rv.xml index d2053b17fa..2210502857 100644 --- a/app/src/main/res/layout/gamedetail_item_libao_rv.xml +++ b/app/src/main/res/layout/gamedetail_item_libao_rv.xml @@ -24,7 +24,7 @@ android:layout_marginBottom = "15dp" android:background = "@color/cutting_line" /> - diff --git a/app/src/main/res/layout/gamedetail_item_plugin.xml b/app/src/main/res/layout/gamedetail_item_plugin.xml index e89c25f630..df699f8fc3 100644 --- a/app/src/main/res/layout/gamedetail_item_plugin.xml +++ b/app/src/main/res/layout/gamedetail_item_plugin.xml @@ -35,7 +35,7 @@ android:layout_height = "@dimen/cutting_line" android:background = "@color/cutting_line" /> - diff --git a/app/src/main/res/layout/gameupdate.xml b/app/src/main/res/layout/gameupdate.xml index d9231bfec5..5ff865ac31 100644 --- a/app/src/main/res/layout/gameupdate.xml +++ b/app/src/main/res/layout/gameupdate.xml @@ -3,7 +3,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - diff --git a/app/src/main/res/layout/item_ask_follow_more.xml b/app/src/main/res/layout/item_ask_follow_more.xml index 632b927909..2811f70e31 100644 --- a/app/src/main/res/layout/item_ask_follow_more.xml +++ b/app/src/main/res/layout/item_ask_follow_more.xml @@ -12,7 +12,7 @@ type="com.gh.gamecenter.entity.UserEntity" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/kc_game_select_item.xml b/app/src/main/res/layout/kc_game_select_item.xml index 2a2336cd95..b9dfcb0f14 100644 --- a/app/src/main/res/layout/kc_game_select_item.xml +++ b/app/src/main/res/layout/kc_game_select_item.xml @@ -137,7 +137,7 @@ android:paddingRight = "8dp" android:visibility = "gone" > - - - - + diff --git a/app/src/main/res/layout/menu_question_detail_more_item.xml b/app/src/main/res/layout/menu_question_detail_more_item.xml index 78e974b361..1a7fdaa574 100644 --- a/app/src/main/res/layout/menu_question_detail_more_item.xml +++ b/app/src/main/res/layout/menu_question_detail_more_item.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index dd6cf8d1f9..ae731b9d73 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -10,7 +10,7 @@ type = "com.gh.gamecenter.entity.MessageEntity" /> - - + diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index 964d046916..e54fb71933 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -14,7 +14,7 @@ android:layout_width = "match_parent" android:layout_height = "wrap_content" > - - - + - - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/personal_home_item.xml b/app/src/main/res/layout/personal_home_item.xml index 1990906472..f791b5f218 100644 --- a/app/src/main/res/layout/personal_home_item.xml +++ b/app/src/main/res/layout/personal_home_item.xml @@ -16,7 +16,7 @@ - - + diff --git a/app/src/main/res/layout/personal_home_top.xml b/app/src/main/res/layout/personal_home_top.xml index b165e8939b..cda4fbe076 100644 --- a/app/src/main/res/layout/personal_home_top.xml +++ b/app/src/main/res/layout/personal_home_top.xml @@ -14,7 +14,7 @@ type = "com.gh.gamecenter.entity.MessageUnreadEntity" /> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/piece_article_bottom.xml b/app/src/main/res/layout/piece_article_bottom.xml index e4f7494113..b049233a21 100644 --- a/app/src/main/res/layout/piece_article_bottom.xml +++ b/app/src/main/res/layout/piece_article_bottom.xml @@ -59,7 +59,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/question_edit_title_search_item.xml b/app/src/main/res/layout/question_edit_title_search_item.xml index f0523f7d08..a6ae73f996 100644 --- a/app/src/main/res/layout/question_edit_title_search_item.xml +++ b/app/src/main/res/layout/question_edit_title_search_item.xml @@ -7,7 +7,7 @@ type = "com.gh.gamecenter.qa.entity.QuestionsIndexEntity" /> - @@ -45,6 +45,6 @@ android:layout_marginTop = "10dp" android:background = "@color/cutting_line" app:layout_constraintTop_toBottomOf = "@id/questions_edit_index_answer_count" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/questions_edit_index_item.xml b/app/src/main/res/layout/questions_edit_index_item.xml index 48c1d2a36b..f360eec9a6 100644 --- a/app/src/main/res/layout/questions_edit_index_item.xml +++ b/app/src/main/res/layout/questions_edit_index_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/questions_edit_tag.xml b/app/src/main/res/layout/questions_edit_tag.xml index 2c1e4c2be7..ee307532ca 100644 --- a/app/src/main/res/layout/questions_edit_tag.xml +++ b/app/src/main/res/layout/questions_edit_tag.xml @@ -1,5 +1,5 @@ - @@ -70,7 +70,7 @@ android:background = "@color/cutting_line" app:layout_constraintTop_toBottomOf = "@id/questions_edit_tag_sv" /> - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index 4affb583f5..7094db1613 100644 --- a/app/src/main/res/layout/questionsinvite_item.xml +++ b/app/src/main/res/layout/questionsinvite_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/questionsinvite_top_item.xml b/app/src/main/res/layout/questionsinvite_top_item.xml index 92c3e98552..b261917532 100644 --- a/app/src/main/res/layout/questionsinvite_top_item.xml +++ b/app/src/main/res/layout/questionsinvite_top_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index a866994d2e..c03c831253 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -16,7 +16,7 @@ type = "com.gh.gamecenter.entity.RatingComment" /> - - - - + + diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml index 25a5bcdce9..4b9e61e88e 100644 --- a/app/src/main/res/layout/rating_reply_item.xml +++ b/app/src/main/res/layout/rating_reply_item.xml @@ -22,7 +22,7 @@ android:layout_height = "wrap_content" android:orientation = "vertical" > - - + - - - @@ -18,4 +18,4 @@ android:layout_gravity = "bottom" app:layout_heightPercent = "25%" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_filereceive.xml b/app/src/main/res/layout/toolbar_filereceive.xml index df87d8f620..5bae31f473 100644 --- a/app/src/main/res/layout/toolbar_filereceive.xml +++ b/app/src/main/res/layout/toolbar_filereceive.xml @@ -5,7 +5,7 @@ android:layout_width = "match_parent" android:layout_height = "@dimen/appbar_height" > - diff --git a/app/src/main/res/layout/view_notifier.xml b/app/src/main/res/layout/view_notifier.xml index 385b99fd67..6c35a5b852 100644 --- a/app/src/main/res/layout/view_notifier.xml +++ b/app/src/main/res/layout/view_notifier.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + diff --git a/app/src/main/res/layout/voting_top_item.xml b/app/src/main/res/layout/voting_top_item.xml index 197377cd73..83164100de 100644 --- a/app/src/main/res/layout/voting_top_item.xml +++ b/app/src/main/res/layout/voting_top_item.xml @@ -1,5 +1,5 @@ - @@ -21,4 +21,4 @@ app:layout_constraintTop_toTopOf = "parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 18e9228d40..8dcdfe6121 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply from: 'dependencies.gradle' buildscript { - ext.kotlin_version = '1.2.60' + ext.kotlin_version = '1.3.10' repositories { google() jcenter() @@ -12,7 +12,7 @@ buildscript { // maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath "com.android.tools.build:gradle:3.1.3" + classpath "com.android.tools.build:gradle:3.4.1" // for tinker // classpath 'com.tencent.tinker:tinker-patch-gradle-plugin:1.8.1' diff --git a/dependencies.gradle b/dependencies.gradle index 43a4853ddb..9957a53b23 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ ext { //Android - buildToolsVersion = "27.0.3" - compileSdkVersion = 27 + buildToolsVersion = "28.0.3" + compileSdkVersion = 28 minSdkVersion = 16 targetSdkVersion = 26 @@ -15,7 +15,7 @@ ext { androidSupport = "27.1.1" multidex = "1.0.3" - butterKnife = "8.8.1" + butterKnife = "10.1.0" eventbus = "3.0.0" eventbusApt = "3.0.1" @@ -30,7 +30,7 @@ ext { okHttp = "3.10.0" gson = "2.8.2" zxing = "3.2.1" - fresco = "1.9.0" + fresco = "1.13.0" ormlite = "5.0" systemBarTint = "1.0.3" switchButton = "1.4.5" diff --git a/gradle.properties b/gradle.properties index 31521f0bad..61366b77eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,6 +59,11 @@ COMMENT_HOST=https\://api.ghzs.com/v3d6d4/ DATA_HOST=http\://data.ghzs666.com/ # 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准 -TINKER_ENABLE= +TINKER_ENABLE=1 TINKER_ID=386c7b19 TINKER_BASE_APK_DIR=app-0603-17-52-20_386c7b19 +android.useAndroidX=true +android.enableJetifier=true + +# 需后续调整才能使用 R8 +android.enableR8 = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 957f2e9e36..07af2c3113 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 21 17:35:06 CST 2017 +#Wed Jun 12 10:07:46 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 56ed06125d..49c7b29be9 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 56ed06125d789af02b5c693e91019dc98f5be4ce +Subproject commit 49c7b29be991a61c98f84e7ca4a99c8461c0d8ba diff --git a/libraries/LogHub/build.gradle b/libraries/LogHub/build.gradle index 75a266707d..048a59ea98 100644 --- a/libraries/LogHub/build.gradle +++ b/libraries/LogHub/build.gradle @@ -8,5 +8,5 @@ android { defaultConfig { consumerProguardFiles 'proguard-library.txt' } - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' } \ No newline at end of file diff --git a/libraries/Matisse/build.gradle b/libraries/Matisse/build.gradle index d89daf36f3..d84d38863e 100644 --- a/libraries/Matisse/build.gradle +++ b/libraries/Matisse/build.gradle @@ -27,9 +27,9 @@ ext.supportLibVersion = '27.1.1' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:appcompat-v7:${androidSupport}" - implementation "com.android.support:support-annotations:${androidSupport}" - implementation "com.android.support:recyclerview-v7:${androidSupport}" + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4' implementation "com.facebook.fresco:fresco:${fresco}" diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/Matisse.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/Matisse.java index 74763215d4..0de59380a8 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/Matisse.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/Matisse.java @@ -18,8 +18,8 @@ package com.zhihu.matisse; import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.zhihu.matisse.ui.MatisseActivity; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/MimeType.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/MimeType.java index 9c199d3c64..bc8c875862 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/MimeType.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/MimeType.java @@ -19,7 +19,7 @@ package com.zhihu.matisse; import android.content.ContentResolver; import android.net.Uri; import android.text.TextUtils; -import android.support.v4.util.ArraySet; +import androidx.collection.ArraySet; import android.webkit.MimeTypeMap; import com.zhihu.matisse.internal.utils.PhotoMetadataUtils; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/SelectionCreator.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/SelectionCreator.java index 43ffa59129..026485d20b 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/SelectionCreator.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/SelectionCreator.java @@ -19,12 +19,12 @@ package com.zhihu.matisse; import android.app.Activity; import android.content.Intent; import android.os.Build; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; import com.zhihu.matisse.engine.ImageEngine; import com.zhihu.matisse.filter.Filter; @@ -226,7 +226,7 @@ public final class SelectionCreator { /** * Capture strategy provided for the location to save photos including internal and external - * storage and also a authority for {@link android.support.v4.content.FileProvider}. + * storage and also a authority for {@link androidx.core.content.FileProvider}. * * @param captureStrategy {@link CaptureStrategy}, needed only when capturing is enabled. * @return {@link SelectionCreator} for fluent API. diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Album.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Album.java index 9ebafb8c5b..4220e18fd4 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Album.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Album.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.os.Parcel; import android.os.Parcelable; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.zhihu.matisse.R; import com.zhihu.matisse.internal.loader.AlbumLoader; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/IncapableCause.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/IncapableCause.java index 5c3920693a..3fc0b980cd 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/IncapableCause.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/IncapableCause.java @@ -16,10 +16,11 @@ package com.zhihu.matisse.internal.entity; import android.content.Context; -import android.support.annotation.IntDef; -import android.support.v4.app.FragmentActivity; import android.widget.Toast; +import androidx.annotation.IntDef; +import androidx.fragment.app.FragmentActivity; + import com.zhihu.matisse.internal.ui.widget.IncapableDialog; import java.lang.annotation.Retention; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Item.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Item.java index e854deb7cc..e3cfbf3b9c 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Item.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/Item.java @@ -22,7 +22,7 @@ import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.zhihu.matisse.MimeType; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/SelectionSpec.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/SelectionSpec.java index cd58d9b755..6db31bfdd6 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/SelectionSpec.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/entity/SelectionSpec.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.entity; import android.content.pm.ActivityInfo; -import android.support.annotation.StyleRes; +import androidx.annotation.StyleRes; import com.zhihu.matisse.MimeType; import com.zhihu.matisse.R; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumLoader.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumLoader.java index f328296a9c..482e22a760 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumLoader.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumLoader.java @@ -22,7 +22,7 @@ import android.database.MatrixCursor; import android.database.MergeCursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.SelectionSpec; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java index ea2b2919ed..47c22b0d2f 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java @@ -22,7 +22,7 @@ import android.database.MatrixCursor; import android.database.MergeCursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.Item; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumCollection.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumCollection.java index 2dc16160cb..b99e0215d1 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumCollection.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumCollection.java @@ -19,9 +19,9 @@ package com.zhihu.matisse.internal.model; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; import com.zhihu.matisse.internal.loader.AlbumLoader; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java index 90a938ab71..fa25939ecb 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java @@ -19,11 +19,11 @@ package com.zhihu.matisse.internal.model; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.loader.AlbumMediaLoader; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java index 73ff53e2a3..01c82e3369 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.Item; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java index 8a097b0289..6d9a401ab2 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java @@ -19,9 +19,9 @@ import android.app.Activity; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.WindowManager; import android.widget.LinearLayout; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java index b00f09c5e8..86c46e2f7a 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java @@ -18,10 +18,10 @@ package com.zhihu.matisse.internal.ui; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java index 9d9f70ffbf..6a4a22e3de 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java @@ -19,8 +19,8 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.graphics.Point; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java index 4bd6e25a7e..8b934c7fd8 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.zhihu.matisse.internal.entity.Item; import com.zhihu.matisse.internal.entity.SelectionSpec; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java index 769ba1ba54..8757386359 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java @@ -20,8 +20,8 @@ import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java index eef46f055a..b75abc1cb6 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java @@ -15,9 +15,9 @@ */ package com.zhihu.matisse.internal.ui.adapter; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import android.view.ViewGroup; import com.zhihu.matisse.internal.entity.Item; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java index 6557dde4de..48203b0926 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.adapter; import android.database.Cursor; import android.provider.MediaStore; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; public abstract class RecyclerViewCursorAdapter extends RecyclerView.Adapter { diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java index b3c9534b73..92dfa27657 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java @@ -20,8 +20,8 @@ import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.ListPopupWindow; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.ListPopupWindow; import android.view.View; import android.widget.AdapterView; import android.widget.CursorAdapter; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java index 387218468f..ee9964034c 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java @@ -3,8 +3,8 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.core.content.res.ResourcesCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import com.zhihu.matisse.R; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckView.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckView.java index b958113655..7407325000 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckView.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckView.java @@ -27,7 +27,7 @@ import android.graphics.Rect; import android.graphics.Shader; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.v4.content.res.ResourcesCompat; +import androidx.core.content.res.ResourcesCompat; import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java index 1599fce212..a1b7201e31 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java @@ -18,9 +18,9 @@ package com.zhihu.matisse.internal.ui.widget; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import com.zhihu.matisse.R; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java index a7c2662aa7..0abb367cfd 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.format.DateUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java index eebcd429b4..dca609c8e2 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class MediaGridInset extends RecyclerView.ItemDecoration { diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java index 56fd370429..b3e66c31c9 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java index 305fe03e07..f493a10ff8 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java @@ -19,7 +19,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Path; import android.graphics.RectF; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; public class RoundedRectangleImageView extends AppCompatImageView { diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java index cc0fc47c59..876c748275 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java @@ -24,9 +24,9 @@ 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 android.support.v4.os.EnvironmentCompat; +import androidx.fragment.app.Fragment; +import androidx.core.content.FileProvider; +import androidx.core.os.EnvironmentCompat; import com.zhihu.matisse.internal.entity.CaptureStrategy; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/listener/OnSelectedListener.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/listener/OnSelectedListener.java index 33e374e626..b7d6d22049 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/listener/OnSelectedListener.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/listener/OnSelectedListener.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.listener; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java index e181715ae7..112a7d71d1 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java @@ -26,11 +26,11 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.Window; diff --git a/libraries/Matisse/src/main/res/layout/activity_matisse.xml b/libraries/Matisse/src/main/res/layout/activity_matisse.xml index 8b4b8cfd00..2d2528cb34 100644 --- a/libraries/Matisse/src/main/res/layout/activity_matisse.xml +++ b/libraries/Matisse/src/main/res/layout/activity_matisse.xml @@ -20,7 +20,7 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - - + - - @@ -213,7 +213,7 @@ android:orientation="vertical" android:visibility="visible" > - * To use the component, simply add it to your view hierarchy. Then in your - * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call + * {@link android.app.Activity} or {@link Fragment} call * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for. *

* The colors can be customized in two ways. The first and simplest is to provide an array of colors diff --git a/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/ItemMarginDecoration.java b/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/ItemMarginDecoration.java index 68838e6287..fe35bad191 100644 --- a/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/ItemMarginDecoration.java +++ b/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/ItemMarginDecoration.java @@ -15,7 +15,7 @@ package com.google.samples.apps.iosched.ui.widget.recyclerview; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/UpdatableAdapter.java b/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/UpdatableAdapter.java index ce569414ea..53ffd7e9b4 100644 --- a/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/UpdatableAdapter.java +++ b/libraries/iosched/src/main/java/com/google/samples/apps/iosched/ui/widget/recyclerview/UpdatableAdapter.java @@ -14,8 +14,8 @@ package com.google.samples.apps.iosched.ui.widget.recyclerview; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; /** * Abstract base class for {@link RecyclerView.Adapter}s whose data can be updated.