Browse Source

Finalize. UIWebView -> WKWebView

pull/1/head
Jeongbae Kong 5 years ago
parent
commit
2e1e1b302e
  1. 33
      GME Remit.xcodeproj/project.pbxproj
  2. 2
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
  3. 3
      GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift
  4. 20
      GME Remit/Utilities/WebLinks/WebLinksViewController.swift

33
GME Remit.xcodeproj/project.pbxproj

@ -13766,8 +13766,8 @@
9FD260F01FD00458007A511D /* Sources */,
9FD260F11FD00458007A511D /* Frameworks */,
9FD260F21FD00458007A511D /* Resources */,
D9FA81272175A87000F328B5 /* ShellScript */,
76677C674232A679B4FC5FE3 /* [CP] Embed Pods Frameworks */,
896E68312419D6BE005C55BE /* ShellScript */,
);
buildRules = (
);
@ -15677,6 +15677,23 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GME Remit/Pods-GME Remit-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
896E68312419D6BE005C55BE /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\n";
};
AA0EA425F38603BE38A9A49F /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -15783,20 +15800,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GMERemittanceTests/Pods-GMERemittanceTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D9FA81272175A87000F328B5 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/Fabric/run\" b575c94baafadc63651a9c5ec62f0b5f468a4093 19e4b10afbd110badb994a253854bdb85320f124dd45be05520d2989d1f01435\n\nif which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
DB67A00297C1A83E4C46C2B3 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

2
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift

@ -133,7 +133,6 @@ extension PhoneCardRechargeViewController {
setUI()
}
private func setUI() {
balanceCheckButton.isHidden = true
regularTypeContainerView.isHidden = true
@ -172,7 +171,6 @@ extension PhoneCardRechargeViewController {
mobileTextField.validCondition = {!$0.isEmpty && $0.count == 11}
mobileTextField.errorMessage = "kyc_mobile_invalid_number_error".localized()
mobileTextField.placeholder = "mobile_placeholder_text".localized()
// mycashLabel.text = "gme_wallet_text".localized()
typeSegment.setTitle("regular_type_text".localized(), forSegmentAt: 0)
typeSegment.setTitle("fixed_charge_text".localized(), forSegmentAt: 1)

3
GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift

@ -55,7 +55,6 @@ class RechargePaymentViewController: UIViewController {
@IBOutlet weak var gmeWalletStackView: UIStackView!
@IBOutlet weak var expectedWalletStackView: UIStackView!
// MARK: VC's Life cycle
override func viewDidLoad() {
super.viewDidLoad()
@ -263,8 +262,6 @@ extension RechargePaymentViewController: BiometricAuthenticationViewControllerDe
print("BiometricAuthenticationWireframe Error: \(errorMessage ?? "")")
viewController.dismiss(animated: true) {
switch error {
case .userFallback:

20
GME Remit/Utilities/WebLinks/WebLinksViewController.swift

@ -10,7 +10,7 @@ import UIKit
import Alamofire
import WebKit
class WebLinksViewController: UIViewController {
class WebLinksViewController: UIViewController, WKUIDelegate {
// MARK: Properties
@ -72,8 +72,7 @@ class WebLinksViewController: UIViewController {
}
// MARK: WKNavigationDelegate
extension WebLinksViewController: WKUIDelegate, WKNavigationDelegate {
extension WebLinksViewController: WKNavigationDelegate {
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
self.activityIndicator?.startAnimating()
}
@ -86,18 +85,3 @@ extension WebLinksViewController: WKUIDelegate, WKNavigationDelegate {
self.alert(type: .error, message: error.localizedDescription)
}
}
// MARK: UIWebViewDelegate
//extension WebLinksViewController: UIWebViewDelegate {
// func webViewDidStartLoad(_ webView: UIWebView) {
// self.activityIndicator?.startAnimating()
// }
//
// func webViewDidFinishLoad(_ webView: UIWebView) {
// self.activityIndicator?.stopAnimating()
// }
//
// func webView(_ webView: UIWebView, didFailLoadWithError error: Error) {
// self.activityIndicator?.stopAnimating()
// self.alert(type: .error, message: error.localizedDescription)
// }
//}
Loading…
Cancel
Save