Migrating PSPDFKIT to version 2024.8.1,

Also migrating: androidx material lib to 1.7.1 kotlin-gradle-plugin to 1.9.24 Compose compile to 1.5.14 Compose libs to 1.7.1 Upping versionCode to 120
zotero · Nov 29, 2024 · a2aedb8 · a2aedb8
1 parent 0aed32c
commit a2aedb8
Show file tree

Hide file tree

Showing 38 changed files with 112 additions and 127 deletions.
diff --git a/app/src/main/java/org/zotero/android/pdf/annotation/PdfAnnotationComponents.kt b/app/src/main/java/org/zotero/android/pdf/annotation/PdfAnnotationComponents.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
@@ -159,7 +159,7 @@ private fun FontSizeChangeButton(text: String, onClick: (() -> Unit)) {
             .clip(roundCornerShape)
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true),
+                indication = ripple(bounded = true),
                 onClick = onClick,
             )
     ) {

diff --git a/app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreBlocks.kt b/app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreBlocks.kt
@@ -18,7 +18,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
@@ -198,7 +198,7 @@ private fun FontSizeChangeButton(text: String, onClick: (() -> Unit)) {
             .clip(roundCornerShape)
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true),
+                indication = ripple(bounded = true),
                 onClick = onClick,
             )
     ) {

diff --git a/app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreScreen.kt b/app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Divider
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -167,7 +167,7 @@ private fun DeleteButton(viewModel: PdfAnnotationMoreViewModel) {
             .safeClickable(
                 onClick = viewModel::onDeleteAnnotation,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true)
+                indication = ripple(bounded = true)
             ), contentAlignment = Alignment.Center
     ) {
         Text(
@@ -191,7 +191,7 @@ private fun PageButton(
             .safeClickable(
                 onClick = viewModel::onPageClicked,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true)
+                indication = ripple(bounded = true)
             ), contentAlignment = Alignment.CenterStart
     ) {
         Text(

diff --git a/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderPspdfKitBox.kt b/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderPspdfKitBox.kt
@@ -2,6 +2,7 @@ package org.zotero.android.pdf.reader
 
 import android.net.Uri
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.AnchoredDraggableState
@@ -112,19 +113,22 @@ internal fun PdfReaderPspdfKitBox(
         shouldShowSnapTargetAreas = false
         true
     }
+    val decayAnimationSpec = rememberSplineBasedDecay<Float>()
     val anchoredDraggableState = rememberSaveable(
         saver = AnchoredDraggableState.Saver(
-            animationSpec = animationSpec,
+            snapAnimationSpec = animationSpec,
             positionalThreshold = positionalThreshold,
             velocityThreshold = velocityThreshold,
             confirmValueChange = confirmValueChange,
+            decayAnimationSpec = decayAnimationSpec
         )
     ) {
         AnchoredDraggableState(
             initialValue = DragAnchors.Start,
             positionalThreshold = positionalThreshold,
             velocityThreshold = velocityThreshold,
-            animationSpec = animationSpec,
+            snapAnimationSpec = animationSpec,
+            decayAnimationSpec =  decayAnimationSpec,
             confirmValueChange = confirmValueChange,
         )
     }

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
@@ -2061,9 +2061,9 @@ class PdfReaderViewModel @Inject constructor(
 //            .setSelectedAnnotationResizeEnabled(false)
             .autosaveEnabled(false)
             .scrollbarsEnabled(true)
-            .disableDefaultToolbar()
-            .hideDocumentTitleOverlay()
-            .enableStylusOnDetection(true)
+            .defaultToolbarEnabled(false)
+            .documentTitleOverlayEnabled(false)
+            .stylusOnDetectionEnabled(true)
             .hideUserInterfaceWhenCreatingAnnotations(false)
             .setUserInterfaceViewMode(UserInterfaceViewMode.USER_INTERFACE_VIEW_MODE_MANUAL)
             .build()

diff --git a/app/src/main/java/org/zotero/android/pdf/reader/pdfsearch/PdfReaderSearchTable.kt b/app/src/main/java/org/zotero/android/pdf/reader/pdfsearch/PdfReaderSearchTable.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -40,7 +40,7 @@ private fun PdfReaderSearchRow(
             .padding(horizontal = 16.dp)
             .combinedClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onItemTapped,
             )
     ) {

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
@@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -86,7 +86,7 @@ internal fun PdfReaderAnnotationsSidebarHeaderSection(
                     .safeClickable(
                         onClick = vMInterface::onMoreOptionsForItemClicked,
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = rememberRipple(bounded = false)
+                        indication = ripple(bounded = false)
                     ),
                 painter = painterResource(id = Drawables.more_horiz_24px),
                 contentDescription = null,
@@ -173,7 +173,7 @@ internal fun PdfReaderAnnotationsSidebarTagsSection(
         Box(modifier = Modifier
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true),
+                indication = ripple(bounded = true),
                 onClick = { vMInterface.onTagsClicked(annotation) }
             )
             .sectionVerticalPadding()

diff --git a/app/src/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderOutlineSidebar.kt b/app/src/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderOutlineSidebar.kt
@@ -17,7 +17,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -162,7 +162,7 @@ private fun OutlineItem(
             modifier = rowModifier
                 .combinedClickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = rememberRipple(),
+                    indication = ripple(),
                     onClick = onItemTapped,
                 )
         ) {

diff --git a/app/src/main/java/org/zotero/android/screens/allitems/table/rows/ItemRow.kt b/app/src/main/java/org/zotero/android/screens/allitems/table/rows/ItemRow.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -42,7 +42,7 @@ internal fun ItemRow(
             modifier = rowModifier
                 .combinedClickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = if (isEditing) null else rememberRipple(),
+                    indication = if (isEditing) null else ripple(),
                     onClick = { onItemTapped(cellModel) },
                     onLongClick = { onItemLongTapped(cellModel.key) }
                 )

diff --git a/app/src/main/java/org/zotero/android/screens/collectionedit/CollectionEditRows.kt b/app/src/main/java/org/zotero/android/screens/collectionedit/CollectionEditRows.kt
@@ -14,7 +14,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -91,7 +91,7 @@ internal fun LibrarySelectorRow(
             .clip(shape = RoundedCornerShape(10.dp))
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onClick
             ),
         verticalAlignment = Alignment.CenterVertically

diff --git a/app/src/main/java/org/zotero/android/screens/collectionpicker/CollectionsPickerTable.kt b/app/src/main/java/org/zotero/android/screens/collectionpicker/CollectionsPickerTable.kt
@@ -14,7 +14,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -100,7 +100,7 @@ private fun CollectionItem(
         modifier = rowModifier
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onClick,
             )
     ) {

diff --git a/app/src/main/java/org/zotero/android/screens/collections/CollectionsTable.kt b/app/src/main/java/org/zotero/android/screens/collections/CollectionsTable.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -131,7 +131,7 @@ private fun CollectionItem(
             modifier = rowModifier
                 .combinedClickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = rememberRipple(),
+                    indication = ripple(),
                     onClick = onItemTapped,
                     onLongClick = onItemLongTapped
                 )

diff --git a/app/src/main/java/org/zotero/android/screens/creatoredit/CreatorEditRows.kt b/app/src/main/java/org/zotero/android/screens/creatoredit/CreatorEditRows.kt
@@ -14,7 +14,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -49,7 +49,7 @@ internal fun CreatorEditFieldTappableRow(
             .background(CustomTheme.colors.surface)
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onClick
             ),
         verticalAlignment = Alignment.CenterVertically
@@ -176,7 +176,7 @@ internal fun CreatorEditToggleNamePresentationRow(
             .background(CustomTheme.colors.surface)
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = viewModel::toggleNamePresentation
             )
     ) {
@@ -206,7 +206,7 @@ internal fun CreatorEditDeleteCreatorRow(
             .background(CustomTheme.colors.surface)
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = viewModel::showDeleteCreatorConfirmation
             )
     ) {

diff --git a/app/src/main/java/org/zotero/android/screens/filter/FilterOptionsPopup.kt b/app/src/main/java/org/zotero/android/screens/filter/FilterOptionsPopup.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -157,7 +157,7 @@ private fun PopupOptionRow(
             .safeClickable(
                 enabled = isEnabled,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onOptionClick,
             ),
         verticalAlignment = Alignment.CenterVertically

diff --git a/app/src/main/java/org/zotero/android/screens/filter/FilterTagsSearchRow.kt b/app/src/main/java/org/zotero/android/screens/filter/FilterTagsSearchRow.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -44,7 +44,7 @@ internal fun FilterTagsSearchRow(
                     .safeClickable(
                         onClick = viewModel::onMoreSearchOptionsClicked,
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = rememberRipple(bounded = false)
+                        indication = ripple(bounded = false)
                     ),
                 painter = painterResource(id = Drawables.more_horiz_24px),
                 contentDescription = null,

diff --git a/app/src/main/java/org/zotero/android/screens/itemdetails/ItemDetailCommon.kt b/app/src/main/java/org/zotero/android/screens/itemdetails/ItemDetailCommon.kt
@@ -21,7 +21,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -72,7 +72,7 @@ internal fun FieldRow(
             .safeClickable(
                 onClick = onRowTapped,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = true)
+                indication = ripple(bounded = true)
             )
     ) {
         Spacer(modifier = Modifier.height(2.dp))
@@ -85,7 +85,7 @@ internal fun FieldRow(
                         .safeClickable(
                             onClick = onDelete,
                             interactionSource = remember { MutableInteractionSource() },
-                            indication = rememberRipple(bounded = false)
+                            indication = ripple(bounded = false)
                         )
                         .padding(start = 4.dp),
                     painter = painterResource(id = Drawables.do_not_disturb_on_24px),
@@ -152,7 +152,7 @@ fun AddItemRow(
         modifier = Modifier
             .safeClickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
                 onClick = onClick
             )
     ) {
@@ -256,7 +256,7 @@ private fun LazyListScope.listOfNotes(
     ) { index, item ->
         Column(modifier = Modifier.combinedClickable(
             interactionSource = remember { MutableInteractionSource() },
-            indication = rememberRipple(),
+            indication = ripple(),
             onClick = { onItemClicked(index) },
             onLongClick = { onItemLongClicked(index) }
         )) {
@@ -334,7 +334,7 @@ private fun LazyListScope.listOfTags(
     ) { item ->
         Column(modifier = Modifier.combinedClickable(
             interactionSource = remember { MutableInteractionSource() },
-            indication = rememberRipple(),
+            indication = ripple(),
             onClick = {},
             onLongClick = { viewModel.onTagLongClick(item) }
         )) {
@@ -389,7 +389,7 @@ private fun LazyListScope.listOfAttachments(
                     .fillMaxWidth()
                     .combinedClickable(
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = rememberRipple(),
+                        indication = ripple(),
                         onClick = { viewModel.openAttachment(item) },
                         onLongClick = { viewModel.onAttachmentLongClick(item) },
                     )