From 84de7ea640b8ee0debeed54a34fd8b458cfd509a Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 11 Oct 2022 22:13:31 -0700
Subject: [PATCH] move annotation view into web reader container

---
 .../omnivore/omnivore/ui/reader/WebReader.kt  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

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 d08c4b857..8aeb8e619 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
@@ -47,6 +47,7 @@ fun WebReaderLoadingContainer(slug: String, webReaderViewModel: WebReaderViewMod
   var webPreferences by remember { mutableStateOf(defaultWebPreferences ) }
 
   val webReaderParams: WebReaderParams? by webReaderViewModel.webReaderParamsLiveData.observeAsState(null)
+  val annotation: String? by webReaderViewModel.annotationLiveData.observeAsState(null)
 
   val maxToolbarHeight = 48.dp
   val maxToolbarHeightPx = with(LocalDensity.current) { maxToolbarHeight.roundToPx().toFloat() }
@@ -116,6 +117,18 @@ fun WebReaderLoadingContainer(slug: String, webReaderViewModel: WebReaderViewMod
           showWebPreferencesDialog = false
         }
       }
+
+      if (annotation != null) {
+        AnnotationEditView(
+          initialAnnotation = annotation!!,
+          onSave = {
+            webReaderViewModel.saveAnnotation(it)
+          },
+          onCancel = {
+            webReaderViewModel.cancelAnnotationEdit()
+          }
+        )
+      }
     }
   } else {
     // TODO: add a proper loading view
@@ -130,8 +143,6 @@ fun WebReader(
   preferences: WebPreferences,
   webReaderViewModel: WebReaderViewModel
 ) {
-  val annotation: String? by webReaderViewModel.annotationLiveData.observeAsState(null)
-
   val javascriptActionLoopUUID: UUID by webReaderViewModel
     .javascriptActionLoopUUIDLiveData
     .observeAsState(UUID.randomUUID())
@@ -195,18 +206,6 @@ fun WebReader(
         webReaderViewModel.resetJavascriptDispatchQueue()
       }
     })
-
-    if (annotation != null) {
-      AnnotationEditView(
-        initialAnnotation = annotation!!,
-        onSave = {
-          webReaderViewModel.saveAnnotation(it)
-        },
-        onCancel = {
-          webReaderViewModel.cancelAnnotationEdit()
-        }
-      )
-    }
   }
 }