Refactor: rename functions

src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -476,7 +476,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
         if (!filePath.isNullOrEmpty()) {
             val defaultValue = viewModel.pageIndexLiveData.value ?: 0
             val pageIndex = loadCurrentPageIndex(filePath as String, defaultValue)
-            viewModel.pdfInfoHandler.setCurrentPage(pageIndex)
+            viewModel.pdfInfoHandler.goToCurrentPage(pageIndex)
             viewModel.fileNameLiveData.postValue(File(filePath as String).name)
         }
         initTextBoxContextMenuActions()
@@ -859,13 +859,13 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
             val handler = viewModel.pdfInfoHandler
             val pageIndex = handler.getCurrentPage()
             val previousPageIndex = Math.max(pageIndex - 1, 0)
-            handler.setCurrentPage(previousPageIndex)
+            handler.goToCurrentPage(previousPageIndex)
         }
         ib_readerActivity_bottomToolbarNext.setOnClickListener {
             val handler = viewModel.pdfInfoHandler
             val pageIndex = handler.getCurrentPage()
             val nextPageIndex = Math.min(pageIndex + 1, handler.getPdfPageCount() - 1)
-            handler.setCurrentPage(nextPageIndex)
+            handler.goToCurrentPage(nextPageIndex)
         }
         ib_readerActivity_bottomToolbarKdanCloud.visibility = if (isBottomBarKdanCloudBtnVisible()) {
             View.VISIBLE

src/main/java/com/kdanmobile/reader/ReaderModel.kt

@@ -70,11 +70,11 @@ class ReaderModel {
             return kmpdfDocumentController?.currentPageNum ?: 0
         }
 
-        override fun setCurrentPage(page: Int): Boolean {
+        override fun goToCurrentPage(page: Int): Boolean {
             return kmpdfDocumentController?.gotoPage(page) ?: false
         }
 
-        override fun textLines(page: Int): Array<Array<TextWord>> {
+        override fun getTextLines(page: Int): Array<Array<TextWord>> {
             return kmpdfDocumentController?.textLines(page) ?: arrayOf()
         }
 

src/main/java/com/kdanmobile/reader/screen/handler/PdfInfoHandler.kt

@@ -11,9 +11,9 @@ interface PdfInfoHandler {
 
     fun getCurrentPage(): Int
 
-    fun setCurrentPage(page: Int): Boolean
+    fun goToCurrentPage(page: Int): Boolean
 
-    fun textLines(page: Int): Array<Array<TextWord>>
+    fun getTextLines(page: Int): Array<Array<TextWord>>
 
     fun getPageChars(page: Int): Array<Array<Array<Array<TextChar>>>>
 }

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

@@ -46,7 +46,7 @@ class BookmarkView: RelativeLayout, LeftToolbarView {
                 onScrollToPosition(viewHolder.adapterPosition, true)
                 val bookmark = adapter?.getItem(viewHolder.adapterPosition)
                 if (null != bookmark) {
-                    pdfInfoHandler?.setCurrentPage(bookmark.pageNum)
+                    pdfInfoHandler?.goToCurrentPage(bookmark.pageNum)
                 }
             }
 

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

@@ -39,7 +39,7 @@ class OutlineView: RelativeLayout, LeftToolbarView {
         lv_viewPdfReaderOutline_.setOnItemClickListener { _, _, position, _ ->
             val item = adapter?.getItem(position)
             if (null != item) {
-                pdfInfoHandler?.setCurrentPage(item.page)
+                pdfInfoHandler?.goToCurrentPage(item.page)
             }
         }
 

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

@@ -108,7 +108,7 @@ class SearchView: RelativeLayout, View.OnClickListener, LeftToolbarView {
                             val position = msg.arg1
                             val info = view.list[position]
                             view.searchHandler?.setSearchResult(info.page, info.keyword, info.rectList)
-                            view.pdfInfoHandler?.setCurrentPage(view.list[position].page)
+                            view.pdfInfoHandler?.goToCurrentPage(view.list[position].page)
                         }
                     }
                 }
@@ -280,7 +280,7 @@ class SearchView: RelativeLayout, View.OnClickListener, LeftToolbarView {
             if (isPage) {
                 val page = Integer.parseInt(searchText)
                 if (page > 0) {
-                    pdfInfoHandler?.setCurrentPage(page - 1)
+                    pdfInfoHandler?.goToCurrentPage(page - 1)
                 }
             } else if (searchText.length >= 3) {
                 if (list.size > 0) {

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

@@ -41,7 +41,7 @@ class ThumbnailView: RelativeLayout, LeftToolbarView {
         id_km_thumb_recycler.addOnItemTouchListener(object : OnRecyclerItemClickListener(id_km_thumb_recycler) {
             override fun onItemClick(viewHolder: RecyclerView.ViewHolder) {
                 onScrollToContent(viewHolder.adapterPosition, true)
-                pdfInfoHandler?.setCurrentPage(viewHolder.adapterPosition)
+                pdfInfoHandler?.goToCurrentPage(viewHolder.adapterPosition)
             }
 
             override fun onItemLongClick(viewHolder: RecyclerView.ViewHolder) {

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

@@ -214,7 +214,7 @@ abstract class PdfThumbDialogFragment: DialogFragment(), PdfThumbAdapter.PageMov
                 onModeSwitched()
             }
             false -> {
-                viewModel.pdfInfoHandler.setCurrentPage(viewModel.pdfInfoHandler.getCurrentPage())
+                viewModel.pdfInfoHandler.goToCurrentPage(viewModel.pdfInfoHandler.getCurrentPage())
                 dismiss()
             }
         }
@@ -331,6 +331,6 @@ abstract class PdfThumbDialogFragment: DialogFragment(), PdfThumbAdapter.PageMov
     }
 
     fun moveToPage(pageIndex: Int) {
-        viewModel.pdfInfoHandler.setCurrentPage(pageIndex)
+        viewModel.pdfInfoHandler.goToCurrentPage(pageIndex)
     }
 }

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

@@ -172,11 +172,11 @@ class PdfThumbViewModel(private val readerModel: ReaderModel): ViewModel() {
         // update selected page
         val currentPage = pdfInfoHandler.getCurrentPage()
         if (currentPage < 0) {
-            pdfInfoHandler.setCurrentPage(0)
+            pdfInfoHandler.goToCurrentPage(0)
             thumbData.currentPage = 0
         }
         else if (currentPage >= pdfPageCount) {
-            pdfInfoHandler.setCurrentPage(pdfPageCount - 1)
+            pdfInfoHandler.goToCurrentPage(pdfPageCount - 1)
             thumbData.currentPage = pdfPageCount - 1
         }
     }