Merge branch 'develop' into issue/1773_add_option_to_change_caret_color

wordpress-mobile · Jan 24, 2020 · 74acf9b · 74acf9b
1 parent 13ece3f
commit 74acf9b
Show file tree

Hide file tree

Showing 14 changed files with 1,789 additions and 1,758 deletions.
diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ Then, open `chrome://inspect` in Chrome to attach the debugger (look into the "R
 
 ## Writing and Running Unit Tests
 
-This project is set up to use [jest](https://facebook.github.io/jest/) for tests. You can configure whatever testing strategy you like, but jest works out of the box. Create test files in directories called `__tests__` or with the `.test.js` extension to have the files loaded by jest. See an example test [here](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/src/app/App.test.js). The [jest documentation](https://facebook.github.io/jest/docs/en/getting-started.html) is also a wonderful resource, as is the [React Native testing tutorial](https://facebook.github.io/jest/docs/en/tutorial-react-native.html).
+This project is set up to use [jest](https://facebook.github.io/jest/) for tests. You can configure whatever testing strategy you like, but jest works out of the box. Create test files in directories called `__tests__` or with the `.test.js` extension to have the files loaded by jest. See an example test [here](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/src/index.test.js). The [jest documentation](https://facebook.github.io/jest/docs/en/getting-started.html) is also a wonderful resource, as is the [React Native testing tutorial](https://facebook.github.io/jest/docs/en/tutorial-react-native.html).
 
 ## UI Tests
 

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,7 +1,7 @@
 1.21.0
 ------
-* [Android] Reduced padding around text
-* Fixed intermittent crash that occurred with very long posts
+* Reduced padding around text on Rich Text based blocks.
+* [Android] Improved stability on very long posts.
 
 1.20.0
 ------

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/strings.xml b/bundle/android/strings.xml
@@ -93,6 +93,7 @@
     <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>
+    <string name="gutenberg_native_template_preview" tools:ignore="UnusedResources">Template Preview</string>
     <string name="gutenberg_native_title" tools:ignore="UnusedResources">Title:</string>
     <string name="gutenberg_native_translate" tools:ignore="UnusedResources">Translate</string>
     <string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</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
@@ -78,6 +78,7 @@ private func dummy() {
     _ = NSLocalizedString("Take a Video", comment: "")
     _ = NSLocalizedString("Tap here to show help", comment: "")
     _ = NSLocalizedString("Tap to hide the keyboard", comment: "")
+    _ = NSLocalizedString("Template Preview", comment: "")
     _ = NSLocalizedString("Title:", comment: "")
     _ = NSLocalizedString("Translate", comment: "")
     _ = NSLocalizedString("Ungroup", comment: "")

diff --git a/gutenberg b/gutenberg
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

diff --git a/react-native-aztec/ios/Cartfile b/react-native-aztec/ios/Cartfile
@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.14.1"
+github "wordpress-mobile/AztecEditor-iOS" "1.15.0"
diff --git a/react-native-aztec/ios/Cartfile.resolved b/react-native-aztec/ios/Cartfile.resolved
@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.14.1"
+github "wordpress-mobile/AztecEditor-iOS" "1.15.0"
diff --git a/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj b/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj
@@ -12,8 +12,8 @@
 		7ECFA94221C39BBB00FC131B /* BlockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECFA94121C39BBB00FC131B /* BlockModel.swift */; };
 		F121467D20ED2F81003DD17B /* RCTAztecViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F121467C20ED2F81003DD17B /* RCTAztecViewManager.m */; };
 		F13BF4A020ECF5450047D3F9 /* RCTAztecViewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F13BF49F20ECF5450047D3F9 /* RCTAztecViewManager.swift */; };
-		F166A38020EE6DF3008E7C9F /* Aztec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F166A37B20EE6DD7008E7C9F /* Aztec.framework */; };
 		F1A879D020EE90C000FABD31 /* RCTAztecView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A879CF20EE90C000FABD31 /* RCTAztecView.swift */; };
+		FF0DC1C523CDD21D0060074D /* Aztec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F166A37B20EE6DD7008E7C9F /* Aztec.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -70,7 +70,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F166A38020EE6DF3008E7C9F /* Aztec.framework in Frameworks */,
+				FF0DC1C523CDD21D0060074D /* Aztec.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -135,6 +135,7 @@ class RCTAztecView: Aztec.TextView {
     }
 
     func commonInit() {
+        Configuration.headersWithBoldTrait = true
         delegate = self
         textContainerInset = .zero
         contentInset = .zero