From 17edcc436ac15a4836118d1a16978acd2f008933 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 13 Dec 2022 14:48:43 -0800
Subject: [PATCH] add note option at time of highlight

---
 .../src/main/java/app/omnivore/omnivore/AppModule.kt   |  1 +
 .../java/app/omnivore/omnivore/ui/reader/WebReader.kt  |  2 +-
 .../app/src/main/res/menu/pdf_text_selection_menu.xml  | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/AppModule.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/AppModule.kt
index 246dcdd96..7acc7aad2 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/AppModule.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/AppModule.kt
@@ -32,6 +32,7 @@ object AppModule {
   ): Analytics {
     val writeKey = app.getString(R.string.segment_write_key)
 
+    // TODO: abstract analytics to custom class
     return Analytics(writeKey, app.applicationContext) {
       trackApplicationLifecycleEvents = true
       application = app.applicationContext
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
index debcfefbb..7b4417258 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
@@ -270,7 +270,7 @@ class OmnivoreWebView(context: Context) : WebView(context) {
     // Called when the user selects a contextual menu item
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
       return when (item.itemId) {
-        R.id.annotateHighlight -> {
+        R.id.annotateHighlight, R.id.annotate -> {
           val script = "var event = new Event('annotate');document.dispatchEvent(event);"
           evaluateJavascript(script) {
             mode.finish()
diff --git a/android/Omnivore/app/src/main/res/menu/pdf_text_selection_menu.xml b/android/Omnivore/app/src/main/res/menu/pdf_text_selection_menu.xml
index 37f081f74..3e0b9a8c0 100644
--- a/android/Omnivore/app/src/main/res/menu/pdf_text_selection_menu.xml
+++ b/android/Omnivore/app/src/main/res/menu/pdf_text_selection_menu.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/copyPdfHighlight"
+        android:title="@string/pdf_highlight_copy"
+        app:showAsAction="always">
+    </item>
+
     <item
         android:id="@+id/createHighlight"
         android:title="@string/pdf_highlight_menu_action"
@@ -8,8 +14,8 @@
     </item>
 
     <item
-        android:id="@+id/copyPdfHighlight"
-        android:title="@string/pdf_highlight_copy"
+        android:id="@+id/annotate"
+        android:title="@string/pdf_highlight_menu_note"
         app:showAsAction="always">
     </item>
 </menu>