From dda498af86c3156ccdc79caf8cec9ac7cc545b3d Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 16:10:36 -0600 Subject: [PATCH 01/15] Removing usage of NUX VCs. --- .../RegisterDomainDetailsViewController.swift | 2 +- ...isterDomainSuggestionsViewController.swift | 28 ++++++++++++++++--- ...DomainSuggestionsTableViewController.swift | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift index 25156c1a2b42..5b39c3b664c4 100644 --- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift +++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift @@ -2,7 +2,7 @@ import UIKit import WordPressAuthenticator import WordPressEditor -class RegisterDomainDetailsViewController: NUXTableViewController { +class RegisterDomainDetailsViewController: UITableViewController { typealias Localized = RegisterDomainDetails.Localized typealias SectionIndex = RegisterDomainDetailsViewModel.SectionIndex diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift index a0c6aa804c1c..59a1d00e166c 100644 --- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift +++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift @@ -1,7 +1,7 @@ import UIKit import WordPressAuthenticator -class RegisterDomainSuggestionsViewController: NUXViewController, DomainSuggestionsButtonViewPresenter { +class RegisterDomainSuggestionsViewController: UIViewController, DomainSuggestionsButtonViewPresenter { @IBOutlet weak var buttonContainerViewBottomConstraint: NSLayoutConstraint! @IBOutlet weak var buttonContainerViewHeightConstraint: NSLayoutConstraint! @@ -69,9 +69,17 @@ class RegisterDomainSuggestionsViewController: NUXViewController, DomainSuggesti title = NSLocalizedString("Register domain", comment: "Register domain - Title for the Suggested domains screen") WPStyleGuide.configureColors(view: view, tableView: nil) - let backButton = UIBarButtonItem() - backButton.title = NSLocalizedString("Back", comment: "Back button title.") - navigationItem.backBarButtonItem = backButton + + let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, + target: self, + action: #selector(handleCancelButtonTapped)) + navigationItem.leftBarButtonItem = cancelButton + + let supportButton = UIBarButtonItem(title: NSLocalizedString("Help", comment: "Help button"), + style: .plain, + target: self, + action: #selector(handleSupportButtonTapped)) + navigationItem.rightBarButtonItem = supportButton } // MARK: - Navigation @@ -90,6 +98,18 @@ class RegisterDomainSuggestionsViewController: NUXViewController, DomainSuggesti domainsTableViewController = vc } } + + // MARK: - Nav Bar Button Handling + + @objc private func handleCancelButtonTapped(sender: UIBarButtonItem) { + dismiss(animated: true) + } + + @objc private func handleSupportButtonTapped(sender: UIBarButtonItem) { + let supportVC = SupportTableViewController() + supportVC.showFromTabBar() + } + } // MARK: - DomainSuggestionsTableViewControllerDelegate diff --git a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift index 9456492f3a60..16a93f3ea78f 100644 --- a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift @@ -11,7 +11,7 @@ protocol DomainSuggestionsTableViewControllerDelegate { /// This is intended to be an abstract base class that provides domain /// suggestions for the keyword that user searches. /// Subclasses should override the open variables to make customizations. -class DomainSuggestionsTableViewController: NUXTableViewController { +class DomainSuggestionsTableViewController: UITableViewController { // MARK: - Properties From 718580ce607f1f1ec4c1bcbaa58441453ac36dd5 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:08:17 -0600 Subject: [PATCH 02/15] Remove NUX VCs. --- .../ViewRelated/NUX/SignupEpilogueTableViewController.swift | 2 +- .../Classes/ViewRelated/NUX/SignupEpilogueViewController.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift index 657d63937937..26fd1e589910 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift @@ -17,7 +17,7 @@ protocol SignupEpilogueTableViewControllerDataSource { var username: String? { get } } -class SignupEpilogueTableViewController: NUXTableViewController, EpilogueUserInfoCellViewControllerProvider { +class SignupEpilogueTableViewController: UITableViewController, EpilogueUserInfoCellViewControllerProvider { // MARK: - Properties diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift index a5b47e22325c..5085a721c011 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift @@ -2,7 +2,7 @@ import SVProgressHUD import WordPressAuthenticator -class SignupEpilogueViewController: NUXViewController { +class SignupEpilogueViewController: UIViewController { // MARK: - Public Properties From 49280d90da7e69ec78e38caa0a23f13e5d0fe17e Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:09:30 -0600 Subject: [PATCH 03/15] Remove using NUX VC. --- .../NUX/SignupUsernameViewController.swift | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift index 6b7c8ffb6f83..002bb1ccd7f3 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift @@ -6,18 +6,11 @@ protocol SignupUsernameViewControllerDelegate { func usernameSelected(_ username: String) } -class SignupUsernameViewController: NUXViewController { +class SignupUsernameViewController: UIViewController { // MARK: - Properties open var currentUsername: String? open var displayName: String? open var delegate: SignupUsernameViewControllerDelegate? - - override var sourceTag: WordPressSupportSourceTag { - get { - return .wpComCreateSiteUsername - } - } - private var usernamesTableViewController: SignupUsernameTableViewController? // MARK: - View @@ -29,9 +22,20 @@ class SignupUsernameViewController: NUXViewController { } private func configureView() { - _ = addHelpButtonToNavController() navigationItem.title = NSLocalizedString("Change Username", comment: "Change Username title.") WPStyleGuide.configureColors(view: view, tableView: nil) + + let supportButton = UIBarButtonItem(title: NSLocalizedString("Help", comment: "Help button"), + style: .plain, + target: self, + action: #selector(handleSupportButtonTapped)) + navigationItem.rightBarButtonItem = supportButton + } + + @objc private func handleSupportButtonTapped(sender: UIBarButtonItem) { + let supportVC = SupportTableViewController() + supportVC.sourceTag = .wpComCreateSiteUsername + supportVC.showFromTabBar() } // MARK: - Segue From 985dafd5cf4b9810a46e1b3375c5e282ee83996d Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:10:04 -0600 Subject: [PATCH 04/15] Remove unnecessary methods. --- .../ViewRelated/NUX/LoginEpilogueViewController.swift | 10 +--------- .../ViewRelated/NUX/SignupEpilogueViewController.swift | 8 ++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift index 8b05507e001f..d4c15000024e 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift @@ -56,20 +56,12 @@ class LoginEpilogueViewController: UIViewController { fatalError() } + navigationController?.setNavigationBarHidden(true, animated: false) view.backgroundColor = .basicBackground topLine.backgroundColor = .divider defaultTableViewMargin = tableViewLeadingConstraint.constant setTableViewMargins(forWidth: view.frame.width) refreshInterface(with: credentials) - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - navigationController?.setNavigationBarHidden(true, animated: false) - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) WordPressAuthenticator.track(.loginEpilogueViewed) } diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift index 5085a721c011..34a6de8d3042 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift @@ -36,18 +36,14 @@ class SignupEpilogueViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + navigationController?.setNavigationBarHidden(true, animated: false) + view.backgroundColor = .basicBackground defaultTableViewMargin = tableViewLeadingConstraint.constant configureDoneButton() setTableViewMargins(forWidth: view.frame.width) WordPressAuthenticator.track(.signupEpilogueViewed, properties: tracksProperties()) } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - navigationController?.setNavigationBarHidden(true, animated: false) - view.backgroundColor = .basicBackground - } - override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { super.viewWillTransition(to: size, with: coordinator) setTableViewMargins(forWidth: size.width) From 5968ed0877066168b85b3446db7294d7f6f8a126 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:13:03 -0600 Subject: [PATCH 05/15] Remove NUX VC. --- .../ViewRelated/NUX/SignupUsernameTableViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupUsernameTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupUsernameTableViewController.swift index 6a2e7db20af6..4d732b4b8d84 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupUsernameTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupUsernameTableViewController.swift @@ -2,7 +2,7 @@ import SVProgressHUD import WordPressAuthenticator -class SignupUsernameTableViewController: NUXTableViewController, SearchTableViewCellDelegate { +class SignupUsernameTableViewController: UITableViewController, SearchTableViewCellDelegate { open var currentUsername: String? open var displayName: String? open var delegate: SignupUsernameViewControllerDelegate? From b2bc76785ec3b99b4bdbbfe045a3cc229e608da1 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:21:17 -0600 Subject: [PATCH 06/15] Set table background color, remove custom header background. --- .../LoginEpilogueTableViewController.swift | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift index 41b289e6e84b..b2cc114f317a 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift @@ -56,6 +56,7 @@ class LoginEpilogueTableViewController: UITableViewController { tableView.tableFooterView = UIView(frame: CGRect(origin: .zero, size: CGSize(width: 0, height: 1))) view.backgroundColor = .basicBackground + tableView.backgroundColor = .basicBackground } /// Initializes the EpilogueTableView so that data associated with the specified Endpoint is displayed. @@ -206,25 +207,6 @@ extension LoginEpilogueTableViewController { } } -// MARK: - UITableViewDelegate methods -// -extension LoginEpilogueTableViewController { - - override func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection section: Int) { - guard let headerView = view as? UITableViewHeaderFooterView else { - return - } - - let backgroundView = UIView() - backgroundView.backgroundColor = .basicBackground - headerView.backgroundView = backgroundView - - headerView.textLabel?.font = UIFont.preferredFont(forTextStyle: .footnote) - headerView.textLabel?.textColor = .neutral(.shade50) - } -} - - // MARK: - Private Methods // private extension LoginEpilogueTableViewController { From 757d6632a473f7f8206670b5e2030122cd58d730 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:35:41 -0600 Subject: [PATCH 07/15] Restrict orientation (was previously provided by NUX VC). --- .../ViewRelated/NUX/SignupEpilogueViewController.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift index 34a6de8d3042..78529780aeab 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift @@ -54,6 +54,10 @@ class SignupEpilogueViewController: UIViewController { setTableViewMargins(forWidth: view.frame.width) } + override var supportedInterfaceOrientations: UIInterfaceOrientationMask { + return UIDevice.isPad() ? .all : .portrait + } + // MARK: - Navigation override func prepare(for segue: UIStoryboardSegue, sender: Any?) { From 56e4ccc6c32713bbd815d522232c02be1e1e6995 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:44:19 -0600 Subject: [PATCH 08/15] Cleanup private methods & properties. --- .../LoginEpilogueTableViewController.swift | 37 +++++------ .../NUX/LoginEpilogueViewController.swift | 9 +-- .../SignupEpilogueTableViewController.swift | 53 ++++++++-------- .../NUX/SignupEpilogueViewController.swift | 61 +++++++++---------- 4 files changed, 72 insertions(+), 88 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift index b2cc114f317a..4ff9727c3dac 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueTableViewController.swift @@ -207,7 +207,7 @@ extension LoginEpilogueTableViewController { } } -// MARK: - Private Methods +// MARK: - Private Extension // private extension LoginEpilogueTableViewController { @@ -244,6 +244,17 @@ private extension LoginEpilogueTableViewController { return blogDataSource.tableView(tableView, numberOfRowsInSection: section - 1) } + enum Sections { + static let userInfoSection = 0 + } + + enum Settings { + static let headerReuseIdentifier = "SectionHeader" + static let userCellReuseIdentifier = "userInfo" + static let profileRowHeight = CGFloat(180) + static let blogRowHeight = CGFloat(60) + static let headerHeight = CGFloat(50) + } } @@ -270,7 +281,7 @@ private extension LoginEpilogueTableViewController { /// Loads the Blog for a given Username / XMLRPC, if any. /// - private func loadBlog(username: String, xmlrpc: String) -> Blog? { + func loadBlog(username: String, xmlrpc: String) -> Blog? { let context = ContextManager.sharedInstance().mainContext let service = BlogService(managedObjectContext: context) @@ -279,7 +290,7 @@ private extension LoginEpilogueTableViewController { /// The self-hosted flow sets user info, if no user info is set, assume a wpcom flow and try the default wp account. /// - private func loadEpilogueForDotcom() -> LoginEpilogueUserInfo { + func loadEpilogueForDotcom() -> LoginEpilogueUserInfo { let context = ContextManager.sharedInstance().mainContext let service = AccountService(managedObjectContext: context) guard let account = service.defaultWordPressComAccount() else { @@ -291,7 +302,7 @@ private extension LoginEpilogueTableViewController { /// Loads the EpilogueInfo for a SelfHosted site, with the specified credentials, at the given endpoint. /// - private func loadEpilogueForSelfhosted(username: String, password: String, xmlrpc: String, completion: @escaping (LoginEpilogueUserInfo?) -> ()) { + func loadEpilogueForSelfhosted(username: String, password: String, xmlrpc: String, completion: @escaping (LoginEpilogueUserInfo?) -> ()) { guard let service = UsersService(username: username, password: password, xmlrpc: xmlrpc) else { completion(nil) return @@ -320,21 +331,3 @@ private extension LoginEpilogueTableViewController { } } } - - -// MARK: - UITableViewDelegate methods -// -private extension LoginEpilogueTableViewController { - - enum Sections { - static let userInfoSection = 0 - } - - enum Settings { - static let headerReuseIdentifier = "SectionHeader" - static let userCellReuseIdentifier = "userInfo" - static let profileRowHeight = CGFloat(180) - static let blogRowHeight = CGFloat(60) - static let headerHeight = CGFloat(50) - } -} diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift index d4c15000024e..15e1672b61c6 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEpilogueViewController.swift @@ -104,7 +104,7 @@ class LoginEpilogueViewController: UIViewController { } -// MARK: - Configuration +// MARK: - Private Extension // private extension LoginEpilogueViewController { @@ -166,12 +166,7 @@ private extension LoginEpilogueViewController { static let ipadLandscape: CGFloat = 0.25 } -} - - -// MARK: - Actions -// -extension LoginEpilogueViewController { + // MARK: - Actions @IBAction func dismissEpilogue() { onDismiss?() diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift index 26fd1e589910..1d8c63703d09 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift @@ -31,32 +31,6 @@ class SignupEpilogueTableViewController: UITableViewController, EpilogueUserInfo private var showPassword: Bool = true private var reloaded: Bool = false - private struct Constants { - static let numberOfSections = 2 - static let userInfoRows = 1 - static let noPasswordRows = 2 - static let allAccountRows = 3 - static let headerFooterHeight: CGFloat = 50 - static let footerTrailingMargin: CGFloat = 16 - static let footerTopMargin: CGFloat = 8 - } - - private struct TableSections { - static let userInfo = 0 - } - - private struct CellIdentifiers { - static let sectionHeaderFooter = "SectionHeaderFooter" - static let signupEpilogueCell = "SignupEpilogueCell" - static let epilogueUserInfoCell = "userInfo" - } - - private struct CellNibNames { - static let sectionHeaderFooter = "EpilogueSectionHeaderFooter" - static let signupEpilogueCell = "SignupEpilogueCell" - static let epilogueUserInfoCell = "EpilogueUserInfoCell" - } - // MARK: - View override func viewDidLoad() { @@ -211,7 +185,7 @@ private extension SignupEpilogueTableViewController { epilogueUserInfo = userInfo } - private func generateDisplayName(from rawEmail: String) -> String { + func generateDisplayName(from rawEmail: String) -> String { // step 1: lower case let email = rawEmail.lowercased() // step 2: remove the @ and everything after @@ -250,6 +224,31 @@ private extension SignupEpilogueTableViewController { return cell } + struct Constants { + static let numberOfSections = 2 + static let userInfoRows = 1 + static let noPasswordRows = 2 + static let allAccountRows = 3 + static let headerFooterHeight: CGFloat = 50 + static let footerTrailingMargin: CGFloat = 16 + static let footerTopMargin: CGFloat = 8 + } + + struct TableSections { + static let userInfo = 0 + } + + struct CellIdentifiers { + static let sectionHeaderFooter = "SectionHeaderFooter" + static let signupEpilogueCell = "SignupEpilogueCell" + static let epilogueUserInfoCell = "userInfo" + } + + struct CellNibNames { + static let sectionHeaderFooter = "EpilogueSectionHeaderFooter" + static let signupEpilogueCell = "SignupEpilogueCell" + static let epilogueUserInfoCell = "EpilogueUserInfoCell" + } } // MARK: - SignupEpilogueCellDelegate diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift index 78529780aeab..37d9fa1df234 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift @@ -57,7 +57,7 @@ class SignupEpilogueViewController: UIViewController { override var supportedInterfaceOrientations: UIInterfaceOrientationMask { return UIDevice.isPad() ? .all : .portrait } - + // MARK: - Navigation override func prepare(for segue: UIStoryboardSegue, sender: Any?) { @@ -79,23 +79,6 @@ class SignupEpilogueViewController: UIViewController { } } - // MARK: - analytics - - private func tracksProperties() -> [AnyHashable: Any] { - let source: String = { - guard let service = socialService else { - return "email" - } - switch service { - case .google: - return "google" - case .apple: - return "apple" - } - }() - - return ["source": source] - } } // MARK: - SignupEpilogueTableViewControllerDataSource @@ -300,29 +283,32 @@ private extension SignupEpilogueViewController { }) } - private func showPasswordError(_ error: Error? = nil) { + func showPasswordError(_ error: Error? = nil) { let errorMessage = error?.localizedDescription ?? HUDMessages.changePasswordGenericError SVProgressHUD.showError(withStatus: errorMessage) } + func tracksProperties() -> [AnyHashable: Any] { + let source: String = { + guard let service = socialService else { + return "email" + } + switch service { + case .google: + return "google" + case .apple: + return "apple" + } + }() + + return ["source": source] + } + enum TableViewMarginMultipliers { static let ipadPortrait: CGFloat = 0.1667 static let ipadLandscape: CGFloat = 0.25 } -} - -extension SignupEpilogueViewController: SignupUsernameViewControllerDelegate { - func usernameSelected(_ username: String) { - if username.isEmpty || username == epilogueUserInfo?.username { - updatedUsername = nil - } else { - updatedUsername = username - } - } -} - -private extension SignupEpilogueViewController { enum ButtonTitle { static let title = NSLocalizedString("Done", comment: "Button text on site creation epilogue page to proceed to My Sites.") // TODO: change UI Test when change this @@ -335,6 +321,17 @@ private extension SignupEpilogueViewController { static let changingPassword = NSLocalizedString("Changing password", comment: "Shown while the app waits for the password changing web service to return.") static let changePasswordGenericError = NSLocalizedString("There was an error changing the password", comment: "Text displayed when there is a failure changing the password.") } + +} + +extension SignupEpilogueViewController: SignupUsernameViewControllerDelegate { + func usernameSelected(_ username: String) { + if username.isEmpty || username == epilogueUserInfo?.username { + updatedUsername = nil + } else { + updatedUsername = username + } + } } // MARK: - User Defaults From e60f30e725c1d04a26a0cda4198201fc8b7d11eb Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 17:46:49 -0600 Subject: [PATCH 09/15] Move private methods to extension. --- .../ViewRelated/NUX/SignupEpilogueCell.swift | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift index 2dc01e7540c3..ccb96d8ff487 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift @@ -115,9 +115,44 @@ class SignupEpilogueCell: UITableViewCell { cellField.backgroundColor = .basicBackground } - // MARK: - Private behavior +} + +extension SignupEpilogueCell: UITextFieldDelegate { + + func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + if let cellType = cellType, cellType == .displayName || cellType == .password { + let updatedText = NSString(string: textField.text!).replacingCharacters(in: range, with: string) + delegate?.changed(value: updatedText, forType: cellType) + } + + return true + } + + func textFieldDidEndEditing(_ textField: UITextField, reason: UITextField.DidEndEditingReason) { + if let cellType = cellType, + let updatedText = textField.text { + delegate?.updated(value: updatedText, forType: cellType) + } + } + + func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { + if let cellType = cellType, + cellType == .username { + delegate?.usernameSelected() + return false + } + return true + } + + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + cellField.endEditing(true) + return true + } +} + +private extension SignupEpilogueCell { - private func configureForPassword() { + func configureForPassword() { let isPassword = (cellType == .password) cellLabel.isHidden = isPassword @@ -131,7 +166,7 @@ class SignupEpilogueCell: UITableViewCell { cellFieldTopConstraint.constant = isPassword ? passwordTopMargin : 0 } - private func configureAccessibility(for cellType: EpilogueCellType) { + func configureAccessibility(for cellType: EpilogueCellType) { if cellType == .username { accessibilityTraits.insert(.button) // selection transitions to SignupUsernameViewController isAccessibilityElement = true // this assures double-tap properly captures cell selection @@ -148,7 +183,7 @@ class SignupEpilogueCell: UITableViewCell { } } - private func configureAccessoryType(for cellType: EpilogueCellType) { + func configureAccessoryType(for cellType: EpilogueCellType) { if cellType == .username { accessoryType = .disclosureIndicator cellFieldTrailingConstraint.constant = cellFieldTrailingMarginDisclosure @@ -158,7 +193,7 @@ class SignupEpilogueCell: UITableViewCell { } } - private func configureTextContentTypeIfNeeded(for cellType: EpilogueCellType) { + func configureTextContentTypeIfNeeded(for cellType: EpilogueCellType) { guard #available(iOS 12, *) else { return } @@ -174,37 +209,3 @@ class SignupEpilogueCell: UITableViewCell { } } - - -extension SignupEpilogueCell: UITextFieldDelegate { - - func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - if let cellType = cellType, cellType == .displayName || cellType == .password { - let updatedText = NSString(string: textField.text!).replacingCharacters(in: range, with: string) - delegate?.changed(value: updatedText, forType: cellType) - } - - return true - } - - func textFieldDidEndEditing(_ textField: UITextField, reason: UITextField.DidEndEditingReason) { - if let cellType = cellType, - let updatedText = textField.text { - delegate?.updated(value: updatedText, forType: cellType) - } - } - - func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { - if let cellType = cellType, - cellType == .username { - delegate?.usernameSelected() - return false - } - return true - } - - func textFieldShouldReturn(_ textField: UITextField) -> Bool { - cellField.endEditing(true) - return true - } -} From e3ec65fc980976b12c37dbb1d58c81d8ff79611d Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 18:07:32 -0600 Subject: [PATCH 10/15] Move private methods to extension. --- .../NUX/SignupUsernameViewController.swift | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift index 002bb1ccd7f3..74b3b20f6bc6 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupUsernameViewController.swift @@ -7,7 +7,9 @@ protocol SignupUsernameViewControllerDelegate { } class SignupUsernameViewController: UIViewController { + // MARK: - Properties + open var currentUsername: String? open var displayName: String? open var delegate: SignupUsernameViewControllerDelegate? @@ -21,7 +23,25 @@ class SignupUsernameViewController: UIViewController { navigationController?.setNavigationBarHidden(false, animated: false) } - private func configureView() { + // MARK: - Segue + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + super.prepare(for: segue, sender: sender) + + if let vc = segue.destination as? SignupUsernameTableViewController { + usernamesTableViewController = vc + vc.delegate = self + vc.displayName = displayName + vc.currentUsername = currentUsername + } + } +} + +// MARK: - Private Extension + +private extension SignupUsernameViewController { + + func configureView() { navigationItem.title = NSLocalizedString("Change Username", comment: "Change Username title.") WPStyleGuide.configureColors(view: view, tableView: nil) @@ -32,24 +52,12 @@ class SignupUsernameViewController: UIViewController { navigationItem.rightBarButtonItem = supportButton } - @objc private func handleSupportButtonTapped(sender: UIBarButtonItem) { + @objc func handleSupportButtonTapped(sender: UIBarButtonItem) { let supportVC = SupportTableViewController() supportVC.sourceTag = .wpComCreateSiteUsername supportVC.showFromTabBar() } - // MARK: - Segue - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - super.prepare(for: segue, sender: sender) - - if let vc = segue.destination as? SignupUsernameTableViewController { - usernamesTableViewController = vc - vc.delegate = self - vc.displayName = displayName - vc.currentUsername = currentUsername - } - } } // MARK: - SignupUsernameTableViewControllerDelegate From adc790d4d7ded295fa949f7dd6761cb10db8e661 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Tue, 5 May 2020 18:22:16 -0600 Subject: [PATCH 11/15] Resurrect viewWillAppear so the nav bar is re-hidden when Username view is dismissed. --- .../ViewRelated/NUX/SignupEpilogueViewController.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift index 37d9fa1df234..50de08936de8 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift @@ -36,7 +36,6 @@ class SignupEpilogueViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - navigationController?.setNavigationBarHidden(true, animated: false) view.backgroundColor = .basicBackground defaultTableViewMargin = tableViewLeadingConstraint.constant configureDoneButton() @@ -44,6 +43,11 @@ class SignupEpilogueViewController: UIViewController { WordPressAuthenticator.track(.signupEpilogueViewed, properties: tracksProperties()) } + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + navigationController?.setNavigationBarHidden(true, animated: false) + } + override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { super.viewWillTransition(to: size, with: coordinator) setTableViewMargins(forWidth: size.width) From 1f10ac584101ccc261f4563216d1412183e13e71 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 6 May 2020 17:44:03 +0100 Subject: [PATCH 12/15] Update Aztec version to 1.19.0 --- Podfile | 4 +- Podfile.lock | 154 +++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Podfile b/Podfile index 2322306935d0..20bdad4e9c32 100644 --- a/Podfile +++ b/Podfile @@ -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.18.0' + pod 'WordPress-Editor-iOS', '~> 1.19.0' end def wordpress_ui @@ -149,7 +149,7 @@ target 'WordPress' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :tag => 'v1.27.0' + gutenberg :commit => '5a7b574445105f18579a73edf7f5349213d80ad3' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index b2a9ab91a465..fd6d61ce2d14 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -363,7 +363,7 @@ PODS: - React - RNTAztecView (1.27.0): - React-Core - - WordPress-Aztec-iOS (~> 1.18.0) + - WordPress-Aztec-iOS (~> 1.19.0) - Sentry (4.5.0): - Sentry/Core (= 4.5.0) - Sentry/Core (4.5.0) @@ -373,9 +373,9 @@ PODS: - SVProgressHUD (2.2.5) - TOCropViewController (2.5.2) - UIDeviceIdentifier (1.4.0) - - WordPress-Aztec-iOS (1.18.0) - - WordPress-Editor-iOS (1.18.0): - - WordPress-Aztec-iOS (= 1.18.0) + - WordPress-Aztec-iOS (1.19.0) + - WordPress-Editor-iOS (1.19.0): + - WordPress-Aztec-iOS (= 1.19.0) - WordPressAuthenticator (1.16.0-beta.3): - 1PasswordExtension (= 1.8.6) - Alamofire (= 4.8) @@ -429,15 +429,15 @@ DEPENDENCIES: - Charts (~> 3.2.2) - CocoaLumberjack (= 3.5.2) - Down (~> 0.6.6) - - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) - - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.2.0) - - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 1.0.1) - - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.27.0`) + - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `5a7b574445105f18579a73edf7f5349213d80ad3`) - JTAppleCalendar (~> 8.0.2) - MediaEditor (~> 1.0.1) - MRProgress (= 0.8.3) @@ -447,45 +447,45 @@ DEPENDENCIES: - OCMock (= 3.4.3) - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) - - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) - - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) - - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) - - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) - - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) - - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.27.0`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `5a7b574445105f18579a73edf7f5349213d80ad3`) - SimulatorStatusMagic - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - - WordPress-Editor-iOS (~> 1.18.0) + - WordPress-Editor-iOS (~> 1.19.0) - WordPressAuthenticator (~> 1.16.0-beta.3) - WordPressKit (~> 4.8.0) - WordPressMocks (~> 0.0.8) - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.6.0) - WPMediaPicker (~> 1.6.1) - - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) - ZendeskSupportSDK (= 5.0.0) - ZIPFoundation (~> 0.9.8) @@ -545,87 +545,87 @@ SPEC REPOS: EXTERNAL SOURCES: FBLazyVector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json FBReactNativeSpec: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 glog: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json Gutenberg: + :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.27.0 RCTRequired: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json RCTTypeSafety: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json React-CoreModules: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json react-native-keyboard-aware-scroll-view: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json react-native-linear-gradient: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json react-native-slider: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json react-native-video: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json ReactCommon: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json RNTAztecView: + :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.27.0 Yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.27.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json CHECKOUT OPTIONS: FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: + :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.27.0 RNTAztecView: + :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.27.0 SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -687,7 +687,7 @@ SPEC CHECKSUMS: ReactCommon: 48926fc48fcd7c8a629860049ffba9c23b4005dc ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348 RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b - RNTAztecView: 58f944218c32079d76f2542e5b762b8a4dff263b + RNTAztecView: dc2364760fad53f52defde7c01be765e77b9ba19 Sentry: ab6c209f23700d1460691dbc90e19ed0a05d496b SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c Sodium: 63c0ca312a932e6da481689537d4b35568841bdc @@ -695,8 +695,8 @@ SPEC CHECKSUMS: SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 TOCropViewController: e9da34f484aedd4e5d5a8ab230ba217cfe16c729 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPress-Aztec-iOS: fae5d158879dfd6f36c8d0ff0cc111a0b8e36790 - WordPress-Editor-iOS: f8217e10cacf138d374d868b1395ffcb41d434f9 + WordPress-Aztec-iOS: fb6ea6409a5228292568f665eb22ea0a0aa7ad7e + WordPress-Editor-iOS: d8010b24893bb471fa1c9ab1431e95fb3e10a902 WordPressAuthenticator: 0fa6e3c9072935e331571403ae7baf71a514b5f4 WordPressKit: 84045e236949248632a2c644149e5657733011bb WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992 @@ -714,6 +714,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: aa52d5b64c7bec88254c2f38ffc047192deaaae7 +PODFILE CHECKSUM: b29183bdc6a1c6da0f02d7fc0bd6026ba5f2d5cd COCOAPODS: 1.8.4 From 7f6327feafec4bb1ddd93a821202f90018918a3a Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 6 May 2020 17:44:53 +0100 Subject: [PATCH 13/15] Update release notes. --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 81fa1be61149..43e481410607 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,7 @@ 14.9 ----- * [internal] the "Change Username" on the Signup Epilogue screen has navigation changes that can cause regressions. See https://git.io/JfGnv for testing details. +* Support the superscript and subscript HTML formatting on the Block Editor and Classic Editor. 14.8 ----- From 1f63cda05bbd415ea2e938e5f277808c1b2ff34d Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Wed, 6 May 2020 12:12:16 -0600 Subject: [PATCH 14/15] Remove force unwrap of field text. --- WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift index ccb96d8ff487..49c972c4d9a9 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift @@ -120,8 +120,10 @@ class SignupEpilogueCell: UITableViewCell { extension SignupEpilogueCell: UITextFieldDelegate { func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - if let cellType = cellType, cellType == .displayName || cellType == .password { - let updatedText = NSString(string: textField.text!).replacingCharacters(in: range, with: string) + if let cellType = cellType, + let originalText = textField.text, + cellType == .displayName || cellType == .password { + let updatedText = NSString(string: originalText).replacingCharacters(in: range, with: string) delegate?.changed(value: updatedText, forType: cellType) } From df5f42f4bbaa29eda6e125bd62c6ef3b73aa824d Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 7 May 2020 22:46:42 +0100 Subject: [PATCH 15/15] Update GB version. --- Podfile | 2 +- Podfile.lock | 138 +++++++++++++++++++++++++-------------------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Podfile b/Podfile index 20bdad4e9c32..5afeb7a1492e 100644 --- a/Podfile +++ b/Podfile @@ -149,7 +149,7 @@ target 'WordPress' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :commit => '5a7b574445105f18579a73edf7f5349213d80ad3' + gutenberg :commit => '1186db17990c7ffbd325f77ff7fe96401639e1d1' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index fd6d61ce2d14..95a7f6daef16 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -429,15 +429,15 @@ DEPENDENCIES: - Charts (~> 3.2.2) - CocoaLumberjack (= 3.5.2) - Down (~> 0.6.6) - - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) - - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.2.0) - - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 1.0.1) - - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `5a7b574445105f18579a73edf7f5349213d80ad3`) + - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `1186db17990c7ffbd325f77ff7fe96401639e1d1`) - JTAppleCalendar (~> 8.0.2) - MediaEditor (~> 1.0.1) - MRProgress (= 0.8.3) @@ -447,34 +447,34 @@ DEPENDENCIES: - OCMock (= 3.4.3) - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) - - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) - - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) - - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) - - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) - - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) - - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `5a7b574445105f18579a73edf7f5349213d80ad3`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `1186db17990c7ffbd325f77ff7fe96401639e1d1`) - SimulatorStatusMagic - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) @@ -485,7 +485,7 @@ DEPENDENCIES: - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.6.0) - WPMediaPicker (~> 1.6.1) - - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) - ZendeskSupportSDK (= 5.0.0) - ZIPFoundation (~> 0.9.8) @@ -545,86 +545,86 @@ SPEC REPOS: EXTERNAL SOURCES: FBLazyVector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json FBReactNativeSpec: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 glog: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json Gutenberg: - :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 + :commit: 1186db17990c7ffbd325f77ff7fe96401639e1d1 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ RCTRequired: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json RCTTypeSafety: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json React-CoreModules: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json react-native-keyboard-aware-scroll-view: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json react-native-linear-gradient: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json react-native-slider: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json react-native-video: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json ReactCommon: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json RNTAztecView: - :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 + :commit: 1186db17990c7ffbd325f77ff7fe96401639e1d1 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ Yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5a7b574445105f18579a73edf7f5349213d80ad3/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1186db17990c7ffbd325f77ff7fe96401639e1d1/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json CHECKOUT OPTIONS: FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 + :commit: 1186db17990c7ffbd325f77ff7fe96401639e1d1 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ RNTAztecView: - :commit: 5a7b574445105f18579a73edf7f5349213d80ad3 + :commit: 1186db17990c7ffbd325f77ff7fe96401639e1d1 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ SPEC CHECKSUMS: @@ -714,6 +714,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: b29183bdc6a1c6da0f02d7fc0bd6026ba5f2d5cd +PODFILE CHECKSUM: 5a1c2ab3ffafd567d4b777dac1fec94afa2e1e33 COCOAPODS: 1.8.4