@jimrising/easymerchantsdk-react-native 1.4.1 → 1.4.2

package/ios/Pods/ViewControllers/BaseVC.swift

@@ -67,7 +67,7 @@ class BaseVC: UIViewController {
 
             let toastLabel = UILabel()
             toastLabel.text = message
-            toastLabel.textColor = UIColor.black
+            toastLabel.textColor = .black
             toastLabel.backgroundColor = .systemGray5
             toastLabel.textAlignment = .center
             toastLabel.font = UIFont.systemFont(ofSize: 15)
@@ -76,17 +76,27 @@ class BaseVC: UIViewController {
             toastLabel.layer.cornerRadius = 10
             toastLabel.clipsToBounds = true
 
-            // Set max width and calculate height based on text
             let horizontalPadding: CGFloat = 22
+            let verticalPadding: CGFloat = 16
             let maxWidth = self.view.frame.width - 2 * horizontalPadding
-            
-            let expectedSize = 30
 
+            // Calculate size based on message content
+            let constraintSize = CGSize(width: maxWidth - 20, height: .greatestFiniteMagnitude)
+            let boundingBox = NSString(string: message).boundingRect(
+                with: constraintSize,
+                options: .usesLineFragmentOrigin,
+                attributes: [.font: toastLabel.font!],
+                context: nil
+            )
+
+            let calculatedHeight = boundingBox.height + verticalPadding
+
+            // Position it 60pt from bottom (was 100)
             toastLabel.frame = CGRect(
                 x: horizontalPadding,
-                y: self.view.frame.height - CGFloat(expectedSize) - 100,
+                y: self.view.frame.height - calculatedHeight - 60,
                 width: maxWidth,
-                height: CGFloat(expectedSize + 20) // Add vertical padding
+                height: calculatedHeight
             )
 
             self.view.addSubview(toastLabel)
@@ -102,6 +112,7 @@ class BaseVC: UIViewController {
             }
         }
     }
+
     
     func showAlert(title: String = "Alert", message: String, actionTitle: String = "OK", handler: ((UIAlertAction) -> Void)? = nil) {
         DispatchQueue.main.async {

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -15,7 +15,7 @@ protocol BillingInfoVCDelegate: AnyObject {
 
 class BillingInfoVC: BaseVC {
     
-    @IBOutlet weak var viewBillingInfo: UIView!
+//    @IBOutlet weak var viewBillingInfo: UIView!
     @IBOutlet weak var btnPrevious: UIButton!
     @IBOutlet weak var viewCountryList: UIView!
     @IBOutlet weak var tblViewCountryList: UITableView!
@@ -254,10 +254,10 @@ class BillingInfoVC: BaseVC {
         if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
            let placeholderColor = UIColor(hex: secondaryFontColor) {
             lblEasyMerchant.textColor = placeholderColor
-            viewBillingInfo.layer.borderColor = placeholderColor.cgColor
+//            viewBillingInfo.layer.borderColor = placeholderColor.cgColor
         }
         else {
-            viewBillingInfo.layer.borderColor = UIColor.systemGray.cgColor
+//            viewBillingInfo.layer.borderColor = UIColor.systemGray.cgColor
         }
         
         if let borderRadiusString = UserStoreSingleton.shared.border_radious,
@@ -265,17 +265,17 @@ class BillingInfoVC: BaseVC {
             btnNext.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
             btnPrevious.layer.cornerRadius = CGFloat(borderRadius)
             btnPrevious.layer.borderWidth = 1
-            viewBillingInfo.layer.cornerRadius = CGFloat(borderRadius)
-            viewBillingInfo.layer.borderWidth = 1
+//            viewBillingInfo.layer.cornerRadius = CGFloat(borderRadius)
+//            viewBillingInfo.layer.borderWidth = 1
         } else {
             btnNext.layer.cornerRadius = 8 // Default value
             btnPrevious.layer.cornerRadius = 8
-            viewBillingInfo.layer.borderWidth = 1
-            viewBillingInfo.layer.cornerRadius = 8
+//            viewBillingInfo.layer.borderWidth = 1
+//            viewBillingInfo.layer.cornerRadius = 8
         }
         btnNext.layer.masksToBounds = true // Ensure the corners are clipped properly
         btnPrevious.layer.masksToBounds = true
-        viewBillingInfo.layer.masksToBounds = true
+//        viewBillingInfo.layer.masksToBounds = true
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
@@ -1193,6 +1193,7 @@ class BillingInfoVC: BaseVC {
                                         // Pass billing and additional info
                                         // Conditionally pass raw FieldItem array
                                         paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.amount = self.amount
                                         
                                         if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
@@ -1369,6 +1370,7 @@ class BillingInfoVC: BaseVC {
                                         // Pass billing and additional info
                                         // Conditionally pass raw FieldItem array
                                         paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.amount = self.amount
                                         
                                         if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo

package/ios/Pods/ViewControllers/CountryListVC.swift

@@ -55,6 +55,26 @@ class CountryListVC: UIViewController {
             searchBarCountry.searchTextField.font = UIFont.systemFont(ofSize: fontSize)
         }
         
+        if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let uiColor = UIColor(hex: secondaryFontColor) {
+            // Set placeholder text color
+            let placeholderAttributes: [NSAttributedString.Key: Any] = [
+                .foregroundColor: uiColor
+            ]
+            searchBarCountry.searchTextField.attributedPlaceholder = NSAttributedString(
+                string: searchBarCountry.searchTextField.placeholder ?? "Search here",
+                attributes: placeholderAttributes
+            )
+            // Set search icon color
+            searchBarCountry.searchTextField.leftView?.tintColor = uiColor
+        }
+        
+        if let searchBar = self.searchBarCountry {
+            searchBar.backgroundImage = UIImage() // Removes background line
+            searchBar.layer.borderWidth = 0
+            searchBar.layer.borderColor = UIColor.clear.cgColor
+        }
+        
         tblViewCountry.delegate = self
         tblViewCountry.dataSource = self
         

package/ios/Pods/ViewControllers/CustomOverlay.swift

@@ -0,0 +1,199 @@
+////
+////  CustomOverlay.swift
+////  EasyPay
+////
+////  Created by Mony's Mac on 21/03/25.
+////
+//
+////import BlinkCard
+//
+//protocol CustomOverlayDelegate: AnyObject {
+//    func didFinishScanningCard(cardNumber: String, expiryDate: String, cvv: String, nameOnCard: String)
+//}
+//
+//class CustomOverlay: MBCCustomOverlayViewController, MBCScanningRecognizerRunnerViewControllerDelegate,
+//                     MBCFirstSideFinishedRecognizerRunnerViewControllerDelegate {
+//    
+//    @IBOutlet weak var tooltipLabel: UILabel!
+//    @IBOutlet weak var centerView: UIView!
+//    @IBOutlet weak var lblScanCardCount: UILabel!
+//    @IBOutlet weak var btnRotate: UIButton!
+//    @IBOutlet weak var imgProcessing: UIImageView!
+//    
+//    var currentScanStep = 1 // Start with 1 for the first scan step
+//    
+//    var blinkCardEditScreen: MBCBlinkCardEditViewController?
+//    var blinkcardNavigationViewController: MBCBlinkCardEditNavigationController?
+//    var blinkCardRecognizerResult: MBCBlinkCardRecognizerResult?
+//    
+//    static func initFromStoryboard() -> CustomOverlay {
+//        let viewController = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "CustomOverlay")
+//        
+//        guard let customOverlay = viewController as? CustomOverlay else {
+//            fatalError("CustomOverlay should always be an instance of \(CustomOverlay.self) here because we instantiate it from the Storyboard")
+//        }
+//        
+//        return customOverlay
+//    }
+//    
+//    weak var delegate: CustomOverlayDelegate?
+//    
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//        
+//        super.scanningRecognizerRunnerViewControllerDelegate = self
+//        super.metadataDelegates.firstSideFinishedRecognizerRunnerViewControllerDelegate = self
+//        
+//        lblScanCardCount.text = "Scan Card (1/2)"
+//        
+//        centerView.layer.borderColor = UIColor.white.cgColor
+//        centerView.layer.borderWidth = 2.0
+//        centerView.layer.cornerRadius = 8.0
+//        
+//        imgProcessing.image = UIImage(systemName: "exclamationmark.circle")
+//        tooltipLabel.text = "Place the front side of your card inside the frame"
+//    }
+//    
+//    func updateScanProgress() {
+//        if currentScanStep < 2 {
+//            currentScanStep += 1
+//            lblScanCardCount.text = "Scan Card (\(currentScanStep)/2)"
+//        }
+//    }
+//    
+//    func showBorderColorForOneSeconds() {
+//        centerView.layer.borderColor = UIColor.green.cgColor
+//        centerView.layer.borderWidth = 2.0
+//        centerView.layer.cornerRadius = 8.0
+//        
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//            self.centerView.layer.borderColor = UIColor.white.cgColor
+//            self.centerView.layer.borderWidth = 2.0
+//        }
+//    }
+//    
+//    func recognizerRunnerViewControllerDidFinishScanning(_ recognizerRunnerViewController: UIViewController & MBCRecognizerRunnerViewController, state: MBCRecognizerResultState) {
+//        if state == .valid {
+//            recognizerRunnerViewController.pauseScanning()
+//            
+//            DispatchQueue.main.async {
+//                self.showBorderColorForOneSeconds()
+//                
+//                // Show loader while processing final results
+//                self.imgProcessing.image = UIImage(named: "loaderImage")
+//                self.tooltipLabel.text = "Keep it in frame while we’re processing..."
+//                self.startRotationAnimation(on: self.imgProcessing)
+//                
+//                for recognizer in self.recognizerCollection.recognizerList where recognizer.baseResult?.resultState == .valid {
+//                    if recognizer is MBCBlinkCardRecognizer {
+//                        let blinkCardRecognizer = recognizer as? MBCBlinkCardRecognizer
+//                        self.blinkCardRecognizerResult = blinkCardRecognizer?.result
+//                    }
+//                }
+//                
+//                self.imgProcessing.image = UIImage(named: "check")
+//                self.tooltipLabel.text = "Done"
+//                self.stopRotationAnimation(on: self.imgProcessing)
+//                
+//                guard let blinkCardResult = self.blinkCardRecognizerResult else { return }
+//                
+//                // Extract card details
+//                let cardNumber = blinkCardResult.cardNumber
+//                let expiryDate = "\(blinkCardResult.expiryDate.month)/\(blinkCardResult.expiryDate.year)"
+//                let cvv = blinkCardResult.cvv
+//                let nameOnCard = blinkCardResult.owner
+//                
+//                // Pass data to delegate
+//                self.delegate?.didFinishScanningCard(cardNumber: cardNumber, expiryDate: expiryDate, cvv: cvv, nameOnCard: nameOnCard)
+//                
+//                // Dismiss the scanner
+//                recognizerRunnerViewController.dismiss(animated: true, completion: nil)
+//            }
+//        }
+//    }
+//    
+//    func recognizerRunnerViewControllerDidFinishRecognition(ofFirstSide recognizerRunnerViewController: UIViewController & MBCRecognizerRunnerViewController) {
+//        DispatchQueue.main.async {
+//            // Show loader image during scanning
+//            self.imgProcessing.image = UIImage(named: "loaderImage", in: .easyPayBundle, with: nil)
+//            self.tooltipLabel.text = "Keep it in frame while we’re processing..."
+//            self.startRotationAnimation(on: self.imgProcessing)
+//            
+//            self.updateScanProgress()
+//            self.showBorderColorForOneSeconds()
+//            
+//            // Update tooltip and show check image after completing the first side
+//            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                self.imgProcessing.image = UIImage(named: "check", in: .easyPayBundle, with: nil)
+//                self.tooltipLabel.text = "Done"
+//                self.stopRotationAnimation(on: self.imgProcessing)
+//                
+//                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                    self.imgProcessing.image = UIImage(systemName: "exclamationmark.circle")
+//                    self.tooltipLabel.text = "Place the back side of your card inside the frame"
+//                    self.stopRotationAnimation(on: self.imgProcessing)
+//                }
+//            }
+//        }
+//    }
+//    
+//    func startRotationAnimation(on imageView: UIImageView) {
+//        let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
+//        rotationAnimation.fromValue = 0
+//        rotationAnimation.toValue = CGFloat.pi * 2
+//        rotationAnimation.duration = 1.0 // Duration of one full rotation
+//        rotationAnimation.repeatCount = Float.infinity // Repeat indefinitely
+//        imageView.layer.add(rotationAnimation, forKey: "rotationAnimation")
+//    }
+//    
+//    func stopRotationAnimation(on imageView: UIImageView) {
+//        imageView.layer.removeAnimation(forKey: "rotationAnimation")
+//    }
+//    
+//    @IBAction func didTapClose(_ sender: Any) {
+//        self.recognizerRunnerViewController?.overlayViewControllerWillCloseCamera(self)
+//        self.dismiss(animated: true, completion: nil)
+//    }
+//    
+//    func showEditScreen(blinkCardRecognizerResult: MBCBlinkCardRecognizerResult) {
+//        blinkCardEditScreen = MBCBlinkCardEditViewController(blinkCardRecognizerResult: blinkCardRecognizerResult, fieldConfiguration: MBCBlinkCardEditFieldConfiguration(), delegate: self)
+//        blinkcardNavigationViewController = MBCBlinkCardEditNavigationController(rootViewController: blinkCardEditScreen!)
+//        self.present(blinkcardNavigationViewController!, animated: true, completion: nil)
+//    }
+//    
+//    @IBAction func actionBtnRotate(_ sender: UIButton) {
+//        UIView.animate(withDuration: 0.5, animations: {
+//            // Rotate the centerView by 180 degrees
+//            self.centerView.transform = self.centerView.transform.rotated(by: .pi/2)
+//        })
+//    }
+//    
+//}
+//
+//extension CustomOverlay: MBCBlinkCardEditViewControllerDelegate {
+//    func blinkCardEditViewControllerDidFinishEditing(_ blinkCardEditViewController: MBCBlinkCardEditViewController, editResult: MBCBlinkCardEditResult) {
+//        self.recognizerRunnerViewController?.pauseScanning()
+//        
+//        DispatchQueue.main.async {
+//            let alertController: UIAlertController = UIAlertController.init(title: "BlinkCard Edit Results", message: editResult.description, preferredStyle: .alert)
+//            
+//            let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: .default, handler: { (action) -> Void in
+//                self.blinkCardEditScreen?.dismiss(animated: true, completion: nil)
+//                self.dismiss(animated: true, completion: nil)
+//            })
+//            alertController.addAction(okAction)
+//            blinkCardEditViewController.present(alertController, animated: true, completion: nil)
+//        }
+//    }
+//    
+//    func blinkCardEditViewControllerDidTapClose(_ blinkCardEditViewController: MBCBlinkCardEditViewController) {
+//        DispatchQueue.main.async {
+//            blinkCardEditViewController.dismiss(animated: true, completion: nil)
+//        }
+//    }
+//}
+//
+//
+//
+//
+//

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -87,7 +87,7 @@ class PaymentDoneVC: UIViewController {
             showDateAndTime()
         }
         
-        showBillingInfo()
+      //  showBillingInfo()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -154,35 +154,35 @@ class PaymentDoneVC: UIViewController {
         
     }
     
-    func showBillingInfo() {
-        var displayText = ""
-        
-        if let visibility = visibility {
-            if visibility.billing, let billing = billingInfo {
-                displayText += "Billing Info:-\n"
-                for (key, value) in billing {
-                    displayText += "\(key.capitalized): \(value)\n"
-                }
-            }
-            
-            if visibility.additional, let additional = additionalInfo {
-                if !displayText.isEmpty {
-                    displayText += "\n"
-                }
-                displayText += "Additional Info:-\n"
-                for (key, value) in additional {
-                    displayText += "\(key.capitalized): \(value)\n"
-                }
-            }
-        }
-        
-        if displayText.isEmpty {
-            lblBillingInfo.isHidden = true
-        } else {
-            lblBillingInfo.text = displayText.trimmingCharacters(in: .whitespacesAndNewlines)
-            lblBillingInfo.isHidden = false
-        }
-    }
+//    func showBillingInfo() {
+//        var displayText = ""
+//        
+//        if let visibility = visibility {
+//            if visibility.billing, let billing = billingInfo {
+//                displayText += "Billing Info:-\n"
+//                for (key, value) in billing {
+//                    displayText += "\(key.capitalized): \(value)\n"
+//                }
+//            }
+//            
+//            if visibility.additional, let additional = additionalInfo {
+//                if !displayText.isEmpty {
+//                    displayText += "\n"
+//                }
+//                displayText += "Additional Info:-\n"
+//                for (key, value) in additional {
+//                    displayText += "\(key.capitalized): \(value)\n"
+//                }
+//            }
+//        }
+//        
+//        if displayText.isEmpty {
+//            lblBillingInfo.isHidden = true
+//        } else {
+//            lblBillingInfo.text = displayText.trimmingCharacters(in: .whitespacesAndNewlines)
+//            lblBillingInfo.isHidden = false
+//        }
+//    }
     
     // Helper method to check if the date string is valid
     func isValidDate(_ dateString: String) -> Bool {

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -4452,38 +4452,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     //MARK: - Card Scan Button Action
     @IBAction func actionButtonScanCard(_ sender: UIButton) {
-//        // Validate BlinkCard License
-//        let licenseErrorMessage = BlinkCardHelper.setupLicense()
-//        if !licenseErrorMessage.isEmpty {
-//            // Show alert if the license is invalid or expired
-//            showLicenseErrorAlert(message: licenseErrorMessage)
-//            return
-//        }
-//        
-//        // Proceed with card scanning if the license is valid
-//        blinkCardRecognizer = MBCBlinkCardRecognizer()
-//        blinkCardRecognizer.returnFullDocumentImage = true
-//        
-//        let recognizerList = [blinkCardRecognizer!]
-//        let recognizerCollection = MBCRecognizerCollection(recognizers: recognizerList)
-//        
-//        let customOverlayViewController: CustomOverlay = CustomOverlay.initFromStoryboard()
-//        
-//        // Reconfigure recognizers with the overlay
-//        customOverlayViewController.reconfigureRecognizers(recognizerCollection)
-//        
-//        // Create the recognizer runner view controller with custom overlay
-//        guard let recognizerRunnerViewController =
-//                MBCViewControllerFactory.recognizerRunnerViewController(withOverlayViewController: customOverlayViewController) else {
-//            showLicenseErrorAlert(message: "Failed to initialize the recognizer view controller.")
-//            return
-//        }
-//        
-//        customOverlayViewController.delegate = self
-//        recognizerRunnerViewController.modalPresentationStyle = .fullScreen
-//        
-//        // Present the recognizer runner view controller
-//        self.present(recognizerRunnerViewController, animated: true, completion: nil)
+       
     }
     
     private func showLicenseErrorAlert(message: String) {
@@ -6914,6 +6883,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        paymentDoneVC.amount = self.amount
                                         // Pass billingInfo and additionalInfo
                                         if let billingData = self.request.billingInfoData,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
@@ -7148,6 +7118,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        paymentDoneVC.amount = self.amount
                                         // Pass billingInfo and additionalInfo
                                         if let billingData = self.request.billingInfoData,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {