diff --git a/README.md b/README.md index 428ee9b..624cdf5 100644 --- a/README.md +++ b/README.md @@ -89,8 +89,6 @@ There is a known bug where sometimes, calling `pod install Iconic` would not run This is how the module ouput is going to look like (plus documentation, which has been removed for this example). Notice that API names are adopting the font's file name to make it easy to work with, and everything is strongly typed, making it safe and auto-completable. -![Iconic Module](Screenshots/screenshot_iconic_module.png) - ## How to use For complete documentation, visit [CocoaPods' auto-generated docs](http://cocoadocs.org/docsets/Iconic/). @@ -172,7 +170,7 @@ Check out the sample project, everything is demo'd there. ## Icon Font Catalog -Besides the auto-generated Swift code, you will notice a `catalog.html` file being added to your directory. This is your icon font catalog, to be used for visual reference about all the icons you have available. +Besides the auto-generated Swift code, an icon font catalog will be added in `Pods/Iconic/Source/Catalog`. Use this as a visual reference about the icons and their names. ![Icon Font Catalog](Screenshots/screenshot_icon_catalog.png) diff --git a/Samples/Podfile.lock b/Samples/Podfile.lock index 18f82c4..8b45048 100644 --- a/Samples/Podfile.lock +++ b/Samples/Podfile.lock @@ -11,12 +11,12 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: Iconic: - :commit: 435ba66aacee2f06073aad69d3b5f23549323cf4 + :commit: 51d56a21e91b4e9a74231a496d0df2a3bd91f7ac :git: https://github.com/dzenbot/Iconic.git :submodules: true SPEC CHECKSUMS: - Iconic: a988d10415b097084316bc2a3385420c4bedd4dc + Iconic: fd00fc2dfa3cc0972a686c2a37adc3eab782d5bf PODFILE CHECKSUM: cebd6ca67a5fd41e00c961d7b2dc73d45f7213ca diff --git a/Samples/Pods/Iconic/Source/FontAwesome.ttf b/Samples/Pods/Iconic/Source/Catalog/FontAwesome.ttf similarity index 100% rename from Samples/Pods/Iconic/Source/FontAwesome.ttf rename to Samples/Pods/Iconic/Source/Catalog/FontAwesome.ttf diff --git a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/data.json b/Samples/Pods/Iconic/Source/Catalog/data.json similarity index 100% rename from Samples/Pods/Iconic/Source/Iconizer/catalog/html/data.json rename to Samples/Pods/Iconic/Source/Catalog/data.json diff --git a/Samples/Pods/Iconic/Source/Iconizer/catalog/catalog.html b/Samples/Pods/Iconic/Source/Catalog/index.html similarity index 63% rename from Samples/Pods/Iconic/Source/Iconizer/catalog/catalog.html rename to Samples/Pods/Iconic/Source/Catalog/index.html index e24acf7..c0d4588 100644 --- a/Samples/Pods/Iconic/Source/Iconizer/catalog/catalog.html +++ b/Samples/Pods/Iconic/Source/Catalog/index.html @@ -4,10 +4,10 @@
- + - - + + Icon Font Reference diff --git a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/script.js b/Samples/Pods/Iconic/Source/Catalog/script.js similarity index 94% rename from Samples/Pods/Iconic/Source/Iconizer/catalog/html/script.js rename to Samples/Pods/Iconic/Source/Catalog/script.js index 089c32e..e52a93a 100644 --- a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/script.js +++ b/Samples/Pods/Iconic/Source/Catalog/script.js @@ -1,6 +1,6 @@ $(document).ready(function(){ - $.getJSON( "html/data.json", function(data) { + $.getJSON( "data.json", function(data) { importFont(data); buildHeader(data); buildList(data); @@ -11,7 +11,7 @@ $(document).ready(function(){ function importFont(data){ var font_name = data["name"]; var file_name = data["filename"]; - $("head").append($('')); + $("head").append($('')); } function buildHeader(data){ diff --git a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/style.css b/Samples/Pods/Iconic/Source/Catalog/style.css similarity index 100% rename from Samples/Pods/Iconic/Source/Iconizer/catalog/html/style.css rename to Samples/Pods/Iconic/Source/Catalog/style.css diff --git a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/FontAwesome.ttf b/Samples/Pods/Iconic/Source/Iconizer/catalog/html/FontAwesome.ttf deleted file mode 100644 index f221e50..0000000 Binary files a/Samples/Pods/Iconic/Source/Iconizer/catalog/html/FontAwesome.ttf and /dev/null differ diff --git a/Samples/Pods/Local Podspecs/Iconic.podspec.json b/Samples/Pods/Local Podspecs/Iconic.podspec.json index 1bcbaa7..3146d10 100644 --- a/Samples/Pods/Local Podspecs/Iconic.podspec.json +++ b/Samples/Pods/Local Podspecs/Iconic.podspec.json @@ -18,8 +18,8 @@ "submodules": true }, "source_files": "Source/*.{swift}", - "resources": "Source/*.{ttf,otf}", - "preserve_paths": "Source/Iconizer/catalog/**/*.*", + "resources": "Source/**/*.{ttf,otf}", + "preserve_paths": "Source/Catalog/**/*.*", "frameworks": [ "UIKit", "CoreText" @@ -28,5 +28,5 @@ "ios": "8.0", "tvos": "9.0" }, - "prepare_command": "cd Vendor/SwiftGen/ && rake install\ncd ../..\nsh Source/Iconizer/Iconizer.sh Samples/Fonts/FontAwesome.ttf Source/ --verbose" + "prepare_command": "cd Vendor/SwiftGen/ && rake install\ncd ../..\nsh Source/Iconizer.sh Fonts/FontAwesome-4.6.3/FontAwesome.ttf Source --verbose" } diff --git a/Samples/Pods/Manifest.lock b/Samples/Pods/Manifest.lock index 18f82c4..8b45048 100644 --- a/Samples/Pods/Manifest.lock +++ b/Samples/Pods/Manifest.lock @@ -11,12 +11,12 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: Iconic: - :commit: 435ba66aacee2f06073aad69d3b5f23549323cf4 + :commit: 51d56a21e91b4e9a74231a496d0df2a3bd91f7ac :git: https://github.com/dzenbot/Iconic.git :submodules: true SPEC CHECKSUMS: - Iconic: a988d10415b097084316bc2a3385420c4bedd4dc + Iconic: fd00fc2dfa3cc0972a686c2a37adc3eab782d5bf PODFILE CHECKSUM: cebd6ca67a5fd41e00c961d7b2dc73d45f7213ca diff --git a/Samples/Pods/Pods.xcodeproj/project.pbxproj b/Samples/Pods/Pods.xcodeproj/project.pbxproj index 35183a3..37ec27d 100644 --- a/Samples/Pods/Pods.xcodeproj/project.pbxproj +++ b/Samples/Pods/Pods.xcodeproj/project.pbxproj @@ -16,21 +16,21 @@ 34BE3A05510B71B274A45BD5722711F1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAFE0A1C5D4E2A0F503236293A22F9E0 /* UIKit.framework */; }; 3826C04E01841F2BCBB33B28D13BD8E3 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37BF147A7E2A23724694E979009AC874 /* CoreText.framework */; }; 38D1296DE38509CEB221C5ECDBEDB8FD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DD2384FE0522CFB96142C30D07817D /* Foundation.framework */; }; - 3987C574067E7B1FE9164526B55E7381 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBE8E122B0E4787BE80C23F47F0E4238 /* FontAwesome.ttf */; }; 42AB6557434F5095FE9DAE147D9122B6 /* Iconic-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E7AD4C841C9F38E365E5E0EAF24BFEC /* Iconic-iOS-dummy.m */; }; 7971F2F8D897B0223A35B54717CA5BA4 /* FontAwesomeIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B39A31B543D62876E0FB803C3EA24B /* FontAwesomeIcon.swift */; }; 7B5623C3D76AD8AFB2F2E4C706715496 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EAB75BD3B4997AD510DE9E931CBF7F2 /* Foundation.framework */; }; 7F7DE142BB977C12D340CF9A60A9D546 /* Iconic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B8CD527225500BE09284DF568B443 /* Iconic.swift */; }; A52806BB7B74D0692E158ABF7D18312A /* Iconic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B8CD527225500BE09284DF568B443 /* Iconic.swift */; }; A94BF36844A97FFCF70B022364716E7F /* Pods-UnitTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D64BA35405D54FB49DE3E7ADEA60D6F /* Pods-UnitTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AFD282EEB22126C46B87D7567091BBBD /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7FA911C1568A2E701F697F92DC2E934E /* FontAwesome.ttf */; }; BDB9680A669AE37E61DB5278A1C6394F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DD2384FE0522CFB96142C30D07817D /* Foundation.framework */; }; CCD66F4C4391651964B8DFED90E61FFF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EB644186D556EE6B6C5FC75FB81F0E9 /* UIKit.framework */; }; D5108AEB5F71BEBFF01917E8AC59D613 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EAB75BD3B4997AD510DE9E931CBF7F2 /* Foundation.framework */; }; D983D910235A3B6864DDC9B669F0BFD4 /* Pods-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CECFE06CF5153BB82F91930691925E9B /* Pods-iOS-dummy.m */; }; - DE6E95DEB8C21E0E75571D05E32646D0 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBE8E122B0E4787BE80C23F47F0E4238 /* FontAwesome.ttf */; }; E0499CDB2B0160214808F2A87E0C711D /* FontAwesomeIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B39A31B543D62876E0FB803C3EA24B /* FontAwesomeIcon.swift */; }; E283585AB873041EF35493621B2EDF7B /* Pods-iOS-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 48E22416DCA58669F7F2997C78CEB3B2 /* Pods-iOS-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; EE1C1EA1B075E8C614F314A4D57E7188 /* Iconic-tvOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1399BE1DAF6A3FADD8B33379B3BFD8D3 /* Iconic-tvOS-dummy.m */; }; + EFE54E14615EC746570E97C4A0D9C220 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7FA911C1568A2E701F697F92DC2E934E /* FontAwesome.ttf */; }; F1BB364F259BBE7E6010C36C58CD7FCE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DD2384FE0522CFB96142C30D07817D /* Foundation.framework */; }; /* End PBXBuildFile section */ @@ -77,6 +77,7 @@ 7EB644186D556EE6B6C5FC75FB81F0E9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 7EFCAA00D6B8E075865184A754CBAB5D /* Pods-UnitTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-UnitTests-acknowledgements.plist"; sourceTree = ""; }; 7F5E174040A6895EEA38F73A455ED0A3 /* Iconic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Iconic.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7FA911C1568A2E701F697F92DC2E934E /* FontAwesome.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; name = FontAwesome.ttf; path = Source/Catalog/FontAwesome.ttf; sourceTree = ""; }; 8227479E6284C1225908736385F66021 /* Pods-iOS-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-iOS-acknowledgements.markdown"; sourceTree = ""; }; 86DF88162839D74742566E6BBC9B9F78 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; }; 87234ABB13A259B13026DB33BB6974C3 /* Pods-tvOS-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-tvOS-frameworks.sh"; sourceTree = ""; }; @@ -104,7 +105,6 @@ EA3AC4383D1C312B8A06B51835A6F639 /* Pods-tvOS-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-tvOS-resources.sh"; sourceTree = ""; }; EA8DB57E830C1FC97D12AC5106C571A0 /* Iconic-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Iconic-iOS-prefix.pch"; sourceTree = ""; }; EB8AB70BB5837765F60014BB8A220867 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - EBE8E122B0E4787BE80C23F47F0E4238 /* FontAwesome.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; name = FontAwesome.ttf; path = Source/FontAwesome.ttf; sourceTree = ""; }; EBEC4754D5940CBBF0D971C70D1ABDA6 /* Iconic-tvOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Iconic-tvOS-umbrella.h"; path = "../Iconic-tvOS/Iconic-tvOS-umbrella.h"; sourceTree = ""; }; F8CDE4BC2101FFF91FF7C1B2F8EEA7AF /* Pods-UnitTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-UnitTests-acknowledgements.markdown"; sourceTree = ""; }; F9DD2384FE0522CFB96142C30D07817D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; @@ -197,10 +197,10 @@ name = "Targets Support Files"; sourceTree = ""; }; - 714656380D76C2F7A7332F59EA3A2C33 /* Resources */ = { + 5F046143DF029DA9E24F685C744BE4B7 /* Resources */ = { isa = PBXGroup; children = ( - EBE8E122B0E4787BE80C23F47F0E4238 /* FontAwesome.ttf */, + 7FA911C1568A2E701F697F92DC2E934E /* FontAwesome.ttf */, ); name = Resources; sourceTree = ""; @@ -248,7 +248,7 @@ children = ( E1B39A31B543D62876E0FB803C3EA24B /* FontAwesomeIcon.swift */, 336B8CD527225500BE09284DF568B443 /* Iconic.swift */, - 714656380D76C2F7A7332F59EA3A2C33 /* Resources */, + 5F046143DF029DA9E24F685C744BE4B7 /* Resources */, AC94D4B404F0FE45A13764F713A2E24F /* Support Files */, ); path = Iconic; @@ -492,7 +492,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3987C574067E7B1FE9164526B55E7381 /* FontAwesome.ttf in Resources */, + EFE54E14615EC746570E97C4A0D9C220 /* FontAwesome.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -500,7 +500,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - DE6E95DEB8C21E0E75571D05E32646D0 /* FontAwesome.ttf in Resources */, + AFD282EEB22126C46B87D7567091BBBD /* FontAwesome.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Screenshots/screenshot_iconic_module.png b/Screenshots/screenshot_iconic_module.png deleted file mode 100644 index 9d454d8..0000000 Binary files a/Screenshots/screenshot_iconic_module.png and /dev/null differ diff --git a/Screenshots/screenshot_sample_proj.png b/Screenshots/screenshot_sample_proj.png index a6cd52b..c1dade6 100644 Binary files a/Screenshots/screenshot_sample_proj.png and b/Screenshots/screenshot_sample_proj.png differ