Merge pull request #2 from Flipkart/testing_assets

APPSCORE-12915 | Changing asset bundling to resolve Asset.car conflicts
Flipkart · Dec 7, 2023 · 8faa79c · 8faa79c
2 parents f0a9020 + fc1b55b
commit 8faa79c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/NowYouSeeMe.podspec b/NowYouSeeMe.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'NowYouSeeMe'
-  s.version          = '1.0.1'
+  s.version          = '1.0.2'
   s.summary          = 'View tracking framework for iOS'
 
   s.description      = <<-DESC
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.swift_version = '5'
 
   s.source_files = 'Source/Classes/**/*.{h,m,swift}'
-  s.resources = 'Source/**/*.{xcassets,xib,storyboard}'
+  s.resource_bundles =  { 'NowYouSeeMe' => ['Source/**/*.{xcassets,xib,storyboard}'] }
 
   s.dependency 'FCChatHeads'
 

diff --git a/Source/Classes/Debug/DebugHelper.swift b/Source/Classes/Debug/DebugHelper.swift
@@ -88,27 +88,33 @@ internal class DebugHelper: NSObject {
         isShown = true
 
         // create chat head image
-        let bundle: Bundle = Bundle(for: Self.self)
-        let imageView: UIImageView = UIImageView(image: UIImage(named: "Logo", in: bundle, compatibleWith: nil))
-        imageView.layer.cornerRadius = 20
-        imageView.clipsToBounds = true
-
-        // create and display chat head with debug options
-        let chatHead: FCChatHeadsController = FCChatHeadsController()
-        chatHead.datasource = self
-        chatHead.delegate = self
-        chatHead.presentChatHead(with: imageView, chatID: "NowYouSeeMe.debugView")
-        self.chatHead = chatHead
+        let bundle: Bundle = Bundle(for: DebugView.self)
+        if let NYSMBundleUrl: URL = bundle.url(forResource: "NowYouSeeMe", withExtension: "bundle"),
+           let NYSMBundle: Bundle = Bundle(url: NYSMBundleUrl) {
+            let imageView: UIImageView = UIImageView(image: UIImage(named: "Logo", in: NYSMBundle, compatibleWith: nil))
+            imageView.layer.cornerRadius = 20
+            imageView.clipsToBounds = true
+
+            // create and display chat head with debug options
+            let chatHead: FCChatHeadsController = FCChatHeadsController()
+            chatHead.datasource = self
+            chatHead.delegate = self
+            chatHead.presentChatHead(with: imageView, chatID: "NowYouSeeMe.debugView")
+            self.chatHead = chatHead
+        }
     }
 }
 
 extension DebugHelper: FCChatHeadsControllerDatasource {
     internal func chatHeadsController(_ chatHeadsController: FCChatHeadsController!, viewForPopoverForChatHeadWithChatID chatID: String!) -> UIView! {
         // provide view for debug options
-        let bundle: Bundle = Bundle(for: Self.self)
-        let myView: DebugView? = bundle.loadNibNamed("DebugView", owner: nil, options: nil)?.first as? DebugView
-
-        return myView ?? UIView()
+        let bundle: Bundle = Bundle(for: DebugView.self)
+        if let NYSMBundleUrl: URL = bundle.url(forResource: "NowYouSeeMe", withExtension: "bundle"),
+           let NYSMBundle: Bundle = Bundle(url: NYSMBundleUrl),
+           let myView: DebugView = NYSMBundle.loadNibNamed("DebugView", owner: nil, options: nil)?.first as? DebugView {
+            return myView
+        }
+        return UIView()
     }
 }