diff --git a/android/build.gradle b/android/build.gradle index 1effb623..0af2880e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ * Contains gradle configuration constants */ ext { - PSPDFKIT_VERSION = '5.5.1' + PSPDFKIT_VERSION = '6.0.2' } buildscript { @@ -72,8 +72,5 @@ dependencies { compile("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' } - compile("com.pspdfkit:pspdfkit-instant:${PSPDFKIT_VERSION}") { - exclude group: 'com.google.auto.value', module: 'auto-value' - } compile "com.facebook.react:react-native:+" } diff --git a/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java b/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java index 475247d9..48894693 100644 --- a/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java +++ b/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java @@ -30,6 +30,9 @@ import com.pspdfkit.configuration.page.PageLayoutMode; import com.pspdfkit.configuration.page.PageScrollDirection; import com.pspdfkit.configuration.page.PageScrollMode; +import com.pspdfkit.configuration.sharing.ShareFeatures; + +import java.util.EnumSet; import java.util.ArrayList; import java.util.Collections; @@ -236,9 +239,9 @@ private void configureImmersiveMode(boolean immersiveMode) { } private void configureShowThumbnailBar(String showThumbnailBar) { - ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT; + ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_FLOATING; if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_DEFAULT)) { - thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT; + thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_FLOATING; } else if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_SCROLLABLE)) { thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_SCROLLABLE; } else if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_NONE)) { @@ -301,9 +304,9 @@ private void configureEnableAnnotationEditing(boolean enableAnnotationEditing) { private void configureShowShareAction(boolean showShareAction) { if (showShareAction) { - configuration.enableShare(); + configuration.setEnabledShareFeatures(ShareFeatures.all()); } else { - configuration.disableShare(); + configuration.setEnabledShareFeatures(ShareFeatures.none()); } } diff --git a/android/src/main/java/com/pspdfkit/views/PdfView.java b/android/src/main/java/com/pspdfkit/views/PdfView.java index 8ef0dbdf..27111917 100644 --- a/android/src/main/java/com/pspdfkit/views/PdfView.java +++ b/android/src/main/java/com/pspdfkit/views/PdfView.java @@ -557,7 +557,7 @@ public Disposable removeAnnotation(final int requestId, ReadableMap annotation) return Observable.empty(); } - return pdfDocument.getAnnotationProvider().getAllAnnotationsOfType(getTypeFromString(type), pageIndex, 1) + return pdfDocument.getAnnotationProvider().getAllAnnotationsOfTypeAsync(getTypeFromString(type), pageIndex, 1) .filter(annotationToFilter -> name.equals(annotationToFilter.getName())) .map(filteredAnnotation -> new Pair<>(filteredAnnotation, pdfDocument)); }) diff --git a/android/src/main/java/com/pspdfkit/views/PdfViewDocumentListener.java b/android/src/main/java/com/pspdfkit/views/PdfViewDocumentListener.java index 7a8d3934..5390829f 100644 --- a/android/src/main/java/com/pspdfkit/views/PdfViewDocumentListener.java +++ b/android/src/main/java/com/pspdfkit/views/PdfViewDocumentListener.java @@ -18,6 +18,8 @@ import com.pspdfkit.ui.special_mode.controller.AnnotationSelectionController; import com.pspdfkit.ui.special_mode.manager.AnnotationManager; +import java.util.List; + class PdfViewDocumentListener implements DocumentListener, AnnotationManager.OnAnnotationSelectedListener, AnnotationProvider.OnAnnotationUpdatedListener { @NonNull @@ -122,4 +124,9 @@ public void onAnnotationUpdated(@NonNull Annotation annotation) { public void onAnnotationRemoved(@NonNull Annotation annotation) { eventDispatcher.dispatchEvent(new PdfViewAnnotationChangedEvent(parent.getId(), PdfViewAnnotationChangedEvent.EVENT_TYPE_REMOVED, annotation)); } + + @Override + public void onAnnotationZOrderChanged(int i, @NonNull List list, @NonNull List list1) { + // Not required. + } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9a48d54d..e8354e3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.26.2", + "version": "1.26.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0aa7a583..8e442d08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.26.2", + "version": "1.26.3", "description": "A React Native module for the PSPDFKit library.", "keywords": [ "react native", diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json index 41a6102c..64247572 100644 --- a/samples/Catalog/package.json +++ b/samples/Catalog/package.json @@ -1,6 +1,6 @@ { "name": "Catalog", - "version": "1.26.2", + "version": "1.26.3", "private": true, "scripts": { "start": "react-native start",