Merge branch 'develop' into fix/inserting-header-block-js-error

wordpress-mobile · Jun 17, 2020 · 60be906 · 60be906
2 parents 8f8df8c + 342f224
commit 60be906
Show file tree

Hide file tree

Showing 145 changed files with 3,299 additions and 3,107 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,4 +6,12 @@
 
     // Use 'prettier-eslint' instead of 'prettier'. Other settings will only be fallbacks in case they could not be inferred from eslint rules.
     "prettier.eslintIntegration": true,
-}
+    "search.exclude": {
+        "**/bundle/android/App.js": true,
+        "**/bundle/android/App.js.map": true,
+        "**/bundle/ios/App.js": true,
+        "**/bundle/ios/App.js.map": true,
+        "**/i18n-cache/data": true,
+        "**/symlinked-packages": true
+    },
+}
diff --git a/Gutenberg.podspec b/Gutenberg.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.preserve_paths = 'bundle/ios/*'
   s.swift_version = '5.0'
-  s.resources = 'common/**/*.{js,css,json}'
+  s.resources = 'react-native-gutenberg-bridge/common/**/*.{js,css,json}'
 
   s.dependency 'React', react_native_version
   s.dependency 'React-CoreModules', react_native_version

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,12 @@
+1.31.0
+------
+* [**] Add support for customizing gradient type and angle in Buttons and Cover blocks.
+* [*] Show content information (block, word and characters counts).
+
 1.30.0
 ------
 * [**] Adds editor support for theme defined colors and theme defined gradients on cover and button blocks.
+* [*] Support for breaking out of captions/citation authors by pressing enter on the following blocks: image, video, gallery, quote, and pullquote.
 
 1.29.1
 ------

diff --git a/android/app/src/main/java/com/gutenberg/MainApplication.java b/android/app/src/main/java/com/gutenberg/MainApplication.java
@@ -22,7 +22,9 @@
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeInterface;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergWebViewActivity;
+import org.wordpress.mobile.ReactNativeGutenbergBridge.RNMedia;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage;
+import org.wordpress.mobile.WPAndroidGlue.Media;
 
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -44,7 +46,7 @@ public class MainApplication extends Application implements ReactApplication, Gu
     private ReactNativeHost createReactNativeHost() {
         mRnReactNativeGutenbergBridgePackage = new RNReactNativeGutenbergBridgePackage(new GutenbergBridgeJS2Parent() {
             @Override
-            public void responseHtml(String title, String html, boolean changed) {
+            public void responseHtml(String title, String html, boolean changed, ReadableMap contentInfo) {
             }
 
             @Override

diff --git a/android/app/src/main/java/com/gutenberg/Media.java b/android/app/src/main/java/com/gutenberg/Media.java
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         gradlePluginVersion = '3.4.2'
-        kotlinVersion = '1.3.11'
+        kotlinVersion = '1.3.61'
         buildToolsVersion = "28.0.3"
         minSdkVersion = 21
         compileSdkVersion = 28

diff --git a/bundle/android/App.js b/bundle/android/App.js
diff --git a/bundle/android/App.js.map b/bundle/android/App.js.map
diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_columns_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_columns_block.json
@@ -14,7 +14,8 @@
 		"html": false,
 		"lightBlockWrapper": true,
 		"__experimentalColor": {
-			"gradients": true
+			"gradients": true,
+			"linkColor": true
 		}
 	}
 }
diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_group_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_group_block.json
@@ -16,7 +16,8 @@
 		"html": false,
 		"lightBlockWrapper": true,
 		"__experimentalColor": {
-			"gradients": true
+			"gradients": true,
+			"linkColor": true
 		}
 	}
 }
diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_heading_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_heading_block.json
@@ -23,7 +23,9 @@
 		"anchor": true,
 		"className": false,
 		"lightBlockWrapper": true,
-		"__experimentalColor": true,
+		"__experimentalColor": {
+			"linkColor": true
+		},
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
 		"__experimentalSelector": {

diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_mediatext_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_mediatext_block.json
@@ -84,7 +84,8 @@
 		],
 		"html": false,
 		"__experimentalColor": {
-			"gradients": true
+			"gradients": true,
+			"linkColor": true
 		}
 	}
 }
diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_paragraph_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_paragraph_block.json
@@ -29,7 +29,9 @@
 	"supports": {
 		"className": false,
 		"lightBlockWrapper": true,
-		"__experimentalColor": true,
+		"__experimentalColor": {
+			"linkColor": true
+		},
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
 		"__experimentalFeatures": {

diff --git a/bundle/android/raw/i18ncache_data_ar.json b/bundle/android/raw/i18ncache_data_ar.json
diff --git a/bundle/android/raw/i18ncache_data_bg.json b/bundle/android/raw/i18ncache_data_bg.json
diff --git a/bundle/android/raw/i18ncache_data_bo.json b/bundle/android/raw/i18ncache_data_bo.json
diff --git a/bundle/android/raw/i18ncache_data_ca.json b/bundle/android/raw/i18ncache_data_ca.json
diff --git a/bundle/android/raw/i18ncache_data_cs.json b/bundle/android/raw/i18ncache_data_cs.json
diff --git a/bundle/android/raw/i18ncache_data_cy.json b/bundle/android/raw/i18ncache_data_cy.json
diff --git a/bundle/android/raw/i18ncache_data_da.json b/bundle/android/raw/i18ncache_data_da.json
diff --git a/bundle/android/raw/i18ncache_data_de.json b/bundle/android/raw/i18ncache_data_de.json
diff --git a/bundle/android/raw/i18ncache_data_el.json b/bundle/android/raw/i18ncache_data_el.json
diff --git a/bundle/android/raw/i18ncache_data_enau.json b/bundle/android/raw/i18ncache_data_enau.json
diff --git a/bundle/android/raw/i18ncache_data_enca.json b/bundle/android/raw/i18ncache_data_enca.json
diff --git a/bundle/android/raw/i18ncache_data_engb.json b/bundle/android/raw/i18ncache_data_engb.json
diff --git a/bundle/android/raw/i18ncache_data_ennz.json b/bundle/android/raw/i18ncache_data_ennz.json
diff --git a/bundle/android/raw/i18ncache_data_enza.json b/bundle/android/raw/i18ncache_data_enza.json
diff --git a/bundle/android/raw/i18ncache_data_es.json b/bundle/android/raw/i18ncache_data_es.json
diff --git a/bundle/android/raw/i18ncache_data_esar.json b/bundle/android/raw/i18ncache_data_esar.json
diff --git a/bundle/android/raw/i18ncache_data_escl.json b/bundle/android/raw/i18ncache_data_escl.json
diff --git a/bundle/android/raw/i18ncache_data_escr.json b/bundle/android/raw/i18ncache_data_escr.json
diff --git a/bundle/android/raw/i18ncache_data_fa.json b/bundle/android/raw/i18ncache_data_fa.json
diff --git a/bundle/android/raw/i18ncache_data_fr.json b/bundle/android/raw/i18ncache_data_fr.json
diff --git a/bundle/android/raw/i18ncache_data_gl.json b/bundle/android/raw/i18ncache_data_gl.json
diff --git a/bundle/android/raw/i18ncache_data_he.json b/bundle/android/raw/i18ncache_data_he.json
diff --git a/bundle/android/raw/i18ncache_data_hr.json b/bundle/android/raw/i18ncache_data_hr.json
diff --git a/bundle/android/raw/i18ncache_data_hu.json b/bundle/android/raw/i18ncache_data_hu.json
diff --git a/bundle/android/raw/i18ncache_data_id.json b/bundle/android/raw/i18ncache_data_id.json
diff --git a/bundle/android/raw/i18ncache_data_is.json b/bundle/android/raw/i18ncache_data_is.json
diff --git a/bundle/android/raw/i18ncache_data_it.json b/bundle/android/raw/i18ncache_data_it.json
diff --git a/bundle/android/raw/i18ncache_data_ja.json b/bundle/android/raw/i18ncache_data_ja.json
diff --git a/bundle/android/raw/i18ncache_data_ka.json b/bundle/android/raw/i18ncache_data_ka.json
diff --git a/bundle/android/raw/i18ncache_data_ko.json b/bundle/android/raw/i18ncache_data_ko.json
diff --git a/bundle/android/raw/i18ncache_data_nb.json b/bundle/android/raw/i18ncache_data_nb.json
diff --git a/bundle/android/raw/i18ncache_data_nl.json b/bundle/android/raw/i18ncache_data_nl.json
diff --git a/bundle/android/raw/i18ncache_data_nlbe.json b/bundle/android/raw/i18ncache_data_nlbe.json
diff --git a/bundle/android/raw/i18ncache_data_pl.json b/bundle/android/raw/i18ncache_data_pl.json
diff --git a/bundle/android/raw/i18ncache_data_pt.json b/bundle/android/raw/i18ncache_data_pt.json
diff --git a/bundle/android/raw/i18ncache_data_ptbr.json b/bundle/android/raw/i18ncache_data_ptbr.json
diff --git a/bundle/android/raw/i18ncache_data_ro.json b/bundle/android/raw/i18ncache_data_ro.json
diff --git a/bundle/android/raw/i18ncache_data_ru.json b/bundle/android/raw/i18ncache_data_ru.json
diff --git a/bundle/android/raw/i18ncache_data_sk.json b/bundle/android/raw/i18ncache_data_sk.json
diff --git a/bundle/android/raw/i18ncache_data_sq.json b/bundle/android/raw/i18ncache_data_sq.json
diff --git a/bundle/android/raw/i18ncache_data_sr.json b/bundle/android/raw/i18ncache_data_sr.json
diff --git a/bundle/android/raw/i18ncache_data_sv.json b/bundle/android/raw/i18ncache_data_sv.json
diff --git a/bundle/android/raw/i18ncache_data_th.json b/bundle/android/raw/i18ncache_data_th.json
diff --git a/bundle/android/raw/i18ncache_data_tr.json b/bundle/android/raw/i18ncache_data_tr.json
diff --git a/bundle/android/raw/i18ncache_data_uk.json b/bundle/android/raw/i18ncache_data_uk.json
diff --git a/bundle/android/raw/i18ncache_data_ur.json b/bundle/android/raw/i18ncache_data_ur.json
diff --git a/bundle/android/raw/i18ncache_data_vi.json b/bundle/android/raw/i18ncache_data_vi.json
diff --git a/bundle/android/raw/i18ncache_data_zhcn.json b/bundle/android/raw/i18ncache_data_zhcn.json
diff --git a/bundle/android/raw/i18ncache_data_zhtw.json b/bundle/android/raw/i18ncache_data_zhtw.json
diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml
@@ -41,6 +41,7 @@
     <!-- 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_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_and_hold_to_edit" tools:ignore="UnusedResources">Double tap and hold to edit</string>
@@ -67,6 +68,7 @@
     <string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
     <!-- translators: sample content for "About" page template -->
     <string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
+    <string name="gutenberg_native_edit_block_in_web_browser" tools:ignore="UnusedResources">Edit block in web browser</string>
     <string name="gutenberg_native_edit_media" tools:ignore="UnusedResources">Edit media</string>
     <string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
     <!-- translators: sample content for "Team" page template -->
@@ -211,7 +213,8 @@ translators: sample content for "Services" page template -->
     <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_in_the_m" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this block using your device\'s web browser.</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m_68559180" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.</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 -->