@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.1

package/ios/Pods/ViewControllers/BaseVC.swift

@@ -16,25 +16,25 @@ class BaseVC: UIViewController {
         super.viewDidLoad()
     }
     
-    func addOverlayView() {
-        guard let keyWindowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
-              let keyWindow = keyWindowScene.windows.first(where: { $0.isKeyWindow }) else {
-            return
-        }
-        DispatchQueue.main.async {
-            let overlayView = UIView(frame: keyWindow.bounds)
-            overlayView.backgroundColor = UIColor.black.withAlphaComponent(0.3)
-            keyWindow.addSubview(overlayView)
-            self.overlayView = overlayView
-        }
-    }
-    
-    func removeOverlayView() {
-        DispatchQueue.main.async {
-            self.overlayView?.removeFromSuperview()
-            self.overlayView = nil
-        }
-    }
+//    func addOverlayView() {
+//        guard let keyWindowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
+//              let keyWindow = keyWindowScene.windows.first(where: { $0.isKeyWindow }) else {
+//            return
+//        }
+//        DispatchQueue.main.async {
+//            let overlayView = UIView(frame: keyWindow.bounds)
+//            overlayView.backgroundColor = UIColor.black.withAlphaComponent(0.3)
+//            keyWindow.addSubview(overlayView)
+//            self.overlayView = overlayView
+//        }
+//    }
+//    
+//    func removeOverlayView() {
+//        DispatchQueue.main.async {
+//            self.overlayView?.removeFromSuperview()
+//            self.overlayView = nil
+//        }
+//    }
     
     func showLoadingIndicator() {
         DispatchQueue.main.async {
@@ -42,8 +42,7 @@ class BaseVC: UIViewController {
             activityIndicator.center = self.view.center
             activityIndicator.hidesWhenStopped = true
             activityIndicator.startAnimating()
-            
-            self.addOverlayView()
+//            self.addOverlayView()
             self.view.addSubview(activityIndicator)
         }
     }
@@ -54,7 +53,7 @@ class BaseVC: UIViewController {
             for subview in self.view.subviews {
                 if let activityIndicator = subview as? UIActivityIndicatorView {
                     activityIndicator.stopAnimating()
-                    self.removeOverlayView()
+//                    self.removeOverlayView()
                     activityIndicator.removeFromSuperview()
                 }
             }
@@ -65,28 +64,33 @@ class BaseVC: UIViewController {
     func showToast(message: String, duration: Double = 3.0) {
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
-            
+
             let toastLabel = UILabel()
             toastLabel.text = message
-            toastLabel.textColor = UIColor.white
-            toastLabel.backgroundColor = UIColor.black.withAlphaComponent(0.7)
+            toastLabel.textColor = UIColor.black
+            toastLabel.backgroundColor = .systemGray5
             toastLabel.textAlignment = .center
-            toastLabel.font = UIFont.systemFont(ofSize: 14)
+            toastLabel.font = UIFont.systemFont(ofSize: 15)
             toastLabel.numberOfLines = 0
             toastLabel.alpha = 0.0
             toastLabel.layer.cornerRadius = 10
             toastLabel.clipsToBounds = true
+
+            // Set max width and calculate height based on text
+            let horizontalPadding: CGFloat = 22
+            let maxWidth = self.view.frame.width - 2 * horizontalPadding
             
-            // Set the position of the toast
-            let toastWidth: CGFloat = min(self.view.frame.width - 40, 250)
-            let toastHeight: CGFloat = 50
-            toastLabel.frame = CGRect(x: (self.view.frame.width - toastWidth) / 2,
-                                      y: self.view.frame.height - 100,
-                                      width: toastWidth,
-                                      height: toastHeight)
-            
+            let expectedSize = 30
+
+            toastLabel.frame = CGRect(
+                x: horizontalPadding,
+                y: self.view.frame.height - CGFloat(expectedSize) - 100,
+                width: maxWidth,
+                height: CGFloat(expectedSize + 20) // Add vertical padding
+            )
+
             self.view.addSubview(toastLabel)
-            
+
             UIView.animate(withDuration: 0.5, animations: {
                 toastLabel.alpha = 1.0
             }) { _ in