Merge pull request #1 from joeboyscout04/storyboard-support

Swift 4, add storyboard support, add R.swift support

Author: s4cha

AssetChecker.swift

@@ -53,14 +53,16 @@ func localizedStrings(inStringFile: String) -> [String] {
     var localizedStrings = [String]()
     let patterns = [
         "#imageLiteral\\(resourceName: \"([\\w-]+)\"\\)", // Image Literal
-        "UIImage\\(named: \"(\\w+)\"\\)" // Default UIImage call
+        "UIImage\\(named: \"(\\w+)\"\\)", // Default UIImage call
+        "\\<image name=\"([\\w-]+)\".*", // Storyboard resources
+        "R.image.([\\w-]+)\\(\\)" //R.swift support
     ]
     for p in patterns {
         let regex = try? NSRegularExpression(pattern: p, options: [])
         let range = NSRange(location:0, length:(inStringFile as NSString).length)
         regex?.enumerateMatches(in: inStringFile,options: [], range: range) { result, _, _ in
             if let r = result {
-                let value = (inStringFile as NSString).substring(with:r.rangeAt(1))
+                let value = (inStringFile as NSString).substring(with:r.range(at: 1))
                 localizedStrings.append(value)
             }
         }
@@ -72,9 +74,10 @@ func listUsedAssetLiterals() -> [String] {
     let sourcesPath = FileManager.default.currentDirectoryPath + sourcePath
     let enumerator = FileManager.default.enumerator(atPath:sourcesPath)
     return elementsInEnumerator(enumerator)
-        .filter { $0.hasSuffix(".swift") || $0.hasSuffix(".m") }    // Only Swift and Obj-C files
+        .filter { $0.hasSuffix(".m") || $0.hasSuffix(".swift") || $0.hasSuffix(".xib") || $0.hasSuffix(".storyboard") }    // Only Swift and Obj-C files
         .map { "\(sourcesPath)/\($0)" }                             // Build file paths
         .map { try? String(contentsOfFile: $0, encoding: .utf8)}    // Get file contents
+        .flatMap{$0}
         .flatMap{$0}                                                // Remove nil entries
         .map(localizedStrings)                                      // Find localizedStrings ocurrences
         .flatMap{$0}                                                // Flatten
@@ -100,3 +103,4 @@ broken.forEach { print("\(assetCatalogAbsolutePath):: error: [Asset Missing] \($
 if broken.count > 0 {
     exit(1)
 }
+