<FIX> Ressources loading

Author: Mahdi

Example/.DS_Store

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name             = 'MBDocCapture'
-    spec.version          = '0.1.2'
+    spec.version          = '0.1.3'
     spec.summary          = 'MBDocCapture makes it easy to add document scanning functionalities to your iOS.'
 
     spec.description      = <<-DESC

Example/Pods/Target Support Files/MBDocCapture/Info.plist

@@ -49,7 +49,7 @@ final class EditScanViewController: UIViewController {
     }()
 
     lazy private var nextButton: UIBarButtonItem = {
-        let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: Bundle(for: EditScanViewController.self), value: "Next", comment: "")
+        let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: bundle(), value: "Next", comment: "")
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(pushReviewController))
         button.tintColor = navigationController?.navigationBar.tintColor
         return button
@@ -83,7 +83,7 @@ final class EditScanViewController: UIViewController {
 
         setupViews()
         setupConstraints()
-        title = NSLocalizedString("mbdoccapture.scan_edit_title", tableName: nil, bundle: Bundle(for: EditScanViewController.self), value: "Trimming", comment: "")
+        title = NSLocalizedString("mbdoccapture.scan_edit_title", tableName: nil, bundle: bundle(), value: "Trimming", comment: "")
         navigationItem.rightBarButtonItem = nextButton
 
         zoomGestureController = ZoomGestureController(image: image, rectView: rectView)

MBDocCapture.podspec

@@ -177,3 +177,17 @@ public struct ImageScannerResults {
     public var detectedRectangle: Rectangle
 
 }
+
+extension UIViewController {
+
+    func bundle() -> Bundle {
+        let frameworkBundle = Bundle(for: type(of: self))
+        let bundleURL = frameworkBundle.resourceURL?.appendingPathComponent("MBDocCapture.bundle")
+        
+        if let bundle = Bundle(url: bundleURL!) {
+            return bundle
+        } else {
+            return Bundle(for: type(of: self))
+        }
+    }
+}

MBDocCapture/Classes/ViewControllers/EditScanViewController.swift

@@ -45,21 +45,21 @@ final class ReviewViewController: UIViewController {
     }()
 
     lazy private var enhanceButton: UIBarButtonItem = {
-        let image = UIImage(named: "enhance", in: Bundle(for: ReviewViewController.self), compatibleWith: nil)
+        let image = UIImage(named: "enhance", in: bundle(), compatibleWith: nil)
         let button = UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(toggleEnhancedImage))
         button.tintColor = .white
         return button
     }()
 
     lazy private var rotateButton: UIBarButtonItem = {
-        let image = UIImage(named: "rotate", in: Bundle(for: ReviewViewController.self), compatibleWith: nil)
+        let image = UIImage(named: "rotate", in: bundle(), compatibleWith: nil)
         let button = UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(rotateImage))
         button.tintColor = .white
         return button
     }()
 
     lazy private var doneButton: UIBarButtonItem = {
-        let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: Bundle(for: ReviewViewController.self), value: "Next", comment: "")
+        let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: bundle(), value: "Next", comment: "")
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(finishScan))
         button.tintColor = navigationController?.navigationBar.tintColor
         return button
@@ -87,7 +87,7 @@ final class ReviewViewController: UIViewController {
         setupToolbar()
         setupConstraints()
 
-        title = NSLocalizedString("mbdoccapture.scan_review_title", tableName: nil, bundle: Bundle(for: ReviewViewController.self), value: "Confirmation", comment: "")
+        title = NSLocalizedString("mbdoccapture.scan_review_title", tableName: nil, bundle: bundle(), value: "Confirmation", comment: "")
         navigationItem.rightBarButtonItem = doneButton
     }
 

MBDocCapture/Classes/ViewControllers/ImageScannerController.swift

@@ -67,7 +67,7 @@ final class ScannerViewController: UIViewController {
     }
 
     lazy private var cancelButton: UIBarButtonItem = {
-        let title = NSLocalizedString("mbdoccapture.cancel_button", tableName: nil, bundle: Bundle(for: ScannerViewController.self), value: "Cancel", comment: "")
+        let title = NSLocalizedString("mbdoccapture.cancel_button", tableName: nil, bundle: bundle(), value: "Cancel", comment: "")
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(cancelImageScannerController))
         button.tintColor = .white
         return button
@@ -337,7 +337,7 @@ extension ScannerViewController: RectangleDetectionDelegateProtocol {
         prepOverlayView.backgroundColor = UIColor(hexString: "FFFFFF99")
 
         let image = UIImageView(frame: CGRect(x: (view.frame.width - 40) / 2, y: 16, width: 40, height: 40))
-        let icon = UIImage(named: "ic_touch", in: Bundle(for: ScannerViewController.self), compatibleWith: nil)
+        let icon = UIImage(named: "ic_touch", in: bundle(), compatibleWith: nil)
         image.image = icon
         prepOverlayView.addSubview(image)
 
@@ -347,7 +347,7 @@ extension ScannerViewController: RectangleDetectionDelegateProtocol {
         label.numberOfLines = 0
         label.textColor = .black
         label.textAlignment = .center
-        label.text = NSLocalizedString("mbdoccapture.document_capture_flip", tableName: nil, bundle: Bundle(for: EditScanViewController.self), value: "Flip your document and Touch the screen when you're ready to start the capture.", comment: "")
+        label.text = NSLocalizedString("mbdoccapture.document_capture_flip", tableName: nil, bundle: bundle(), value: "Flip your document and Touch the screen when you're ready to start the capture.", comment: "")
         prepOverlayView.addSubview(label)
 
         let button = UIButton(frame: view.bounds)