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.

Sign up for GitHub

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

Jump to bottom

[Gutenberg] Update to v1.21.0 #13250

Merged
merged 19 commits into from
Jan 24, 2020
Merged

[Gutenberg] Update to v1.21.0 #13250

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
82bb92c
Update Aztec to version 1.15.0 and matching Gutenberg version.
SergioEstevao Jan 14, 2020
81ec7b2
Update GB-mobile
SergioEstevao Jan 14, 2020
5ec027a
Remove spaces.
SergioEstevao Jan 15, 2020
7136d8a
Update GB-mobile version
SergioEstevao Jan 16, 2020
d3e05e9
Update gutenberg ref to v1.21.0
etoledom Jan 20, 2020
9f3240a
Update Podfile to oficial 1.15.0 release of Aztec.
SergioEstevao Jan 21, 2020
6fcb57c
Merge branch 'gutenberg/integrate_release_1.21.0' into update/aztec_1_15
SergioEstevao Jan 21, 2020
f5f8dcf
Merge pull request #13228 from wordpress-mobile/update/aztec_1_15
SergioEstevao Jan 21, 2020
81fc458
Update gutenberg ref
etoledom Jan 21, 2020
fc860f2
Update gutenberg ref
etoledom Jan 22, 2020
03d490a
Update gutenberg ref
etoledom Jan 22, 2020
7db9764
Update gutenberg ref
etoledom Jan 22, 2020
7b3f99a
Update gutenberg ref
etoledom Jan 23, 2020
38440da
Merge remote-tracking branch 'origin/develop' into gutenberg/integrat…
etoledom Jan 23, 2020
f72c18c
Fix UI unit tests
SergioEstevao Jan 23, 2020
0fa36a4
Fix test for block editor too.
SergioEstevao Jan 23, 2020
cfdcc87
Update Release notes with shortcode mention
maxme Jan 23, 2020
29d7cdb
Merge remote-tracking branch 'origin/develop' into gutenberg/integrat…
etoledom Jan 23, 2020
7fffd24
Update gutenberg ref
etoledom Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def aztec
## pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'ba8524aba1332550efb05cad583a85ed3511beb5'
## pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => '1.5.0.beta.1'
## pod 'WordPress-Editor-iOS', :path => '../AztecEditor-iOS'
pod 'WordPress-Editor-iOS', '~> 1.14.0'
pod 'WordPress-Editor-iOS', '~> 1.15.0'
end

def wordpress_ui
Expand Down Expand Up @@ -141,7 +141,7 @@ target 'WordPress' do
## Gutenberg (React Native)
## =====================
##
gutenberg :commit => 'aafa4188ebd4f76116ee3dce81a9a5fb870a01bf'
gutenberg :commit => '40f4c19eaa2147cc8165332af68776f338471f92'

## Third party libraries
## =====================
Expand Down
138 changes: 69 additions & 69 deletions Podfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ class AztecPostViewController: UIViewController, PostEditor {
///
fileprivate(set) lazy var editorView: Aztec.EditorView = {

Configuration.headersWithBoldTrait = true

let paragraphStyle = ParagraphStyle.default

// Paragraph style customizations will go here.
Expand Down Expand Up @@ -156,7 +158,7 @@ class AztecPostViewController: UIViewController, PostEditor {

textView.backgroundColor = Colors.aztecBackground
textView.blockquoteBackgroundColor = .neutral(.shade5)
textView.blockquoteBorderColor = .listIcon
textView.blockquoteBorderColors = [.listIcon]
textView.preBackgroundColor = .neutral(.shade5)

textView.linkTextAttributes = linkAttributes
Expand Down
3 changes: 2 additions & 1 deletion WordPress/Classes/ViewRelated/Post/PostEditorNavigationBarManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class PostEditorNavigationBarManager {
let button = UIButton(type: .system)
button.setImage(image, for: .normal)
button.frame = CGRect(origin: .zero, size: image.size)
button.accessibilityLabel = NSLocalizedString("More", comment: "Action button to display more available options")
button.accessibilityLabel = NSLocalizedString("More Options", comment: "Action button to display more available options")
button.accessibilityIdentifier = "more_post_options"
button.addTarget(self, action: #selector(moreWasPressed), for: .touchUpInside)
button.setContentHuggingPriority(.required, for: .horizontal)
return button
Expand Down
4 changes: 3 additions & 1 deletion WordPress/WordPressShareExtension/ShareExtensionEditorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class ShareExtensionEditorViewController: ShareExtensionAbstractViewController {
///
fileprivate(set) lazy var richTextView: Aztec.TextView = {

Configuration.headersWithBoldTrait = true

let paragraphStyle = ParagraphStyle.default

// Paragraph style customizations will go here.
Expand All @@ -59,7 +61,7 @@ class ShareExtensionEditorViewController: ShareExtensionAbstractViewController {
textView.textColor = .text
textView.tintColor = ShareColors.aztecCursorColor
textView.blockquoteBackgroundColor = .neutral(.shade5)
textView.blockquoteBorderColor = .listIcon
textView.blockquoteBorderColors = [.listIcon]
textView.preBackgroundColor = .neutral(.shade5)
textView.linkTextAttributes = linkAttributes
textView.textAlignment = .natural
Expand Down
2 changes: 1 addition & 1 deletion WordPress/WordPressUITests/Screens/Editor/AztecEditorScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AztecEditorScreen: BaseScreen {

let editorCloseButton = XCUIApplication().navigationBars["Azctec Editor Navigation Bar"].buttons["Close"]
let publishButton = XCUIApplication().buttons["Publish"]
let moreButton = XCUIApplication().buttons["More"]
let moreButton = XCUIApplication().buttons["more_post_options"]
let uploadProgressBar = XCUIApplication().progressIndicators["Progress"]

let titleView = XCUIApplication().textViews["Title"]
Expand Down
2 changes: 1 addition & 1 deletion WordPress/WordPressUITests/Screens/Editor/BlockEditorScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class BlockEditorScreen: BaseScreen {
let editorNavBar = XCUIApplication().navigationBars["Gutenberg Editor Navigation Bar"]
let editorCloseButton = XCUIApplication().navigationBars["Gutenberg Editor Navigation Bar"].buttons["Close"]
let publishButton = XCUIApplication().buttons["Publish"]
let moreButton = XCUIApplication().buttons["More"]
let moreButton = XCUIApplication().buttons["more_post_options"]

// Editor area
// Title
Expand Down