Skip to content

Customise Distance measurement border style and line ends #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Contains gradle configuration constants
*/
ext {
PSPDFKIT_VERSION = '8.10.0'
PSPDFKIT_VERSION = '2024.1.0'
}

buildscript {
Expand Down
12 changes: 12 additions & 0 deletions android/src/main/java/com/pspdfkit/views/PdfView.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
import com.pspdfkit.PSPDFKit;
import com.pspdfkit.annotations.Annotation;
import com.pspdfkit.annotations.AnnotationType;
import com.pspdfkit.annotations.BorderStyle;
import com.pspdfkit.annotations.configuration.AnnotationConfiguration;
import com.pspdfkit.annotations.configuration.FreeTextAnnotationConfiguration;
import com.pspdfkit.annotations.configuration.MeasurementDistanceAnnotationConfiguration;
import com.pspdfkit.configuration.activity.PdfActivityConfiguration;
import com.pspdfkit.document.DocumentSaveOptions;
import com.pspdfkit.document.ImageDocument;
Expand Down Expand Up @@ -72,6 +74,7 @@
import com.pspdfkit.ui.PdfUiFragmentBuilder;
import com.pspdfkit.ui.fonts.Font;
import com.pspdfkit.ui.fonts.FontManager;
import com.pspdfkit.ui.inspector.views.BorderStylePreset;
import com.pspdfkit.ui.search.PdfSearchView;
import com.pspdfkit.ui.search.PdfSearchViewInline;
import com.pspdfkit.ui.special_mode.controller.AnnotationTool;
Expand Down Expand Up @@ -553,6 +556,15 @@ public void onDocumentLoaded(@NonNull PdfDocument document) {
}
}
}

List<Integer> customBorderStyle = List.of(5, 3, 1, 3);
List<BorderStylePreset> borderStylePresets = ((MeasurementDistanceAnnotationConfiguration) pdfFragment.getAnnotationConfiguration().get(AnnotationTool.MEASUREMENT_DISTANCE)).getBorderStylePresets();
borderStylePresets.add(new BorderStylePreset(BorderStyle.DASHED, customBorderStyle));
MeasurementDistanceAnnotationConfiguration measurementDistanceAnnotationConfiguration = MeasurementDistanceAnnotationConfiguration.builder(getContext())
.setBorderStylePresets(
borderStylePresets
).build();
pdfFragment.getAnnotationConfiguration().put(AnnotationTool.MEASUREMENT_DISTANCE, measurementDistanceAnnotationConfiguration);
}

public void removeFragment(boolean makeInactive) {
Expand Down
6 changes: 6 additions & 0 deletions ios/RCTPSPDFKit/RCTPSPDFKitView.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
#import "RCTConvert+PSPDFAnnotation.h"
#import "RCTConvert+PSPDFViewMode.h"
#import "RCTConvert+UIBarButtonItem.h"
#if __has_include("PSPDFKitReactNativeiOS-Swift.h")
#import "PSPDFKitReactNativeiOS-Swift.h"
#else
#import <PSPDFKitReactNativeiOS/PSPDFKitReactNativeiOS-Swift.h>
#endif

#define VALIDATE_DOCUMENT(document, ...) { if (!document.isValid) { NSLog(@"Document is invalid."); if (self.onDocumentLoadFailed) { self.onDocumentLoadFailed(@{@"error": @"Document is invalid."}); } return __VA_ARGS__; }}

Expand Down Expand Up @@ -48,6 +53,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(spreadIndexDidChange:) name:PSPDFDocumentViewControllerSpreadIndexDidChangeNotification object:nil];
}

[Customization changeLineStyle];
return self;
}

Expand Down
13 changes: 13 additions & 0 deletions ios/RCTPSPDFKit/RNConfigurationHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@
import Foundation
import PSPDFKit

@objc public class Customization: NSObject {

@objc public static func changeLineStyle() {

let styleManager = PSPDFKit.SDK.shared.styleManager
let key = Annotation.ToolVariantID(tool: .line, variant: .distanceMeasurement)

styleManager.setLastUsedValue([5,3,1,3] as NSArray, forProperty: #keyPath(LineAnnotation.__dashArray), forKey: key)
styleManager.setLastUsedValue(AbstractLineAnnotation.EndType.openArrow.rawValue, forProperty: #keyPath(LineAnnotation.lineEnd1), forKey: key)
styleManager.setLastUsedValue(AbstractLineAnnotation.EndType.openArrow.rawValue, forProperty: #keyPath(LineAnnotation.lineEnd2), forKey: key)
}
}

struct RNConfigurationHelper {
var configuration: [String: Any]

Expand Down
4 changes: 2 additions & 2 deletions react-native-pspdfkit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pod::Spec.new do |s|
s.source = { git: "https://github.com/PSPDFKit/react-native" }
s.source_files = "ios/*.{xcodeproj}", "ios/RCTPSPDFKit/*.{h,m,swift}", "ios/RCTPSPDFKit/Converters/*.{h,m,swift}"
s.dependency("React")
s.dependency("PSPDFKit", "13.1.0")
s.dependency("Instant", "13.1.0")
s.dependency("PSPDFKit", "13.3.0")
s.dependency("Instant", "13.3.0")
s.frameworks = "UIKit"
end