IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug fixed

pull/1/head
gme_2 6 years ago
parent
551e547aa0
commit
87e7798548
5 changed files with 24 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      GMERemittance/Base.lproj/Main.storyboard
  2. 6
      GMERemittance/Home/Home.storyboard
  3. 7
      GMERemittance/Recipient/RecipientListViewController.storyboard
  4. 4
      GMERemittance/Recipient/RecipientListViewController.swift
  5. 20
      GMERemittance/SendMoneyViewController.swift

6
GMERemittance/Base.lproj/Main.storyboard
View File

@ -2843,7 +2843,7 @@
</tabBar> </tabBar>
<connections> <connections>
<segue destination="5If-HB-nF9" kind="relationship" relationship="viewControllers" id="akz-q7-zbx"/> <segue destination="5If-HB-nF9" kind="relationship" relationship="viewControllers" id="akz-q7-zbx"/>
<segue destination="38P-15-aiz" kind="relationship" relationship="viewControllers" id="8fF-LB-9Gv"/>
<segue destination="mPx-rX-glm" kind="relationship" relationship="viewControllers" id="PnV-hv-xR7"/>
<segue destination="YMA-bz-0X2" kind="relationship" relationship="viewControllers" id="9Jz-5E-Ydv"/> <segue destination="YMA-bz-0X2" kind="relationship" relationship="viewControllers" id="9Jz-5E-Ydv"/>
<segue destination="4BF-jK-v1V" kind="relationship" relationship="viewControllers" id="H7M-CF-kRm"/> <segue destination="4BF-jK-v1V" kind="relationship" relationship="viewControllers" id="H7M-CF-kRm"/>
</connections> </connections>
@ -2860,7 +2860,7 @@
</viewControllerPlaceholder> </viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="vLu-48-Hp8" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="vLu-48-Hp8" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3557" y="2173"/>
<point key="canvasLocation" x="2974" y="3296"/>
</scene> </scene>
<!--Profile--> <!--Profile-->
<scene sceneID="r9M-2F-bv9"> <scene sceneID="r9M-2F-bv9">
@ -2887,7 +2887,7 @@
<objects> <objects>
<viewController storyboardIdentifier="SendMoneyViewController" id="38P-15-aiz" customClass="SendMoneyViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController"> <viewController storyboardIdentifier="SendMoneyViewController" id="38P-15-aiz" customClass="SendMoneyViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="dZ6-CO-zZz"> <view key="view" contentMode="scaleToFill" id="dZ6-CO-zZz">
<rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="qmF-9V-4Bf"/> <viewLayoutGuide key="safeArea" id="qmF-9V-4Bf"/>

6
GMERemittance/Home/Home.storyboard
View File

@ -1111,7 +1111,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8WZ-lQ-Im6" userLabel="LoadMoreView"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8WZ-lQ-Im6" userLabel="LoadMoreView">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7wo-T4-XhL"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7wo-T4-XhL">
<rect key="frame" x="155.5" y="8" width="63" height="29"/> <rect key="frame" x="155.5" y="8" width="63" height="29"/>
@ -4818,9 +4818,9 @@
<segue reference="6O0-ny-JWy"/> <segue reference="6O0-ny-JWy"/>
<segue reference="feB-tI-OQn"/> <segue reference="feB-tI-OQn"/>
<segue reference="Sre-bK-k37"/> <segue reference="Sre-bK-k37"/>
<segue reference="ooM-jL-pon"/>
<segue reference="jto-24-soc"/>
<segue reference="PW6-gx-VOe"/> <segue reference="PW6-gx-VOe"/>
<segue reference="JWL-u9-2pJ"/>
<segue reference="QEa-2B-g0R"/>
<segue reference="szv-2b-0eb"/> <segue reference="szv-2b-0eb"/>
<segue reference="361-f3-ZdA"/> <segue reference="361-f3-ZdA"/>
<segue reference="6wY-nJ-ufO"/> <segue reference="6wY-nJ-ufO"/>

7
GMERemittance/Recipient/RecipientListViewController.storyboard
View File

@ -27,7 +27,7 @@
</array> </array>
</customFonts> </customFonts>
<scenes> <scenes>
<!--Recipient List View Controller-->
<!--Send Money-->
<scene sceneID="RDV-Nf-xM8"> <scene sceneID="RDV-Nf-xM8">
<objects> <objects>
<viewController storyboardIdentifier="RecipientListViewController" id="IRF-H1-BUJ" customClass="RecipientListViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController"> <viewController storyboardIdentifier="RecipientListViewController" id="IRF-H1-BUJ" customClass="RecipientListViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
@ -68,7 +68,7 @@
</connections> </connections>
</view> </view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TSh-Aq-vZt"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TSh-Aq-vZt">
<rect key="frame" x="10" y="143.5" width="355" height="523.5"/>
<rect key="frame" x="10" y="143.5" width="355" height="474.5"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="recipientList" rowHeight="80" id="UZD-5L-uLg" customClass="RecipientListTableViewCell" customModule="GMERemittance" customModuleProvider="target"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="recipientList" rowHeight="80" id="UZD-5L-uLg" customClass="RecipientListTableViewCell" customModule="GMERemittance" customModuleProvider="target">
@ -149,6 +149,8 @@
</constraints> </constraints>
<viewLayoutGuide key="safeArea" id="YfC-Ea-cWu"/> <viewLayoutGuide key="safeArea" id="YfC-Ea-cWu"/>
</view> </view>
<tabBarItem key="tabBarItem" title="Send Money" image="ic-sendmoney" id="Y4g-R7-ief"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections> <connections>
<outlet property="labelSwipeInfo" destination="8h1-8y-HWl" id="0Go-Q2-rJJ"/> <outlet property="labelSwipeInfo" destination="8h1-8y-HWl" id="0Go-Q2-rJJ"/>
<outlet property="tableView" destination="TSh-Aq-vZt" id="iSi-t9-bHo"/> <outlet property="tableView" destination="TSh-Aq-vZt" id="iSi-t9-bHo"/>
@ -2928,6 +2930,7 @@ Share with concerned party only</string>
</scenes> </scenes>
<resources> <resources>
<image name="Korea" width="40" height="40"/> <image name="Korea" width="40" height="40"/>
<image name="ic-sendmoney" width="20" height="20"/>
<image name="ic_bank" width="51" height="51"/> <image name="ic_bank" width="51" height="51"/>
<image name="ic_cash" width="51" height="51"/> <image name="ic_cash" width="51" height="51"/>
<image name="ic_document" width="10" height="14"/> <image name="ic_document" width="10" height="14"/>

4
GMERemittance/Recipient/RecipientListViewController.swift
View File

@ -29,6 +29,7 @@ class RecipientListViewController: UIViewController {
super.viewWillAppear(animated) super.viewWillAppear(animated)
setupNavigation() setupNavigation()
self.title = "Send Money" self.title = "Send Money"
self.navigationItem.title = "Send Money"
fetchReceipients() fetchReceipients()
} }
@ -58,7 +59,8 @@ class RecipientListViewController: UIViewController {
override func viewWillDisappear(_ animated: Bool) { override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated) super.viewWillDisappear(animated)
self.title = ""
// self.title = ""
self.navigationItem.title = ""
} }
@IBAction func addNewRecipientTap(_ sender: UITapGestureRecognizer) { @IBAction func addNewRecipientTap(_ sender: UITapGestureRecognizer) {

20
GMERemittance/SendMoneyViewController.swift
View File

@ -10,16 +10,16 @@ import UIKit
class SendMoneyViewController: UIViewController { class SendMoneyViewController: UIViewController {
override func viewDidAppear(_ animated: Bool) {
if (UserDefaults.standard.object(forKey: "com.gmeremit.isVerified") as! Bool) {
let storyboard = UIStoryboard.init(name: "RecipientListViewController", bundle: Bundle.main)
let vController = storyboard.instantiateViewController(withIdentifier: "RecipientListViewController") as! RecipientListViewController
self.navigationController!.pushViewController(vController, animated: true)
} else {
popUpMessage(value: 14)
}
}
// override func viewDidAppear(_ animated: Bool) {
// if (UserDefaults.standard.object(forKey: "com.gmeremit.isVerified") as! Bool) {
// let storyboard = UIStoryboard.init(name: "RecipientListViewController", bundle: Bundle.main)
// let vController = storyboard.instantiateViewController(withIdentifier: "RecipientListViewController") as! RecipientListViewController
// self.navigationController!.pushViewController(vController, animated: true)
// } else {
// popUpMessage(value: 14)
// }
//
// }
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()

Write Preview
Loading…
Cancel
Save