Преглед изворни кода

Refactor: rename 'isPdf' to 'isNoPasswordProtectedPdf'

cooperku_kdanmobile пре 5 година
родитељ
комит
ca9b73c961

+ 9 - 7
src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -273,11 +273,13 @@ abstract class ReaderActivity :
     }
 
     fun isPdf(): Boolean {
-        var isPdf = filePath?.toLowerCase(Locale.US)?.endsWith(".pdf") ?: false
+        return filePath?.toLowerCase(Locale.US)?.endsWith(".pdf") ?: false
+    }
+
+    fun isNoPasswordProtectedPdf(): Boolean {
         //  TODO this workaround should be removed in the future
         //  workaround: password-protected pdf is not editable
-        isPdf = isPdf && !isPasswordProtected
-        return isPdf
+        return isPdf() && !isPasswordProtected
     }
 
     final override fun onBackPressed() {
@@ -295,7 +297,7 @@ abstract class ReaderActivity :
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
             menu?.findItem(R.id.item_reader_more_print)?.isVisible = false
         }
-        if (!isPdf()) {
+        if (!isNoPasswordProtectedPdf()) {
             menu?.apply {
                 findItem(R.id.item_reader_more_text_reflow)?.isVisible = false
                 findItem(R.id.item_reader_more_clear_signature)?.isVisible = false
@@ -816,7 +818,7 @@ abstract class ReaderActivity :
         iv_readerActivity_outline.setOnClickListener { onClickLeftToolbarItem(ReaderViewModel.LeftToolbarType.OUTLINE) }
         iv_readerActivity_search.setOnClickListener { onClickLeftToolbarItem(ReaderViewModel.LeftToolbarType.SEARCH) }
 
-        if (!isPdf()) {
+        if (!isNoPasswordProtectedPdf()) {
             iv_readerActivity_bookmark.visibility = View.GONE
             if (!isPasswordProtected) iv_readerActivity_outline.visibility = View.GONE
         }
@@ -955,7 +957,7 @@ abstract class ReaderActivity :
             onClickShare()
         }
 
-        if (!isPdf()) {
+        if (!isNoPasswordProtectedPdf()) {
             ib_readerActivity_bottomToolbarMediaBox.visibility = View.GONE
         }
     }
@@ -1161,7 +1163,7 @@ abstract class ReaderActivity :
             }
         }
 
-        if (!isPdf()) {
+        if (!isNoPasswordProtectedPdf()) {
             iv_readerActivity_highLight.visibility = View.GONE
             iv_readerActivity_strike.visibility = View.GONE
             iv_readerActivity_underline.visibility = View.GONE

+ 2 - 2
src/main/java/com/kdanmobile/reader/thumb/PdfThumbDialogFragment.kt

@@ -177,7 +177,7 @@ abstract class PdfThumbDialogFragment:
                     val isExtractEnable = viewModel.hasSelectItem()
                     val isRotateEnable = viewModel.hasSelectItem()
                     val isDeleteEnable = viewModel.hasSelectItem() && !viewModel.isAllItemSelect()
-                    val visible = viewModel.isPdf
+                    val visible = viewModel.isNoPasswordProtectedPdf
                     menu.findItem(R.id.item_action_edit_thumb).isVisible = false
                     menu.findItem(R.id.item_action_select_all_thumb)
                             .setVisible(visible)
@@ -190,7 +190,7 @@ abstract class PdfThumbDialogFragment:
                             .setVisible(visible).isEnabled = isDeleteEnable
                 }
                 false -> {
-                    val visible = viewModel.isPdf
+                    val visible = viewModel.isNoPasswordProtectedPdf
                     menu.findItem(R.id.item_action_edit_thumb).isVisible = visible
                     menu.findItem(R.id.item_action_select_all_thumb).isVisible = false
                     menu.findItem(R.id.item_action_extract_thumb).isVisible = false

+ 3 - 3
src/main/java/com/kdanmobile/reader/thumb/PdfThumbViewModel.kt

@@ -25,7 +25,7 @@ class PdfThumbViewModel(private val readerModel: ReaderModel): ViewModel() {
     val mapSelect: MutableMap<Int, Boolean> = HashMap()
     var mode: Mode = normalMode
     var isEdit = false
-    var isPdf = false
+    var isNoPasswordProtectedPdf = false
 
     val pdfInfoHandler = readerModel.pdfInfoHandler
 
@@ -38,10 +38,10 @@ class PdfThumbViewModel(private val readerModel: ReaderModel): ViewModel() {
     val passwordHandler = readerModel.passwordHandler
 
     init {
-        isPdf = kmpdfFactory?.fileName?.toLowerCase(Locale.US)?.endsWith(".pdf") ?: false
+        isNoPasswordProtectedPdf = kmpdfFactory?.fileName?.toLowerCase(Locale.US)?.endsWith(".pdf") ?: false
         //  TODO this workaround should be removed in the future
         //  workaround: password-protected pdf is not editable
-        isPdf = isPdf && !(kmpdfFactory?.needPassWord() ?: false)
+        isNoPasswordProtectedPdf = isNoPasswordProtectedPdf && !(kmpdfFactory?.needPassWord() ?: false)
         pageCount = kmpdfDocumentController?.getDocumentPageCount(false) ?: 0
         setAllUnSelect()
     }