Bug fixes and performance improvements

texyz · texyz · commit 9424e2da9b6b · 2021-11-23T19:33:22.000+01:00
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Alamofire (5.2.1)
   - IQKeyboardManagerSwift (6.5.5)
   - lottie-ios (3.0.7)
-  - RaveSDK (2.2.9):
+  - RaveSDK (2.3.2):
     - Alamofire
     - IQKeyboardManagerSwift
     - lottie-ios (~> 3.0.2)
@@ -27,7 +27,7 @@ SPEC CHECKSUMS:
   Alamofire: e911732990610fe89af59ac0077f923d72dc3dfd
   IQKeyboardManagerSwift: 0fb93310284665245591f50f7a5e38de615960b7
   lottie-ios: c38c3178ae8c4a8f200661aa5f80b9f1ca7f56b3
-  RaveSDK: 2667142054cc4d173763e8210c1e46c634fd775f
+  RaveSDK: 91715e58550c9124667acbdc467ecf22d1e88545
 
 PODFILE CHECKSUM: f1bcbf0178b99b16df462e51edd978e6ec5e61f4
 
diff --git a/Example/Pods/Local Podspecs/RaveSDK.podspec.json b/Example/Pods/Local Podspecs/RaveSDK.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/RaveSDK/RaveSDK-Info.plist b/Example/Pods/Target Support Files/RaveSDK/RaveSDK-Info.plist
diff --git a/Example/Pods/Target Support Files/RaveSDK/ResourceBundle-RaveSDK-RaveSDK-Info.plist b/Example/Pods/Target Support Files/RaveSDK/ResourceBundle-RaveSDK-RaveSDK-Info.plist
diff --git a/Example/RaveSDK.xcodeproj/project.pbxproj b/Example/RaveSDK.xcodeproj/project.pbxproj
@@ -211,7 +211,7 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = NSPMGSMKS7;
+						DevelopmentTeam = YL4C3AS383;
 						LastSwiftMigration = 0900;
 					};
 					607FACE41AFB9204008FA782 = {
@@ -483,11 +483,11 @@
 			baseConfigurationReference = A2A54C44696D217D69C4769A /* Pods-RaveSDK_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = NSPMGSMKS7;
+				DEVELOPMENT_TEAM = YL4C3AS383;
 				INFOPLIST_FILE = RaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.3;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -502,11 +502,11 @@
 			baseConfigurationReference = DEB5BD93E69BD4BFCE599006 /* Pods-RaveSDK_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = NSPMGSMKS7;
+				DEVELOPMENT_TEAM = YL4C3AS383;
 				INFOPLIST_FILE = RaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.3;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Example/RaveSDK.xcodeproj/xcshareddata/xcschemes/RaveSDK-Example.xcscheme b/Example/RaveSDK.xcodeproj/xcshareddata/xcschemes/RaveSDK-Example.xcscheme
@@ -40,8 +40,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+            BuildableName = "RaveSDK_Example.app"
+            BlueprintName = "RaveSDK_Example"
+            ReferencedContainer = "container:RaveSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -54,23 +62,11 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "RaveSDK_Example.app"
-            BlueprintName = "RaveSDK_Example"
-            ReferencedContainer = "container:RaveSDK.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
             ReferencedContainer = "container:RaveSDK.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Example/RaveSDK/ViewController.swift b/Example/RaveSDK/ViewController.swift
@@ -44,7 +44,7 @@ class ViewController: UIViewController ,RavePayProtocol {
                        controller.delegate = self
                        self.present(nav, animated: true)
                        
-                   }
+    }
     
    
     override func viewDidLoad() {
diff --git a/RaveSDK.podspec b/RaveSDK.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'RaveSDK'
-  s.version          = '2.3.2'
+  s.version          = '2.3.3'
   s.summary          = 'RaveSDK'
 
 # This description is used to generate tags and improve search results.
diff --git a/RaveSDK/Classes/App/RaveCardClient.swift b/RaveSDK/Classes/App/RaveCardClient.swift
@@ -104,13 +104,14 @@ class RaveCardClient{
                                       "amount":amount ?? "",
                                       "firstname":RaveConfig.sharedConfig().firstName ?? "",
                                       "lastname": RaveConfig.sharedConfig().lastName ?? "",
+                                      "otp":"123456",
                                       "txRef": RaveConfig.sharedConfig().transcationRef!]
             if let saveCard = isSaveCardCharge{
                 param.merge(["is_saved_card_charge":saveCard])
             }
-            if let _otp = otp{
-                param.merge(["otp":_otp])
-            }
+//            if let _otp = otp{
+//                param.merge(["otp":"1234567"])
+//            }
             if let saveCardType = saveCardPayment{
                 param.merge(["payment_type":saveCardType])
             }
diff --git a/RaveSDK/Classes/UI/NewRavePayViewController.swift b/RaveSDK/Classes/UI/NewRavePayViewController.swift
@@ -494,6 +494,10 @@ public class NewRavePayViewController: UITableViewController {
         configureMobileMoneyRwanda()
         configureMobileMoneyFranco()
         configureMobileMoneyZambia()
+        
+        if #available(iOS 15.0, *) {
+            UITableView.appearance().sectionHeaderTopPadding = 0
+        }
     }
     
     override public func viewDidLayoutSubviews() {
@@ -917,7 +921,7 @@ public class NewRavePayViewController: UITableViewController {
             currentPaymentOption == paymentOption
         }.count > 0
     }
-    
+   
     override  public func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         switch section {
         case 0:
@@ -1857,11 +1861,11 @@ extension NewRavePayViewController : UITextFieldDelegate,CardSelect,UIPickerView
     
     func cardSelected(card: SavedCard?) {
         raveCardClient.selectedCard = card
-        if let card =  raveCardClient.selectedCard{
-            LoadingHUD.shared().show()
-
-            raveCardClient.sendOTP(card: card)
-        }
+        LoadingHUD.shared().show()
+        raveCardClient.isSaveCardCharge = "1"
+         raveCardClient.saveCardPayment = "saved-card"
+         raveCardClient.amount = self.amount
+         raveCardClient.saveCardCharge()
     }
     @objc func textFieldDidChange(textField: UITextField) {
         if (textField == pinViewContainer.hiddenPinTextField){
@@ -1995,23 +1999,25 @@ extension NewRavePayViewController : UITextFieldDelegate,CardSelect,UIPickerView
     func showOTP(message:String, flwRef:String, otpType:OTPType){
         switch otpType {
         case .savedCard:
-            self.otpContentContainer.isHidden = false
-            otpContentContainer.alpha = 0
-            otpContentContainer.otpMessage.text = message
-            otpContentContainer.otpButton.removeTarget(self, action: #selector(accountOTPButtonTapped), for: .touchUpInside)
-            otpContentContainer.otpButton.removeTarget(self, action: #selector(cardOTPButtonTapped), for: .touchUpInside)
-            otpContentContainer.otpButton.addTarget(self, action: #selector(saveCardOTPButtonTapped), for: .touchUpInside)
-            
-            UIView.animate(withDuration: 0.6, animations: {
-                self.otpContentContainer.alpha = 1
-                self.pinViewContainer.alpha = 0
-                self.debitCardView.alpha = 0
-                self.saveCardContainer.alpha = 0
-            }) { (success) in
-                self.pinViewContainer.isHidden = true
-                self.debitCardView.isHidden = true
-                self.saveCardContainer.isHidden = true
-            }
+            print("")
+//        case .savedCard:
+//            self.otpContentContainer.isHidden = false
+//            otpContentContainer.alpha = 0
+//            otpContentContainer.otpMessage.text = message
+//            otpContentContainer.otpButton.removeTarget(self, action: #selector(accountOTPButtonTapped), for: .touchUpInside)
+//            otpContentContainer.otpButton.removeTarget(self, action: #selector(cardOTPButtonTapped), for: .touchUpInside)
+//            otpContentContainer.otpButton.addTarget(self, action: #selector(saveCardOTPButtonTapped), for: .touchUpInside)
+//
+//            UIView.animate(withDuration: 0.6, animations: {
+//                self.otpContentContainer.alpha = 1
+//                self.pinViewContainer.alpha = 0
+//                self.debitCardView.alpha = 0
+//                self.saveCardContainer.alpha = 0
+//            }) { (success) in
+//                self.pinViewContainer.isHidden = true
+//                self.debitCardView.isHidden = true
+//                self.saveCardContainer.isHidden = true
+//            }
             
         case .card:
             self.otpContentContainer.isHidden = false
@@ -2070,16 +2076,16 @@ extension NewRavePayViewController : UITextFieldDelegate,CardSelect,UIPickerView
     }
     
     @objc func saveCardOTPButtonTapped(){
-        self.view.endEditing(true)
-        guard let otp = otpContentContainer.otpTextField.text, otp != ""  else {
-            return
-        }
-        LoadingHUD.shared().show()
-        raveCardClient.otp = otp
-        raveCardClient.isSaveCardCharge = "1"
-        raveCardClient.saveCardPayment = "saved-card"
-        raveCardClient.amount = self.amount
-        raveCardClient.saveCardCharge()
+//        self.view.endEditing(true)
+//        guard let otp = otpContentContainer.otpTextField.text, otp != ""  else {
+//            return
+//        }
+//        LoadingHUD.shared().show()
+//        raveCardClient.otp = otp
+//        raveCardClient.isSaveCardCharge = "1"
+//        raveCardClient.saveCardPayment = "saved-card"
+//        raveCardClient.amount = self.amount
+//        raveCardClient.saveCardCharge()
     }
     @objc func pinContinueButtonTapped(){
         self.pinAction()
diff --git a/RaveSDK/Classes/Utils/RaveExtension.swift b/RaveSDK/Classes/Utils/RaveExtension.swift
@@ -41,13 +41,14 @@ func showSnackBarWithMessage(msg: String, style:Style = .success,autoComplete:Bo
 public enum SubAccountChargeType:String {
     case flat = "flat" , percentage = "percentage"
 }
+
 public class SubAccount{
     public let id:String
     public let ratio:Double?
     public let charge_type:SubAccountChargeType?
     public let charge:Double?
     
-    public init(id:String , ratio:Double?, charge_type:SubAccountChargeType? ,charge:Double?) {
+    public init(id:String, ratio:Double?, charge_type:SubAccountChargeType? ,charge:Double?) {
         self.id = id
         self.ratio = ratio
         self.charge_type = charge_type
@@ -56,6 +57,7 @@ public class SubAccount{
 }
 
 
+
 func MD5(string: String) -> Data? {
     guard let messageData = string.data(using:String.Encoding.utf8) else { return nil }
     var digestData = Data(count: Int(CC_MD5_DIGEST_LENGTH))
