Merge branch develop into fix/more-button-accessibility

shiki · shiki · commit 87a1bcbd3f15 · 2019-12-11T14:55:31.000-07:00
diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A830345228583B200798076 /* NSBundle+AztecBundle.swift */; };
+		1EDDEBA5239A68320000A957 /* XCodeVersion.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */; };
 		40359F261FD88A5F00B1C1D2 /* HRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */; };
 		40359F281FD88A7900B1C1D2 /* BRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */; };
 		40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
@@ -281,6 +282,7 @@
 
 /* Begin PBXFileReference section */
 		1A830345228583B200798076 /* NSBundle+AztecBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecBundle.swift"; sourceTree = "<group>"; };
+		1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XCodeVersion.xcconfig; sourceTree = "<group>"; };
 		40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HRElementConverter.swift; sourceTree = "<group>"; };
 		40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRElementConverter.swift; sourceTree = "<group>"; };
 		40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = "<group>"; };
@@ -551,6 +553,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		1EDDEBA3239A68090000A957 /* config */ = {
+			isa = PBXGroup;
+			children = (
+				1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */,
+			);
+			path = config;
+			sourceTree = "<group>";
+		};
 		40A2986F1FD61B1C00AEDF3B /* Implementations */ = {
 			isa = PBXGroup;
 			children = (
@@ -597,6 +607,7 @@
 				FF5B98E21DC29D0C00571CA4 /* README.md */,
 				FF7A1C4A1E51F05700C4C7C8 /* CONTRIBUTING.md */,
 				FFC2BBF81F2A25CF00E404FB /* CHANGELOG.md */,
+				1EDDEBA3239A68090000A957 /* config */,
 				5951CB901D8BC93600E1866F /* Aztec */,
 				5951CB9B1D8BC93600E1866F /* AztecTests */,
 				599F255A1D8BCD97002871D6 /* Frameworks */,
@@ -1492,6 +1503,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1EDDEBA5239A68320000A957 /* XCodeVersion.xcconfig in Resources */,
 				FF1F56A3239562B900E93A30 /* html_colors.json in Resources */,
 				FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */,
 			);
@@ -1901,6 +1913,7 @@
 		};
 		5951CBA31D8BC93600E1866F /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
diff --git a/Aztec/Assets/Media.xcassets/image.imageset/Contents.json b/Aztec/Assets/Media.xcassets/image.imageset/Contents.json
@@ -3,6 +3,16 @@
     {
       "idiom" : "universal",
       "filename" : "gridicons-image.pdf"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "gridicons-image-dark.pdf",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
     }
   ],
   "info" : {
diff --git a/Aztec/Assets/Media.xcassets/image.imageset/gridicons-image-dark.pdf b/Aztec/Assets/Media.xcassets/image.imageset/gridicons-image-dark.pdf
diff --git a/Aztec/Classes/TextKit/ColorProvider.swift b/Aztec/Classes/TextKit/ColorProvider.swift
@@ -46,10 +46,13 @@ public class ColorProvider {
     }
 
     public lazy var codeBackgroungColor: UIColor = {
+        #if XCODE11
         if #available(iOS 13.0, *) {
             return .secondarySystemBackground
         } else {
             return .lightGray
         }
+        #endif
+        return .lightGray
     }()
 }
diff --git a/Aztec/Classes/TextKit/MediaAttachment.swift b/Aztec/Classes/TextKit/MediaAttachment.swift
@@ -186,6 +186,14 @@ open class MediaAttachment: NSTextAttachment {
         needsNewAsset = refreshAsset
     }
 
+    /// Invalidates the attachment and forces an update of the attachment image
+    open func refresh() {
+        needsNewAsset = true
+        retryCount = 0
+        image = nil
+        glyphImage = nil
+    }
+
     /// Refresh attachment identifier
     ///
     /// - Parameter identifier: new identifier
diff --git a/Aztec/Classes/TextKit/TextView.swift b/Aztec/Classes/TextKit/TextView.swift
@@ -249,13 +249,27 @@ open class TextView: UITextView {
     }
 
     open lazy var defaultTextColor: UIColor? = {
+        #if XCODE11
         if #available(iOS 13.0, *) {
             return UIColor.label
         } else {
             return UIColor.darkText
-        }        
+        }
+        #endif
+        return UIColor.darkText
     }()
 
+    open override var textColor: UIColor? {
+        set {
+            super.textColor = newValue
+            defaultTextColor = newValue
+        }
+
+        get {
+            return super.textColor
+        }
+    }
+
     // MARK: - Plugin Loading
     
     var pluginManager: PluginManager {
@@ -303,7 +317,13 @@ open class TextView: UITextView {
         }
     }
 
-
+    public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        if #available(iOS 13.0, *) {
+            if let previous = previousTraitCollection, previous.hasDifferentColorAppearance(comparedTo: traitCollection) {
+                self.refreshMediaAttachments()
+            }
+        }
+    }
     /// Blockquote Blocks Background Width.
     ///
     @objc dynamic public var blockquoteBorderWidth: CGFloat {
@@ -1383,6 +1403,14 @@ open class TextView: UITextView {
         notifyTextViewDidChange()
     }
 
+    /// Forces  a Refresh of all media attachment in the text view
+    open func refreshMediaAttachments() {
+        storage.enumerateAttachmentsOfType(MediaAttachment.self) { (attachment, range, _) in
+            attachment.refresh()
+            self.refresh(attachment, overlayUpdateOnly: false)
+        }
+    }
+
     /// Replaces a Video attachment at the specified range
     ///
     /// - Parameters:
diff --git a/Aztec/Classes/TextKit/TextViewPasteboardDelegate.swift b/Aztec/Classes/TextKit/TextViewPasteboardDelegate.swift
@@ -81,9 +81,11 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
     }
 
     private func fixColors(in string: NSAttributedString, using baseColor: UIColor?) -> NSAttributedString {
+#if XCODE11
         guard #available(iOS 13.0, *) else {
             return string
         }
+        
         let colorToUse = baseColor ?? UIColor.label
 
         let newString = NSMutableAttributedString(attributedString: string)
@@ -93,6 +95,9 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
             }
         }
         return newString
+#else
+        return string
+#endif
     }
 
     /// Tries to paste raw text from the clipboard, replacing the selected range.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.14.1
+-----
+* Support for xcode 10.
+
 1.14.0
 -----
 * Support standard HTML colors by name.
diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
 		F1D3610B20929F0200B4E7A5 /* WordPressEditor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1D3610420929E6D00B4E7A5 /* WordPressEditor.framework */; };
 		FF149F4A20E3C49A0070FECB /* imagesOverlays.html in Resources */ = {isa = PBXBuildFile; fileRef = FF149F4920E3C49A0070FECB /* imagesOverlays.html */; };
 		FF1FD05C20932EDE00186384 /* gutenberg.html in Resources */ = {isa = PBXBuildFile; fileRef = FF1FD05B20932EDE00186384 /* gutenberg.html */; };
+		FF5CDACD239E78B200CF235B /* failedMedia.html in Resources */ = {isa = PBXBuildFile; fileRef = FF5CDACC239E78B200CF235B /* failedMedia.html */; };
 		FF629DC9223BC418004C4106 /* videoShortcodes.html in Resources */ = {isa = PBXBuildFile; fileRef = FF629DC8223BC418004C4106 /* videoShortcodes.html */; };
 		FF9AF5481DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */; };
 		FFC41BDE20DBC7BA004DFB4D /* video.html in Resources */ = {isa = PBXBuildFile; fileRef = FFC41BDD20DBC7BA004DFB4D /* video.html */; };
@@ -155,6 +156,7 @@
 		F1D360FC20929E6D00B4E7A5 /* WordPressEditor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WordPressEditor.xcodeproj; path = ../WordPressEditor/WordPressEditor.xcodeproj; sourceTree = "<group>"; };
 		FF149F4920E3C49A0070FECB /* imagesOverlays.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = imagesOverlays.html; sourceTree = "<group>"; };
 		FF1FD05B20932EDE00186384 /* gutenberg.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = gutenberg.html; sourceTree = "<group>"; };
+		FF5CDACC239E78B200CF235B /* failedMedia.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = failedMedia.html; sourceTree = "<group>"; };
 		FF629DC8223BC418004C4106 /* videoShortcodes.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = videoShortcodes.html; sourceTree = "<group>"; };
 		FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = AttachmentDetailsViewController.storyboard; sourceTree = "<group>"; };
 		FFC41BDD20DBC7BA004DFB4D /* video.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = video.html; sourceTree = "<group>"; };
@@ -202,6 +204,7 @@
 				FF1FD05B20932EDE00186384 /* gutenberg.html */,
 				FFC41BDD20DBC7BA004DFB4D /* video.html */,
 				FF629DC8223BC418004C4106 /* videoShortcodes.html */,
+				FF5CDACC239E78B200CF235B /* failedMedia.html */,
 			);
 			path = SampleContent;
 			sourceTree = "<group>";
@@ -443,6 +446,7 @@
 				607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
 				607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
 				59280F2A1D47CAF40083FB59 /* content.html in Resources */,
+				FF5CDACD239E78B200CF235B /* failedMedia.html in Resources */,
 				B5FB212A1FEC38470067D597 /* captions.html in Resources */,
 				FF1FD05C20932EDE00186384 /* gutenberg.html in Resources */,
 				59280F2B1D47CAF40083FB59 /* SampleText.rtf in Resources */,
diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift
@@ -1055,6 +1055,7 @@ extension EditorDemoController {
 
 }
 
+// MARK: - TextViewAttachmentDelegate
 
 extension EditorDemoController: TextViewAttachmentDelegate {
 
@@ -1087,7 +1088,7 @@ extension EditorDemoController: TextViewAttachmentDelegate {
 
     func placeholderImage(for attachment: NSTextAttachment) -> UIImage {
         let imageSize = CGSize(width:64, height:64)
-        let placeholderImage: UIImage
+        var placeholderImage: UIImage
         switch attachment {
         case _ as ImageAttachment:
             placeholderImage = Gridicon.iconOfType(.image, withSize: imageSize)
@@ -1096,7 +1097,9 @@ extension EditorDemoController: TextViewAttachmentDelegate {
         default:
             placeholderImage = Gridicon.iconOfType(.attachment, withSize: imageSize)
         }
-
+        if #available(iOS 13.0, *) {
+            placeholderImage = placeholderImage.withTintColor(.label)
+        }
         return placeholderImage
     }
 
@@ -1501,10 +1504,19 @@ private extension EditorDemoController
 
 extension EditorDemoController {
 
+    static var tintedMissingImage: UIImage = {
+        if #available(iOS 13.0, *) {
+            return Gridicon.iconOfType(.image).withTintColor(.label)
+        } else {
+            // Fallback on earlier versions
+            return Gridicon.iconOfType(.image)
+        }
+    }()
+
     struct Constants {
         static let defaultContentFont   = UIFont.systemFont(ofSize: 14)
         static let defaultHtmlFont      = UIFont.systemFont(ofSize: 24)
-        static let defaultMissingImage  = Gridicon.iconOfType(.image)
+        static let defaultMissingImage  = tintedMissingImage
         static let formatBarIconSize    = CGSize(width: 20.0, height: 20.0)
         static let headers              = [Header.HeaderType.none, .h1, .h2, .h3, .h4, .h5, .h6]
         static let lists                = [TextList.Style.unordered, .ordered]        
diff --git a/Example/Example/SampleContent/failedMedia.html b/Example/Example/SampleContent/failedMedia.html
@@ -0,0 +1,5 @@
+<h3>Video</h3>
+<video src="https://nothere.mp4" poster="notthere.jpg" alt="Another video with bunnies"></video>
+
+<h3>Image</h3>
+<img src="https://nothere.jpeg" alt="Coyote" class="alignleft"/>
diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift
@@ -19,6 +19,7 @@ class ViewController: UITableViewController
                 DemoRow(title: "Captions Demo", action: { self.showEditorDemo(filename: "captions") }),
                 DemoRow(title: "Image Overlays", action: { self.showEditorDemo(filename: "imagesOverlays") }),
                 DemoRow(title: "Video Demo", action: { self.showEditorDemo(filename: "video", wordPressMode: false) }),
+                DemoRow(title: "Failed Media", action: { self.showEditorDemo(filename: "failedMedia") }),
                 DemoRow(title: "Empty Demo", action: { self.showEditorDemo() })
                 ]
             ),
diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.14.0'
+  s.version          = '1.14.1'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.
diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.14.0'
+  s.version          = '1.14.1'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.
diff --git a/config/XCodeVersion.xcconfig b/config/XCodeVersion.xcconfig
@@ -0,0 +1,6 @@
+_AZTEC_IOS_130000 = XCODE11
+_AZTEC_IOS_120000 = XCODE10
+
+AZTEC_IOS_SDK = $(_AZTEC_IOS_$(SDK_VERSION_MAJOR))
+
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) $(AZTEC_IOS_SDK)

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,13 @@ public class ColorProvider {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public lazy var codeBackgroungColor: UIColor = {`
	`49`	`+ #if XCODE11`
`49`	`50`	`if #available(iOS 13.0, *) {`
`50`	`51`	`return .secondarySystemBackground`
`51`	`52`	`} else {`
`52`	`53`	`return .lightGray`
`53`	`54`	`}`
	`55`	`+ #endif`
	`56`	`+ return .lightGray`
`54`	`57`	`}()`
`55`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,11 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private func fixColors(in string: NSAttributedString, using baseColor: UIColor?) -> NSAttributedString {`
	`84`	`+#if XCODE11`
`84`	`85`	`guard #available(iOS 13.0, *) else {`
`85`	`86`	`return string`
`86`	`87`	`}`
	`88`	`+`
`87`	`89`	`let colorToUse = baseColor ?? UIColor.label`
`88`	`90`
`89`	`91`	`let newString = NSMutableAttributedString(attributedString: string)`
`@@ -93,6 +95,9 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {`
`93`	`95`	`}`
`94`	`96`	`}`
`95`	`97`	`return newString`
	`98`	`+#else`
	`99`	`+ return string`
	`100`	`+#endif`
`96`	`101`	`}`
`97`	`102`
`98`	`103`	`/// Tries to paste raw text from the clipboard, replacing the selected range.`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +1.14.1
 +-----
 +* Support for xcode 10.
++
 .14.0
 -----
 * Support standard HTML colors by name.