From 29e84161bddbd412a562ef658cc8deb950898ae8 Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Thu, 22 Jun 2017 13:24:40 +0100
Subject: [PATCH 1/4] Remove gridicons references from the main Aztec pod.

Only keep references that are done on the demo project.
---
 .../Converters/HTMLNodeToNSAttributedString.swift   |  1 -
 Aztec/Classes/TextKit/TextView.swift                |  3 +--
 Aztec/Classes/TextKit/VideoAttachment.swift         |  3 +--
 .../Formatters/BlockquoteFormatterTests.swift       |  3 +--
 AztecTests/Formatters/PreFormaterTests.swift        |  1 -
 AztecTests/TextViewStubAttachmentDelegate.swift     |  8 ++++----
 AztecTests/TextViewTests.swift                      | 13 ++++++-------
 Example/Cartfile                                    |  2 +-
 Example/Cartfile.resolved                           |  2 +-
 WordPress-Aztec-iOS.podspec                         |  2 --
 10 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/Aztec/Classes/Converters/HTMLNodeToNSAttributedString.swift b/Aztec/Classes/Converters/HTMLNodeToNSAttributedString.swift
index 8a27bd514..19a7115fa 100644
--- a/Aztec/Classes/Converters/HTMLNodeToNSAttributedString.swift
+++ b/Aztec/Classes/Converters/HTMLNodeToNSAttributedString.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Gridicons
 import UIKit
 
 class HTMLNodeToNSAttributedString: SafeConverter {
diff --git a/Aztec/Classes/TextKit/TextView.swift b/Aztec/Classes/TextKit/TextView.swift
index a41dc66e6..b3bc3ae91 100644
--- a/Aztec/Classes/TextKit/TextView.swift
+++ b/Aztec/Classes/TextKit/TextView.swift
@@ -1,7 +1,6 @@
 
 import UIKit
 import Foundation
-import Gridicons
 
 
 // MARK: - TextViewAttachmentDelegate
@@ -196,7 +195,7 @@ open class TextView: UITextView {
     required public init?(coder aDecoder: NSCoder) {
 
         defaultFont = UIFont.systemFont(ofSize: 14)
-        defaultMissingImage = Gridicon.iconOfType(.image)
+        defaultMissingImage = UIImage()
         super.init(coder: aDecoder)
         commonInit()
     }
diff --git a/Aztec/Classes/TextKit/VideoAttachment.swift b/Aztec/Classes/TextKit/VideoAttachment.swift
index e9d1e5c3c..9598d7fd3 100644
--- a/Aztec/Classes/TextKit/VideoAttachment.swift
+++ b/Aztec/Classes/TextKit/VideoAttachment.swift
@@ -1,6 +1,5 @@
 import Foundation
 import UIKit
-import Gridicons
 
 protocol VideoAttachmentDelegate: class {
     func videoAttachment(
@@ -43,7 +42,7 @@ open class VideoAttachment: MediaAttachment {
         
         super.init(identifier: identifier, url: posterURL)
 
-        self.overlayImage = Gridicon.iconOfType(.video)
+        self.overlayImage = UIImage()
     }
 
     /// Required Initializer
diff --git a/AztecTests/Formatters/BlockquoteFormatterTests.swift b/AztecTests/Formatters/BlockquoteFormatterTests.swift
index e361c2443..53ec108b8 100644
--- a/AztecTests/Formatters/BlockquoteFormatterTests.swift
+++ b/AztecTests/Formatters/BlockquoteFormatterTests.swift
@@ -1,5 +1,4 @@
 import XCTest
-import Gridicons
 @testable import Aztec
 
 // MARK: - BlockquoteFormatterTests Tests
@@ -101,7 +100,7 @@ class BlockquoteFormatterTests: XCTestCase {
 
 private extension BlockquoteFormatterTests {
     var testTextView: TextView {
-        let view = TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.image))
+        let view = TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
         view.text = plainText
         return view
     }
diff --git a/AztecTests/Formatters/PreFormaterTests.swift b/AztecTests/Formatters/PreFormaterTests.swift
index 5f89d18f6..fdde9e477 100644
--- a/AztecTests/Formatters/PreFormaterTests.swift
+++ b/AztecTests/Formatters/PreFormaterTests.swift
@@ -1,5 +1,4 @@
 import XCTest
-import Gridicons
 @testable import Aztec
 
 
diff --git a/AztecTests/TextViewStubAttachmentDelegate.swift b/AztecTests/TextViewStubAttachmentDelegate.swift
index f8bd10279..dd3d935d7 100644
--- a/AztecTests/TextViewStubAttachmentDelegate.swift
+++ b/AztecTests/TextViewStubAttachmentDelegate.swift
@@ -1,6 +1,6 @@
 import Foundation
 import Aztec
-import Gridicons
+import UIKit
 
 class TextViewStubAttachmentDelegate: TextViewAttachmentDelegate {
 
@@ -17,11 +17,11 @@ class TextViewStubAttachmentDelegate: TextViewAttachmentDelegate {
         let placeholderImage: UIImage
         switch attachment {
         case _ as ImageAttachment:
-            placeholderImage = Gridicon.iconOfType(.image, withSize: imageSize)
+            placeholderImage = UIImage()
         case _ as VideoAttachment:
-            placeholderImage = Gridicon.iconOfType(.video, withSize: imageSize)
+            placeholderImage = UIImage()
         default:
-            placeholderImage = Gridicon.iconOfType(.attachment, withSize: imageSize)
+            placeholderImage = UIImage()
 
         }
 
diff --git a/AztecTests/TextViewTests.swift b/AztecTests/TextViewTests.swift
index b3d1e9637..eb6acc503 100644
--- a/AztecTests/TextViewTests.swift
+++ b/AztecTests/TextViewTests.swift
@@ -1,6 +1,5 @@
 import XCTest
 @testable import Aztec
-import Gridicons
 
 class TextViewTests: XCTestCase {
 
@@ -25,13 +24,13 @@ class TextViewTests: XCTestCase {
     // MARK: - TextView construction
 
     func createEmptyTextView() -> Aztec.TextView {
-        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
         richTextView.textAttachmentDelegate = attachmentDelegate
         return richTextView
     }
 
     func createTextView(withHTML html: String) -> Aztec.TextView {
-        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
         richTextView.textAttachmentDelegate = attachmentDelegate
         richTextView.setHTML(html)
 
@@ -40,7 +39,7 @@ class TextViewTests: XCTestCase {
 
     func createTextViewWithContent() -> Aztec.TextView {
         let paragraph = "Lorem ipsum dolar sit amet.\n"
-        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let richTextView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
         richTextView.textAttachmentDelegate = attachmentDelegate
         let attributes = [NSParagraphStyleAttributeName : NSParagraphStyle()]
         let templateString = NSMutableAttributedString(string: paragraph, attributes: attributes)
@@ -58,7 +57,7 @@ class TextViewTests: XCTestCase {
 
     func testTextViewReferencesStorage() {
 
-        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
 
         textView.text = "Foo"
         XCTAssert(textView.text == "Foo")
@@ -79,7 +78,7 @@ class TextViewTests: XCTestCase {
     // MARK: - Test Index Wrangling
 
     func testMaxIndex() {
-        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
 
         textView.text = "foo"
 
@@ -92,7 +91,7 @@ class TextViewTests: XCTestCase {
     }
 
     func testAdjustedIndex() {
-        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: Gridicon.iconOfType(.attachment))
+        let textView = Aztec.TextView(defaultFont: UIFont.systemFont(ofSize: 14), defaultMissingImage: UIImage())
 
         textView.text = "foobarbaz"
 
diff --git a/Example/Cartfile b/Example/Cartfile
index d8fc3c9d9..45854aaf5 100644
--- a/Example/Cartfile
+++ b/Example/Cartfile
@@ -1 +1 @@
-github "Automattic/Gridicons-iOS" "0.7"
+github "Automattic/Gridicons-iOS" "0.8"
diff --git a/Example/Cartfile.resolved b/Example/Cartfile.resolved
index d8fc3c9d9..45854aaf5 100644
--- a/Example/Cartfile.resolved
+++ b/Example/Cartfile.resolved
@@ -1 +1 @@
-github "Automattic/Gridicons-iOS" "0.7"
+github "Automattic/Gridicons-iOS" "0.8"
diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
index 9ad339d1e..a58b9f950 100644
--- a/WordPress-Aztec-iOS.podspec
+++ b/WordPress-Aztec-iOS.podspec
@@ -38,6 +38,4 @@ Pod::Spec.new do |s|
   s.xcconfig = {'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'}
   s.preserve_paths = 'Aztec/Modulemaps/libxml2/*'
 
-  s.dependency 'Gridicons', '0.8'
-
 end

From 87c3f1f0be8f9ab67fbb57e320201f8b2bbcf1b8 Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Fri, 23 Jun 2017 23:18:08 +0100
Subject: [PATCH 2/4] Add resources for play and image.

---
 Aztec.xcodeproj/project.pbxproj                  |  12 ++++++++++++
 Aztec/Assets/Media.xcassets/Contents.json        |   6 ++++++
 .../Media.xcassets/Image.imageset/Contents.json  |  12 ++++++++++++
 .../Image.imageset/gridicons-image.pdf           | Bin 0 -> 4012 bytes
 .../Media.xcassets/play.imageset/Contents.json   |  12 ++++++++++++
 .../play.imageset/gridicons-play.pdf             | Bin 0 -> 3925 bytes
 Aztec/Classes/TextKit/VideoAttachment.swift      |   4 +++-
 7 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 Aztec/Assets/Media.xcassets/Contents.json
 create mode 100644 Aztec/Assets/Media.xcassets/Image.imageset/Contents.json
 create mode 100644 Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf
 create mode 100644 Aztec/Assets/Media.xcassets/play.imageset/Contents.json
 create mode 100644 Aztec/Assets/Media.xcassets/play.imageset/gridicons-play.pdf

diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
index 250bf447e..3b4ae05a1 100644
--- a/Aztec.xcodeproj/project.pbxproj
+++ b/Aztec.xcodeproj/project.pbxproj
@@ -124,6 +124,7 @@
 		F1FA0E861E6EF514009D98EE /* Node.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FA0E7E1E6EF514009D98EE /* Node.swift */; };
 		F1FA0E871E6EF514009D98EE /* StandardElementType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FA0E7F1E6EF514009D98EE /* StandardElementType.swift */; };
 		F1FA0E881E6EF514009D98EE /* TextNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FA0E801E6EF514009D98EE /* TextNode.swift */; };
+		FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FF0714001EFD78AF00E50713 /* Media.xcassets */; };
 		FF152D8E1E68552A00FF596C /* StringRangeConversionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF152D8D1E68552A00FF596C /* StringRangeConversionTests.swift */; };
 		FF20D6401EDC389A00294B78 /* HTMLAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63D1EDC389A00294B78 /* HTMLAttributes.swift */; };
 		FF20D6411EDC389A00294B78 /* HTMLProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63E1EDC389A00294B78 /* HTMLProcessor.swift */; };
@@ -288,6 +289,7 @@
 		F1FA0E7E1E6EF514009D98EE /* Node.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Node.swift; sourceTree = "<group>"; };
 		F1FA0E7F1E6EF514009D98EE /* StandardElementType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StandardElementType.swift; sourceTree = "<group>"; };
 		F1FA0E801E6EF514009D98EE /* TextNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextNode.swift; sourceTree = "<group>"; };
+		FF0714001EFD78AF00E50713 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
 		FF152D8D1E68552A00FF596C /* StringRangeConversionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringRangeConversionTests.swift; sourceTree = "<group>"; };
 		FF20D63D1EDC389A00294B78 /* HTMLAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLAttributes.swift; sourceTree = "<group>"; };
 		FF20D63E1EDC389A00294B78 /* HTMLProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLProcessor.swift; sourceTree = "<group>"; };
@@ -357,6 +359,7 @@
 		5951CB901D8BC93600E1866F /* Aztec */ = {
 			isa = PBXGroup;
 			children = (
+				FF0713FE1EFD78AF00E50713 /* Assets */,
 				5951CB921D8BC93600E1866F /* Info.plist */,
 				599F25001D8BC9A1002871D6 /* Classes */,
 				599F25911D8BDCA9002871D6 /* Documentation */,
@@ -781,6 +784,14 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
+		FF0713FE1EFD78AF00E50713 /* Assets */ = {
+			isa = PBXGroup;
+			children = (
+				FF0714001EFD78AF00E50713 /* Media.xcassets */,
+			);
+			path = Assets;
+			sourceTree = "<group>";
+		};
 		FF20D63C1EDC389A00294B78 /* Processor */ = {
 			isa = PBXGroup;
 			children = (
@@ -896,6 +907,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F138062A1E3651DC00CFB9ED /* ControlCharacters.rtf in Resources */,
+				FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Aztec/Assets/Media.xcassets/Contents.json b/Aztec/Assets/Media.xcassets/Contents.json
new file mode 100644
index 000000000..da4a164c9
--- /dev/null
+++ b/Aztec/Assets/Media.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Aztec/Assets/Media.xcassets/Image.imageset/Contents.json b/Aztec/Assets/Media.xcassets/Image.imageset/Contents.json
new file mode 100644
index 000000000..30bf4ae6b
--- /dev/null
+++ b/Aztec/Assets/Media.xcassets/Image.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "gridicons-image.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf b/Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f8f4c1a6b98f1f0a7837554ac0ec3b2bce9e2d1f
GIT binary patch
literal 4012
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
A(EtDd

literal 0
HcmV?d00001

diff --git a/Aztec/Assets/Media.xcassets/play.imageset/Contents.json b/Aztec/Assets/Media.xcassets/play.imageset/Contents.json
new file mode 100644
index 000000000..a54066a68
--- /dev/null
+++ b/Aztec/Assets/Media.xcassets/play.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "gridicons-play.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Aztec/Assets/Media.xcassets/play.imageset/gridicons-play.pdf b/Aztec/Assets/Media.xcassets/play.imageset/gridicons-play.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..19231ad4f86e3a92aeab3e2ed45fa103a77eeb35
GIT binary patch
literal 3925
zcmai%c{o&W8^<kE7(!)<l#`z&r7^3e?1M?vSW<Ro#$aqyOt!L>C5-Hel0?=lMI{=t
zWQo@#TPkE35<+B6-Wk>V>$hCjd#-cMIrBZwb3f1Xz3)Fhw~Vo_{t*}i0hVcGd|^!G
zE!=t4*aSubP=Jhg1*@q6ibh0FXNn7eVoIifqCUx;LiA!j-EkD6E|EZXBmx>5U~h^S
z5$6H+V?T*C<mWiRH$ayk+}0>^5bB179v09-rr&8*S;o3|YNOGT{+ZW>dCx%WcJIFm
z8E@Y;t><ulByi`IutJYHPRh#`TeYwGb#BJXR?Cp62@u5dn*8>KIR&v>`-r)kuNJ5`
zgGL6vM|D?^L~z)eDl2}-ze6eyoiRkF+?oeHMGl--^PpBuVy4}NxgLNWzgB&SX6)E^
zLTNjg=;`=#lgu~P*;of+Jz*#$>m%zG{@bxn`=28MipDtStzR#qCj~(Ku)vh)O}^ko
zAbJBzKLj+{lfwM&4X|uudUTTLNW$rm{QzqyQ-HH>TQJk4pR2HD{W90si%c*hQUGh_
zQo8zpEue@dyOX`l&fy3|faN~g8wMzEh1Jkt8T~Vc%5O1#CP;N_l;SDoHWjs5N%CZ7
z2vF1|`j7}jQ;g34&t1lK-_vIOB9U~OGVRqaDL`gXJb(vyeeAd}$Rx@j#F!%@Ox8zt
zo4(La`7@5EpR;2kr3iXLyjL#c`*^+x8aLIM=;|>BsBS#7#i)hB^o?fAq5g>{ef`d}
zfqhkM#@{Z3>M0iNA;>HXq0duwHoJDWH7;}P5oG7LV1GXB<OIU3=yG&_qp7E*<sWY<
zU-}FQajbr)P-`sf-Mbl_Af=3!-p&Tr>rqk*k`-leB%77L5QA@mUM{A{!y{mDku09O
z_oYS~OWl|9#t&Dw-bj@l%M!Qj5POEaO|3Q_OqUtXrh>9;ZpeIa&c4J&q@6ZMXJafM
z?CM&%WyA&*O0#dDkj-+Bg6j#1eUAFV!N#53sQS!{KW0_c<u;pNuJc$lD9QkzyR+{G
ziSe<;X>GpTY!weXoZN77_^O`~eX)Y?8dNl-lzd%}UB=QQ%_U)`SYl?zvUl8NwYGm~
ze~{URdP~5%`Mm5j{kAssw&jrf^nFE|2-}jh)y;k7H7Vw76&~BQ7{m9mvjE$dZEO{T
zw-)wCxZ5Q*j_}Fx#!OGUd$VV{K@NXZUeCNtepwr#x}4VbdHu|>Tv5%?KMaHsL_J1s
zUap~TdpjS0D&28oS#Wdoxhm;DtqlsdGM|gihkrCT`IyWT7UfbMt`=$$4{-#C1@{aG
z?@^ND5(~<36LPs=&lVW2YFuf+)k0QhL;t}k?Wq~S5jbTn2m`m&JaZ{dDD{qm2YjDc
zljOCD_8d0SmNFY(;)`?ilDVrOmOT{aUdOR3o{Mq^j0}Z9ITRdrNQ5BHaSj4(VIju_
zIj?g<j&qQ-Ko7Mw-mrnSVQ<)duDG6K>kbWg1v+(E>D+c3(AnoZ&hhevV6?yyb%s#(
z!B7(S<vBs&yV`~EA~^zSI=zB>t+@Ts+QuqEoG;K(@q&q3tFL79_Z+%Xn1wc0U;Kk2
zUd3&DW$g~vD*(BDgFP^8=M9c7+>SSFk3;&)j!AH1>f1i(`U&6S5`F$|_(Y|M2LF?K
z(c!&wYzpD_^-0`XE!>=)`WD=K=XG`BEu`6Z9&k&L%Hb%`OONNz+50s1c*6NH&h3#|
zxEp&!n#4vUEvdu!Gq_&-324s^!i_UVqT@<Vf{4)7%lGg-4{|N!?rZw+DDAu%d!+G<
zL!5(kS?UAMH@N9z68z22#YQB~1y$~`fqSA#Ku-kvsMR4;4LgQq=lz}?8WftnEKuh?
zhre{71{^FAyniT8vZ+=sp2rI0c3I%SbwJu(`m~@p_XPJw*v@*SNoYQnA{8O%-)MuE
ze{k)M_A>(s*;7eE1`*Ptrqc3h6``jMT%~Mf)n#c1l3I^CV!ZZPYT02+q%#3~8G%Gi
z<K%;~Lf8`$dOH25R8KtB^4Ic5-!t8j@7Zlpc%v%A3QN-sJQ1jfNkXJ9q>i>0Clw{Q
zrA(z>l))zVrTV7YLo(&;4+Nk1p8Ktm!=z5D&MY*$>`a#aa7Dd(xPe~!-4y&)d^$b~
ze`N&q!bIj-Vrb%%UDyJx$+Fin_YR2bblvlRU0HFm;^<rATj)NFa?W~J(&URp$&a)}
z9-<7<nsJaJ!4PMZzck%m4|P~Un2Oz_CQ+-YaSO=tr}R<!JEc;R-R3j-l+{C?hc2Z^
zr8uRqr^FQ+nUi~jdNK+<3bEZ#S6Nq_YrpGy52PrTo=5k+P0z4LZjOD6{8UyI6;Qe6
z`nBPc`llrEbnzN-F>!P8RAduMEZsA`HJy<@fo!gDvEqFMvSL_GJhFqPq<wBb?Icqk
zqncG*GLv_tQzK`fNWGYlUvA-?eX6`;w{0TCT3P#v%@Z?U9ju|Eg`$0_$!wN}NoH|o
zPA#U^I{4-DSHN3`810*N`B~9fwYb~3>|w$mg$YHShqA4*k2R?f9-oh%*BG^yEsM%9
zNHmCTJ!$r)d+@YF6}^Ja=Qi#li!4G_H{UILZ)tg7zxR%6gIdd_Z2z09hk4awEMhW5
z21M)?W)#ehOesiO%3E%;@TmAyw$|{rG2P9U5ZD~yI!Y+-$Q>AeR9tXm$ftHD@L0NS
z*?>s(scQNX|B}?Y>^h7~J<>0d#=rcA;&ZS%EU;(i)W_k<j(O@Rm)u3U2VDkvLm8GG
z@*O)mvU&ML=R~`Y?D6V6KU^u{l>l*sQ0@KBWp$gsOBuDAT5CVq7dzq8=+QXvM!kQd
za{aJ?p+EvAra3t;X+oUNYj-uZ^lZY}(kF?__*vK4JdL9oQ5vxtyK8)EiUJi^a2p&O
zK5GLDeRC6Qed}0|3g|x1M{o{EA9RLGgBQ-TYug1-Lmhiv^<_!L*Y?sj-69-1-_Snc
zYCI@DTj4eDJrD)tec5UMN^`#;KVQ%hyq+$)vHEyi%j*_QOst5Zh_8Mt=7nAl=A_<5
zy;MEJR0{>m@-cm?6&1);7m?g6d{NrRt6=%{fMMk5^ayzLGX!CCy?pwu*CR$j8@(jn
zzRvReq5XR$_YDbdM(wUIU>KDw+CTMWfclcEBi9ornhsCI&fBgKza@ZD!yblp>ZUf@
zMiC5341^6vIk4J~K3sTc|0Q&+AUQrcTOLu+S@0iHSj9?3myQfBy6mtmLS2rg*nrH2
zqN`q#dOn-)zN^)lV06&i(y98!weLn>k5i>@%3QJJEq8r5=!_v|zBFmyIlefSKIYlB
zuXUkyJqYE5^1a|(<MTb@TOI1N8-H<lZ;8#jr>A^v>#Byo)=b5D03OHt=i2n!Vu^c)
zJfjD@P41YK)i}76&yF|gJk>E7rXA_9=68SLF6=%t;8b4h`Yu(<uJbFtZ6taGEAu{a
zYREG1?CL=KQrHab-qO8w-w!_AzV8Pns}?NM@RoM{uS!1H7Bkwv-2L*T`s{Sg8JzWb
z2LV!?V_XG1{~_%}sVk-@?^DjFQ1Q6*aoVSgPi8XSHoxnu9r6h7Vvpr~!KJZZNa9&=
z%d)Xsv9`wx-237C4fLtIpQ>t|gYAQLXO7P&&@thdd(HK67kZ9$_bKNqCo9#*CN@17
zJ>N{;`0y2dad*+AF(Uiv3P|OE>ikIaisbBVKDB=T=)l5BxsA-F$FHoSt+IOG_eMR=
zQ6gP5x;Qi$(v`8VW8V?Yo12#wsY_|;<u9EL=?NXew{EIt`UZW`X$qf@i4u)GdX}P5
zRWbHDqok~4uq`yT)NcN%SHU~l`Zx2`BIgoS+hc(lfwY;3jo9A()wi$PPY01EAI*Bu
zCeM{`TpumIR<kW|V$F74ad4?Bka2A@V=rgS_O;KDnv0uu@6{&*2RAyo3Iyyl+XGZK
zTs8>Pqj%-N*h9AqHH$ZTR{ER@Xp7T#`W)!xSDoV`D$$CYDXXQ}hHdl$`eFSF{ZE);
z44t}49SC@^_+qY&n%XrQUMv6o@p4LMQD%_uI?Wm1+BoOdIhCe)Vlcl(b**>FW5V&{
zSeGwpHa9PNu&73JDRd)iov_%PFgcA~!KP%!YWiN{`S!(6*28IhXgO?Q{hw6LqR=gr
zR)WEQ!77ViSsD{^4bW&EoHx-CU;(TtVEbzb3$1@K@t@@F{qHQzg5(QK9)|&nh9pOC
zCOosiof+*nK!&l<`>zqvI10|4?EC}jy?@gDpGXaZ{hV>|B#r=J%>WAk28F=j5ENi?
z0p~>t0GNcnh5CLJ`Ct2n{c0Hw>K=tdVaiY?I0A-1C?gP7P^cX9{&VDS`(aYQ;{^h<
zjoMn1*)gD*-4lgG_S9t|`&LX=8$ovb{r{gk_46V+fuR5l0fzqX0+diF1PX8hergCL
zg6S#i0z7|dP`DB^J%7~@a40i9f7PH+IP+M4)8Htkqkq#7%1qDxsv%&?|D20N{BvCx
z>L23}a1~}*{4E{=@h_U{Z|hRLa3pu4*H*7;Mham1$83O1$z*1Iuxfy5q=BasnOQ79
z-gTMfqJ~5eV0au9M<go4;Y0)uh9kmZDo~t?k`fAsP$6i5|NoF5<>pOcmc~{>5Gbe$
LSVl$<s}KG!sz9D0

literal 0
HcmV?d00001

diff --git a/Aztec/Classes/TextKit/VideoAttachment.swift b/Aztec/Classes/TextKit/VideoAttachment.swift
index 9598d7fd3..a514d97ef 100644
--- a/Aztec/Classes/TextKit/VideoAttachment.swift
+++ b/Aztec/Classes/TextKit/VideoAttachment.swift
@@ -42,7 +42,9 @@ open class VideoAttachment: MediaAttachment {
         
         super.init(identifier: identifier, url: posterURL)
 
-        self.overlayImage = UIImage()
+        let bundle = Bundle(for: VideoAttachment.self)
+        let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
+        self.overlayImage = playImage
     }
 
     /// Required Initializer

From 9dd0d8f2e476abf42777db03392a3d2b11c98439 Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Mon, 26 Jun 2017 14:32:11 +0100
Subject: [PATCH 3/4] Update images assets.

---
 .../Image.imageset/gridicons-image.pdf        | Bin 4012 -> 4007 bytes
 .../play.imageset/gridicons-play.pdf          | Bin 3925 -> 4067 bytes
 Aztec/Classes/TextKit/VideoAttachment.swift   |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf b/Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf
index f8f4c1a6b98f1f0a7837554ac0ec3b2bce9e2d1f..ba4edd9880c83723a444e4f0b30ee03eddb838d1 100644
GIT binary patch
delta 561
zcmZ1@zg&JoK)r5&V;+kk$L{mmHS0p86g(#v$8T6}mvALZ`)t^)bN`plQuJa`IVMr@
zs7?J$Lf7%9zE!Uc#Mg@+yM5^0hItJ2Y{H)pdN500kZj3K)of&oN{ZC1%SqL>O`86$
z(K@SBssDp0``u-q>>fI61U#6VrXIo(=aIOh>BYN6@+EOi6H~I459Z!(e&?1pE!ktH
zk56n^9P7J@v*)%Xs|Sc*ov^j{ubiQPwX{*%1DT4lq)Vq+`7(RwXl>=+;Z^!BZEp<M
zR%7$svlf}IT9Tpj=riknjY}V!xA#vzZEG1ar}%hw_w5}@hwqE;EBwuF{U&_&WP3(w
zCS$Y7F^sXSCI$+|Mw|CBx^qLAleu{3vzr+j8(J7xPTs)VsAXuXU;qLNc?w)$hJk^x
zsUf<Uv5|%4<Y+$idLwih0~1qYbTMNiQxkMC15+a`rW#|YGd4CiK-X(*VgwcALpame
z#N2o?Kfj%`nX#F<p{2P+l7VHCfl+d*iJ@_lrG;Udi9u3YvUyUP9hVIuC6g!ci*Oil
Lsj9mAyKw;kE6=m_

delta 596
zcmZ23zeavSK)r3i>Ab@RJiC8uSI8Nh{bX$SoxAE5JBzf@0@({+|2Ix7Gdt3eGI^1P
zZNX9IcONoDzt7zHbc^BUYr-+@0+0F5b3cj}O#C!sqnUuN#Okz*$5zQ`#U#~yv_E$<
z=tfrE;YN{_Lhrgb&08~WCwxzo)9%Ro^Oi;VVe7=t^G_~OVL7zAzU$D+3lUFz<1C_;
zA6`jWw{G(8U*7*kEY)@w7)n`Q5S(>2D)L^+94$LuG40eBv)1N3d17%eX=Qnd_sr;3
z*J{^z7o6JgS;^1;Xx8-no5408{x#+MUHj0w{q*IH_NJQqpZ8r~HF@VUu{ygCov-zq
zzeIX+rRJp+mlUNY=7L!HlRX)Em`n^Ohcm{q8W|`Unr+_6=*|scPG;qu&u(mJY;105
zIC(X1qZUws0SGAMDR6-q1_s8aX6RzZMwTX%!}!$e&Cz8HOiV4%#f*(iEz!jcOpUOZ
zYK)-{=rU7uy~ZX+P%%D)GmTBmEhcmE+r_6O8(J7yrW&M}SeP3cC#D&iCnuSwC8k;=
r8=I$^8=Bj3*$`Bs5UXHk$5mXCSX5F`l$yq6Y-(xBrK;-c@5TiHUEj=9

diff --git a/Aztec/Assets/Media.xcassets/play.imageset/gridicons-play.pdf b/Aztec/Assets/Media.xcassets/play.imageset/gridicons-play.pdf
index 19231ad4f86e3a92aeab3e2ed45fa103a77eeb35..a34b2e8eaa014c2da9f662b7f33ca61ff2199d0c 100644
GIT binary patch
delta 813
zcmcaA_gH>HKz;25TfV~zJgwj7JUTnoD~Bg@hIPriE6fZ2d1fx1^4oi>r_=URVrF&E
z4jVk~k(?*Mq2Hr-R6!)yU7$?l(FBvLZEF_3)Ll8LGrBlD&^J85Hrvo@p#qcT4#S^?
z4HG6GX;eH|_(7(wlPP>-_FLW!4y9)+8rTh9zmcjv#A1J|_i|L&{4I~0%un!El>Oak
zP;_znjHx~Umb6wMw43E_^gpI>_5M%O?}UEJb53?PJ|nW$`K8OfXOSK8oL{_5xKi^{
zic5-86LUeV{G=={Qw0MB5N&8-Hkp+%mc_(C!DMn8qkE>lYek8Ba7kiGs)CJ;g1&pP
zp@IcaZ4j58or0YmOgl&jq#dLrq_QAY0ZE&Fa-xEPo+*-QOC;4ksd?!o84895n@=;g
zaxobiOb+BxXSAGL$zuv}#3mruaPlo4H7WhD)S}|d{5%DHLp>8D;|z@^^YEHT8beLh
zaIrEnFf=zXGcq$YHZ(CYnH<Th#%MITfmcKmq$Wr~-#0(S1>_?`2p{2(ilWpsE&~Na
zlgWE|WwcFAfx!X-3V8}#V1|K#v4J7Fn6a^;>0}l@wR#I9bSVQ91E3YCMi?7e7@&(8
zm{<Y>1y!AasR@Sl#zv+X>Wqyo&A@t<k=$u)VuoRfv8kc)<Q;r6TqX+oLHYS53WkQ0
z@9{~*8yHv^ni(3Io0}vX8XBdhm?tNjn41^@128!)G1c7Mj?0Fi5`|b$gcO$~7L|a*
Q(Adn_fJ;@?)!&T^0FVvw>;M1&

delta 714
zcmaDXe^qWmK)tWOHy@KC&)xHy_gIgJX&7Yt8))-8n9N#m(&D>+&P7LOXZgzc(?q$$
z3=Rs*b?7}iBlN~Kq3}_yU~|i=+z-qpr%uG$d|h!cJK%fNcfHQ%EP8o;nrxpx=t$0y
zO<iVx;d9UIx<_~abza&1sEsK$$Xx%yiUpaQ8{c}HOr7(QWv7YR-9nq(o?S29-{gq0
zZ{$k(y6ZvLQ(jpwGd8Z&yp-aSqSVA(5Gy|^i_28OKmkM>nwm^jWsGGpGEgv@+{WlG
zXJ-dfVgXfRW22z&lbV-alA&O^*^H@`i_voOULJKui^)%UOd%TOc-0vVCcE*f@gTGt
z8cuHGHIX!enxf%iWn^GzZeV6)Y-nt3ZfrdHGOwDNAy76*LEjnZw35vHJeS0hR0Ttj
z7NDSSehQR7S)Nba!<fqe4iwBxO^r<z(iEU##wNzb3Se1<JeZh)k(njBn6Z(8`Q$o2
zwR%$nbSVR4bD(2D0AYl&p*heksA2{t#+b$$nqsIkHnIQ)AgW$tV`GRI(0aH#jg2jl
zEG{WZ%*;tG;sOPFaAp-SG>jGWgYxrB6bua}=kQC!n;0h>CM6mqrly)38KoL08YZS1
w8Cn=5T9}!cCK_8L+i}?tRH6{80F0;NlEk8tilWpsE@M*z3ocbvSARDy0DF<mApigX

diff --git a/Aztec/Classes/TextKit/VideoAttachment.swift b/Aztec/Classes/TextKit/VideoAttachment.swift
index a514d97ef..147f61d09 100644
--- a/Aztec/Classes/TextKit/VideoAttachment.swift
+++ b/Aztec/Classes/TextKit/VideoAttachment.swift
@@ -43,7 +43,7 @@ open class VideoAttachment: MediaAttachment {
         super.init(identifier: identifier, url: posterURL)
 
         let bundle = Bundle(for: VideoAttachment.self)
-        let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
+        let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)
         self.overlayImage = playImage
     }
 

From 3e28403b6885fc65f7a27b16b39dadd49ef128aa Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Mon, 26 Jun 2017 15:06:30 +0100
Subject: [PATCH 4/4] Update code to use local assets.

---
 Aztec.xcodeproj/project.pbxproj                |   4 ++++
 .../Contents.json                              |   0
 .../gridicons-image.pdf                        | Bin
 Aztec/Classes/GUI/Assets.swift                 |  17 +++++++++++++++++
 Aztec/Classes/TextKit/TextView.swift           |   2 +-
 Aztec/Classes/TextKit/VideoAttachment.swift    |   4 +---
 Example/Example/EditorDemoController.swift     |   3 ++-
 7 files changed, 25 insertions(+), 5 deletions(-)
 rename Aztec/Assets/Media.xcassets/{Image.imageset => image.imageset}/Contents.json (100%)
 rename Aztec/Assets/Media.xcassets/{Image.imageset => image.imageset}/gridicons-image.pdf (100%)
 create mode 100644 Aztec/Classes/GUI/Assets.swift

diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
index 3b4ae05a1..b9555c2eb 100644
--- a/Aztec.xcodeproj/project.pbxproj
+++ b/Aztec.xcodeproj/project.pbxproj
@@ -131,6 +131,7 @@
 		FF20D6421EDC389A00294B78 /* Processor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63F1EDC389A00294B78 /* Processor.swift */; };
 		FF20D6441EDC395E00294B78 /* NSTextingResult+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D6431EDC395E00294B78 /* NSTextingResult+Helpers.swift */; };
 		FF20D6471EDC3B3900294B78 /* HTMLProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D6461EDC3B3900294B78 /* HTMLProcessorTests.swift */; };
+		FF24AC991F0146AF003CA91D /* Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF24AC981F0146AF003CA91D /* Assets.swift */; };
 		FF4E26601EA8DF1E005E8E42 /* ImageAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */; };
 		FF7A1C511E5651EA00C4C7C8 /* LineAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF7A1C501E5651EA00C4C7C8 /* LineAttachment.swift */; };
 		FF7C89B01E3BC52F000472A8 /* NSAttributedString+FontTraits.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF7C89AF1E3BC52F000472A8 /* NSAttributedString+FontTraits.swift */; };
@@ -296,6 +297,7 @@
 		FF20D63F1EDC389A00294B78 /* Processor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Processor.swift; sourceTree = "<group>"; };
 		FF20D6431EDC395E00294B78 /* NSTextingResult+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextingResult+Helpers.swift"; sourceTree = "<group>"; };
 		FF20D6461EDC3B3900294B78 /* HTMLProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLProcessorTests.swift; sourceTree = "<group>"; };
+		FF24AC981F0146AF003CA91D /* Assets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Assets.swift; sourceTree = "<group>"; };
 		FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAttachment.swift; sourceTree = "<group>"; };
 		FF5B98E21DC29D0C00571CA4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		FF5B98E41DC355B400571CA4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
@@ -507,6 +509,7 @@
 			isa = PBXGroup;
 			children = (
 				599F25291D8BC9A1002871D6 /* FormatBar */,
+				FF24AC981F0146AF003CA91D /* Assets.swift */,
 			);
 			path = GUI;
 			sourceTree = "<group>";
@@ -1014,6 +1017,7 @@
 				B551A4A01E770B3800EE3A7F /* UIFont+Emoji.swift in Sources */,
 				F12F586E1EF20394008AE298 /* LinkFormatter.swift in Sources */,
 				F12F586A1EF20394008AE298 /* HeaderFormatter.swift in Sources */,
+				FF24AC991F0146AF003CA91D /* Assets.swift in Sources */,
 				599F254D1D8BC9A1002871D6 /* FormatBar.swift in Sources */,
 				F1FA0E881E6EF514009D98EE /* TextNode.swift in Sources */,
 				599F253A1D8BC9A1002871D6 /* InNodeConverter.swift in Sources */,
diff --git a/Aztec/Assets/Media.xcassets/Image.imageset/Contents.json b/Aztec/Assets/Media.xcassets/image.imageset/Contents.json
similarity index 100%
rename from Aztec/Assets/Media.xcassets/Image.imageset/Contents.json
rename to Aztec/Assets/Media.xcassets/image.imageset/Contents.json
diff --git a/Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf b/Aztec/Assets/Media.xcassets/image.imageset/gridicons-image.pdf
similarity index 100%
rename from Aztec/Assets/Media.xcassets/Image.imageset/gridicons-image.pdf
rename to Aztec/Assets/Media.xcassets/image.imageset/gridicons-image.pdf
diff --git a/Aztec/Classes/GUI/Assets.swift b/Aztec/Classes/GUI/Assets.swift
new file mode 100644
index 000000000..59861699f
--- /dev/null
+++ b/Aztec/Classes/GUI/Assets.swift
@@ -0,0 +1,17 @@
+import Foundation
+import UIKit
+
+class Assets {
+
+    public static var playIcon: UIImage {
+        let bundle = Bundle(for: self)
+        let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)!
+        return playImage
+    }
+
+    public static var imageIcon: UIImage {
+        let bundle = Bundle(for: self)
+        let playImage = UIImage(named: "image", in: bundle, compatibleWith: nil)!
+        return playImage
+    }
+}
diff --git a/Aztec/Classes/TextKit/TextView.swift b/Aztec/Classes/TextKit/TextView.swift
index b3bc3ae91..48903fe03 100644
--- a/Aztec/Classes/TextKit/TextView.swift
+++ b/Aztec/Classes/TextKit/TextView.swift
@@ -195,7 +195,7 @@ open class TextView: UITextView {
     required public init?(coder aDecoder: NSCoder) {
 
         defaultFont = UIFont.systemFont(ofSize: 14)
-        defaultMissingImage = UIImage()
+        defaultMissingImage = Assets.imageIcon
         super.init(coder: aDecoder)
         commonInit()
     }
diff --git a/Aztec/Classes/TextKit/VideoAttachment.swift b/Aztec/Classes/TextKit/VideoAttachment.swift
index 147f61d09..a505e20b1 100644
--- a/Aztec/Classes/TextKit/VideoAttachment.swift
+++ b/Aztec/Classes/TextKit/VideoAttachment.swift
@@ -42,9 +42,7 @@ open class VideoAttachment: MediaAttachment {
         
         super.init(identifier: identifier, url: posterURL)
 
-        let bundle = Bundle(for: VideoAttachment.self)
-        let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)
-        self.overlayImage = playImage
+        self.overlayImage = Assets.playIcon
     }
 
     /// Required Initializer
diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift
index 0b10f6bb5..a7dd1529a 100644
--- a/Example/Example/EditorDemoController.swift
+++ b/Example/Example/EditorDemoController.swift
@@ -1243,8 +1243,9 @@ private extension EditorDemoController
         if progress.fractionCompleted >= 1 {
             timer.invalidate()
             attachment.progress = nil
-            if let videoAttachment = attachment as? VideoAttachment, let videoURL = progress.userInfo[MediaProgressKey.mediaID] as? URL {
+            if let videoAttachment = attachment as? VideoAttachment, let videoURL = progress.userInfo[MediaProgressKey.videoURL] as? URL {
                 videoAttachment.srcURL = videoURL
+                videoAttachment.overlayColor = UIColor.clear
                 richTextView.update(attachment: videoAttachment)
             }
         }