Browse Source

todays rate normal navigation setup

pull/1/head
ccr 6 years ago
parent
commit
4528856055
  1. 6
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  2. 12
      GMERemittance/Module/PennyTest/User Interface/View/PennyTest.storyboard
  3. 2
      GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift
  4. 1
      GMERemittance/Recipient/RecipientListViewController.swift

6
GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

@ -401,11 +401,7 @@ class ExchangeRatesViewController: UIViewController {
private func setupNavigation() {
var backBtnImage = #imageLiteral(resourceName: "backIconBlack")
backBtnImage = backBtnImage.withRenderingMode(UIImageRenderingMode.alwaysOriginal)
self.navigationController!.navigationBar.backIndicatorImage = backBtnImage
self.navigationController!.navigationBar.backIndicatorTransitionMaskImage = backBtnImage
self.navigationController?.navigationBar.barTintColor = UIColor.white
self.setupNormalNavigation()
}
}

12
GMERemittance/Module/PennyTest/User Interface/View/PennyTest.storyboard

@ -33,7 +33,7 @@
<rect key="frame" x="0.0" y="40" width="355" height="565"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bank1" translatesAutoresizingMaskIntoConstraints="NO" id="ss6-tL-AGW">
<rect key="frame" x="127.5" y="83" width="100" height="100"/>
<rect key="frame" x="127.5" y="63" width="100" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="IR6-tl-6BT"/>
<constraint firstAttribute="width" secondItem="ss6-tL-AGW" secondAttribute="height" multiplier="1:1" id="NZ8-yC-nZP"/>
@ -46,7 +46,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OS-ti-E8d">
<rect key="frame" x="77.5" y="437" width="200" height="50"/>
<rect key="frame" x="77.5" y="365" width="200" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="9kg-kR-MK6"/>
@ -66,8 +66,8 @@
<action selector="proceed:" destination="HSb-ou-7T5" eventType="touchUpInside" id="usL-YX-gQp"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="93u-O5-ntU">
<rect key="frame" x="146" y="507" width="63" height="33"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="93u-O5-ntU">
<rect key="frame" x="146" y="435" width="63" height="33"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<state key="normal" title="Not Now">
<color key="titleColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/>
@ -82,14 +82,14 @@
<constraint firstAttribute="bottom" secondItem="v7v-LL-JPa" secondAttribute="bottom" constant="301" id="0dG-fo-6kf"/>
<constraint firstItem="v7v-LL-JPa" firstAttribute="centerY" secondItem="4Rc-Nq-MZM" secondAttribute="centerY" constant="-49" id="Cbq-bn-VTA"/>
<constraint firstItem="ss6-tL-AGW" firstAttribute="centerX" secondItem="v7v-LL-JPa" secondAttribute="centerX" id="I0c-mY-x80"/>
<constraint firstAttribute="bottom" secondItem="3OS-ti-E8d" secondAttribute="bottom" constant="78" id="MHW-g2-z2B"/>
<constraint firstAttribute="bottom" secondItem="3OS-ti-E8d" secondAttribute="bottom" constant="150" id="MHW-g2-z2B"/>
<constraint firstAttribute="trailing" secondItem="v7v-LL-JPa" secondAttribute="trailing" constant="15" id="UTl-63-l11"/>
<constraint firstItem="93u-O5-ntU" firstAttribute="top" secondItem="3OS-ti-E8d" secondAttribute="bottom" constant="20" id="brn-z1-Eq8"/>
<constraint firstItem="93u-O5-ntU" firstAttribute="centerX" secondItem="4Rc-Nq-MZM" secondAttribute="centerX" id="gS6-pp-e6Q"/>
<constraint firstItem="v7v-LL-JPa" firstAttribute="leading" secondItem="4Rc-Nq-MZM" secondAttribute="leading" constant="15" id="gV4-qz-Ei0"/>
<constraint firstItem="v7v-LL-JPa" firstAttribute="centerX" secondItem="4Rc-Nq-MZM" secondAttribute="centerX" id="iHJ-iT-KL7"/>
<constraint firstItem="3OS-ti-E8d" firstAttribute="centerX" secondItem="4Rc-Nq-MZM" secondAttribute="centerX" id="neB-C6-JPZ"/>
<constraint firstItem="v7v-LL-JPa" firstAttribute="top" secondItem="ss6-tL-AGW" secondAttribute="bottom" constant="20" id="rgC-cz-pCI"/>
<constraint firstItem="v7v-LL-JPa" firstAttribute="top" secondItem="ss6-tL-AGW" secondAttribute="bottom" constant="40" id="rgC-cz-pCI"/>
</constraints>
</view>
</subviews>

2
GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift

@ -65,7 +65,7 @@ class PennyTestViewController: UIViewController {
}
@IBAction func dismiss(_ sender: UIButton) {
self.dismiss(animated: true, completion: nil)
self.navigationController?.popViewController(animated: true)
}
private func proceed() {

1
GMERemittance/Recipient/RecipientListViewController.swift

@ -39,6 +39,7 @@ class RecipientListViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
self.setupDelegates()
self.showProgressHud()
viewAddRecipient.layer.cornerRadius = 10

Loading…
Cancel
Save