Merge pull request #1924 from wordpress-mobile/release/1.23.0

1.23.0 Release -> Master

.flowconfig

@@ -31,6 +31,7 @@
 
 ; Ignore various node_modules
 <PROJECT_ROOT>/node_modules/react-native-gesture-handler/.*
+<PROJECT_ROOT>/node_modules/react-native-linear-gradient/.*
 <PROJECT_ROOT>/node_modules/expo/.*
 <PROJECT_ROOT>/node_modules/react-navigation/.*
 <PROJECT_ROOT>/node_modules/xdl/.*

RELEASE-NOTES.txt

@@ -1,3 +1,16 @@
+1.23.0
+------
+* New block: Group
+* Add support for upload options in Gallery block
+* Add support for size options in the Image block
+* New block: Button
+* Add scroll support inside block picker and block settings
+* [Android] Fix issue preventing correct placeholder image from displaying during image upload
+* [iOS] Fix diplay of large numbers on ordered lists
+* Fix issue where adding emojis to the post title add strong HTML elements to the title of the post
+* [iOS] Fix issue where alignment of paragraph blocks was not always being respected when splitting the paragraph or reading the post's html content.
+* We’ve introduced a new toolbar that floats above the block you’re editing, which makes navigating your blocks easier — especially complex ones.
+
 1.22.0
 ------
 * Make inserter to show options on long-press to add before/after

RNTAztecView.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
                         'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React-Core'
-  s.dependency         'WordPress-Aztec-iOS', '1.15.0'
+  s.dependency         'WordPress-Aztec-iOS', '1.16.0'
 
 end

android/app/build.gradle

@@ -155,6 +155,7 @@ repositories {
 
 
 dependencies {
+    implementation project(':react-native-linear-gradient')
     implementation project(':@react-native-community_slider')
     implementation project(':react-native-video')
     implementation project(':react-native-svg')

android/app/src/main/java/com/gutenberg/MainApplication.java

@@ -7,6 +7,7 @@
 import androidx.core.util.Consumer;
 
 import com.facebook.react.ReactApplication;
+import com.BV.LinearGradient.LinearGradientPackage;
 import com.reactnativecommunity.slider.ReactSliderPackage;
 import com.brentvatne.react.ReactVideoPackage;
 import com.facebook.react.bridge.ReadableArray;
@@ -136,6 +137,7 @@ protected List<ReactPackage> getPackages() {
                         new ReactVideoPackage(),
                         new SvgPackage(),
                         new ReactAztecPackage(),
+                        new LinearGradientPackage(),
                         mRnReactNativeGutenbergBridgePackage);
             }
 

android/settings.gradle

@@ -12,5 +12,7 @@ include ':react-native-aztec'
 project(':react-native-aztec').projectDir = new File(rootProject.projectDir, '../react-native-aztec/android')
 include ':react-native-gutenberg-bridge'
 project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, '../react-native-gutenberg-bridge/android')
+include ':react-native-linear-gradient'
+project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 
 include ':app'

bundle/android/raw/gutenberg_packages_blocklibrary_src_columns_block.json

@@ -10,6 +10,12 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
+		},
+		"customTextColor" : {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
 		}
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_gallery_block.json

@@ -9,27 +9,32 @@
 			"selector": ".blocks-gallery-item",
 			"query": {
 				"url": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "src"
 				},
 				"fullUrl": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-full-url"
 				},
 				"link": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-link"
 				},
 				"alt": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "alt",
 					"default": ""
 				},
 				"id": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-id"

bundle/android/strings.xml

@@ -18,6 +18,9 @@
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <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_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
+    <string name="gutenberg_native_border_settings" tools:ignore="UnusedResources">Border Settings</string>
+    <string name="gutenberg_native_button_color_settings_are_coming_soon" tools:ignore="UnusedResources">Button color settings are coming soon.</string>
+    <string name="gutenberg_native_button_link_url" tools:ignore="UnusedResources">Button Link URL</string>
     <string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
     <string name="gutenberg_native_clear_all_settings" tools:ignore="UnusedResources">Clear All Settings</string>
     <string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
@@ -50,6 +53,7 @@
     <!-- translators: accessibility text. %s: image caption. -->
     <string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
     <string name="gutenberg_native_link_inserted" tools:ignore="UnusedResources">Link inserted</string>
+    <string name="gutenberg_native_link_settings" tools:ignore="UnusedResources">Link Settings</string>
     <string name="gutenberg_native_link_text" tools:ignore="UnusedResources">Link text</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) -->

bundle/ios/GutenbergNativeTranslations.swift

@@ -22,6 +22,9 @@ private func dummy() {
     _ = NSLocalizedString("Alt Text", comment: "")
     _ = NSLocalizedString("An unknown error occurred. Please try again.", comment: "")
     _ = NSLocalizedString("Annotations Sidebar", comment: "")
+    _ = NSLocalizedString("Border Settings", comment: "")
+    _ = NSLocalizedString("Button color settings are coming soon.", comment: "")
+    _ = NSLocalizedString("Button Link URL", comment: "")
     _ = NSLocalizedString("Choose from device", comment: "")
     _ = NSLocalizedString("Clear All Settings", comment: "")
     _ = NSLocalizedString("Content…", comment: "")
@@ -49,6 +52,7 @@ private func dummy() {
     _ = NSLocalizedString("Hide keyboard", comment: "")
     _ = NSLocalizedString("Image caption. %s", comment: "translators: accessibility text. %s: image caption.")
     _ = NSLocalizedString("Link inserted", comment: "")
+    _ = NSLocalizedString("Link Settings", comment: "")
     _ = NSLocalizedString("Link text", comment: "")
     _ = NSLocalizedString("Move block down", comment: "")
     _ = NSLocalizedString("Move block down from row %1$s to row %2$s", comment: "translators: accessibility text. %1: current block position (number). %2: next block position (number)")

bundle/ios/assets/gutenberg/packages/block-library/src/columns/block.json

@@ -10,6 +10,12 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
+		},
+		"customTextColor" : {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
 		}
 	}
 }

bundle/ios/assets/gutenberg/packages/block-library/src/gallery/block.json

@@ -9,27 +9,32 @@
 			"selector": ".blocks-gallery-item",
 			"query": {
 				"url": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "src"
 				},
 				"fullUrl": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-full-url"
 				},
 				"link": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-link"
 				},
 				"alt": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "alt",
 					"default": ""
 				},
 				"id": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-id"

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
+  - BVLinearGradient (2.5.6):
+    - React
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.61.5)
   - FBReactNativeSpec (0.61.5):
@@ -239,11 +241,12 @@ PODS:
     - React
   - RNTAztecView (1.22.0):
     - React-Core
-    - WordPress-Aztec-iOS (= 1.15.0)
-  - WordPress-Aztec-iOS (1.15.0)
+    - WordPress-Aztec-iOS (= 1.16.0)
+  - WordPress-Aztec-iOS (1.16.0)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
@@ -287,6 +290,8 @@ SPEC REPOS:
     - WordPress-Aztec-iOS
 
 EXTERNAL SOURCES:
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -356,6 +361,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  BVLinearGradient: 60a475b2edfe7707deda00278cb8ce9bfe70e669
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
@@ -387,8 +393,8 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
   RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
-  RNTAztecView: 8f1559db67161d20d394291a8adca2e473ac365e
-  WordPress-Aztec-iOS: 004a458e7c4a7b0e6ed1f40695f4ce3b35ba040f
+  RNTAztecView: 19eb77f908e7d834e35b8f9b323b9069ace39e86
+  WordPress-Aztec-iOS: 64a2989d25befb5ce086fac440315f696026ffd5
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
 PODFILE CHECKSUM: 2ca635b0121a10753500623fbaee9edd0fe6ef92

ios/gutenberg.xcodeproj/project.pbxproj

@@ -461,6 +461,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-gutenberg/Pods-gutenberg-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework",
 				"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
 				"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
 				"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
@@ -494,6 +495,7 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.22.1",
+  "version": "1.23.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -167,6 +167,7 @@
     "react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6",
     "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
     "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7",
+    "react-native-linear-gradient": "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37",
     "react-native-modal": "^6.5.0",
     "react-native-safe-area": "^0.5.0",
     "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#a628e92990a2404e30a0086f168bd2b5b7b4ce96",

react-native-aztec/README.md

@@ -7,66 +7,3 @@ Wrapping Aztec Android and Aztec iOS in a React Native component
 # License
 
 GPL v2
-
-## Android: Run the example app
-
-Make sure to have an emulator running or an Android device connected, and then:
-
-```
-$ cd example/
-$ yarn clean:install
-$ yarn android
-```
-
-This will build the Android library (via `gradle`) and example app, then launch the main example activity on your connected device and run the Metro bundler at the same time.
-
-## iOS: Run the example app
-
-Before being able to run the Example App, you'll need to install [Carthage](https://github.com/Carthage/Carthage) and the dependencies for this project:
-```
-cd ios
-carthage bootstrap --platform iOS
-```
-
-Then go back to the root directory of the project and do:
-```
-$ cd example/
-$ yarn clean:install
-$ yarn ios
-```
-
-This will compile the example project, launch metro, run the simulator and run the app.
-
-## FAQ / Troubleshooting
-
-Q: The example app doesn't run
-
-A: Make sure you have yarn and babel installed (https://yarnpkg.com/lang/en/docs/install/)
-
-
-Q: The example app gets compiled but ReactNative cannot connect to Metro bundler (I'm on a real device attached through USB)
-
-A: To debug on the device through USB, remember to revert ports before launching metro:
-`adb reverse tcp:8081 tcp:8081`
-
-
-Q: The example app gets compiled but ReactNative shows an error 
-
-A: try running, from the root folder in the project
-```
-$ cd example/
-$ yarn start --reset-cache
-```
-
-Open a new shell window and run either of these depending on the platform:
-
-```
-$ yarn android
-```
-
-or
-
-```
-$ yarn ios
-```
-