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.

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

Integrate gutenberg-mobile release 1.39.0 #13119

Merged
merged 11 commits into from
Oct 16, 2020
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
16.0
-----
* [*] Stats: Added the possibility to report and unreport a referrer as spam. [https://github.com/wordpress-mobile/WordPress-Android/pull/13047]
* [***] Block Editor: Full-width and wide alignment support for Video, Latest-posts, Gallery, Media & text, and Pullquote block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2605]
* [***] Block Editor: Fix unsupported block bottom sheet is triggered when device is rotated. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2710]
* [***] Block Editor: Unsupported Block Editor: Fixed issue when cannot view or interact with the classic block on Jetpack site. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2709]
* [**] Reader: Allow users to access Reader even when they do not follow any tags/topics.

15.9
Expand Down
33 changes: 9 additions & 24 deletions WordPress/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3008,7 +3008,6 @@
<string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
<string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
<string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
<string name="gutenberg_native_black" tools:ignore="UnusedResources">Black</string>
<!-- translators: displayed right after the block is copied. -->
<string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
<!-- translators: displayed right after the block is cut. -->
Expand All @@ -3022,24 +3021,22 @@
<string name="gutenberg_native_block_settings" tools:ignore="UnusedResources">Block settings</string>
<!-- translators: title for "Blog" page template -->
<string name="gutenberg_native_blog" tools:ignore="UnusedResources">Blog</string>
<string name="gutenberg_native_blush_bordeaux" tools:ignore="UnusedResources">Blush bordeaux</string>
<string name="gutenberg_native_blush_light_purple" tools:ignore="UnusedResources">Blush light purple</string>
<string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
<string name="gutenberg_native_choose_image" tools:ignore="UnusedResources">Choose image</string>
<string name="gutenberg_native_choose_image_or_video" tools:ignore="UnusedResources">Choose image or video</string>
<string name="gutenberg_native_choose_images" tools:ignore="UnusedResources">Choose images</string>
<string name="gutenberg_native_choose_video" tools:ignore="UnusedResources">Choose video</string>
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_city_10100" tools:ignore="UnusedResources">City, 10100</string>
<string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
<string name="gutenberg_native_cool_to_warm_spectrum" tools:ignore="UnusedResources">Cool to warm spectrum</string>
<string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
<string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
<!-- translators: %s: current cell value. -->
<string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
<string name="gutenberg_native_customize" tools:ignore="UnusedResources">CUSTOMIZE</string>
<string name="gutenberg_native_customize_gradient" tools:ignore="UnusedResources">Customize Gradient</string>
<string name="gutenberg_native_cut_block" tools:ignore="UnusedResources">Cut block</string>
<string name="gutenberg_native_cyan_bluish_gray" tools:ignore="UnusedResources">Cyan bluish gray</string>
<string name="gutenberg_native_dismiss" tools:ignore="UnusedResources">Dismiss</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened" tools:ignore="UnusedResources">Don’t cry because it’s over, smile because it happened.</string>
<string name="gutenberg_native_double_tap_to_add_a_block" tools:ignore="UnusedResources">Double tap to add a block</string>
Expand Down Expand Up @@ -3068,8 +3065,8 @@
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
<string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</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_electric_grass" tools:ignore="UnusedResources">Electric grass</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
<string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
Expand All @@ -3083,6 +3080,8 @@ translators: sample content for "Services" page template
translators: sample content for "Team" page template -->
<string name="gutenberg_native_get_in_touch" tools:ignore="UnusedResources">Get in Touch</string>
<string name="gutenberg_native_gradient_type" tools:ignore="UnusedResources">Gradient Type</string>
<string name="gutenberg_native_help_button" tools:ignore="UnusedResources">Help button</string>
<string name="gutenberg_native_help_icon" tools:ignore="UnusedResources">Help icon</string>
<string name="gutenberg_native_here_is_the_panel_content" tools:ignore="UnusedResources">Here is the panel content!</string>
<string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
<!-- translators: accessibility text. %s: image caption. -->
Expand All @@ -3103,15 +3102,7 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_let_s_build_something_together_7019bfe3" tools:ignore="UnusedResources">Let\'s build something together!</string>
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati" tools:ignore="UnusedResources">Let\'s talk 👋 Don\'t hesitate to reach out with the contact information below, or send a message using the form.</string>
<string name="gutenberg_native_light_green_cyan" tools:ignore="UnusedResources">Light green cyan</string>
<string name="gutenberg_native_light_green_cyan_to_vivid_green_cyan" tools:ignore="UnusedResources">Light green cyan to vivid green cyan</string>
<string name="gutenberg_native_link_to" tools:ignore="UnusedResources">Link To</string>
<string name="gutenberg_native_luminous_dusk" tools:ignore="UnusedResources">Luminous dusk</string>
<string name="gutenberg_native_luminous_vivid_amber" tools:ignore="UnusedResources">Luminous vivid amber</string>
<string name="gutenberg_native_luminous_vivid_amber_to_luminous_vivid_orange" tools:ignore="UnusedResources">Luminous vivid amber to luminous vivid orange</string>
<string name="gutenberg_native_luminous_vivid_orange" tools:ignore="UnusedResources">Luminous vivid orange</string>
<string name="gutenberg_native_luminous_vivid_orange_to_vivid_red" tools:ignore="UnusedResources">Luminous vivid orange to vivid red</string>
<string name="gutenberg_native_midnight" tools:ignore="UnusedResources">Midnight</string>
<string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block down from row %1$s to row %2$s</string>
Expand Down Expand Up @@ -3147,9 +3138,6 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_page_title_empty" tools:ignore="UnusedResources">Page title. Empty</string>
<!-- translators: accessibility text. %s: text content of the page title. -->
<string name="gutenberg_native_page_title_s" tools:ignore="UnusedResources">Page title. %s</string>
<string name="gutenberg_native_pale_cyan_blue" tools:ignore="UnusedResources">Pale cyan blue</string>
<string name="gutenberg_native_pale_ocean" tools:ignore="UnusedResources">Pale ocean</string>
<string name="gutenberg_native_pale_pink" tools:ignore="UnusedResources">Pale pink</string>
<string name="gutenberg_native_paste_block_after" tools:ignore="UnusedResources">Paste block after</string>
<string name="gutenberg_native_paste_url" tools:ignore="UnusedResources">Paste URL</string>
<!-- translators: title for "Portfolio" page template -->
Expand All @@ -3175,6 +3163,8 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_s_block_options" tools:ignore="UnusedResources">%s block options</string>
<!-- translators: accessibility text for blocks with invalid content. %d: localized block title -->
<string name="gutenberg_native_s_block_this_block_has_invalid_content" tools:ignore="UnusedResources">%s block. This block has invalid content</string>
<!-- translators: Missing block alert title. %s: The localized block name -->
<string name="gutenberg_native_s_is_not_fully_supported" tools:ignore="UnusedResources">\'%s\' is not fully–supported</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_sally_smith" tools:ignore="UnusedResources">Sally Smith</string>
<!-- translators: sample content for "Team" page template -->
Expand All @@ -3197,6 +3187,7 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_take_a_photo" tools:ignore="UnusedResources">Take a Photo</string>
<string name="gutenberg_native_take_a_photo_or_video" tools:ignore="UnusedResources">Take a Photo or Video</string>
<string name="gutenberg_native_take_a_video" tools:ignore="UnusedResources">Take a Video</string>
<string name="gutenberg_native_tap_here_to_show_help" tools:ignore="UnusedResources">Tap here to show help</string>
<string name="gutenberg_native_tap_to_hide_the_keyboard" tools:ignore="UnusedResources">Tap to hide the keyboard</string>
<!-- translators: title for "Team" page template -->
<string name="gutenberg_native_team" tools:ignore="UnusedResources">Team</string>
Expand All @@ -3212,32 +3203,26 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_updates_the_title" tools:ignore="UnusedResources">Updates the title.</string>
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_usa" tools:ignore="UnusedResources">USA</string>
<string name="gutenberg_native_very_light_gray_to_cyan_bluish_gray" tools:ignore="UnusedResources">Very light gray to cyan bluish gray</string>
<!-- translators: accessibility text. Empty video caption. -->
<string name="gutenberg_native_video_caption_empty" tools:ignore="UnusedResources">Video caption. Empty</string>
<!-- translators: accessibility text. %s: video caption. -->
<string name="gutenberg_native_video_caption_s" tools:ignore="UnusedResources">Video caption. %s</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u" tools:ignore="UnusedResources">Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.</string>
<string name="gutenberg_native_vivid_cyan_blue" tools:ignore="UnusedResources">Vivid cyan blue</string>
<string name="gutenberg_native_vivid_cyan_blue_to_vivid_purple" tools:ignore="UnusedResources">Vivid cyan blue to vivid purple</string>
<string name="gutenberg_native_vivid_green_cyan" tools:ignore="UnusedResources">Vivid green cyan</string>
<string name="gutenberg_native_vivid_purple" tools:ignore="UnusedResources">Vivid purple</string>
<string name="gutenberg_native_vivid_red" tools:ignore="UnusedResources">Vivid red</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_walt_disney" tools:ignore="UnusedResources">Walt Disney</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_want_to_work_with_us" tools:ignore="UnusedResources">Want to work with us?</string>
<string name="gutenberg_native_warning_message" tools:ignore="UnusedResources">Warning Message</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o" tools:ignore="UnusedResources">We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release" tools:ignore="UnusedResources">We are working hard to add more blocks with each release.</string>
<!-- translators: sample content for "Services" page template -->
<string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you" tools:ignore="UnusedResources">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
<!-- translators: sample content for "Blog" page template -->
<string name="gutenberg_native_welcome_to_our_new_blog" tools:ignore="UnusedResources">Welcome to our new blog</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_what_people_say" tools:ignore="UnusedResources">What People Say</string>
<string name="gutenberg_native_white" tools:ignore="UnusedResources">White</string>
<string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
<!--/Autogenerated:Gutenberg Native-->
<string name="toast_capture_operation_permission_needed">You need to grant the app audio recording permission in order to record video</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class WPGutenbergWebViewActivity extends GutenbergWebViewActivity {

public static final String ARG_USER_ID = "authenticated_user_id";
public static final String ARG_BLOCK_ID = "block_id";
public static final String ARG_BLOCK_NAME = "block_name";
public static final String ARG_BLOCK_TITLE = "block_title";
public static final String ARG_BLOCK_CONTENT = "block_content";

private boolean mIsJetpackSsoEnabled;
Expand Down Expand Up @@ -73,9 +73,9 @@ && getIntent().getExtras() != null) {

@Override
protected String getToolbarTitle() {
String blockName = getIntent().getExtras().getString(ARG_BLOCK_NAME);
if (blockName != null) {
return String.format(getString(R.string.menu_toolbar_title), blockName);
String blockTitle = getIntent().getExtras().getString(ARG_BLOCK_TITLE);
if (blockTitle != null) {
return String.format(getString(R.string.menu_toolbar_title), blockTitle);
}
return "";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ public void gutenbergDidRequestUnsupportedBlockFallback(UnsupportedBlock unsuppo
openGutenbergWebViewActivity(
unsupportedBlock.getContent(),
unsupportedBlock.getId(),
unsupportedBlock.getName()
unsupportedBlock.getName(),
unsupportedBlock.getTitle()
);
}
},
Expand Down Expand Up @@ -360,7 +361,7 @@ public void run() {
return view;
}

private void openGutenbergWebViewActivity(String content, String blockId, String blockName) {
private void openGutenbergWebViewActivity(String content, String blockId, String blockName, String blockTitle) {
GutenbergWebViewAuthorizationData gutenbergWebViewAuthData =
getArguments().getParcelable(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA);

Expand All @@ -370,7 +371,7 @@ private void openGutenbergWebViewActivity(String content, String blockId, String

Intent intent = new Intent(getActivity(), WPGutenbergWebViewActivity.class);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_ID, blockId);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_NAME, blockName);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_TITLE, blockTitle);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_CONTENT, content);
intent.putExtra(WPGutenbergWebViewActivity.ARG_GUTENBERG_WEB_VIEW_AUTH_DATA, gutenbergWebViewAuthData);

Expand Down
2 changes: 1 addition & 1 deletion libs/gutenberg-mobile
Submodule gutenberg-mobile updated 113 files