Skip to content

Commit a2aedb8

Browse files
Dima-AndroidDima-Android
committed
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
1 parent 0aed32c commit a2aedb8

38 files changed

+112
-127
lines changed

Diff for: ‎app/src/main/java/org/zotero/android/pdf/annotation/PdfAnnotationComponents.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.size
1515
import androidx.compose.foundation.layout.width
1616
import androidx.compose.foundation.shape.RoundedCornerShape
1717
import androidx.compose.material.Text
18-
import androidx.compose.material.ripple.rememberRipple
18+
import androidx.compose.material.ripple
1919
import androidx.compose.material3.Slider
2020
import androidx.compose.material3.SliderDefaults
2121
import androidx.compose.runtime.Composable
@@ -159,7 +159,7 @@ private fun FontSizeChangeButton(text: String, onClick: (() -> Unit)) {
159159
.clip(roundCornerShape)
160160
.safeClickable(
161161
interactionSource = remember { MutableInteractionSource() },
162-
indication = rememberRipple(bounded = true),
162+
indication = ripple(bounded = true),
163163
onClick = onClick,
164164
)
165165
) {

Diff for: ‎app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreBlocks.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import androidx.compose.foundation.layout.size
1818
import androidx.compose.foundation.layout.width
1919
import androidx.compose.foundation.shape.RoundedCornerShape
2020
import androidx.compose.material.Text
21-
import androidx.compose.material.ripple.rememberRipple
21+
import androidx.compose.material.ripple
2222
import androidx.compose.material3.Slider
2323
import androidx.compose.material3.SliderDefaults
2424
import androidx.compose.runtime.Composable
@@ -198,7 +198,7 @@ private fun FontSizeChangeButton(text: String, onClick: (() -> Unit)) {
198198
.clip(roundCornerShape)
199199
.safeClickable(
200200
interactionSource = remember { MutableInteractionSource() },
201-
indication = rememberRipple(bounded = true),
201+
indication = ripple(bounded = true),
202202
onClick = onClick,
203203
)
204204
) {

Diff for: ‎app/src/main/java/org/zotero/android/pdf/annotationmore/PdfAnnotationMoreScreen.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.padding
1111
import androidx.compose.foundation.lazy.LazyColumn
1212
import androidx.compose.material.Divider
1313
import androidx.compose.material.Text
14-
import androidx.compose.material.ripple.rememberRipple
14+
import androidx.compose.material.ripple
1515
import androidx.compose.runtime.Composable
1616
import androidx.compose.runtime.LaunchedEffect
1717
import androidx.compose.runtime.getValue
@@ -167,7 +167,7 @@ private fun DeleteButton(viewModel: PdfAnnotationMoreViewModel) {
167167
.safeClickable(
168168
onClick = viewModel::onDeleteAnnotation,
169169
interactionSource = remember { MutableInteractionSource() },
170-
indication = rememberRipple(bounded = true)
170+
indication = ripple(bounded = true)
171171
), contentAlignment = Alignment.Center
172172
) {
173173
Text(
@@ -191,7 +191,7 @@ private fun PageButton(
191191
.safeClickable(
192192
onClick = viewModel::onPageClicked,
193193
interactionSource = remember { MutableInteractionSource() },
194-
indication = rememberRipple(bounded = true)
194+
indication = ripple(bounded = true)
195195
), contentAlignment = Alignment.CenterStart
196196
) {
197197
Text(

Diff for: ‎app/src/main/java/org/zotero/android/pdf/reader/PdfReaderPspdfKitBox.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.zotero.android.pdf.reader
22

33
import android.net.Uri
44
import androidx.compose.animation.core.tween
5+
import androidx.compose.animation.rememberSplineBasedDecay
56
import androidx.compose.foundation.Canvas
67
import androidx.compose.foundation.background
78
import androidx.compose.foundation.gestures.AnchoredDraggableState
@@ -112,19 +113,22 @@ internal fun PdfReaderPspdfKitBox(
112113
shouldShowSnapTargetAreas = false
113114
true
114115
}
116+
val decayAnimationSpec = rememberSplineBasedDecay<Float>()
115117
val anchoredDraggableState = rememberSaveable(
116118
saver = AnchoredDraggableState.Saver(
117-
animationSpec = animationSpec,
119+
snapAnimationSpec = animationSpec,
118120
positionalThreshold = positionalThreshold,
119121
velocityThreshold = velocityThreshold,
120122
confirmValueChange = confirmValueChange,
123+
decayAnimationSpec = decayAnimationSpec
121124
)
122125
) {
123126
AnchoredDraggableState(
124127
initialValue = DragAnchors.Start,
125128
positionalThreshold = positionalThreshold,
126129
velocityThreshold = velocityThreshold,
127-
animationSpec = animationSpec,
130+
snapAnimationSpec = animationSpec,
131+
decayAnimationSpec = decayAnimationSpec,
128132
confirmValueChange = confirmValueChange,
129133
)
130134
}

Diff for: ‎app/src/main/java/org/zotero/android/pdf/reader/PdfReaderViewModel.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2061,9 +2061,9 @@ class PdfReaderViewModel @Inject constructor(
20612061
// .setSelectedAnnotationResizeEnabled(false)
20622062
.autosaveEnabled(false)
20632063
.scrollbarsEnabled(true)
2064-
.disableDefaultToolbar()
2065-
.hideDocumentTitleOverlay()
2066-
.enableStylusOnDetection(true)
2064+
.defaultToolbarEnabled(false)
2065+
.documentTitleOverlayEnabled(false)
2066+
.stylusOnDetectionEnabled(true)
20672067
.hideUserInterfaceWhenCreatingAnnotations(false)
20682068
.setUserInterfaceViewMode(UserInterfaceViewMode.USER_INTERFACE_VIEW_MODE_MANUAL)
20692069
.build()

Diff for: ‎app/src/main/java/org/zotero/android/pdf/reader/pdfsearch/PdfReaderSearchTable.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding
99
import androidx.compose.foundation.lazy.LazyListScope
1010
import androidx.compose.foundation.lazy.items
1111
import androidx.compose.material.Text
12-
import androidx.compose.material.ripple.rememberRipple
12+
import androidx.compose.material.ripple
1313
import androidx.compose.runtime.Composable
1414
import androidx.compose.runtime.remember
1515
import androidx.compose.ui.Alignment
@@ -40,7 +40,7 @@ private fun PdfReaderSearchRow(
4040
.padding(horizontal = 16.dp)
4141
.combinedClickable(
4242
interactionSource = remember { MutableInteractionSource() },
43-
indication = rememberRipple(),
43+
indication = ripple(),
4444
onClick = onItemTapped,
4545
)
4646
) {

Diff for: ‎app/src/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderAnnotationsSidebarRowParts.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.padding
1717
import androidx.compose.foundation.layout.size
1818
import androidx.compose.foundation.layout.width
1919
import androidx.compose.material.Text
20-
import androidx.compose.material.ripple.rememberRipple
20+
import androidx.compose.material.ripple
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.runtime.remember
2323
import androidx.compose.ui.Alignment
@@ -86,7 +86,7 @@ internal fun PdfReaderAnnotationsSidebarHeaderSection(
8686
.safeClickable(
8787
onClick = vMInterface::onMoreOptionsForItemClicked,
8888
interactionSource = remember { MutableInteractionSource() },
89-
indication = rememberRipple(bounded = false)
89+
indication = ripple(bounded = false)
9090
),
9191
painter = painterResource(id = Drawables.more_horiz_24px),
9292
contentDescription = null,
@@ -173,7 +173,7 @@ internal fun PdfReaderAnnotationsSidebarTagsSection(
173173
Box(modifier = Modifier
174174
.clickable(
175175
interactionSource = remember { MutableInteractionSource() },
176-
indication = rememberRipple(bounded = true),
176+
indication = ripple(bounded = true),
177177
onClick = { vMInterface.onTagsClicked(annotation) }
178178
)
179179
.sectionVerticalPadding()

Diff for: ‎app/src/main/java/org/zotero/android/pdf/reader/sidebar/PdfReaderOutlineSidebar.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.compose.foundation.lazy.LazyListScope
1717
import androidx.compose.foundation.lazy.rememberLazyListState
1818
import androidx.compose.foundation.shape.RoundedCornerShape
1919
import androidx.compose.material.Text
20-
import androidx.compose.material.ripple.rememberRipple
20+
import androidx.compose.material.ripple
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.runtime.remember
2323
import androidx.compose.ui.Alignment
@@ -162,7 +162,7 @@ private fun OutlineItem(
162162
modifier = rowModifier
163163
.combinedClickable(
164164
interactionSource = remember { MutableInteractionSource() },
165-
indication = rememberRipple(),
165+
indication = ripple(),
166166
onClick = onItemTapped,
167167
)
168168
) {

Diff for: ‎app/src/main/java/org/zotero/android/screens/allitems/table/rows/ItemRow.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.Spacer
99
import androidx.compose.foundation.layout.height
1010
import androidx.compose.foundation.layout.padding
1111
import androidx.compose.foundation.layout.width
12-
import androidx.compose.material.ripple.rememberRipple
12+
import androidx.compose.material.ripple
1313
import androidx.compose.runtime.Composable
1414
import androidx.compose.runtime.remember
1515
import androidx.compose.ui.Alignment
@@ -42,7 +42,7 @@ internal fun ItemRow(
4242
modifier = rowModifier
4343
.combinedClickable(
4444
interactionSource = remember { MutableInteractionSource() },
45-
indication = if (isEditing) null else rememberRipple(),
45+
indication = if (isEditing) null else ripple(),
4646
onClick = { onItemTapped(cellModel) },
4747
onLongClick = { onItemLongTapped(cellModel.key) }
4848
)

Diff for: ‎app/src/main/java/org/zotero/android/screens/collectionedit/CollectionEditRows.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.compose.foundation.text.KeyboardActions
1414
import androidx.compose.foundation.text.KeyboardOptions
1515
import androidx.compose.material.Icon
1616
import androidx.compose.material.Text
17-
import androidx.compose.material.ripple.rememberRipple
17+
import androidx.compose.material.ripple
1818
import androidx.compose.runtime.Composable
1919
import androidx.compose.runtime.LaunchedEffect
2020
import androidx.compose.runtime.remember
@@ -91,7 +91,7 @@ internal fun LibrarySelectorRow(
9191
.clip(shape = RoundedCornerShape(10.dp))
9292
.safeClickable(
9393
interactionSource = remember { MutableInteractionSource() },
94-
indication = rememberRipple(),
94+
indication = ripple(),
9595
onClick = onClick
9696
),
9797
verticalAlignment = Alignment.CenterVertically

Diff for: ‎app/src/main/java/org/zotero/android/screens/collectionpicker/CollectionsPickerTable.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.compose.foundation.lazy.LazyListScope
1414
import androidx.compose.foundation.lazy.rememberLazyListState
1515
import androidx.compose.material.Icon
1616
import androidx.compose.material.Text
17-
import androidx.compose.material.ripple.rememberRipple
17+
import androidx.compose.material.ripple
1818
import androidx.compose.runtime.Composable
1919
import androidx.compose.runtime.remember
2020
import androidx.compose.ui.Alignment
@@ -100,7 +100,7 @@ private fun CollectionItem(
100100
modifier = rowModifier
101101
.safeClickable(
102102
interactionSource = remember { MutableInteractionSource() },
103-
indication = rememberRipple(),
103+
indication = ripple(),
104104
onClick = onClick,
105105
)
106106
) {

Diff for: ‎app/src/main/java/org/zotero/android/screens/collections/CollectionsTable.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.compose.foundation.lazy.LazyListScope
1515
import androidx.compose.foundation.lazy.rememberLazyListState
1616
import androidx.compose.material.Icon
1717
import androidx.compose.material.Text
18-
import androidx.compose.material.ripple.rememberRipple
18+
import androidx.compose.material.ripple
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.runtime.remember
2121
import androidx.compose.ui.Alignment
@@ -131,7 +131,7 @@ private fun CollectionItem(
131131
modifier = rowModifier
132132
.combinedClickable(
133133
interactionSource = remember { MutableInteractionSource() },
134-
indication = rememberRipple(),
134+
indication = ripple(),
135135
onClick = onItemTapped,
136136
onLongClick = onItemLongTapped
137137
)

Diff for: ‎app/src/main/java/org/zotero/android/screens/creatoredit/CreatorEditRows.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.compose.foundation.text.KeyboardActions
1414
import androidx.compose.foundation.text.KeyboardOptions
1515
import androidx.compose.material.Icon
1616
import androidx.compose.material.Text
17-
import androidx.compose.material.ripple.rememberRipple
17+
import androidx.compose.material.ripple
1818
import androidx.compose.runtime.Composable
1919
import androidx.compose.runtime.remember
2020
import androidx.compose.ui.Alignment
@@ -49,7 +49,7 @@ internal fun CreatorEditFieldTappableRow(
4949
.background(CustomTheme.colors.surface)
5050
.safeClickable(
5151
interactionSource = remember { MutableInteractionSource() },
52-
indication = rememberRipple(),
52+
indication = ripple(),
5353
onClick = onClick
5454
),
5555
verticalAlignment = Alignment.CenterVertically
@@ -176,7 +176,7 @@ internal fun CreatorEditToggleNamePresentationRow(
176176
.background(CustomTheme.colors.surface)
177177
.safeClickable(
178178
interactionSource = remember { MutableInteractionSource() },
179-
indication = rememberRipple(),
179+
indication = ripple(),
180180
onClick = viewModel::toggleNamePresentation
181181
)
182182
) {
@@ -206,7 +206,7 @@ internal fun CreatorEditDeleteCreatorRow(
206206
.background(CustomTheme.colors.surface)
207207
.safeClickable(
208208
interactionSource = remember { MutableInteractionSource() },
209-
indication = rememberRipple(),
209+
indication = ripple(),
210210
onClick = viewModel::showDeleteCreatorConfirmation
211211
)
212212
) {

Diff for: ‎app/src/main/java/org/zotero/android/screens/filter/FilterOptionsPopup.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.width
1515
import androidx.compose.foundation.shape.RoundedCornerShape
1616
import androidx.compose.material.Icon
1717
import androidx.compose.material.Text
18-
import androidx.compose.material.ripple.rememberRipple
18+
import androidx.compose.material.ripple
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.runtime.remember
2121
import androidx.compose.ui.Alignment
@@ -157,7 +157,7 @@ private fun PopupOptionRow(
157157
.safeClickable(
158158
enabled = isEnabled,
159159
interactionSource = remember { MutableInteractionSource() },
160-
indication = rememberRipple(),
160+
indication = ripple(),
161161
onClick = onOptionClick,
162162
),
163163
verticalAlignment = Alignment.CenterVertically

Diff for: ‎app/src/main/java/org/zotero/android/screens/filter/FilterTagsSearchRow.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Row
77
import androidx.compose.foundation.layout.Spacer
88
import androidx.compose.foundation.layout.size
99
import androidx.compose.foundation.layout.width
10-
import androidx.compose.material.ripple.rememberRipple
10+
import androidx.compose.material.ripple
1111
import androidx.compose.runtime.Composable
1212
import androidx.compose.runtime.remember
1313
import androidx.compose.ui.Alignment
@@ -44,7 +44,7 @@ internal fun FilterTagsSearchRow(
4444
.safeClickable(
4545
onClick = viewModel::onMoreSearchOptionsClicked,
4646
interactionSource = remember { MutableInteractionSource() },
47-
indication = rememberRipple(bounded = false)
47+
indication = ripple(bounded = false)
4848
),
4949
painter = painterResource(id = Drawables.more_horiz_24px),
5050
contentDescription = null,

Diff for: ‎app/src/main/java/org/zotero/android/screens/itemdetails/ItemDetailCommon.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.foundation.lazy.items
2121
import androidx.compose.foundation.lazy.itemsIndexed
2222
import androidx.compose.material.Icon
2323
import androidx.compose.material.Text
24-
import androidx.compose.material.ripple.rememberRipple
24+
import androidx.compose.material.ripple
2525
import androidx.compose.runtime.Composable
2626
import androidx.compose.runtime.remember
2727
import androidx.compose.ui.Alignment
@@ -72,7 +72,7 @@ internal fun FieldRow(
7272
.safeClickable(
7373
onClick = onRowTapped,
7474
interactionSource = remember { MutableInteractionSource() },
75-
indication = rememberRipple(bounded = true)
75+
indication = ripple(bounded = true)
7676
)
7777
) {
7878
Spacer(modifier = Modifier.height(2.dp))
@@ -85,7 +85,7 @@ internal fun FieldRow(
8585
.safeClickable(
8686
onClick = onDelete,
8787
interactionSource = remember { MutableInteractionSource() },
88-
indication = rememberRipple(bounded = false)
88+
indication = ripple(bounded = false)
8989
)
9090
.padding(start = 4.dp),
9191
painter = painterResource(id = Drawables.do_not_disturb_on_24px),
@@ -152,7 +152,7 @@ fun AddItemRow(
152152
modifier = Modifier
153153
.safeClickable(
154154
interactionSource = remember { MutableInteractionSource() },
155-
indication = rememberRipple(),
155+
indication = ripple(),
156156
onClick = onClick
157157
)
158158
) {
@@ -256,7 +256,7 @@ private fun LazyListScope.listOfNotes(
256256
) { index, item ->
257257
Column(modifier = Modifier.combinedClickable(
258258
interactionSource = remember { MutableInteractionSource() },
259-
indication = rememberRipple(),
259+
indication = ripple(),
260260
onClick = { onItemClicked(index) },
261261
onLongClick = { onItemLongClicked(index) }
262262
)) {
@@ -334,7 +334,7 @@ private fun LazyListScope.listOfTags(
334334
) { item ->
335335
Column(modifier = Modifier.combinedClickable(
336336
interactionSource = remember { MutableInteractionSource() },
337-
indication = rememberRipple(),
337+
indication = ripple(),
338338
onClick = {},
339339
onLongClick = { viewModel.onTagLongClick(item) }
340340
)) {
@@ -389,7 +389,7 @@ private fun LazyListScope.listOfAttachments(
389389
.fillMaxWidth()
390390
.combinedClickable(
391391
interactionSource = remember { MutableInteractionSource() },
392-
indication = rememberRipple(),
392+
indication = ripple(),
393393
onClick = { viewModel.openAttachment(item) },
394394
onLongClick = { viewModel.onAttachmentLongClick(item) },
395395
)

0 commit comments

Comments
 (0)