Skip to content

Update project to have iOS 11 has a minimum #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergioEstevao merged 5 commits into from
Oct 10, 2019
Merged

Update project to have iOS 11 has a minimum #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1994a24
Update code for iOS 11
SergioEstevao Oct 8, 2019
dcf6ec9
Merge branch 'issue/allow_change_of_default_font' into issue/update_x…
SergioEstevao Oct 9, 2019
f7561ef
Convert to let variables.
SergioEstevao Oct 9, 2019
dfb037f
Merge branch 'issue/allow_change_of_default_font' into issue/update_x…
SergioEstevao Oct 9, 2019
7035a6a
Merge branch 'develop' into issue/update_xcode_ios_version
SergioEstevao Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Aztec.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,7 +1816,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lxml2";
Expand Down Expand Up @@ -1877,7 +1877,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "-lxml2";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1909,6 +1909,7 @@
);
INFOPLIST_FILE = Aztec/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1938,6 +1939,7 @@
);
INFOPLIST_FILE = Aztec/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2079,7 +2081,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lxml2";
Expand Down Expand Up @@ -2111,6 +2113,7 @@
);
INFOPLIST_FILE = Aztec/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2191,7 +2194,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lxml2";
Expand Down Expand Up @@ -2224,6 +2227,7 @@
);
INFOPLIST_FILE = Aztec/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
20 changes: 8 additions & 12 deletions Aztec/Classes/EditorView/EditorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,10 @@ public class EditorView: UIView {

self.htmlTextView = htmlTextView
self.richTextView = richTextView

if #available(iOS 11, *) {
htmlTextView.smartInsertDeleteType = .no
htmlTextView.smartDashesType = .no
htmlTextView.smartQuotesType = .no
}

htmlTextView.smartInsertDeleteType = .no
htmlTextView.smartDashesType = .no
htmlTextView.smartQuotesType = .no

super.init(coder: aDecoder)

Expand All @@ -129,12 +127,10 @@ public class EditorView: UIView {

self.htmlTextView = UITextView(frame: .zero, textContainer: container)
self.richTextView = TextView(defaultFont: defaultFont, defaultParagraphStyle: defaultParagraphStyle, defaultMissingImage: defaultMissingImage)

if #available(iOS 11, *) {
htmlTextView.smartInsertDeleteType = .no
htmlTextView.smartDashesType = .no
htmlTextView.smartQuotesType = .no
}

htmlTextView.smartInsertDeleteType = .no
htmlTextView.smartDashesType = .no
htmlTextView.smartQuotesType = .no

super.init(frame: .zero)

Expand Down
13 changes: 3 additions & 10 deletions Aztec/Classes/GUI/FormatBar/FormatBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,7 @@ open class FormatBar: UIView {
open override func didMoveToWindow() {
super.didMoveToWindow()

if #available(iOS 11.0, *) {
updateForSafeAreaInsets()
}
updateForSafeAreaInsets()
}

open override func layoutSubviews() {
Expand Down Expand Up @@ -683,13 +681,8 @@ private extension FormatBar {
/// Sets up the Constraints
///
func configureConstraints() {
var leadingAnchor = self.leadingAnchor
var trailingAnchor = self.trailingAnchor

if #available(iOS 11.0, *) {
leadingAnchor = safeAreaLayoutGuide.leadingAnchor
trailingAnchor = safeAreaLayoutGuide.trailingAnchor
}
let leadingAnchor = safeAreaLayoutGuide.leadingAnchor
let trailingAnchor = safeAreaLayoutGuide.trailingAnchor

///Overflow toggle item

Expand Down
12 changes: 2 additions & 10 deletions Aztec/Classes/TextKit/FontProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,14 @@ public class FontProvider {
public lazy var monospaceFont: UIFont = {
let baseFont = UIFont(descriptor:UIFontDescriptor(name: "Menlo", size: 14), size:14)
let font: UIFont
if #available(iOS 11.0, *) {
font = UIFontMetrics.default.scaledFont(for: baseFont)
} else {
font = baseFont
}
font = UIFontMetrics.default.scaledFont(for: baseFont)
return font
}()

public lazy var defaultFont: UIFont = {
let baseFont = UIFont.systemFont(ofSize: 14)
let font: UIFont
if #available(iOS 11.0, *) {
font = UIFontMetrics.default.scaledFont(for: baseFont)
} else {
font = baseFont
}
font = UIFontMetrics.default.scaledFont(for: baseFont)
return font
}()
}
7 changes: 1 addition & 6 deletions Aztec/Classes/TextKit/ParagraphProperty/Header.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ open class Header: ParagraphProperty {

public var fontSize: Float {
let fontSize = HeaderType.fontSizeMap[self] ?? Constants.defaultFontSize

if #available(iOS 11.0, *) {
return Float(UIFontMetrics.default.scaledValue(for: CGFloat(fontSize)))
} else {
return fontSize
}
return Float(UIFontMetrics.default.scaledValue(for: CGFloat(fontSize)))
}
}

Expand Down
12 changes: 4 additions & 8 deletions Aztec/Classes/TextKit/TextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,8 @@ open class TextView: UITextView {
defaultParagraphStyle: ParagraphStyle = ParagraphStyle.default,
defaultMissingImage: UIImage) {

if #available(iOS 11.0, *) {
self.defaultFont = UIFontMetrics.default.scaledFont(for: defaultFont)
} else {
self.defaultFont = defaultFont
}
self.defaultFont = UIFontMetrics.default.scaledFont(for: defaultFont)

self.defaultParagraphStyle = defaultParagraphStyle
self.defaultMissingImage = defaultMissingImage

Expand All @@ -401,9 +398,8 @@ open class TextView: UITextView {

private func commonInit() {
allowsEditingTextAttributes = true
if #available(iOS 10.0, *) {
adjustsFontForContentSizeCategory = true
}
adjustsFontForContentSizeCategory = true

storage.attachmentsDelegate = self
font = defaultFont
linkTextAttributes = [.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue), .foregroundColor: tintColor as Any]
Expand Down
8 changes: 4 additions & 4 deletions Example/AztecExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -635,7 +635,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -797,7 +797,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -880,7 +880,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down
39 changes: 15 additions & 24 deletions Example/Example/EditorDemoController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@ class EditorDemoController: UIViewController {

fileprivate(set) lazy var editorView: Aztec.EditorView = {
let defaultHTMLFont: UIFont

if #available(iOS 11, *) {
defaultHTMLFont = UIFontMetrics.default.scaledFont(for: Constants.defaultContentFont)
} else {
defaultHTMLFont = Constants.defaultContentFont
}

defaultHTMLFont = UIFontMetrics.default.scaledFont(for: Constants.defaultContentFont)

let editorView = Aztec.EditorView(
defaultFont: Constants.defaultContentFont,
Expand Down Expand Up @@ -63,10 +59,8 @@ class EditorDemoController: UIViewController {
textView.textAttachmentDelegate = self
textView.accessibilityIdentifier = "richContentView"
textView.clipsToBounds = false
if #available(iOS 11, *) {
textView.smartDashesType = .no
textView.smartQuotesType = .no
}
textView.smartDashesType = .no
textView.smartQuotesType = .no
}

private func setupHTMLTextView(_ textView: UITextView) {
Expand All @@ -79,14 +73,10 @@ class EditorDemoController: UIViewController {
textView.autocorrectionType = .no
textView.autocapitalizationType = .none
textView.clipsToBounds = false
if #available(iOS 10, *) {
textView.adjustsFontForContentSizeCategory = true
}

if #available(iOS 11, *) {
textView.smartDashesType = .no
textView.smartQuotesType = .no
}
textView.adjustsFontForContentSizeCategory = true

textView.smartDashesType = .no
textView.smartQuotesType = .no
}

fileprivate(set) lazy var titleTextView: UITextView = {
Expand Down Expand Up @@ -249,9 +239,8 @@ class EditorDemoController: UIViewController {
func updateScrollInsets() {
var scrollInsets = editorView.contentInset
var rightMargin = (view.frame.maxX - editorView.frame.maxX)
if #available(iOS 11.0, *) {
rightMargin -= view.safeAreaInsets.right
}
rightMargin -= view.safeAreaInsets.right

scrollInsets.right = -rightMargin
editorView.scrollIndicatorInsets = scrollInsets
}
Expand Down Expand Up @@ -499,6 +488,10 @@ extension EditorDemoController : UITextViewDelegate {
return true
}

func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
return false
}

func scrollViewDidScroll(_ scrollView: UIScrollView) {
updateTitlePosition()
}
Expand Down Expand Up @@ -798,9 +791,7 @@ extension EditorDemoController {
textField.clearButtonMode = UITextField.ViewMode.always;
textField.placeholder = NSLocalizedString("URL", comment:"URL text field placeholder");
textField.keyboardType = .URL
if #available(iOS 10, *) {
textField.textContentType = .URL
}
textField.textContentType = .URL
textField.text = urlToUse?.absoluteString

textField.addTarget(self,
Expand Down
4 changes: 2 additions & 2 deletions WordPress-Aztec-iOS.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'WordPress-Aztec-iOS'
s.version = '1.10.1'
s.version = '1.11'
s.summary = 'The native HTML Editor.'

# This description is used to generate tags and improve search results.
Expand All @@ -27,7 +27,7 @@ Pod::Spec.new do |s|
s.author = { 'Automattic' => '[email protected]', 'Diego Rey Mendez' => '[email protected]', 'Sergio Estevao' => '[email protected]', 'Jorge Leandro Perez' => '[email protected]' }
s.social_media_url = "http://twitter.com/WordPressiOS"
s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s }
s.ios.deployment_target = '10.0'
s.ios.deployment_target = '11.0'
s.swift_version = '5.0'

s.module_name = "Aztec"
Expand Down
4 changes: 2 additions & 2 deletions WordPress-Editor-iOS.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'WordPress-Editor-iOS'
s.version = '1.10.1'
s.version = '1.11'
s.summary = 'The WordPress HTML Editor.'

# This description is used to generate tags and improve search results.
Expand All @@ -27,7 +27,7 @@ Pod::Spec.new do |s|
s.author = { 'Automattic' => '[email protected]', 'Diego Rey Mendez' => '[email protected]', 'Sergio Estevao' => '[email protected]', 'Jorge Leandro Perez' => '[email protected]' }
s.social_media_url = "http://twitter.com/WordPressiOS"
s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s }
s.ios.deployment_target = '10.0'
s.ios.deployment_target = '11.0'
s.swift_version = '5.0'

s.module_name = "WordPressEditor"
Expand Down
9 changes: 6 additions & 3 deletions WordPressEditor/WordPressEditor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -787,6 +787,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = WordPressEditor/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -871,7 +872,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -930,7 +931,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -955,6 +956,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = WordPressEditor/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -980,6 +982,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = WordPressEditor/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down