Merge branch 'fix-text'

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

@@ -29,7 +29,6 @@ import com.kdanmobile.reader.screen.data.SignatureAttribute
 import com.kdanmobile.reader.screen.data.StampAttribute
 import com.kdanmobile.reader.screen.data.TextBoxAttribute
 import com.kdanmobile.reader.screen.handler.*
-import com.kdanmobile.reader.thumb.PdfThumbViewModel
 import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
@@ -377,6 +376,8 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
         setSignatureContextMenuActions()
         setStampContextMenuActions()
         setShapeContextMenuActions()
+        setInkMenuActions()
+        setMarkerUpMenuActions()
 
         if (!isFirst) {
             restoreStateBeforeDestroy()
@@ -413,29 +414,53 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
     private fun setStampContextMenuActions() {
         val item = KMPDFMenuItem()
         item.annotType = KMPDFMenuItem.AnnotType.STAMP
-        item.menu_resId = R.menu.context_menu_stamp
+        item.menu_resId = R.menu.context_menu_normal
         item.menuCallbacks.add(MenuItemCallback { view, annotType ->
             (kmpdfFactory?.getController(KMPDFFactory.ControllerType.STAMP) as KMPDFStampController).deleteStampAnnotView()
             return@MenuItemCallback true
         })
-        item.menuCallbacks.add(MenuItemCallback { view, annotType ->
-            saveModifyingAnnotation()
-            return@MenuItemCallback true
-        })
         kmpdfFactory?.setAnnotationContextMenu(item)
     }
 
     private fun setShapeContextMenuActions() {
         val item = KMPDFMenuItem()
         item.annotType = KMPDFMenuItem.AnnotType.LINE
-        item.menu_resId = R.menu.context_menu_shape
+        item.menu_resId = R.menu.context_menu_normal
         item.menuCallbacks.add(MenuItemCallback { view, annotType ->
             (kmpdfFactory?.getController(KMPDFFactory.ControllerType.SHAPE) as KMPDFShapeAnnotController).deleteShapeAnnotView()
             return@MenuItemCallback true
         })
-        item.menuCallbacks.add(MenuItemCallback { view, annotType ->
-            saveModifyingAnnotation()
-            return@MenuItemCallback true
+        kmpdfFactory?.setAnnotationContextMenu(item)
+    }
+
+    private fun setInkMenuActions() {
+        val item = KMPDFMenuItem()
+        item.annotType = KMPDFMenuItem.AnnotType.INK
+        item.menu_resId = R.menu.context_menu_normal
+        item.menuCallbacks.add(MenuItemCallback { _, _ ->
+            kmpdfFactory?.let {
+                val controller = it.getController(KMPDFFactory.ControllerType.INK) as KMPDFInkController
+                controller.deleteInkAnnotView()
+                return@MenuItemCallback true
+            }
+            return@MenuItemCallback false
+        })
+        kmpdfFactory?.setAnnotationContextMenu(item)
+    }
+
+    private fun setMarkerUpMenuActions() {
+        val item = KMPDFMenuItem()
+        /** Just set HIGH_LIGHT then highlight, strike, underline will be triggered. **/
+        /** WTF !!!!!!!!!!! **/
+        item.annotType = KMPDFMenuItem.AnnotType.HIGH_LIGHT
+        item.menu_resId = R.menu.context_menu_normal
+        item.menuCallbacks.add(MenuItemCallback { _, _ ->
+            kmpdfFactory?.let {
+                val controller = it.getController(KMPDFFactory.ControllerType.MARKER_UP) as KMPDFMarkupController
+                controller.deleteMarkupAnnotView()
+                return@MenuItemCallback true
+            }
+            return@MenuItemCallback false
         })
         kmpdfFactory?.setAnnotationContextMenu(item)
     }

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

@@ -294,8 +294,8 @@ abstract class PdfThumbActivity: AppCompatActivity(), PdfThumbAdapter.PageMoveHa
         } else {
             val builder = AlertDialog.Builder(this)
             builder.setMessage(R.string.pdf_thumb_delete_check_dialog_msg)
-            builder.setNegativeButton(R.string.common_cancel) { dialog, _ -> dialog.dismiss() }
-            builder.setPositiveButton(R.string.common_okay) { _, _ ->
+            builder.setNegativeButton(android.R.string.no) { dialog, _ -> dialog.dismiss() }
+            builder.setPositiveButton(android.R.string.yes) { _, _ ->
                 viewModel.pageDelete(Runnable {
                     viewModel.setAllUnSelect()
                     updateToolbar()

src/main/res/menu/context_menu_normal.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:title="@string/contextMenu_normal_delete" />
+
+</menu>

src/main/res/menu/context_menu_shape.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:title="@string/contextMenu_shape_delete" />
-
-    <item
-        android:title="@string/contextMenu_shape_ok" />
-
-</menu>

src/main/res/menu/context_menu_stamp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-<item
-    android:title="@string/contextMenu_stamp_delete" />
-
-<item
-    android:title="@string/contextMenu_stamp_ok" />
-
-</menu>

src/main/res/values-de/strings.xml

@@ -77,9 +77,6 @@
     <string name="contextMenu_textbox_copy">Kopieren</string>
     <string name="contextMenu_signature_delete">Löschen</string>
     <string name="contextMenu_signature_add">HINZUFÜGEN</string>
-    <string name="contextMenu_stamp_delete">Löschen</string>
-    <string name="contextMenu_stamp_ok">Ok</string>
-    <string name="contextMenu_shape_delete">Löschen</string>
-    <string name="contextMenu_shape_ok">Ok</string>
     <string name="reader_mediaBox_signature_brushSize">Pinselgröße</string>
+    <string name="contextMenu_normal_delete">Löschen</string>
 </resources>

src/main/res/values-es/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">Copia</string>
     <string name="contextMenu_signature_delete">Eliminar</string>
     <string name="contextMenu_signature_add">AGREGAR</string>
-    <string name="contextMenu_stamp_delete">Eliminar</string>
-    <string name="contextMenu_stamp_ok">De acuerdo</string>
-    <string name="contextMenu_shape_delete">Eliminar</string>
-    <string name="contextMenu_shape_ok">De acuerdo</string>
     <string name="reader_mediaBox_signature_brushSize">Tamaño del Broche</string>
+    <string name="contextMenu_normal_delete">Eliminar</string>
 </resources>

src/main/res/values-fr/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">Copier</string>
     <string name="contextMenu_signature_delete">Supprimer</string>
     <string name="contextMenu_signature_add">AJOUTER</string>
-    <string name="contextMenu_stamp_delete">Supprimer</string>
-    <string name="contextMenu_stamp_ok">Ok</string>
-    <string name="contextMenu_shape_delete">Supprimer</string>
-    <string name="contextMenu_shape_ok">Ok</string>
     <string name="reader_mediaBox_signature_brushSize">Taille de Brosse</string>
+    <string name="contextMenu_normal_delete">Supprimer</string>
 </resources>

src/main/res/values-it/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">Copia</string>
     <string name="contextMenu_signature_delete">Cancellare</string>
     <string name="contextMenu_signature_add">AGGIUNGERE</string>
-    <string name="contextMenu_stamp_delete">Cancellare</string>
-    <string name="contextMenu_stamp_ok">OK</string>
-    <string name="contextMenu_shape_delete">Cancellare</string>
-    <string name="contextMenu_shape_ok">OK</string>
     <string name="reader_mediaBox_signature_brushSize">Dimensione pennello</string>
+    <string name="contextMenu_normal_delete">Cancellare</string>
 </resources>

src/main/res/values-ja/strings.xml

@@ -75,9 +75,6 @@
     <string name="contextMenu_textbox_copy">コピー</string>
     <string name="contextMenu_signature_delete">削除</string>
     <string name="contextMenu_signature_add">追加</string>
-    <string name="contextMenu_stamp_delete">削除</string>
-    <string name="contextMenu_stamp_ok">OK</string>
-    <string name="contextMenu_shape_delete">削除</string>
-    <string name="contextMenu_shape_ok">OK</string>
     <string name="reader_mediaBox_signature_brushSize">ブラシサイズ</string>
+    <string name="contextMenu_normal_delete">削除</string>
 </resources>

src/main/res/values-ko/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">복사</string>
     <string name="contextMenu_signature_delete">삭제</string>
     <string name="contextMenu_signature_add">추가</string>
-    <string name="contextMenu_stamp_delete">삭제</string>
-    <string name="contextMenu_stamp_ok">확인</string>
-    <string name="contextMenu_shape_delete">삭제</string>
-    <string name="contextMenu_shape_ok">확인</string>
     <string name="reader_mediaBox_signature_brushSize">브러시 크기</string>
+    <string name="contextMenu_normal_delete">삭제</string>
 </resources>

src/main/res/values-pt/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">Copiar</string>
     <string name="contextMenu_signature_delete">Apagar</string>
     <string name="contextMenu_signature_add">ADICIONAR</string>
-    <string name="contextMenu_stamp_delete">Apagar</string>
-    <string name="contextMenu_stamp_ok">ОК</string>
-    <string name="contextMenu_shape_delete">Apagar</string>
-    <string name="contextMenu_shape_ok">ОК</string>
     <string name="reader_mediaBox_signature_brushSize">Tamanho da Escova</string>
+    <string name="contextMenu_normal_delete">Apagar</string>
 </resources>

src/main/res/values-ru/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">Копировать</string>
     <string name="contextMenu_signature_delete">Удалить</string>
     <string name="contextMenu_signature_add">ДОБАВИТЬ</string>
-    <string name="contextMenu_stamp_delete">Удалить</string>
-    <string name="contextMenu_stamp_ok">ОК</string>
-    <string name="contextMenu_shape_delete">Удалить</string>
-    <string name="contextMenu_shape_ok">ОК</string>
     <string name="reader_mediaBox_signature_brushSize">Размер кисти</string>
+    <string name="contextMenu_normal_delete">Удалить</string>
 </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">複製</string>
     <string name="contextMenu_signature_delete">删除</string>
     <string name="contextMenu_signature_add">新增</string>
-    <string name="contextMenu_stamp_delete">删除</string>
-    <string name="contextMenu_stamp_ok">確定</string>
-    <string name="contextMenu_shape_delete">删除</string>
-    <string name="contextMenu_shape_ok">確定</string>
     <string name="reader_mediaBox_signature_brushSize">筆刷大小</string>
+    <string name="contextMenu_normal_delete">删除</string>
 </resources>

src/main/res/values-zh/strings.xml

@@ -76,9 +76,6 @@
     <string name="contextMenu_textbox_copy">复制</string>
     <string name="contextMenu_signature_delete">删除</string>
     <string name="contextMenu_signature_add">新增</string>
-    <string name="contextMenu_stamp_delete">删除</string>
-    <string name="contextMenu_stamp_ok">确定</string>
-    <string name="contextMenu_shape_delete">删除</string>
-    <string name="contextMenu_shape_ok">确定</string>
     <string name="reader_mediaBox_signature_brushSize">笔刷大小</string>
+    <string name="contextMenu_normal_delete">删除</string>
 </resources>

src/main/res/values/strings.xml

@@ -55,10 +55,7 @@
     <string name="contextMenu_textbox_copy">Copy</string>
     <string name="contextMenu_signature_delete">Delete</string>
     <string name="contextMenu_signature_add">Add</string>
-    <string name="contextMenu_stamp_delete">Delete</string>
-    <string name="contextMenu_stamp_ok">OK</string>
-    <string name="contextMenu_shape_delete">Delete</string>
-    <string name="contextMenu_shape_ok">OK</string>
+    <string name="contextMenu_normal_delete">Delete</string>
 
     <!--MediaBox-->
     <string name="reader_mediaBox_textBox_title">Text Box Tool</string>