wordpress-mobile · mchowning · Feb 21, 2020 · Jan 23, 2020 · Jan 23, 2020 · Jan 29, 2020
diff --git a/.flowconfig b/.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/.*

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,15 @@
+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
+
 1.22.0
 ------
+* Add support for changing images size in Gallery block
 * Make inserter to show options on long-press to add before/after
 * Retry displaying image when connectivity restores
 * [iOS] Show an "Edit" button overlay on selected image blocks

diff --git a/android/app/build.gradle b/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')

diff --git a/android/app/src/main/java/com/gutenberg/MainApplication.java b/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);
             }
 

diff --git a/android/settings.gradle b/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'
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
@@ -10,6 +10,12 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
+		},
+		"customTextColor" : {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
 		}
 	}
 }
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_es.json b/bundle/android/raw/i18ncache_data_es.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_hr.json b/bundle/android/raw/i18ncache_data_hr.json
diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml
@@ -18,8 +18,11 @@
     <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_url" tools:ignore="UnusedResources">Button 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_color_settings" tools:ignore="UnusedResources">Color Settings</string>
     <string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
     <string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
     <string name="gutenberg_native_double_tap_and_hold_to_edit" tools:ignore="UnusedResources">Double tap and hold to edit</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) -->
@@ -65,6 +69,7 @@
     <string name="gutenberg_native_my_pre_publish_panel" tools:ignore="UnusedResources">My pre publish panel</string>
     <string name="gutenberg_native_navigate_up" tools:ignore="UnusedResources">Navigate Up</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
+    <string name="gutenberg_native_note_theme_colors_are_not_available_at_this_time" tools:ignore="UnusedResources">Note: Theme colors are not available at this time.</string>
     <string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
     <!-- translators: accessibility text. %s: Page break text. -->
     <string name="gutenberg_native_page_break_block_s" tools:ignore="UnusedResources">Page break block. %s</string>

diff --git a/bundle/ios/App.js b/bundle/ios/App.js
diff --git a/bundle/ios/App.js.map b/bundle/ios/App.js.map
diff --git a/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift
@@ -22,8 +22,11 @@ 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 URL", comment: "")
     _ = NSLocalizedString("Choose from device", comment: "")
     _ = NSLocalizedString("Clear All Settings", comment: "")
+    _ = NSLocalizedString("Color Settings", comment: "")
     _ = NSLocalizedString("Content…", comment: "")
     _ = NSLocalizedString("Current value is %s", comment: "")
     _ = NSLocalizedString("Double tap and hold to edit", 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)")
@@ -62,6 +66,7 @@ private func dummy() {
     _ = NSLocalizedString("My pre publish panel", comment: "")
     _ = NSLocalizedString("Navigate Up", comment: "")
     _ = NSLocalizedString("No application can handle this request. Please install a Web browser.", comment: "")
+    _ = NSLocalizedString("Note: Theme colors are not available at this time.", comment: "")
     _ = NSLocalizedString("Open Settings", comment: "")
     _ = NSLocalizedString("Page break block. %s", comment: "translators: accessibility text. %s: Page break text.")
     _ = NSLocalizedString("Paste URL", comment: "")

diff --git a/bundle/ios/assets/gutenberg/packages/block-library/src/columns/block.json b/bundle/ios/assets/gutenberg/packages/block-library/src/columns/block.json
@@ -10,6 +10,12 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
+		},
+		"customTextColor" : {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
 		}
 	}
 }
diff --git a/bundle/ios/assets/i18n-cache/data/de.json b/bundle/ios/assets/i18n-cache/data/de.json
diff --git a/bundle/ios/assets/i18n-cache/data/es.json b/bundle/ios/assets/i18n-cache/data/es.json
diff --git a/bundle/ios/assets/i18n-cache/data/fr.json b/bundle/ios/assets/i18n-cache/data/fr.json
diff --git a/bundle/ios/assets/i18n-cache/data/gl.json b/bundle/ios/assets/i18n-cache/data/gl.json
diff --git a/bundle/ios/assets/i18n-cache/data/hr.json b/bundle/ios/assets/i18n-cache/data/hr.json
diff --git a/gutenberg b/gutenberg
diff --git a/ios/Podfile.lock b/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):
@@ -244,6 +246,7 @@ PODS:
   - 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

diff --git a/ios/gutenberg.xcodeproj/project.pbxproj b/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",

diff --git a/package.json b/package.json
@@ -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",

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -12,6 +12,8 @@ class RCTAztecView: Aztec.TextView {
     @objc var onPaste: RCTBubblingEventBlock? = nil
     @objc var onContentSizeChange: RCTBubblingEventBlock? = nil
     @objc var onSelectionChange: RCTBubblingEventBlock? = nil
+    @objc var minWidth: CGFloat = 0
+    @objc var maxWidth: CGFloat = 0
     @objc var blockType: NSDictionary? = nil {
         didSet {
             guard let block = blockType, let tag = block["tag"] as? String else {
@@ -174,14 +176,25 @@ class RCTAztecView: Aztec.TextView {
         recognizer.isEnabled = false
     }
 
-    // MARK - View Height: Match to content height
+    // MARK: - View height and width: Match to the content
 
     override func layoutSubviews() {
         super.layoutSubviews()
+        adjustWidth()
         fixLabelPositionForRTLLayout()
         updateContentSizeInRN()
     }
 
+    private func adjustWidth() {
+        if (maxWidth > 0 && minWidth > 0) {
+            let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude)
+            let newWidth = sizeThatFits(maxSize).width
+            if (newWidth != frame.size.width) {
+                frame.size.width = max(newWidth, minWidth)
+            }
+        }
+    }
+
     private func fixLabelPositionForRTLLayout() {
         if hasRTLLayout {
             // RCTScrollViews are flipped horizontally on RTL layout.

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m b/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
@@ -21,6 +21,8 @@ @interface RCT_EXTERN_MODULE(RCTAztecViewManager, NSObject)
 RCT_EXPORT_VIEW_PROPERTY(placeholderTextColor, UIColor)
 RCT_REMAP_VIEW_PROPERTY(color, textColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(linkTextColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(minWidth, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(maxWidth, CGFloat)
 
 RCT_EXPORT_VIEW_PROPERTY(fontFamily, NSString)
 RCT_EXPORT_VIEW_PROPERTY(fontSize, CGFloat)

diff --git a/react-native-gutenberg-bridge/android/build.gradle b/react-native-gutenberg-bridge/android/build.gradle
@@ -129,6 +129,7 @@ dependencies {
 
     if (rootProject.ext.buildGutenbergFromSource) {
         println "using gutenberg from source"
+        implementation project(':react-native-linear-gradient')
         implementation project(':react-native-svg')
         implementation project(':react-native-video')
         implementation project(':@react-native-community_slider')
@@ -139,6 +140,7 @@ dependencies {
 
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-svg', readHashedVersion('../../package.json', 'react-native-svg', 'dependencies')))
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-video', readHashedVersion('../../package.json', 'react-native-video', 'dependencies')))
+        implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-linear-gradient', readHashedVersion('../../package.json', 'react-native-linear-gradient', 'dependencies')))
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-slider', readHashedVersion('../../package.json', '@react-native-community/slider', 'dependencies')))
 
         // FIXME Temporary fix to get Jitpack builds to green while I work on a solution without hardcoded values.

diff --git a/...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java b/...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
@@ -119,7 +119,7 @@ public void requestMediaPickFrom(String mediaSource, ReadableArray filter, Boole
         } else if (mediaSource.equals(MEDIA_SOURCE_DEVICE_LIBRARY)) {
             mGutenbergBridgeJS2Parent.requestMediaPickFromDeviceLibrary(getNewUploadMediaCallback(allowMultipleSelection, onUploadMediaSelected), allowMultipleSelection, mediaType);
         } else if (mediaSource.equals(MEDIA_SOURCE_DEVICE_CAMERA)) {
-            mGutenbergBridgeJS2Parent.requestMediaPickerFromDeviceCamera(getNewUploadMediaCallback(false, onUploadMediaSelected), mediaType);
+            mGutenbergBridgeJS2Parent.requestMediaPickerFromDeviceCamera(getNewUploadMediaCallback(allowMultipleSelection, onUploadMediaSelected), mediaType);
         } else {
             mGutenbergBridgeJS2Parent.requestMediaPickFrom(mediaSource, getNewUploadMediaCallback(allowMultipleSelection, onUploadMediaSelected), allowMultipleSelection);
         }

diff --git a/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -32,6 +32,7 @@
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.horcrux.svg.SvgPackage;
+import com.BV.LinearGradient.LinearGradientPackage;
 import com.reactnativecommunity.slider.ReactSliderPackage;
 
 import org.wordpress.android.util.AppLog;
@@ -321,6 +322,7 @@ public void requestMediaEditor(MediaUploadCallback mediaUploadCallback, String m
         return Arrays.asList(
                 new MainReactPackage(getMainPackageConfig(getImagePipelineConfig(sOkHttpClient))),
                 new SvgPackage(),
+                new LinearGradientPackage(),
                 new ReactAztecPackage(),
                 new ReactVideoPackage(),
                 new ReactSliderPackage(),

diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json
@@ -0,0 +1,23 @@
+{
+  "name": "react-native-linear-gradient",
+  "version": "2.5.6",
+  "summary": "A <LinearGradient /> component for react-native",
+  "description": "A <LinearGradient /> component for react-native",
+  "license": "MIT",
+  "authors": "Brent Vatne => brentvatne@gmail.com",
+  "homepage": "https://github.com/brentvatne/react-native-linear-gradient.git",
+  "source": {
+    "git": "https://github.com/brentvatne/react-native-linear-gradient.git",
+    "tag": "v2.5.6"
+  },
+  "source_files": "BVLinearGradient/*.{h,m}",
+  "preserve_paths": "**/*.js",
+  "platforms": {
+    "ios": "8.0"
+  },
+  "dependencies": {
+    "React": [
+
+    ]
+  }
+}
diff --git a/src/_colors.scss b/src/_colors.scss
@@ -136,6 +136,9 @@ $blue-50: #2271b1;
 // Primary tint color (dark)
 $blue-30: #5198d9;
 
+$button-default-bg: #2271b1;
+$button-fallback-bg: #595959;
+
 // color-studio
 $gray-0: #f6f7f7;
 $gray-5: #dcdcde;

diff --git a/src/index.js b/src/index.js
@@ -65,7 +65,7 @@ export class RootComponent extends React.Component {
 	render() {
 		const { initialHtmlModeEnabled } = this.props;
 		const settings = {
-			__experimentalEnablePageTemplates: !! __DEV__,
+			__mobileEnablePageTemplates: !! __DEV__,
 		};
 		let initialData = this.props.initialData;
 		let initialTitle = this.props.initialTitle;

diff --git a/yarn.lock b/yarn.lock
@@ -11479,6 +11479,10 @@ react-native-iphone-x-helper@^1.0.3:
     prop-types "^15.6.2"
     react-native-iphone-x-helper "^1.0.3"
 
+"react-native-linear-gradient@git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37":
+  version "2.5.6"
+  resolved "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37"
+
 react-native-modal@^6.5.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-6.5.0.tgz#46220b2289a41597d344c1db17454611b426a758"
+1 −1		.travis.yml
+7 −21		packages/block-editor/src/components/plain-text/index.native.js
+4 −4		packages/block-editor/src/store/defaults.js