Browse Source

cleaned

pull/1/head
gme_2 6 years ago
parent
commit
129248e463
  1. 11
      GMERemittance/Module/Main/User Interface/View/MainViewController.swift
  2. 46
      GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  3. 16
      GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift

11
GMERemittance/Module/Main/User Interface/View/MainViewController.swift

@ -52,8 +52,6 @@ class MainViewController: UITabBarController {
override func setupTabItem() {
self.viewControllers?.forEach({ (viewController) in
// viewController.tabBarItem.imageInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
// viewController.tabBarItem.titlePositionAdjustment = UIOffsetMake(0, -5)
})
}
@ -85,14 +83,6 @@ extension UINavigationBar {
let navBarAppearance = UINavigationBar.appearance()
navBarAppearance.isTranslucent = false
navBarAppearance.barTintColor = UIColor.white
// navBarAppearance.shadowImage = UIImage() //Colors.NavBar.shadow.image()
// let font = Fonts.NavBar.titleFont
//
// navBarAppearance.titleTextAttributes = [
// NSAttributedStringKey.foregroundColor: Colors.NavBar.tint,
// NSAttributedStringKey.font: font]
// navBarAppearance.tintColor = Colors.NavBar.tint
}
static func setOutsideAppearance() {
@ -107,7 +97,6 @@ extension UINavigationBar {
}
static func setupImageAppearance() {
// self.setInsideAppearance()
let navBarAppearance = UINavigationBar.appearance()
navBarAppearance.barTintColor = Colors.defaultRed
let font = Fonts.NavBar.titleFont

46
GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@ -32,7 +32,6 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var mobileTitleLabel: UILabel!
// Transation Details
@IBOutlet weak var payoutCountryLabel: UILabel!
@IBOutlet weak var payoutModeLabel: UILabel!
@IBOutlet weak var payingAmountLabel: UILabel!
@ -47,7 +46,6 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var serviceChargeTitleLabel: UILabel!
@IBOutlet weak var payoutAgentBankTitleLabel: UILabel!
// title labels
@IBOutlet weak var recieverDetailsLabel: UILabel!
@IBOutlet weak var transactionDetailsLabel: UILabel!
@ -98,9 +96,8 @@ class SendMoneyVerificationViewController: UITableViewController {
}
}
}
// MARK: VC's Life cycle
// MARK: VC's Life cycle
override func viewDidLoad() {
super.viewDidLoad()
self.keyboardSetup()
@ -112,7 +109,6 @@ class SendMoneyVerificationViewController: UITableViewController {
super.viewWillAppear(animated)
populateRecieversInformations()
populateTransactionDetails()
}
override func viewDidDisappear(_ animated: Bool) {
@ -126,22 +122,16 @@ 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/Terms"
let nav = UINavigationController.init(rootViewController: webController)
self.present(nav, animated: true, completion: nil)
// self.navigationController?.pushViewController(webController, animated: true)
}
@IBAction func submit(_ sender: UIButton) {
self.askPassword()
// submit the request model
}
// MARK: Other Functions
@ -154,15 +144,12 @@ class SendMoneyVerificationViewController: UITableViewController {
self.addressTitleLabel.text = "address_text".localized()
self.countryTitleLabel.text = "country_text".localized()
self.mobileTitleLabel.text = "mobile_text".localized()
self.payoutCountryTitleLabel.text = "payout_country_text".localized()
self.payoutModeTitleLabel.text = "payout_mode_text".localized()
self.payingAmountTitleLabel.text = "paying_amount_text".localized()
self.exchangeRateTitleLabel.text = "exchange_rate_text".localized()
self.serviceChargeTitleLabel.text = "service_charge_text".localized()
self.payoutAgentBankTitleLabel.text = "payout_agent_text".localized()
self.recieverDetailsLabel.text = StringConstants().recieverDetails
self.transactionDetailsLabel.text = StringConstants().transactionDetails
self.readAndAgreeTextLabel.text = StringConstants().readNAgreeText
@ -176,15 +163,9 @@ class SendMoneyVerificationViewController: UITableViewController {
isShowQwerty = false
isTranskeyShowing = false
let iv: Array<String> = ["M", "o", "b", "i", "l", "e", "T", "r" , "a", "n", "s", "K", "e", "y", "1", "0"]
secureKey = NSData(bytes: iv, length: 16)
NSLog("securekey : %@", secureKey)
// securekey : <d689e80d 01000000 01000000 00000000>
// real securekey : <4d6f6269 6c655472 616e734b 65793130>
setQwertyTranskey()
setNumberTranskey()
}
private func setQwertyTranskey(){
@ -221,7 +202,6 @@ class SendMoneyVerificationViewController: UITableViewController {
self.payoutAgentBankLabel.text = self.requestModel?.bank?.name
}
func askPassword() {
if let _ = self.requestModel?.autoDebitAccount?.kftcLogId {
showNumberTranskeyAction()
@ -231,15 +211,13 @@ class SendMoneyVerificationViewController: UITableViewController {
}
// start keyboard
private func showQwertyTranskeyAction(){
private func showQwertyTranskeyAction() {
if mQwertyTransKeyView?.isBeingPresented == false {
isShowQwerty = true
isTranskeyShowing = true
let hintStr = String(format:"%d자리 이상 입력해주세요.", 0)
let font = UIFont(name: "Arial", size: 15)
mQwertyTransKeyView?.mTK_SetHint(hintStr, font: font)
mQwertyTransKeyView?.mTK_ShowMessageIfMaxLength("16자리 입력이 초과되었습니다.")
mQwertyTransKeyView?.mTK_UseCursor(true)
@ -250,7 +228,6 @@ class SendMoneyVerificationViewController: UITableViewController {
mQwertyTransKeyView?.mTK_SetControlCenter(false)
mQwertyTransKeyView?.mTK_setIgnoreStatusbar(false)
mQwertyTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
mQwertyTransKeyView?.setKeyboardType(self,
keypadType: 0,
mTK_inputType: 2,
@ -266,17 +243,11 @@ class SendMoneyVerificationViewController: UITableViewController {
self.present(mQwertyTransKeyView, animated: true, completion: nil)
}
}
}
func showNumberTranskeyAction(){
// setNumberTranskey()
if mNumberTransKeyView?.isBeingPresented == false{
isShowNumber = true
isTranskeyShowing = true
mNumberTransKeyView?.mTK_SetHint("password", font:UIFont(name:"Arial", size: 15.0))
@ -286,7 +257,6 @@ class SendMoneyVerificationViewController: UITableViewController {
mNumberTransKeyView?.mTK_setIgnoreStatusbar(false)
mNumberTransKeyView?.mTK_SetControlCenter(false)
mNumberTransKeyView?.mTK_UseAllDeleteButton(false)
mNumberTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
mNumberTransKeyView?.setKeyboardType(self,
keypadType: TransKeyKeypadTypeText,
@ -297,15 +267,11 @@ class SendMoneyVerificationViewController: UITableViewController {
mTK_minLength: 0,
mTK_keypadUpper: false,
mTK_languageType: Int(mTK_Language_English.rawValue))
if let mNumberTransKeyView = mNumberTransKeyView {
self.present(mNumberTransKeyView, animated: true, completion: nil)
}
}
}
}
// MARK: SendMoneyVerificationViewInterface
@ -340,8 +306,6 @@ extension SendMoneyVerificationViewController {
}
}
extension SendMoneyVerificationViewController: TransKeyViewDelegate {
func secureInputFinish(_ type: Int) {
NSLog("secureInputFinish Btn Type : %d", type)
@ -350,7 +314,6 @@ extension SendMoneyVerificationViewController: TransKeyViewDelegate {
NSLog("qwerty : " + isShowQwerty.description + " number : " + isShowNumber.description)
if isShowQwerty == true{
qwertyCipherString = mQwertyTransKeyView?.mTK_GetSecureData()
if mQwertyTransKeyView?.mTK_GetDataLength() == 0 {
self.encryptedText = ""
@ -359,14 +322,9 @@ extension SendMoneyVerificationViewController: TransKeyViewDelegate {
}
self.encryptedText = qwertyCipherString
targetView = mQwertyTransKeyView
}
if isShowNumber == true{
numberCipherString = mNumberTransKeyView?.mTK_GetSecureData()
self.encryptedNumber = numberCipherString

16
GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift

@ -7,8 +7,6 @@
//
import UIKit
import LTMorphingLabel
import Localize_Swift
import DTTJailbreakDetection
@ -37,7 +35,7 @@ class SplashScreenViewController: UIViewController {
@IBOutlet weak var buttonSignUp: UIButton!
@IBOutlet weak var languageBackGroundView: UIView!
@IBOutlet weak var languageLabel: LTMorphingLabel!
@IBOutlet weak var languageLabel: UILabel!
var languageTapGuesture: UITapGestureRecognizer?
// MARK: Properties
@ -323,15 +321,3 @@ class SplashScreenViewController: UIViewController {
extension SplashScreenViewController: SplashScreenViewInterface {
}
extension SplashScreenViewController: LTMorphingLabelDelegate {
func morphingDidStart(_ label: LTMorphingLabel) {
print("start")
}
func morphingDidComplete(_ label: LTMorphingLabel) {
print("complete")
}
}
Loading…
Cancel
Save