From 5dce65824dc8b0aa5caf59f2d03bafc4e28defb9 Mon Sep 17 00:00:00 2001
From: gme_2 <gme_2@gme-2s-iMac.local>
Date: Thu, 23 Aug 2018 15:58:30 +0900
Subject: [PATCH] country picker view improvised

---
 .../TablePicker/TableViewPicker.storyboard    | 19 ++++++++++--------
 GMERemittance/Module/ExchangeRate.storyboard  | 20 +++++++++----------
 .../Module/ExchangeRateViewControllerV2.swift |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/GMERemittance/Library/TablePicker/TableViewPicker.storyboard b/GMERemittance/Library/TablePicker/TableViewPicker.storyboard
index c1f64519..f8601a31 100644
--- a/GMERemittance/Library/TablePicker/TableViewPicker.storyboard
+++ b/GMERemittance/Library/TablePicker/TableViewPicker.storyboard
@@ -20,6 +20,9 @@
         <array key="Roboto-Regular.ttf">
             <string>Roboto-Regular</string>
         </array>
+        <array key="SanFranciscoDisplay-Regular.otf">
+            <string>SanFranciscoDisplay-Regular</string>
+        </array>
         <array key="SanFranciscoDisplay-Semibold.otf">
             <string>SanFranciscoDisplay-Semibold</string>
         </array>
@@ -45,7 +48,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wzp-T6-Ixq" userLabel="mainView">
                                         <rect key="frame" x="20" y="70" width="335" height="527"/>
                                         <subviews>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zVI-SC-i0w" customClass="IMEGradientView" customModule="GMERemittance" customModuleProvider="target">
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zVI-SC-i0w">
                                                 <rect key="frame" x="0.0" y="0.0" width="335" height="60"/>
                                                 <color key="backgroundColor" red="0.97647058823529409" green="0.97647058823529409" blue="0.97647058823529409" alpha="0.79871808978873238" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -76,8 +79,8 @@
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="45" id="NZi-8N-TRD"/>
                                                         </constraints>
-                                                        <nil key="textColor"/>
-                                                        <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="14"/>
+                                                        <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                         <textInputTraits key="textInputTraits"/>
                                                     </textField>
                                                 </subviews>
@@ -123,10 +126,10 @@
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <subviews>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W99-fc-7xF">
-                                                                    <rect key="frame" x="25" y="5" width="265" height="33"/>
+                                                                    <rect key="frame" x="5" y="5" width="305" height="33"/>
                                                                     <subviews>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LabelLabelLabelLabelLabel" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6kC-9f-Tap">
-                                                                            <rect key="frame" x="65" y="10" width="142" height="14"/>
+                                                                            <rect key="frame" x="65" y="10" width="182" height="14"/>
                                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                             <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="12"/>
                                                                             <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
@@ -141,7 +144,7 @@
                                                                             </constraints>
                                                                         </imageView>
                                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right" translatesAutoresizingMaskIntoConstraints="NO" id="qLD-xB-yJn">
-                                                                            <rect key="frame" x="233" y="6" width="20" height="20"/>
+                                                                            <rect key="frame" x="273" y="6" width="20" height="20"/>
                                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" secondItem="qLD-xB-yJn" secondAttribute="height" multiplier="1:1" id="VrY-7X-q4U"/>
@@ -165,8 +168,8 @@
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="bottom" secondItem="W99-fc-7xF" secondAttribute="bottom" constant="5" id="1Zd-oC-kp4"/>
-                                                                <constraint firstAttribute="trailing" secondItem="W99-fc-7xF" secondAttribute="trailing" constant="25" id="ABM-CE-b68"/>
-                                                                <constraint firstItem="W99-fc-7xF" firstAttribute="leading" secondItem="zyE-DB-6EC" secondAttribute="leading" constant="25" id="Dih-lQ-PLY"/>
+                                                                <constraint firstAttribute="trailing" secondItem="W99-fc-7xF" secondAttribute="trailing" constant="5" id="ABM-CE-b68"/>
+                                                                <constraint firstItem="W99-fc-7xF" firstAttribute="leading" secondItem="zyE-DB-6EC" secondAttribute="leading" constant="5" id="Dih-lQ-PLY"/>
                                                                 <constraint firstItem="W99-fc-7xF" firstAttribute="top" secondItem="zyE-DB-6EC" secondAttribute="top" constant="5" id="UZm-um-auC"/>
                                                             </constraints>
                                                         </tableViewCellContentView>
diff --git a/GMERemittance/Module/ExchangeRate.storyboard b/GMERemittance/Module/ExchangeRate.storyboard
index f6b5a0ab..834cda88 100644
--- a/GMERemittance/Module/ExchangeRate.storyboard
+++ b/GMERemittance/Module/ExchangeRate.storyboard
@@ -49,24 +49,24 @@
                                                                                 <rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mke-AD-VCJ">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="222" height="3"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
                                                                                         <constraints>
-                                                                                            <constraint firstAttribute="height" constant="3" id="zQG-0L-BT3"/>
+                                                                                            <constraint firstAttribute="height" constant="6" id="zQG-0L-BT3"/>
                                                                                         </constraints>
                                                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                                         <nil key="textColor"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You Send" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fA0-lC-Tqc">
-                                                                                        <rect key="frame" x="0.0" y="3" width="222" height="9"/>
+                                                                                        <rect key="frame" x="0.0" y="6" width="222" height="14"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                         <color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10000000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LXB-bJ-saO">
-                                                                                        <rect key="frame" x="0.0" y="12" width="222" height="48"/>
+                                                                                        <rect key="frame" x="0.0" y="20" width="222" height="40"/>
                                                                                         <constraints>
-                                                                                            <constraint firstAttribute="height" constant="48" id="uhl-7Q-2yF"/>
+                                                                                            <constraint firstAttribute="height" constant="40" id="uhl-7Q-2yF"/>
                                                                                         </constraints>
                                                                                         <color key="textColor" red="0.92941176470588238" green="0.11372549019607843" blue="0.19607843137254902" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
@@ -262,24 +262,24 @@
                                                                                 <rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wvN-oC-LtE">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="222" height="3"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
                                                                                         <constraints>
-                                                                                            <constraint firstAttribute="height" constant="3" id="Jrl-la-Wuu"/>
+                                                                                            <constraint firstAttribute="height" constant="6" id="Jrl-la-Wuu"/>
                                                                                         </constraints>
                                                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                                         <nil key="textColor"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You Send" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cgh-SW-cPx">
-                                                                                        <rect key="frame" x="0.0" y="3" width="222" height="9"/>
+                                                                                        <rect key="frame" x="0.0" y="6" width="222" height="14"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                         <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1000000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AYL-Cb-OKd">
-                                                                                        <rect key="frame" x="0.0" y="12" width="222" height="48"/>
+                                                                                        <rect key="frame" x="0.0" y="20" width="222" height="40"/>
                                                                                         <constraints>
-                                                                                            <constraint firstAttribute="height" constant="48" id="1tP-a4-Bd4"/>
+                                                                                            <constraint firstAttribute="height" constant="40" id="1tP-a4-Bd4"/>
                                                                                         </constraints>
                                                                                         <color key="textColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
diff --git a/GMERemittance/Module/ExchangeRateViewControllerV2.swift b/GMERemittance/Module/ExchangeRateViewControllerV2.swift
index 9da5a7cb..62dc4a5c 100644
--- a/GMERemittance/Module/ExchangeRateViewControllerV2.swift
+++ b/GMERemittance/Module/ExchangeRateViewControllerV2.swift
@@ -52,7 +52,7 @@ class ExchangeRateViewControllerV2: UIViewController {
     
     var countryListTapGuesture: UITapGestureRecognizer?
     var selectedPaymentIndex: IndexPath = IndexPath.init(row: 0, section: 0)
-    var nativeCountry: String? = "Thailand"
+    var nativeCountry: String? = "Nepal"
     var calcBy = ""
     
     var exchangeRateModels: [ExchangeRateModel]? {