Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add support for enableAnnotationEditing and editableAnnotationTypes prop to Android #311

Merged
merged 2 commits into from
Oct 28, 2019
Merged

Add support for enableAnnotationEditing and editableAnnotationTypes prop to Android #311

merged 2 commits into from
Oct 28, 2019

Conversation

irgendeinich
Copy link
Contributor

@irgendeinich irgendeinich commented Oct 16, 2019 •
edited
Loading

Details

  • Adds enableAnnotationEditing configuration option.
  • Adds editableAnnotationTypes configuration option.

Acceptance Criteria

  • When approved, right before merging, rebase with master and increment the package version in package.json, package-lock.json, and samples/Catalog/package.json (see example commit: 1bf805f).
  • Create a new release (and tag) with the new package version (see https://github.com/PSPDFKit/react-native/releases).

@irgendeinich irgendeinich self-assigned this Oct 16, 2019
radazzouz
radazzouz approved these changes Oct 16, 2019
View reviewed changes
Copy link
Contributor

@radazzouz radazzouz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not impact iOS + the usage in JavaScript in the Catalog LGTM 👍

tomassurin
tomassurin approved these changes Oct 17, 2019
View reviewed changes
Copy link
Contributor

@tomassurin tomassurin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

simoarpe
simoarpe approved these changes Oct 18, 2019
View reviewed changes
Copy link
Contributor

@simoarpe simoarpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java Outdated Show resolved Hide resolved
@irgendeinich irgendeinich merged commit 05b137e into master Oct 28, 2019
@irgendeinich irgendeinich deleted the reinhard/expose-enableAnnotationEditing branch October 28, 2019 10:51
mattslight added a commit to SharekApp/react-native-pspdfkit that referenced this pull request Nov 26, 2019
@mattslight
Squashed commit of the following:
f5c4d9b 
commit b6686db
Author: Matthew Slight <matthew@slight.me>
Date:   Tue Nov 26 10:37:18 2019 +0400

    merge source/tags/1.26.4 with local/fix/annotation-selection-box

commit ae93813
Merge: e4c2f7e 73c3051
Author: Matthew Slight <matthew@slight.me>
Date:   Tue Nov 26 10:27:56 2019 +0400

    Merge branch 'fix/annotation-select-box' into version/1.26.4

commit 73c3051
Author: Matthew Slight <matthew@slight.me>
Date:   Wed Nov 20 22:28:22 2019 +0400

    don't subscribe to annotationChangeNotification

commit e4c2f7e
Merge: 20fc189 6b2a65f
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Tue Nov 5 10:45:04 2019 +0100

    Merge pull request PSPDFKit#318 from PSPDFKit/reinhard/native-catalog

    Add "Native Catalog" with advanced integration examples

commit 6b2a65f
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Nov 5 10:39:58 2019 +0100

    Bump version number

commit c91aa72
Merge: 2af4ac9 20fc189
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Nov 5 10:36:44 2019 +0100

    Merge branch 'master' into reinhard/native-catalog

commit 2af4ac9
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Tue Nov 5 10:27:58 2019 +0100

    Apply suggestions from code review

    Co-Authored-By: Rad Azzouz <radazzouz@users.noreply.github.com>

commit 54f1201
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Mon Nov 4 17:42:59 2019 +0100

    Address review remarks

commit 9dc11b3
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Mon Nov 4 17:32:06 2019 +0100

    Remove iOS project

commit b998c3e
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Mon Nov 4 17:25:34 2019 +0100

    Apply suggestions from code review

    Co-Authored-By: Rad Azzouz <radazzouz@users.noreply.github.com>
    Co-Authored-By: David Schreiber-Ranner <davidschreiber@users.noreply.github.com>

commit 20fc189
Author: Rad Azzouz <rad@pspdfkit.com>
Date:   Sun Nov 3 10:01:33 2019 -0500

    Embed & Sign XCFrameworks

commit b1a4e2c
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Wed Oct 30 16:27:08 2019 +0100

    Add instructions how to run the NativeCatalog sample

commit 526f94f
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 29 18:30:35 2019 +0100

    Add getFragment to PdfView for more ease when using PdfView directly

commit 72735ff
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 29 18:26:08 2019 +0100

    Also request permissions for watermark example

commit 44a6f9f
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 29 18:24:04 2019 +0100

    Add readme for native catalog

commit 684b07e
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 29 15:51:50 2019 +0100

    Add example of adding a watermark to a document and saving it to a a new file

commit 2003be4
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 29 15:28:29 2019 +0100

    Add example for starting signing flow and digitally signing from react-native

commit 2f05642
Merge: 05b137e 956bc96
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Mon Oct 28 11:56:08 2019 +0100

    Merge pull request PSPDFKit#312 from PSPDFKit/reinhard/update-pspdfkit-6.0

    Update PSPDFKit to 6.0.2

commit 956bc96
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Mon Oct 28 11:55:24 2019 +0100

    Update package version

commit ea1ffdf
Merge: afa606c 05b137e
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Mon Oct 28 11:52:42 2019 +0100

    Merge branch 'master' into reinhard/update-pspdfkit-6.0

commit 05b137e
Merge: 64500f0 f6c1c2d
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Mon Oct 28 11:51:13 2019 +0100

    Merge pull request PSPDFKit#311 from PSPDFKit/reinhard/expose-enableAnnotationEditing

    Add support for enableAnnotationEditing and editableAnnotationTypes prop to Android

commit 64500f0
Merge: 35de88e a43aaed
Author: Reinhard Hafenscher <reinhard@pspdfkit.com>
Date:   Mon Oct 28 11:50:48 2019 +0100

    Merge pull request PSPDFKit#308 from PSPDFKit/reinhard/save-document-promise

    Make saveCurrentDocument and setFormFieldValue return a promise

commit afa606c
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Tue Oct 22 16:31:41 2019 +0200

    Update PSPDFKit to 6.0.2

commit f6c1c2d
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Fri Oct 18 13:39:07 2019 +0200

    Log error instead of warning

commit 7e1cbcd
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Wed Oct 16 14:33:25 2019 +0200

    Add support for enableAnnotationEditing and editableAnnotationTypes prop to Android

commit a43aaed
Author: Rad Azzouz <rad@pspdfkit.com>
Date:   Thu Oct 10 10:06:28 2019 -0400

    Make setFormFieldValue return a promise on iOS

commit 876fc2d
Author: irgendeinich <reinhard@pspdfkit.com>
Date:   Thu Oct 10 14:23:10 2019 +0200

    Make saveCurrentDocument and setFormFieldValue return a promise
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@radazzouz radazzouz radazzouz approved these changes

@simoarpe simoarpe simoarpe approved these changes

@tomassurin tomassurin tomassurin approved these changes

Assignees

@irgendeinich irgendeinich

Labels
Android enhancement READY TO REVIEW
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@irgendeinich @tomassurin @simoarpe @radazzouz