fix(ScannerView, CropView): fix paths to resources

Author: StanDimitroff

DocumentScanner.xcodeproj/project.pbxproj

@@ -336,6 +336,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
 				INFOPLIST_FILE = DocumentScanner/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -360,6 +361,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
 				INFOPLIST_FILE = DocumentScanner/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

DocumentScanner/Source/CroppView.swift

@@ -48,24 +48,28 @@ class CroppView: UIView {
     }
 
     private func setup() {
-        let podBundle = Bundle(for: self.classForCoder)
+        var bundle: Bundle? = nil
 
-        if let bundleURL = podBundle.url(forResource: "DocumentScanner", withExtension: "bundle") {
-            if let bundle = Bundle.init(url: bundleURL) {
+        let libBundle = Bundle(for: self.classForCoder)
 
-                let nib  = UINib(nibName: "CroppView", bundle: bundle)
-                let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
-
-                view.frame = bounds
-
-                addSubview(view)
+        // Search resource in Pod resource bundle
+        if let bundleURL = libBundle.url(forResource: "DocumentScanner", withExtension: "bundle") {
+            if let resourceBundle = Bundle.init(url: bundleURL) {
+                bundle = resourceBundle
             } else {
-                assertionFailure("Could not load the bundle")
+                assertionFailure("Could not load the resource bundle")
             }
         } else {
-            assertionFailure("Could not create a path to the bundle")
+            bundle = libBundle
         }
 
+        let nib  = UINib(nibName: "CroppView", bundle: bundle)
+        let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
+
+        view.frame = bounds
+
+        addSubview(view)
+
         retakeButton.title = NSLocalizedString("Retake", comment: "Retake")
         keepButton.title   = NSLocalizedString("Crop", comment: "Crop")
 

DocumentScanner/Source/ScannerView.swift

@@ -38,24 +38,28 @@ final class ScannerView: UIView {
     }
 
     private func setup() {
-        let podBundle = Bundle(for: self.classForCoder)
+        var bundle: Bundle? = nil
 
-        if let bundleURL = podBundle.url(forResource: "DocumentScanner", withExtension: "bundle") {
-            if let bundle = Bundle.init(url: bundleURL) {
+        let libBundle = Bundle(for: self.classForCoder)
 
-                let nib  = UINib(nibName: "ScannerView", bundle: bundle)
-                let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
-
-                view.frame = bounds
-
-                addSubview(view)
+        // Search resource in Pod resource bundle
+        if let bundleURL = libBundle.url(forResource: "DocumentScanner", withExtension: "bundle") {
+            if let resourceBundle = Bundle.init(url: bundleURL) {
+                bundle = resourceBundle
             } else {
-                assertionFailure("Could not load the bundle")
+                assertionFailure("Could not load the resource bundle")
             }
         } else {
-            assertionFailure("Could not create a path to the bundle")
+            bundle = libBundle
         }
 
+        let nib  = UINib(nibName: "ScannerView", bundle: bundle)
+        let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
+
+        view.frame = bounds
+
+        addSubview(view)
+
         cancelButton.setTitle(NSLocalizedString("Cancel", comment: "Cancel"), for: .normal)
     }
 

Example/DocumentScanner/ScannerViewController.swift

@@ -35,7 +35,6 @@ class ScannerViewController: UIViewController {
                     self.dismiss(animated: true, completion: nil)
                 }
 
-
             self.previewView.onRescan = {
                 // continue session on current scanner instance
                 scanner.continueSession()

Example/Podfile.lock

@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  DocumentScanner: e4e3badd9fe51a275698df7d2ab365ddfdcfd2ce
+  DocumentScanner: be8800dc5974b6eff1900a07be51e470e25e0ca6
 
 PODFILE CHECKSUM: 17bd2e0c29a1621d1827cccff1cb72b77f989be3