Refactor

src/main/java/com/kdanmobile/reader/copyfile/FileCannotOpenDialogFragment.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import androidx.appcompat.app.AlertDialog
 
-class FileCannotOpenDialogFragment : androidx.fragment.app.DialogFragment() {
+class FileCannotOpenDialogFragment : DialogFragment() {
 
     companion object {
         const val KEY_DIALOG_TITLE = "title"

src/main/java/com/kdanmobile/reader/copyfile/FileUriSource.kt

@@ -13,7 +13,7 @@ class FileUriSource(private val context: Context, private val uri: Uri): CopyFil
 
     override fun getFileName(): String? {
         return try {
-            androidx.documentfile.provider.DocumentFile.fromSingleUri(context, uri)?.name ?: uri.lastPathSegment
+            DocumentFile.fromSingleUri(context, uri)?.name ?: uri.lastPathSegment
         } catch (e: Exception) {
             null
         }

src/main/java/com/kdanmobile/reader/screen/adapter/BookmarkAdapter.kt

@@ -16,7 +16,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 
-class BookmarkAdapter(private val pdfInfoHandler: PdfInfoHandler, private val thumbnailHandler: ThumbnailHandler, private var bookmarks: Array<Bookmark>): androidx.recyclerview.widget.RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder>() {
+class BookmarkAdapter(private val pdfInfoHandler: PdfInfoHandler, private val thumbnailHandler: ThumbnailHandler, private var bookmarks: Array<Bookmark>): RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder>() {
     var bookmarkIndex = -1
         private set
 

src/main/java/com/kdanmobile/reader/screen/adapter/ThumbnailAdapter.kt

@@ -20,7 +20,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 
-class ThumbnailAdapter(private val pdfInfoHandler: PdfInfoHandler, private val thumbnailHandler: ThumbnailHandler): androidx.recyclerview.widget.RecyclerView.Adapter<ThumbnailViewHolder>() {
+class ThumbnailAdapter(private val pdfInfoHandler: PdfInfoHandler, private val thumbnailHandler: ThumbnailHandler): RecyclerView.Adapter<ThumbnailViewHolder>() {
     private var currentPage = 0
 
     init {
@@ -79,7 +79,7 @@ class ThumbnailAdapter(private val pdfInfoHandler: PdfInfoHandler, private val t
 
         init {
             val idReaderThumbFl = itemView.findViewById<View>(R.id.id_reader_thumb_fl) as FrameLayout
-            val params = androidx.recyclerview.widget.RecyclerView.LayoutParams(parent.measuredWidth - 20, (parent.measuredWidth - 20) * 9 / 7)
+            val params = RecyclerView.LayoutParams(parent.measuredWidth - 20, (parent.measuredWidth - 20) * 9 / 7)
             params.setMargins(10, 5, 10, 5)
             idReaderThumbFl.layoutParams = params
 

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/shape/ShapeTabView.kt

@@ -95,7 +95,7 @@ class ShapeTabView : ConstraintLayout {
         return ShapeAttribute(shapeType, lineColor, lineWidth, lineAlpha, fillColor, fillAlpha)
     }
 
-    private inner class ViewPagerAdapter(context: Context, private val tabs: ArrayList<String>) : androidx.viewpager.widget.PagerAdapter() {
+    private inner class ViewPagerAdapter(context: Context, private val tabs: ArrayList<String>) : PagerAdapter() {
         private val layoutInflater = LayoutInflater.from(context)
 
         override fun instantiateItem(container: ViewGroup, position: Int): Any {

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/signature/SignatureAdapter.kt

@@ -17,12 +17,12 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.view_media_box_item_signature.view.*
 
-class SignatureAdapter(private val context: Context, private var signaturePaths: ArrayList<String>): androidx.recyclerview.widget.RecyclerView.Adapter<SignatureViewHolder>() {
+class SignatureAdapter(private val context: Context, private var signaturePaths: ArrayList<String>): RecyclerView.Adapter<SignatureViewHolder>() {
 
     companion object {
         val maxMemory = Runtime.getRuntime().maxMemory() / 16
 
-        val mMemoryCache: androidx.collection.LruCache<String, Bitmap> = object: androidx.collection.LruCache<String, Bitmap>(maxMemory.toInt()) {
+        val mMemoryCache: LruCache<String, Bitmap> = object: LruCache<String, Bitmap>(maxMemory.toInt()) {
             override fun sizeOf(key: String, value: Bitmap): Int {
                 return value.byteCount
             }
@@ -66,7 +66,7 @@ class SignatureAdapter(private val context: Context, private var signaturePaths:
     }
 }
 
-class SignatureViewHolder(view: View): androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
+class SignatureViewHolder(view: View): RecyclerView.ViewHolder(view) {
     val ivSignature: ImageView = view.iv_signature
     val btnClose: View = view.btn_close
     var filename: String = ""

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/signature/SignatureRecyclerViewItemDecoration.kt

@@ -6,12 +6,12 @@ import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 
 
-class SignatureRecyclerViewItemDecoration(private val space: Int, private val additionalPadding: Int) : androidx.recyclerview.widget.RecyclerView.ItemDecoration() {
+class SignatureRecyclerViewItemDecoration(private val space: Int, private val additionalPadding: Int) : RecyclerView.ItemDecoration() {
 
-    override fun getItemOffsets(outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, state: androidx.recyclerview.widget.RecyclerView.State) {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
         val position = parent.getChildAdapterPosition(view)
         val childCount = parent.adapter?.itemCount ?: 0
-        val layoutManager = parent.layoutManager as androidx.recyclerview.widget.GridLayoutManager
+        val layoutManager = parent.layoutManager as GridLayoutManager
         val currentRow = (position / layoutManager.spanCount)
         val lastRow = ((childCount - 1) / layoutManager.spanCount)
         outRect.bottom = when (currentRow == lastRow) {

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/signature/SignatureTabView.kt

@@ -43,7 +43,7 @@ class SignatureTabView : ConstraintLayout {
         updateSignaturePaths()
         updateSignatureMessage()
 
-        recyclerView_signature.layoutManager = androidx.recyclerview.widget.GridLayoutManager(context, resources.getInteger(R.integer.mediaBox_signature_columnCount))
+        recyclerView_signature.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.mediaBox_signature_columnCount))
         val adapter = SignatureAdapter(context, signaturePaths)
         adapter.setOnSignatureClickListener(object : OnSignatureClickListener {
             override fun onSignatureClick(path: String) {
@@ -55,7 +55,7 @@ class SignatureTabView : ConstraintLayout {
             override fun onSignatureRemove(path: String) {
                 val position = signaturePaths.indexOf(path)
 
-                val layoutManager = recyclerView_signature.layoutManager as androidx.recyclerview.widget.GridLayoutManager
+                val layoutManager = recyclerView_signature.layoutManager as GridLayoutManager
                 val updateRow = (position - 1) / layoutManager.spanCount
                 val positionStart = updateRow * layoutManager.spanCount
                 adapter.notifyItemRangeChanged(positionStart, adapter.itemCount - positionStart)

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/stamp/CustomStampAdapter.kt

@@ -9,7 +9,7 @@ import android.widget.ImageView
 import com.kdanmobile.reader.R
 import kotlinx.android.synthetic.main.view_media_box_item_stamp_custom_viewholder.view.*
 
-class CustomStampAdapter(private val context: Context, private val stampTypes: Array<CustomStampType>): androidx.recyclerview.widget.RecyclerView.Adapter<CustomStampViewHolder>() {
+class CustomStampAdapter(private val context: Context, private val stampTypes: Array<CustomStampType>): RecyclerView.Adapter<CustomStampViewHolder>() {
 
     private var selectedIndex = 0
     private var onStampClickListener: OnStampClickListener? = null
@@ -58,7 +58,7 @@ class CustomStampAdapter(private val context: Context, private val stampTypes: A
     }
 }
 
-class CustomStampViewHolder(val view: View): androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
+class CustomStampViewHolder(val view: View): RecyclerView.ViewHolder(view) {
 //        val kmpdfStampTextView: KMPDFStampTextView = view.findViewById(R.id.kmpdfStampTextView)
     val ivStamp: ImageView = view.iv_stamp
     val ivSelectedBorder: View = view.iv_selectedBorder

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/stamp/StampTabView.kt

@@ -104,7 +104,7 @@ class StampTabView : ConstraintLayout {
         inputMethodManager.hideSoftInputFromWindow(et_mediaBoxItemStampCustom_text.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
     }
 
-    private inner class StampViewPagerAdapter(private val tabs: ArrayList<String>): androidx.viewpager.widget.PagerAdapter() {
+    private inner class StampViewPagerAdapter(private val tabs: ArrayList<String>): PagerAdapter() {
         private val layoutInflater = LayoutInflater.from(context)
 
         override fun instantiateItem(container: ViewGroup, position: Int): Any {
@@ -133,7 +133,7 @@ class StampTabView : ConstraintLayout {
                     })
 
                     val recyclerView = customStampView.recyclerView_shapeCustom
-                    recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
+                    recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
                     val adapter = CustomStampAdapter(context, CustomStampType.values())
                     adapter.setOnStampClickListener(object : OnStampClickListener {
                         override fun onStampClick(index: Int) {
@@ -154,7 +154,7 @@ class StampTabView : ConstraintLayout {
                 else -> {
                     val standardStampView = layoutInflater.inflate(R.layout.view_media_box_item_stamp_standard, container, false)
                     val recyclerView = standardStampView.recyclerView_shapeStandard
-                    recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(context, resources.getInteger(R.integer.mediaBox_standardStamp_columnCount))
+                    recyclerView.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.mediaBox_standardStamp_columnCount))
                     val adapter = StandardStampAdapter(context, STANDARD_STAMP_RES.values())
                     adapter.setOnStampClickListener(object : OnStampClickListener {
                         override fun onStampClick(index: Int) {

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/stamp/StandardStampAdapter.kt

@@ -10,7 +10,7 @@ import android.widget.ImageView
 import com.kdanmobile.kmpdfkit.annotation.stamp.StampConfig
 import com.kdanmobile.reader.R
 
-class StandardStampAdapter(private val context: Context, private val resourceIds: Array<StampConfig.STANDARD_STAMP_RES>): androidx.recyclerview.widget.RecyclerView.Adapter<StandardStampViewHolder>() {
+class StandardStampAdapter(private val context: Context, private val resourceIds: Array<StampConfig.STANDARD_STAMP_RES>): RecyclerView.Adapter<StandardStampViewHolder>() {
 
     private var selectedIndex = 0
     private var onStampClickListener: OnStampClickListener? = null
@@ -48,6 +48,6 @@ class StandardStampAdapter(private val context: Context, private val resourceIds
     }
 }
 
-class StandardStampViewHolder(itemView: View): androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
+class StandardStampViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
     val imageView: ImageView = itemView.findViewById(R.id.iv_mediaBoxStampStandard)
 }

src/main/java/com/kdanmobile/reader/screen/view/BookmarkView.kt

@@ -35,14 +35,14 @@ class BookmarkView: RelativeLayout, LeftToolbarView {
 
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.view_bookmark, this)
-        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-        layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
+        val layoutManager = LinearLayoutManager(context)
+        layoutManager.orientation = LinearLayoutManager.VERTICAL
 
         id_km_bookmark_recycler.setHasFixedSize(true)
         id_km_bookmark_recycler.layoutManager = layoutManager
-        id_km_bookmark_recycler.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+        id_km_bookmark_recycler.layoutManager = LinearLayoutManager(context)
         id_km_bookmark_recycler.addOnItemTouchListener(object : OnRecyclerItemClickListener(id_km_bookmark_recycler) {
-            override fun onItemClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+            override fun onItemClick(viewHolder: RecyclerView.ViewHolder) {
                 onScrollToPosition(viewHolder.adapterPosition, true)
                 val bookmark = adapter?.getItem(viewHolder.adapterPosition)
                 if (null != bookmark) {
@@ -50,7 +50,7 @@ class BookmarkView: RelativeLayout, LeftToolbarView {
                 }
             }
 
-            override fun onItemLongClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+            override fun onItemLongClick(viewHolder: RecyclerView.ViewHolder) {
 
             }
         })

src/main/java/com/kdanmobile/reader/screen/view/ThumbnailView.kt

@@ -32,19 +32,19 @@ class ThumbnailView: RelativeLayout, LeftToolbarView {
 
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.view_thumbnail, this)
-        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-        layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
+        val layoutManager = LinearLayoutManager(context)
+        layoutManager.orientation = LinearLayoutManager.VERTICAL
 
         id_km_thumb_recycler.setHasFixedSize(true)
         id_km_thumb_recycler.layoutManager = layoutManager
-        id_km_thumb_recycler.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+        id_km_thumb_recycler.layoutManager = LinearLayoutManager(context)
         id_km_thumb_recycler.addOnItemTouchListener(object : OnRecyclerItemClickListener(id_km_thumb_recycler) {
-            override fun onItemClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+            override fun onItemClick(viewHolder: RecyclerView.ViewHolder) {
                 onScrollToContent(viewHolder.adapterPosition, true)
                 pdfInfoHandler?.goToCurrentPage(viewHolder.adapterPosition)
             }
 
-            override fun onItemLongClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+            override fun onItemLongClick(viewHolder: RecyclerView.ViewHolder) {
 
             }
         })

src/main/java/com/kdanmobile/reader/setting/ReaderSettingDialogFragment.kt

@@ -15,7 +15,7 @@ import androidx.appcompat.widget.Toolbar
 import android.view.*
 import com.kdanmobile.reader.screen.view.*
 
-open class ReaderSettingDialogFragment : androidx.fragment.app.DialogFragment() {
+open class ReaderSettingDialogFragment : DialogFragment() {
 
     private lateinit var viewModel: ReaderSettingViewModel
     private val isReaderSettingFullScreen by lazy { resources.getBoolean(R.bool.isReaderSettingFullScreen) }

src/main/java/com/kdanmobile/reader/thumb/ItemMoveSwipeListener.kt

@@ -3,10 +3,10 @@ package com.kdanmobile.reader.thumb
 import androidx.recyclerview.widget.RecyclerView
 
 interface ItemMoveSwipeListener {
-    fun getMovementFlags(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder): Int
+    fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int
     fun isLongPressDragEnabled(): Boolean
     fun onItemMove(fromPosition: Int, toPosition: Int): Boolean
     fun onItemSwipe(position: Int)
-    fun onSelectedChanged(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder?, actionState: Int)
-    fun clearView(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder)
+    fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int)
+    fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder)
 }

src/main/java/com/kdanmobile/reader/thumb/ItemTouchHelpCallback.kt

@@ -10,23 +10,23 @@ class ItemTouchHelpCallback (private val itemMoveSwipeListener: ItemMoveSwipeLis
         return itemMoveSwipeListener.isLongPressDragEnabled()
     }
 
-    override fun getMovementFlags(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder): Int {
+    override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
         return itemMoveSwipeListener.getMovementFlags(recyclerView,viewHolder)
     }
 
-    override fun onMove(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, target: androidx.recyclerview.widget.RecyclerView.ViewHolder): Boolean {
+    override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
         return itemMoveSwipeListener.onItemMove(viewHolder.adapterPosition, target.adapterPosition)
     }
-    override fun onSwiped(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, direction: Int) {
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
         itemMoveSwipeListener.onItemSwipe(viewHolder.adapterPosition)
     }
 
-    override fun clearView(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         itemMoveSwipeListener.clearView(recyclerView,viewHolder)
         super.clearView(recyclerView, viewHolder)
     }
 
-    override fun onSelectedChanged(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder?, actionState: Int) {
+    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
         itemMoveSwipeListener.onSelectedChanged(viewHolder, actionState)
         super.onSelectedChanged(viewHolder, actionState)
     }

src/main/java/com/kdanmobile/reader/thumb/PdfThumbAdapter.kt

@@ -18,7 +18,7 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.item_pdf_thumb.view.*
 
-class PdfThumbAdapter(var data: ThumbData, var handler: PageMoveHandler, private val thumbnailHandler: ThumbnailHandler): androidx.recyclerview.widget.RecyclerView.Adapter<PdfThumbAdapter.ViewHolder>(), ItemMoveSwipeListener {
+class PdfThumbAdapter(var data: ThumbData, var handler: PageMoveHandler, private val thumbnailHandler: ThumbnailHandler): RecyclerView.Adapter<PdfThumbAdapter.ViewHolder>(), ItemMoveSwipeListener {
 
     override fun getItemCount(): Int {
         return data.pageCount
@@ -40,7 +40,7 @@ class PdfThumbAdapter(var data: ThumbData, var handler: PageMoveHandler, private
         holder.stopLoadThumbSync()
     }
 
-    class ViewHolder (view : View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
+    class ViewHolder (view : View) : RecyclerView.ViewHolder(view) {
         private var disposable: Disposable? = null
 
         fun bind(thumbData: ThumbData, position: Int, thumbnailHandler: ThumbnailHandler) {
@@ -135,7 +135,7 @@ class PdfThumbAdapter(var data: ThumbData, var handler: PageMoveHandler, private
         return data.isEditMode
     }
 
-    override fun getMovementFlags(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder): Int {
+    override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
         val dragFlags = ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT or ItemTouchHelper.UP or ItemTouchHelper.DOWN
         val swipeFlags = 0
         return makeMovementFlags(dragFlags, swipeFlags)
@@ -150,13 +150,13 @@ class PdfThumbAdapter(var data: ThumbData, var handler: PageMoveHandler, private
     override fun onItemSwipe(position: Int) {
     }
 
-    override fun clearView(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         viewHolder.itemView.scaleX = 1.0f
         viewHolder.itemView.scaleY = 1.0f
         notifyDataSetChanged()
     }
 
-    override fun onSelectedChanged(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder?, actionState: Int) {
+    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
         if (actionState != ItemTouchHelper.ACTION_STATE_IDLE && null != viewHolder) {
             viewHolder.itemView.scaleX = 0.7f
             viewHolder.itemView.scaleY = 0.7f

src/main/java/com/kdanmobile/reader/thumb/PdfThumbDialogFragment.kt

@@ -29,7 +29,7 @@ import org.koin.core.parameter.parametersOf
 import java.io.File
 
 abstract class PdfThumbDialogFragment:
-        androidx.fragment.app.DialogFragment(),
+        DialogFragment(),
         PdfThumbAdapter.PageMoveHandler,
         ReadModuleKoinComponent {
     abstract fun provideIntent(): Intent
@@ -53,7 +53,7 @@ abstract class PdfThumbDialogFragment:
         get() = if (activity is PdfThumbFragmentListener) (activity as PdfThumbFragmentListener) else null
 
     private lateinit var toolbar_pdfThumb: Toolbar
-    private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
+    private lateinit var recyclerView: RecyclerView
 
     private var disposable: Disposable? = null
     private var editMode = EditMode()
@@ -129,12 +129,12 @@ abstract class PdfThumbDialogFragment:
                 .subscribe({
                     pdfThumbAdapter = PdfThumbAdapter(it,this, viewModel.thumbnailHandler)
                     recyclerView.adapter = pdfThumbAdapter
-                    recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity!!, columns)
+                    recyclerView.layoutManager = GridLayoutManager(activity!!, columns)
                     recyclerView.addOnItemTouchListener(object : OnRecyclerItemClickListener(recyclerView) {
-                        override fun onItemClick(vh: androidx.recyclerview.widget.RecyclerView.ViewHolder) {
+                        override fun onItemClick(vh: RecyclerView.ViewHolder) {
                             viewModel.mode.onPageItemClick(this@PdfThumbDialogFragment, vh.adapterPosition, viewModel.mapSelect, pdfThumbAdapter)
                         }
-                        override fun onItemLongClick(vh: androidx.recyclerview.widget.RecyclerView.ViewHolder) {}
+                        override fun onItemLongClick(vh: RecyclerView.ViewHolder) {}
                     })
                     recyclerView.scrollToPosition(viewModel.pdfInfoHandler.getCurrentPage())
                     val itemTouchHelperCallBack = ItemTouchHelpCallback(pdfThumbAdapter)

src/main/java/com/kdanmobile/reader/thumb/ThumbData.kt

@@ -12,7 +12,7 @@ class ThumbData {
     var isEditMode = false
     var pageCount = 0
     val maxMemory = Runtime.getRuntime().maxMemory() / 16
-    val pages: androidx.collection.LruCache<Int, Bitmap> = object: androidx.collection.LruCache<Int, Bitmap>(maxMemory.toInt()) {
+    val pages: LruCache<Int, Bitmap> = object: LruCache<Int, Bitmap>(maxMemory.toInt()) {
         override fun sizeOf(key: Int, value: Bitmap): Int {
             return value.byteCount
         }

src/main/java/com/kdanmobile/reader/view/NonSwipeableViewPage.kt

@@ -8,7 +8,7 @@ import android.view.MotionEvent
 class NonSwipeableViewPage @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null
-) : androidx.viewpager.widget.ViewPager(context, attrs) {
+) : ViewPager(context, attrs) {
 
     override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
         return false

src/main/java/com/kdanmobile/reader/widget/drag/OnRecyclerItemClickListener.kt

@@ -12,19 +12,19 @@ import android.view.View
  * @date：1/11/17 21:57
  * @description：监控RecyclerView的点击事件，单击，长按
  */
-abstract class OnRecyclerItemClickListener(private val recyclerView: androidx.recyclerview.widget.RecyclerView) : androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
+abstract class OnRecyclerItemClickListener(private val recyclerView: RecyclerView) : RecyclerView.OnItemTouchListener {
     private val mGestureDetector: GestureDetectorCompat
 
     init {
         mGestureDetector = GestureDetectorCompat(recyclerView.context, ItemTouchHelperGestureListener())
     }
 
-    override fun onInterceptTouchEvent(recyclerView: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
+    override fun onInterceptTouchEvent(recyclerView: RecyclerView, e: MotionEvent): Boolean {
         mGestureDetector.onTouchEvent(e)
         return false
     }
 
-    override fun onTouchEvent(recyclerView: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {
+    override fun onTouchEvent(recyclerView: RecyclerView, e: MotionEvent) {
         mGestureDetector.onTouchEvent(e)
     }
 
@@ -49,7 +49,7 @@ abstract class OnRecyclerItemClickListener(private val recyclerView: androidx.re
         }
     }
 
-    abstract fun onItemClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder)
+    abstract fun onItemClick(viewHolder: RecyclerView.ViewHolder)
 
-    abstract fun onItemLongClick(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder)
+    abstract fun onItemLongClick(viewHolder: RecyclerView.ViewHolder)
 }