Skip to content

Commit 8f62667

Browse files
committed
Revert PSPDFKit update
1 parent 24af880 commit 8f62667

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Versions {
2525

2626
/* Others */
2727
const val APOLLO = "4.3.3"
28-
const val NUTRIENT = "10.9.0"
28+
const val NUTRIENT = "10.7.0"
2929
const val PHOTO_VIEW = "2.3.0"
3030
const val MOBIUS = "1.2.1"
3131
const val HILT = "2.57.2"

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ import com.pspdfkit.annotations.AnnotationFlags
5959
import com.pspdfkit.annotations.AnnotationProvider
6060
import com.pspdfkit.annotations.AnnotationType
6161
import com.pspdfkit.annotations.appearance.AssetAppearanceStreamGenerator
62-
import com.pspdfkit.annotations.configuration.AnnotationProperty
63-
import com.pspdfkit.annotations.configuration.EraserToolConfiguration
64-
import com.pspdfkit.annotations.configuration.FreeTextAnnotationConfiguration
65-
import com.pspdfkit.annotations.configuration.InkAnnotationConfiguration
66-
import com.pspdfkit.annotations.configuration.MarkupAnnotationConfiguration
67-
import com.pspdfkit.annotations.configuration.ShapeAnnotationConfiguration
68-
import com.pspdfkit.annotations.configuration.StampAnnotationConfiguration
62+
import com.pspdfkit.annotations.configuration.*
6963
import com.pspdfkit.annotations.stamps.CustomStampAppearanceStreamGenerator
7064
import com.pspdfkit.annotations.stamps.StampPickerItem
7165
import com.pspdfkit.configuration.PdfConfiguration
@@ -86,16 +80,12 @@ import com.pspdfkit.ui.special_mode.controller.AnnotationEditingController
8680
import com.pspdfkit.ui.special_mode.controller.AnnotationSelectionController
8781
import com.pspdfkit.ui.special_mode.controller.AnnotationTool
8882
import com.pspdfkit.ui.special_mode.manager.AnnotationManager
89-
import com.pspdfkit.ui.toolbar.AnnotationCreationToolbar
90-
import com.pspdfkit.ui.toolbar.AnnotationEditingToolbar
91-
import com.pspdfkit.ui.toolbar.ContextualToolbar
92-
import com.pspdfkit.ui.toolbar.ContextualToolbarMenuItem
93-
import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
83+
import com.pspdfkit.ui.toolbar.*
9484
import com.pspdfkit.ui.toolbar.grouping.MenuItemGroupingRule
9585
import kotlinx.coroutines.Job
9686
import okhttp3.Response
9787
import java.io.File
98-
import java.util.EnumSet
88+
import java.util.*
9989

10090
@SuppressLint("ViewConstructor")
10191
abstract class PdfSubmissionView(context: Context, private val studentAnnotationView: Boolean = false, private val courseId: Long) : FrameLayout(context), AnnotationManager.OnAnnotationCreationModeChangeListener, AnnotationManager.OnAnnotationEditingModeChangeListener {
@@ -568,11 +558,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
568558
}
569559
}
570560

571-
override fun onAnnotationZOrderChanged(
572-
pageIndex: Int,
573-
oldOrder: List<@JvmSuppressWildcards Annotation>,
574-
newOrder: List<@JvmSuppressWildcards Annotation>
575-
) = Unit
561+
override fun onAnnotationZOrderChanged(p0: Int, p1: MutableList<Annotation>, p2: MutableList<Annotation>) {}
576562
}
577563

578564
private fun annotationNetworkCheck(annotation: Annotation): Boolean {

0 commit comments

Comments
 (0)