Bugfixes for underline and freeText annotation sync.

Hiding incomplete underline and text annotations UI from sidebar. Upping versionCode to 100
zotero · Sep 16, 2024 · ec394d8 · ec394d8
1 parent 2f45aff
commit ec394d8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/app/src/main/java/org/zotero/android/database/objects/AnnotationType.kt b/app/src/main/java/org/zotero/android/database/objects/AnnotationType.kt
@@ -1,12 +1,12 @@
 package org.zotero.android.database.objects
 
-enum class AnnotationType(val str: String) {
-    note(""),
-    highlight(""),
-    image(""),
-    ink(""),
-    underline(""),
-    freeText("text");
+enum class AnnotationType() {
+    note,
+    highlight,
+    image,
+    ink,
+    underline,
+    text;
 
 
     val kind: com.pspdfkit.annotations.AnnotationType
@@ -17,7 +17,7 @@ enum class AnnotationType(val str: String) {
                 image -> com.pspdfkit.annotations.AnnotationType.SQUARE
                 ink -> com.pspdfkit.annotations.AnnotationType.INK
                 underline -> com.pspdfkit.annotations.AnnotationType.UNDERLINE
-                freeText -> com.pspdfkit.annotations.AnnotationType.FREETEXT
+                text -> com.pspdfkit.annotations.AnnotationType.FREETEXT
             }
         }
 }

diff --git a/app/src/main/java/org/zotero/android/database/objects/AnnotationsConfig.kt b/app/src/main/java/org/zotero/android/database/objects/AnnotationsConfig.kt
@@ -23,8 +23,8 @@ object AnnotationsConfig {
         AnnotationType.HIGHLIGHT,
         AnnotationType.SQUARE,
         AnnotationType.INK,
-        AnnotationType.UNDERLINE,
-        AnnotationType.FREETEXT,
+//        AnnotationType.UNDERLINE,
+//        AnnotationType.FREETEXT,
     )
     val keyKey = "Zotero:Key"
     val noteAnnotationSize = Pair(22F, 22F)
@@ -65,7 +65,7 @@ object AnnotationsConfig {
 
     fun colors(type: org.zotero.android.database.objects.AnnotationType): List<String> {
         return when (type) {
-            org.zotero.android.database.objects.AnnotationType.ink, org.zotero.android.database.objects.AnnotationType.freeText -> {
+            org.zotero.android.database.objects.AnnotationType.ink, org.zotero.android.database.objects.AnnotationType.text -> {
                 listOf(
                     "#ffd400",
                     "#ff6666",

diff --git a/app/src/main/java/org/zotero/android/database/objects/FieldKeys.kt b/app/src/main/java/org/zotero/android/database/objects/FieldKeys.kt
@@ -180,7 +180,7 @@ class FieldKeys {
                                 KeyBaseKeyPair(key = sortIndex, baseKey = null),
                             )
                         }
-                        AnnotationType.freeText -> {
+                        AnnotationType.text -> {
                             return listOf(
                                 KeyBaseKeyPair(key = type, baseKey = null),
                                 KeyBaseKeyPair(key = comment, baseKey = null),
@@ -241,7 +241,7 @@ class FieldKeys {
                             )
                         }
 
-                        AnnotationType.freeText -> {
+                        AnnotationType.text -> {
                             return listOf(
                                 KeyBaseKeyPair(key = Companion.type, baseKey = null),
                                 KeyBaseKeyPair(key = comment, baseKey = null),

diff --git a/app/src/main/java/org/zotero/android/database/objects/RItem.kt b/app/src/main/java/org/zotero/android/database/objects/RItem.kt
@@ -299,7 +299,7 @@ open class RItem : Updatable, Deletable, Syncable, RealmObject() {
                 jsonData[FieldKeys.Item.Annotation.Position.paths] = apiPaths
             }
 
-            AnnotationType.highlight, AnnotationType.image, AnnotationType.note, AnnotationType.underline, AnnotationType.freeText -> {
+            AnnotationType.highlight, AnnotationType.image, AnnotationType.note, AnnotationType.underline, AnnotationType.text -> {
                 val rectArray = mutableListOf<List<Double>>()
                 this.rects.forEach { rRect ->
                     rectArray.add(

diff --git a/app/src/main/java/org/zotero/android/database/requests/ReadAnnotationsDbRequest.kt b/app/src/main/java/org/zotero/android/database/requests/ReadAnnotationsDbRequest.kt
@@ -28,7 +28,7 @@ class ReadAnnotationsDbRequest(
             .parent(this.attachmentKey, this.libraryId)
             .items(type = ItemTypes.annotation, notSyncState = ObjectSyncState.dirty)
             .deleted(false)
-            .rawPredicate("annotationType in %@", supportedTypes)
+            .`in`("annotationType", supportedTypes.toTypedArray())
             .sort("annotationSortIndex", Sort.ASCENDING)
             .findAll()
     }

diff --git a/app/src/main/java/org/zotero/android/pdf/annotation/PdfAnnotationRows.kt b/app/src/main/java/org/zotero/android/pdf/annotation/PdfAnnotationRows.kt
@@ -46,7 +46,7 @@ internal fun PdfAnnotationHeaderRow(
         AnnotationType.image -> Drawables.area_large
         AnnotationType.ink -> Drawables.ink_large
         AnnotationType.underline -> Drawables.ink_large // TODO set correct icon
-        AnnotationType.freeText -> Drawables.ink_large// TODO set correct icon
+        AnnotationType.text -> Drawables.ink_large// TODO set correct icon
     }
     Box(modifier = Modifier.fillMaxWidth()) {
         Row(

diff --git a/app/src/main/java/org/zotero/android/pdf/data/PDFAnnotation.kt b/app/src/main/java/org/zotero/android/pdf/data/PDFAnnotation.kt
@@ -41,7 +41,7 @@ interface PDFAnnotation {
 
             }
 
-            AnnotationType.note, AnnotationType.highlight, AnnotationType.image, AnnotationType.underline, AnnotationType.freeText -> {
+            AnnotationType.note, AnnotationType.highlight, AnnotationType.image, AnnotationType.underline, AnnotationType.text -> {
                 val rects = rects(boundingBoxConverter = boundingBoxConverter)
                 if (rects.size == 1) {
                     return rects[0].rounded(3)

diff --git a/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderViewModel.kt b/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderViewModel.kt
@@ -1073,7 +1073,7 @@ class PdfReaderViewModel @Inject constructor(
                     return false
                 }
             }
-            org.zotero.android.database.objects.AnnotationType.freeText -> {
+            org.zotero.android.database.objects.AnnotationType.text -> {
                 if (databaseAnnotation.item.rects.isEmpty()) {
                     Timber.i("PDFReaderActionHandler: ${databaseAnnotation.type} annotation ${databaseAnnotation.key} missing rects")
                     return false
@@ -1677,7 +1677,7 @@ class PdfReaderViewModel @Inject constructor(
                 }
             }
 
-            org.zotero.android.database.objects.AnnotationType.image, org.zotero.android.database.objects.AnnotationType.freeText -> {
+            org.zotero.android.database.objects.AnnotationType.image, org.zotero.android.database.objects.AnnotationType.text -> {
                 val newBoundingBox =
                     annotation.boundingBox(boundingBoxConverter = annotationBoundingBoxConverter)
                 if (pdfAnnotation.boundingBox.rounded(3) != newBoundingBox) {

diff --git a/...rc/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderAnnotationsSidebarRowParts.kt b/...rc/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderAnnotationsSidebarRowParts.kt
@@ -56,7 +56,7 @@ internal fun PdfReaderAnnotationsSidebarHeaderSection(
         AnnotationType.image -> Drawables.area_large
         AnnotationType.ink -> Drawables.ink_large
         AnnotationType.underline -> Drawables.ink_large //TODO correct icon
-        AnnotationType.freeText -> Drawables.ink_large //TODO correct icon
+        AnnotationType.text -> Drawables.ink_large //TODO correct icon
     }
     Row(
         modifier = Modifier

diff --git a/app/src/main/java/org/zotero/android/sync/AnnotationConverter.kt b/app/src/main/java/org/zotero/android/sync/AnnotationConverter.kt
@@ -115,7 +115,7 @@ class AnnotationConverter {
                     alpha = alpha,
                     boundingBoxConverter = boundingBoxConverter
                 )
-                AnnotationType.freeText -> annotation = freeTextAnnotation(
+                AnnotationType.text -> annotation = freeTextAnnotation(
                     zoteroAnnotation,
                     color = color,
                     boundingBoxConverter = boundingBoxConverter
@@ -366,7 +366,7 @@ class AnnotationConverter {
                 text = underlineAnnotation.highlightedText
                 paths = emptyList()
             } else if (freeTextAnnotation != null) {
-                type = AnnotationType.freeText
+                type = AnnotationType.text
                 fontSize = annotation.textSize
                 rotation = annotation.rotation
                 paths = emptyList()

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val compileSdkVersion = 34
     const val targetSdk = 34
 
-    val versionCode = 99 // Must be updated on every build
+    val versionCode = 100 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,