Browse Source

close added in web controller

pull/1/head
gme_2 6 years ago
parent
commit
fbd9f024c9
  1. 16
      GMERemittance.xcodeproj/project.pbxproj
  2. 2
      GMERemittance/Home/HomeViewController.swift
  3. 48
      GMERemittance/Library/WebLinks/Storyboard.storyboard
  4. 91
      GMERemittance/Library/WebLinks/WebLinksViewController.swift
  5. 9
      GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  6. 8
      GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

16
GMERemittance.xcodeproj/project.pbxproj

@ -328,6 +328,8 @@
D95B5E4921314D31000C0B33 /* GmeContacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4821314D31000C0B33 /* GmeContacts.swift */; }; D95B5E4921314D31000C0B33 /* GmeContacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4821314D31000C0B33 /* GmeContacts.swift */; };
D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */; }; D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */; };
D95B7043213F9A2C0053CC3D /* CALayerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B7042213F9A2C0053CC3D /* CALayerExtension.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 */; }; D962230C212BD7A100B7A115 /* ArrayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D962230B212BD7A100B7A115 /* ArrayExtension.swift */; };
D9622316212BE3DC00B7A115 /* TablePickerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */; }; D9622316212BE3DC00B7A115 /* TablePickerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */; };
D9622317212BE3DC00B7A115 /* TableViewPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9622313212BE3DB00B7A115 /* TableViewPicker.storyboard */; }; 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 = "<group>"; }; D95B5E4821314D31000C0B33 /* GmeContacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GmeContacts.swift; sourceTree = "<group>"; };
D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTableViewCell.swift; sourceTree = "<group>"; }; D95B5E4A21315C57000C0B33 /* EmptyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTableViewCell.swift; sourceTree = "<group>"; };
D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CALayerExtension.swift; sourceTree = "<group>"; }; D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CALayerExtension.swift; sourceTree = "<group>"; };
D95B7045213FB5F00053CC3D /* WebLinksViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebLinksViewController.swift; sourceTree = "<group>"; };
D95B7046213FB5F00053CC3D /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = "<group>"; };
D962230B212BD7A100B7A115 /* ArrayExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayExtension.swift; sourceTree = "<group>"; }; D962230B212BD7A100B7A115 /* ArrayExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayExtension.swift; sourceTree = "<group>"; };
D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePickerTableViewCell.swift; sourceTree = "<group>"; }; D9622312212BE3DB00B7A115 /* TablePickerTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePickerTableViewCell.swift; sourceTree = "<group>"; };
D9622313212BE3DB00B7A115 /* TableViewPicker.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TableViewPicker.storyboard; sourceTree = "<group>"; }; D9622313212BE3DB00B7A115 /* TableViewPicker.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TableViewPicker.storyboard; sourceTree = "<group>"; };
@ -2071,9 +2075,19 @@
path = ViewModels; path = ViewModels;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
D95B7044213FB5F00053CC3D /* WebLinks */ = {
isa = PBXGroup;
children = (
D95B7045213FB5F00053CC3D /* WebLinksViewController.swift */,
D95B7046213FB5F00053CC3D /* Storyboard.storyboard */,
);
path = WebLinks;
sourceTree = "<group>";
};
D96222FF212BD5E700B7A115 /* Library */ = { D96222FF212BD5E700B7A115 /* Library */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D95B7044213FB5F00053CC3D /* WebLinks */,
D9BF7EDD2137CECE00264387 /* CurrencyPicker */, D9BF7EDD2137CECE00264387 /* CurrencyPicker */,
D9CB49812132A58C00B7A124 /* ItemPickerView */, D9CB49812132A58C00B7A124 /* ItemPickerView */,
D9CB497A21329DCE00B7A124 /* CountryWithFlagPicker */, D9CB497A21329DCE00B7A124 /* CountryWithFlagPicker */,
@ -2432,6 +2446,7 @@
D90A9D67213696E400A96E45 /* BankPicker.storyboard in Resources */, D90A9D67213696E400A96E45 /* BankPicker.storyboard in Resources */,
5565FF2D1FE275E5002934E9 /* SanFranciscoText-MediumItalic.otf in Resources */, 5565FF2D1FE275E5002934E9 /* SanFranciscoText-MediumItalic.otf in Resources */,
D922D9492135124200D43053 /* SendMoneyPaymentMode.storyboard in Resources */, D922D9492135124200D43053 /* SendMoneyPaymentMode.storyboard in Resources */,
D95B7048213FB5F10053CC3D /* Storyboard.storyboard in Resources */,
5565FF241FE275E5002934E9 /* SanFranciscoText-HeavyItalic.otf in Resources */, 5565FF241FE275E5002934E9 /* SanFranciscoText-HeavyItalic.otf in Resources */,
A2ECF90B2023122C0009F481 /* Exchange.storyboard in Resources */, A2ECF90B2023122C0009F481 /* Exchange.storyboard in Resources */,
9FD260FD1FD00458007A511D /* Main.storyboard in Resources */, 9FD260FD1FD00458007A511D /* Main.storyboard in Resources */,
@ -2991,6 +3006,7 @@
D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */, D95B5E4B21315C57000C0B33 /* EmptyTableViewCell.swift in Sources */,
04CAEC2D1FEBAEB400C819D4 /* KYCViewModel.swift in Sources */, 04CAEC2D1FEBAEB400C819D4 /* KYCViewModel.swift in Sources */,
9F03D22E1FECFC52002E132E /* RecipientTranscationViewController.swift in Sources */, 9F03D22E1FECFC52002E132E /* RecipientTranscationViewController.swift in Sources */,
D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */,
A270F08D2075C74300B78D00 /* AgentCountryList.swift in Sources */, A270F08D2075C74300B78D00 /* AgentCountryList.swift in Sources */,
9FA09740200E129500F3B5EC /* CommentsViewController.swift in Sources */, 9FA09740200E129500F3B5EC /* CommentsViewController.swift in Sources */,
A2E3379F204911CA002DB015 /* PopUpInviteeDetail.swift in Sources */, A2E3379F204911CA002DB015 /* PopUpInviteeDetail.swift in Sources */,

2
GMERemittance/Home/HomeViewController.swift

@ -944,7 +944,7 @@ extension HomeViewController {
amount = getCommaAddedAmountString(amountString: balance!) amount = getCommaAddedAmountString(amountString: balance!)
} }
let amountUnit = " KRW"
let amountUnit = " USD"
let fontAttribute = [ NSAttributedStringKey.font: UIFont(name: "SanFranciscoDisplay-Regular", size: 18.0)! ] let fontAttribute = [ NSAttributedStringKey.font: UIFont(name: "SanFranciscoDisplay-Regular", size: 18.0)! ]

48
GMERemittance/Library/WebLinks/Storyboard.storyboard

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Web Links View Controller-->
<scene sceneID="TEI-cp-8EX">
<objects>
<viewController storyboardIdentifier="WebLinksViewController" id="Gs8-MK-kOk" customClass="WebLinksViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="gWm-PL-UoZ"/>
<viewControllerLayoutGuide type="bottom" id="H3O-SE-EUG"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="kYe-Gd-MEg">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P0T-t1-hQc">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</webView>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="dph-jS-4Zm">
<rect key="frame" x="177.5" y="323.5" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="P0T-t1-hQc" firstAttribute="top" secondItem="gWm-PL-UoZ" secondAttribute="bottom" id="CzQ-rY-uNV"/>
<constraint firstItem="H3O-SE-EUG" firstAttribute="top" secondItem="P0T-t1-hQc" secondAttribute="bottom" id="MXh-Oi-WAL"/>
<constraint firstItem="P0T-t1-hQc" firstAttribute="leading" secondItem="kYe-Gd-MEg" secondAttribute="leading" id="YP3-JJ-ofo"/>
<constraint firstItem="dph-jS-4Zm" firstAttribute="centerX" secondItem="kYe-Gd-MEg" secondAttribute="centerX" id="mmh-36-fTN"/>
<constraint firstItem="dph-jS-4Zm" firstAttribute="centerY" secondItem="kYe-Gd-MEg" secondAttribute="centerY" id="nDY-hR-4wj"/>
<constraint firstAttribute="trailing" secondItem="P0T-t1-hQc" secondAttribute="trailing" id="vc5-MO-xJb"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Voq-Um-Zj5" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-145" y="-19"/>
</scene>
</scenes>
</document>

91
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)
}
}

9
GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift

@ -60,9 +60,18 @@ class SendMoneyReceiptViewController: UIViewController {
// all setup should be done here // all setup should be done here
let button = UIBarButtonItem.init(title: nil, style: UIBarButtonItemStyle.plain, target: nil, action: nil) let button = UIBarButtonItem.init(title: nil, style: UIBarButtonItemStyle.plain, target: nil, action: nil)
self.navigationItem.leftBarButtonItem = button self.navigationItem.leftBarButtonItem = button
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
self.navigationItem.title = "Receipt" self.navigationItem.title = "Receipt"
} }
override func viewWillDisappear(_ animated: Bool) {
super.viewWillAppear(animated)
self.navigationItem.title = ""
}
private func createMockModel() -> SendMoneyReciept { private func createMockModel() -> SendMoneyReciept {
let recipt = SendMoneyReciept() let recipt = SendMoneyReciept()
reciept?.payMode = "pay mode" reciept?.payMode = "pay mode"

8
GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@ -28,6 +28,7 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var payoutAgentBankLabel: UILabel! @IBOutlet weak var payoutAgentBankLabel: UILabel!
@IBOutlet weak var checkBoxButton: UIButton! @IBOutlet weak var checkBoxButton: UIButton!
var url: String?
// MARK: Properties // MARK: Properties
@ -37,6 +38,7 @@ class SendMoneyVerificationViewController: UITableViewController {
var requestModel: SendMoneyRequestModel? var requestModel: SendMoneyRequestModel?
var hudDelegate: HUDStatusDelegate? var hudDelegate: HUDStatusDelegate?
var password: String? { var password: String? {
didSet { didSet {
if let model = self.requestModel, let reciepient = self.reciepient { if let model = self.requestModel, let reciepient = self.reciepient {
@ -63,6 +65,12 @@ class SendMoneyVerificationViewController: UITableViewController {
// MARK: IBActions // MARK: IBActions
// @IBOutlet weak var usewUserAgreement: UIButton! // @IBOutlet weak var usewUserAgreement: UIButton!
@IBAction func showUserAgreement(_ sender: 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)
} }

Loading…
Cancel
Save