PSPDFKit

Author: tamaskozmer

apps/buildSrc/src/main/java/GlobalDependencies.kt

@@ -25,7 +25,7 @@ object Versions {
 
     /* Others */
     const val APOLLO = "4.3.3"
-    const val NUTRIENT = "10.7.0"
+    const val NUTRIENT = "10.9.0"
     const val PHOTO_VIEW = "2.3.0"
     const val MOBIUS = "1.2.1"
     const val HILT = "2.57.2"
@@ -132,7 +132,7 @@ object Libs {
     const val COMPOSE_VIEW_MODEL = "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.LIFECYCLE}"
 
     /* Media and content handling */
-    const val NUTRIENT = "io.nutrient:nutrient:${Versions.NUTRIENT}" // TODO
+    const val NUTRIENT = "io.nutrient:nutrient:${Versions.NUTRIENT}"
     const val MEDIA3 = "androidx.media3:media3-exoplayer:${Versions.MEDIA3}"
     const val MEDIA3_UI = "androidx.media3:media3-ui:${Versions.MEDIA3}"
     const val MEDIA3_HLS = "androidx.media3:media3-exoplayer-hls:${Versions.MEDIA3}"

libs/annotations/src/main/java/com/instructure/annotations/PdfSubmissionView.kt

@@ -59,7 +59,13 @@ import com.pspdfkit.annotations.AnnotationFlags
 import com.pspdfkit.annotations.AnnotationProvider
 import com.pspdfkit.annotations.AnnotationType
 import com.pspdfkit.annotations.appearance.AssetAppearanceStreamGenerator
-import com.pspdfkit.annotations.configuration.*
+import com.pspdfkit.annotations.configuration.AnnotationProperty
+import com.pspdfkit.annotations.configuration.EraserToolConfiguration
+import com.pspdfkit.annotations.configuration.FreeTextAnnotationConfiguration
+import com.pspdfkit.annotations.configuration.InkAnnotationConfiguration
+import com.pspdfkit.annotations.configuration.MarkupAnnotationConfiguration
+import com.pspdfkit.annotations.configuration.ShapeAnnotationConfiguration
+import com.pspdfkit.annotations.configuration.StampAnnotationConfiguration
 import com.pspdfkit.annotations.stamps.CustomStampAppearanceStreamGenerator
 import com.pspdfkit.annotations.stamps.StampPickerItem
 import com.pspdfkit.configuration.PdfConfiguration
@@ -80,12 +86,16 @@ import com.pspdfkit.ui.special_mode.controller.AnnotationEditingController
 import com.pspdfkit.ui.special_mode.controller.AnnotationSelectionController
 import com.pspdfkit.ui.special_mode.controller.AnnotationTool
 import com.pspdfkit.ui.special_mode.manager.AnnotationManager
-import com.pspdfkit.ui.toolbar.*
+import com.pspdfkit.ui.toolbar.AnnotationCreationToolbar
+import com.pspdfkit.ui.toolbar.AnnotationEditingToolbar
+import com.pspdfkit.ui.toolbar.ContextualToolbar
+import com.pspdfkit.ui.toolbar.ContextualToolbarMenuItem
+import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import com.pspdfkit.ui.toolbar.grouping.MenuItemGroupingRule
 import kotlinx.coroutines.Job
 import okhttp3.Response
 import java.io.File
-import java.util.*
+import java.util.EnumSet
 
 @SuppressLint("ViewConstructor")
 abstract class PdfSubmissionView(context: Context, private val studentAnnotationView: Boolean = false, private val courseId: Long) : FrameLayout(context), AnnotationManager.OnAnnotationCreationModeChangeListener, AnnotationManager.OnAnnotationEditingModeChangeListener {
@@ -558,7 +568,11 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             }
         }
 
-        override fun onAnnotationZOrderChanged(p0: Int, p1: MutableList<Annotation>, p2: MutableList<Annotation>) {}
+        override fun onAnnotationZOrderChanged(
+            pageIndex: Int,
+            oldOrder: List<@JvmSuppressWildcards Annotation>,
+            newOrder: List<@JvmSuppressWildcards Annotation>
+        ) = Unit
     }
 
     private fun annotationNetworkCheck(annotation: Annotation): Boolean {