Просмотр исходного кода

Merge branch 'restoreAnnotationEditModeOnResume'

cooperku_kdanmobile 6 лет назад
Родитель
Сommit
8711e87aee

+ 5 - 0
src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -515,6 +515,11 @@ abstract class ReaderActivity : AppCompatActivity(), ReaderSettingListener, PdfT
         super.onStop()
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.restoreAnnotationEditMode()
+    }
+
     private fun onPageIndexChanged(pageIndex: Int?) {
         pageIndex?.also {
             viewModel.setBookmarkDisplay(pageIndex)

+ 4 - 0
src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -517,6 +517,10 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.NULL)
     }
 
+    fun restoreAnnotationEditMode() {
+        restoreStateBeforeDestroy()
+    }
+
     fun clearSelection() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.NULL)
         kmpdfFactory?.kmpdfAnnotEditMode?.pdfAnnotEditMode = KMPDFAnnotEditMode.Mode.NULL