From fbd9f024c92bb60f8cbe6f8822966b10fec2d86d Mon Sep 17 00:00:00 2001 From: gme_2 Date: Wed, 5 Sep 2018 16:58:09 +0900 Subject: [PATCH] close added in web controller --- GMERemittance.xcodeproj/project.pbxproj | 16 ++++ GMERemittance/Home/HomeViewController.swift | 2 +- .../Library/WebLinks/Storyboard.storyboard | 48 ++++++++++ .../WebLinks/WebLinksViewController.swift | 91 +++++++++++++++++++ .../View/SendMoneyReceiptViewController.swift | 9 ++ .../SendMoneyVerificationViewController.swift | 8 ++ 6 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 GMERemittance/Library/WebLinks/Storyboard.storyboard create mode 100644 GMERemittance/Library/WebLinks/WebLinksViewController.swift diff --git a/GMERemittance.xcodeproj/project.pbxproj b/GMERemittance.xcodeproj/project.pbxproj index 2eaf3311..700571fb 100644 --- a/GMERemittance.xcodeproj/project.pbxproj +++ b/GMERemittance.xcodeproj/project.pbxproj @@ -328,6 +328,8 @@ D95B5E4921314D31000C0B33 /* GmeContacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4821314D31000C0B33 /* GmeContacts.swift */; }; D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */; }; D95B7043213F9A2C0053CC3D /* CALayerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */; }; + D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B7045213FB5F00053CC3D /* WebLinksViewController.swift */; }; + D95B7048213FB5F10053CC3D /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D95B7046213FB5F00053CC3D /* Storyboard.storyboard */; }; D962230C212BD7A100B7A115 /* ArrayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D962230B212BD7A100B7A115 /* ArrayExtension.swift */; }; D9622316212BE3DC00B7A115 /* TablePickerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */; }; D9622317212BE3DC00B7A115 /* TableViewPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9622313212BE3DB00B7A115 /* TableViewPicker.storyboard */; }; @@ -730,6 +732,8 @@ D95B5E4821314D31000C0B33 /* GmeContacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GmeContacts.swift; sourceTree = ""; }; D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTableViewCell.swift; sourceTree = ""; }; D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CALayerExtension.swift; sourceTree = ""; }; + D95B7045213FB5F00053CC3D /* WebLinksViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebLinksViewController.swift; sourceTree = ""; }; + D95B7046213FB5F00053CC3D /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = ""; }; D962230B212BD7A100B7A115 /* ArrayExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayExtension.swift; sourceTree = ""; }; D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePickerTableViewCell.swift; sourceTree = ""; }; D9622313212BE3DB00B7A115 /* TableViewPicker.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TableViewPicker.storyboard; sourceTree = ""; }; @@ -2071,9 +2075,19 @@ path = ViewModels; sourceTree = ""; }; + D95B7044213FB5F00053CC3D /* WebLinks */ = { + isa = PBXGroup; + children = ( + D95B7045213FB5F00053CC3D /* WebLinksViewController.swift */, + D95B7046213FB5F00053CC3D /* Storyboard.storyboard */, + ); + path = WebLinks; + sourceTree = ""; + }; D96222FF212BD5E700B7A115 /* Library */ = { isa = PBXGroup; children = ( + D95B7044213FB5F00053CC3D /* WebLinks */, D9BF7EDD2137CECE00264387 /* CurrencyPicker */, D9CB49812132A58C00B7A124 /* ItemPickerView */, D9CB497A21329DCE00B7A124 /* CountryWithFlagPicker */, @@ -2432,6 +2446,7 @@ D90A9D67213696E400A96E45 /* BankPicker.storyboard in Resources */, 5565FF2D1FE275E5002934E9 /* SanFranciscoText-MediumItalic.otf in Resources */, D922D9492135124200D43053 /* SendMoneyPaymentMode.storyboard in Resources */, + D95B7048213FB5F10053CC3D /* Storyboard.storyboard in Resources */, 5565FF241FE275E5002934E9 /* SanFranciscoText-HeavyItalic.otf in Resources */, A2ECF90B2023122C0009F481 /* Exchange.storyboard in Resources */, 9FD260FD1FD00458007A511D /* Main.storyboard in Resources */, @@ -2991,6 +3006,7 @@ D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */, 04CAEC2D1FEBAEB400C819D4 /* KYCViewModel.swift in Sources */, 9F03D22E1FECFC52002E132E /* RecipientTranscationViewController.swift in Sources */, + D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */, A270F08D2075C74300B78D00 /* AgentCountryList.swift in Sources */, 9FA09740200E129500F3B5EC /* CommentsViewController.swift in Sources */, A2E3379F204911CA002DB015 /* PopUpInviteeDetail.swift in Sources */, diff --git a/GMERemittance/Home/HomeViewController.swift b/GMERemittance/Home/HomeViewController.swift index 115caed9..65b70cff 100644 --- a/GMERemittance/Home/HomeViewController.swift +++ b/GMERemittance/Home/HomeViewController.swift @@ -944,7 +944,7 @@ extension HomeViewController { amount = getCommaAddedAmountString(amountString: balance!) } - let amountUnit = " KRW" + let amountUnit = " USD" let fontAttribute = [ NSAttributedStringKey.font: UIFont(name: "SanFranciscoDisplay-Regular", size: 18.0)! ] diff --git a/GMERemittance/Library/WebLinks/Storyboard.storyboard b/GMERemittance/Library/WebLinks/Storyboard.storyboard new file mode 100644 index 00000000..5fda157d --- /dev/null +++ b/GMERemittance/Library/WebLinks/Storyboard.storyboard @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMERemittance/Library/WebLinks/WebLinksViewController.swift b/GMERemittance/Library/WebLinks/WebLinksViewController.swift new file mode 100644 index 00000000..24a5250f --- /dev/null +++ b/GMERemittance/Library/WebLinks/WebLinksViewController.swift @@ -0,0 +1,91 @@ +// +// WebLinksViewController.swift +// Sipradi +// +// Created by shishir sapkota on 7/26/17. +// Copyright © 2017 Ekbana. All rights reserved. +// + + + +import Foundation +import UIKit +import Alamofire + +class WebLinksViewController: UIViewController { + + // MARK: Properties + + // MARK: Outlets + + // @IBOutlet weak var webView: UIWebView! + // @IBOutlet weak var activityIndicator: UIActivityIndicatorView! + + var navTitle: String = "" + var url: String? + var titleString: String = "" + // MARK: VC's Life cycle + + var webView: UIWebView? + var activityIndicator: UIActivityIndicatorView? + + + override func viewDidLoad() { + UIApplication.shared.statusBarStyle = .lightContent + super.viewDidLoad() + let barButton = UIBarButtonItem.init(title: "Close", style: UIBarButtonItemStyle.plain, target: self, action: #selector(self.cancel)) + self.navigationItem.rightBarButtonItem = barButton + webView = UIWebView(frame: self.view.frame) + webView?.delegate = self + activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: UIActivityIndicatorViewStyle.gray) + activityIndicator?.center = self.view.center + self.view.addSubview(webView!) + self.view.addSubview(activityIndicator!) + } + + + + private func setupWebView() { + self.webView?.delegate = self + } + + // MARK: IBActions + + override func viewWillAppear(_ animated: Bool) { + self.navigationItem.title = titleString + self.openURLInWebView() + } + + @objc func cancel() { + self.dismiss(animated: true, completion: nil) + } + + func openURLInWebView() { + if NetworkReachabilityManager()?.isReachable == true { + if let url = URL.init(string: self.url ?? "") { + let request = URLRequest(url: url) + webView?.loadRequest(request) + } + }else { + self.alert(message: "Please check your internet connection", title: "") + } + } +} + + +// 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(message: error.localizedDescription) + } +} + diff --git a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift index 942b22db..395bd5d4 100644 --- a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift +++ b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift @@ -60,9 +60,18 @@ class SendMoneyReceiptViewController: UIViewController { // all setup should be done here let button = UIBarButtonItem.init(title: nil, style: UIBarButtonItemStyle.plain, target: nil, action: nil) self.navigationItem.leftBarButtonItem = button + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) self.navigationItem.title = "Receipt" } + override func viewWillDisappear(_ animated: Bool) { + super.viewWillAppear(animated) + self.navigationItem.title = "" + } + private func createMockModel() -> SendMoneyReciept { let recipt = SendMoneyReciept() reciept?.payMode = "pay mode" diff --git a/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift index 9977a0c8..aa4437c4 100644 --- a/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift +++ b/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift @@ -28,6 +28,7 @@ class SendMoneyVerificationViewController: UITableViewController { @IBOutlet weak var payoutAgentBankLabel: UILabel! @IBOutlet weak var checkBoxButton: UIButton! + var url: String? // MARK: Properties @@ -37,6 +38,7 @@ class SendMoneyVerificationViewController: UITableViewController { var requestModel: SendMoneyRequestModel? var hudDelegate: HUDStatusDelegate? + var password: String? { didSet { if let model = self.requestModel, let reciepient = self.reciepient { @@ -63,6 +65,12 @@ class SendMoneyVerificationViewController: UITableViewController { // MARK: IBActions // @IBOutlet weak var usewUserAgreement: UIButton! @IBAction func showUserAgreement(_ sender: UIButton) { + let webController = UIStoryboard.init(name: "Storyboard", bundle: nil).instantiateViewController(withIdentifier: "WebLinksViewController") as! WebLinksViewController + webController.titleString = "User Agreement" + webController.url = self.url ?? "https://online.gmeremit.com/default" + let nav = UINavigationController.init(rootViewController: webController) + self.present(nav, animated: true, completion: nil) +// self.navigationController?.pushViewController(webController, animated: true) }