Skip to content

Commit

Permalink
Merge pull request #5743 from wordpress-mobile/add-embed-webview
Browse files Browse the repository at this point in the history
Add embed webview
  • Loading branch information
jhnstn authored May 10, 2023
2 parents c902cf1 + 4ddf9cf commit 1c64b73
Show file tree
Hide file tree
Showing 8 changed files with 2,237 additions and 2,231 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Unreleased
* [**] Add fullscreen embed preview to Android [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5743]

1.94.0
---
Expand Down
6 changes: 4 additions & 2 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@
<string name="gutenberg_native_edit_media" tools:ignore="UnusedResources">Edit media</string>
<string name="gutenberg_native_edit_using_web_editor" tools:ignore="UnusedResources">Edit using web editor</string>
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_and" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for Android</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_ios" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for iOS</string>
<!-- translators: %s: name of the host app (e.g. WordPress) -->
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_s_for_android" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on %s for Android</string>
<!-- translators: %s: name of the host app (e.g. WordPress) -->
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_s_for_ios" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on %s for iOS</string>
<string name="gutenberg_native_embed_block_previews_are_coming_soon" tools:ignore="UnusedResources">Embed block previews are coming soon</string>
<!-- translators: accessibility text. Empty Embed caption. -->
<string name="gutenberg_native_embed_caption_empty" tools:ignore="UnusedResources">Embed caption. Empty</string>
Expand Down
4,450 changes: 2,227 additions & 2,223 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bundle/ios/GutenbergNativeTranslations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ private func dummy() {
_ = NSLocalizedString("Edit media", comment: "")
_ = NSLocalizedString("Edit using web editor", comment: "")
_ = NSLocalizedString("Edit video", comment: "")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on WordPress for Android", comment: "")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on WordPress for iOS", comment: "")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on %s for Android", comment: "translators: %s: name of the host app (e.g. WordPress)")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on %s for iOS", comment: "translators: %s: name of the host app (e.g. WordPress)")
_ = NSLocalizedString("Embed block previews are coming soon", comment: "")
_ = NSLocalizedString("Embed caption. %s", comment: "translators: accessibility text. %s: Embed caption.")
_ = NSLocalizedString("Embed caption. Empty", comment: "translators: accessibility text. Empty Embed caption.")
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 203 files
2 changes: 1 addition & 1 deletion jetpack
Submodule jetpack updated 86 files
+4 −0 projects/packages/image-cdn/changelog/fix-legacy-photon-calls
+1 −1 projects/packages/image-cdn/package.json
+25 −1 projects/packages/image-cdn/src/class-image-cdn.php
+4 −0 projects/packages/plans/changelog/add-make-earn-products-free-for-all
+1 −1 projects/packages/plans/composer.json
+1 −1 projects/packages/plans/package.json
+5 −4 projects/packages/plans/src/class-current-plan.php
+4 −0 projects/packages/publicize/changelog/update-publicize-skip-meta
+1 −1 projects/packages/publicize/composer.json
+1 −1 projects/packages/publicize/package.json
+11 −12 projects/packages/publicize/src/class-connections-post-field.php
+28 −25 projects/packages/publicize/src/class-publicize-base.php
+4 −4 projects/packages/publicize/src/class-publicize-ui.php
+4 −2 projects/packages/publicize/tests/php/test-connections-post-field.php
+4 −0 projects/packages/videopress/changelog/videopress-rnmobile-android-webview
+23 −4 projects/packages/videopress/src/client/block-editor/blocks/video/components/player/index.native.js
+4 −0 projects/packages/videopress/src/client/block-editor/blocks/video/components/player/style.native.scss
+4 −0 projects/plugins/crm/changelog/Update lock file
+5 −0 projects/plugins/crm/changelog/fix-crm-impromptu_cleanup
+4 −0 projects/plugins/crm/changelog/fix-order-id-crm-warning
+10 −27 projects/plugins/crm/includes/ZeroBSCRM.AJAX.php
+1 −42 projects/plugins/crm/includes/ZeroBSCRM.Core.php
+5 −677 projects/plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php
+0 −20 projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.Companies.php
+0 −35 projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.Contacts.php
+0 −2 projects/plugins/crm/includes/ZeroBSCRM.DAL3.ObjectLayer.php
+1 −1 projects/plugins/crm/includes/ZeroBSCRM.DAL3.php
+0 −31 projects/plugins/crm/includes/ZeroBSCRM.InvoiceBuilder.php
+2 −2 projects/plugins/crm/modules/woo-sync/includes/class-woo-sync.php
+3 −1 projects/plugins/jetpack/3rd-party/bbpress.php
+12 −12 projects/plugins/jetpack/_inc/lib/core-api/wpcom-fields/post-fields-publicize-connections.php
+4 −0 projects/plugins/jetpack/changelog/add-make-earn-products-free-for-all
+5 −0 projects/plugins/jetpack/changelog/add-make-earn-products-free-for-all#2
+4 −0 projects/plugins/jetpack/changelog/add-wpcom-block-editor-wpcom-editor-styles
+4 −0 projects/plugins/jetpack/changelog/fix-ai-assistant-expand-disable
+4 −0 projects/plugins/jetpack/changelog/fix-legacy-photon-calls
+4 −0 projects/plugins/jetpack/changelog/update-ai-assistance-fix-retrying-request
+4 −0 projects/plugins/jetpack/changelog/update-ai-assistance-iterate-over-summarize
+4 −0 projects/plugins/jetpack/changelog/update-ai-assistant-store-content-persistently
+5 −0 projects/plugins/jetpack/changelog/update-controls-jetpack-ai
+4 −0 projects/plugins/jetpack/changelog/update-publicize-skip-meta
+5 −0 projects/plugins/jetpack/changelog/update-publicize-skip-meta#2
+5 −0 projects/plugins/jetpack/changelog/update-publicize-skip-meta#3
+5 −4 projects/plugins/jetpack/class.jetpack-plan.php
+1 −1 projects/plugins/jetpack/class.jetpack-post-images.php
+4 −4 projects/plugins/jetpack/composer.lock
+22 −5 projects/plugins/jetpack/extensions/blocks/ai-assistant/ai-control.js
+0 −1 projects/plugins/jetpack/extensions/blocks/ai-assistant/attributes.js
+19 −9 projects/plugins/jetpack/extensions/blocks/ai-assistant/create-prompt.js
+8 −4 projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
+5 −5 projects/plugins/jetpack/extensions/blocks/ai-assistant/test/edit.js
+48 −13 projects/plugins/jetpack/extensions/blocks/ai-assistant/use-suggestions-from-openai.js
+0 −1 projects/plugins/jetpack/extensions/blocks/donations/donations.php
+3 −34 projects/plugins/jetpack/extensions/blocks/payment-buttons/edit.js
+2 −36 projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
+0 −1 projects/plugins/jetpack/extensions/blocks/simple-payments/simple-payments.php
+10 −13 projects/plugins/jetpack/extensions/shared/components/product-management-controls/index.js
+1 −2 projects/plugins/jetpack/extensions/shared/components/product-management-controls/inspector-control.js
+4 −5 projects/plugins/jetpack/extensions/shared/components/product-management-controls/toolbar-control.js
+1 −1 projects/plugins/jetpack/extensions/shared/components/stripe-nudge/index.jsx
+1 −19 projects/plugins/jetpack/extensions/shared/test/stripe-nudge-test.js
+0 −10 projects/plugins/jetpack/extensions/store/membership-products/actions.js
+0 −6 projects/plugins/jetpack/extensions/store/membership-products/reducer.js
+0 −4 projects/plugins/jetpack/extensions/store/membership-products/selectors.js
+1 −37 projects/plugins/jetpack/extensions/store/membership-products/test/actions-test.js
+0 −30 projects/plugins/jetpack/extensions/store/membership-products/test/reducer-test.js
+9 −25 projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php
+2 −4 projects/plugins/jetpack/modules/simple-payments/simple-payments.php
+2 −2 projects/plugins/jetpack/modules/tiled-gallery/tiled-gallery.php
+2 −4 projects/plugins/jetpack/modules/widgets/flickr.php
+1 −5 projects/plugins/jetpack/modules/widgets/image-widget.php
+8 −0 projects/plugins/jetpack/modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php
+3 −1 projects/plugins/jetpack/tests/php/core-api/wpcom-fields/test-post-fields-publicize-connections.php
+2 −0 projects/plugins/jetpack/tests/php/core-api/wpcom-fields/test_post-fields-publicize-connections-inactive.php
+2 −3 projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/test_class.jetpack-premium-content.php
+2 −0 projects/plugins/jetpack/tests/php/modules/publicize/test_class.publicize.php
+2 −2 projects/plugins/jetpack/tests/php/modules/subscriptions/test_class.jetpack-subscriptions.php
+5 −0 projects/plugins/protect/changelog/add-make-earn-products-free-for-all
+2 −2 projects/plugins/protect/composer.lock
+5 −0 projects/plugins/social/changelog/add-make-earn-products-free-for-all
+5 −0 projects/plugins/social/changelog/update-publicize-skip-meta
+5 −0 projects/plugins/social/changelog/update-publicize-skip-meta#2
+4 −4 projects/plugins/social/composer.lock
+5 −0 projects/plugins/videopress/changelog/add-make-earn-products-free-for-all
+2 −2 projects/plugins/videopress/composer.lock
+14 −2 tools/e2e-commons/helpers/plan-helper.js
1 change: 0 additions & 1 deletion src/jetpack-editor-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const supportedJetpackBlocks = {
available: __DEV__,
},
'videopress/video': {
// VideoPress block will be released first on iOS.
available: Platform.select( { android: __DEV__, ios: true } ),
},
};
Expand Down

0 comments on commit 1c64b73

Please sign in to comment.