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

constraints managed

pull/1/head
gme_2 6 years ago
parent
cc400ded0e
commit
ef5444dc4a
6 changed files with 30 additions and 20 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. 2
      GMERemittance/AppDelegate.swift
  2. 24
      GMERemittance/Module/GmeContacts/User Interface/View/GmeContacts.storyboard
  3. 2
      GMERemittance/Module/GmeContacts/User Interface/View/GmeContactsViewController.swift
  4. 18
      GMERemittance/Module/Home/User Interface/View/Home.storyboard
  5. 2
      GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift
  6. 2
      GMERemittance/UrlManager.swift

2
GMERemittance/AppDelegate.swift
View File

@ -19,7 +19,7 @@ import AlamofireNetworkActivityLogger
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
import LGSideMenuController import LGSideMenuController
let server: Server = .stagging
let server: Server = .live

24
GMERemittance/Module/GmeContacts/User Interface/View/GmeContacts.storyboard
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<customFonts key="customFonts"> <customFonts key="customFonts">
@ -20,7 +20,7 @@
<!--GmeContacts--> <!--GmeContacts-->
<scene sceneID="R60-Pu-Hpy"> <scene sceneID="R60-Pu-Hpy">
<objects> <objects>
<viewController storyboardIdentifier="GmeContactsViewController" title="GmeContacts" id="HSb-ou-7T5" customClass="GmeContactsViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="GmeContactsViewController" title="GmeContacts" id="HSb-ou-7T5" customClass="GmeContactsViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides> <layoutGuides>
<viewControllerLayoutGuide type="top" id="y1H-iV-BwG"/> <viewControllerLayoutGuide type="top" id="y1H-iV-BwG"/>
<viewControllerLayoutGuide type="bottom" id="PYB-Kq-ghm"/> <viewControllerLayoutGuide type="bottom" id="PYB-Kq-ghm"/>
@ -34,7 +34,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="GmeContactsTableViewCell" rowHeight="183" id="LdW-uo-vBI" customClass="GmeContactsTableViewCell" customModule="GMERemittance" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="GmeContactsTableViewCell" rowHeight="183" id="LdW-uo-vBI" customClass="GmeContactsTableViewCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="183"/> <rect key="frame" x="0.0" y="28" width="375" height="183"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LdW-uo-vBI" id="aQq-zX-TJs"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LdW-uo-vBI" id="aQq-zX-TJs">
@ -65,10 +65,10 @@
</subviews> </subviews>
</stackView> </stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LCK-tf-nUj"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LCK-tf-nUj">
<rect key="frame" x="0.0" y="17" width="240" height="79"/>
<rect key="frame" x="0.0" y="17" width="240" height="96"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="right" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qpa-at-ZiX"> <label opaque="NO" userInteractionEnabled="NO" contentMode="right" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qpa-at-ZiX">
<rect key="frame" x="0.0" y="0.0" width="240" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="240" height="96"/>
<string key="text">Ansan-si, Gyeonggido Dan-Wongu, Wongogdong Jung-Angdaero 445 (798-12 beonji) 2nd floor <string key="text">Ansan-si, Gyeonggido Dan-Wongu, Wongogdong Jung-Angdaero 445 (798-12 beonji) 2nd floor
Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string> Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -82,12 +82,12 @@ Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
<constraint firstItem="Qpa-at-ZiX" firstAttribute="top" secondItem="LCK-tf-nUj" secondAttribute="top" id="Sd5-ut-Yvw"/> <constraint firstItem="Qpa-at-ZiX" firstAttribute="top" secondItem="LCK-tf-nUj" secondAttribute="top" id="Sd5-ut-Yvw"/>
<constraint firstAttribute="bottom" secondItem="Qpa-at-ZiX" secondAttribute="bottom" id="Uch-vI-YA4"/> <constraint firstAttribute="bottom" secondItem="Qpa-at-ZiX" secondAttribute="bottom" id="Uch-vI-YA4"/>
<constraint firstItem="Qpa-at-ZiX" firstAttribute="leading" secondItem="LCK-tf-nUj" secondAttribute="leading" id="WD0-Ab-7Lh"/> <constraint firstItem="Qpa-at-ZiX" firstAttribute="leading" secondItem="LCK-tf-nUj" secondAttribute="leading" id="WD0-Ab-7Lh"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="jIJ-Qo-YgM"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="jIJ-Qo-YgM"/>
<constraint firstAttribute="trailing" secondItem="Qpa-at-ZiX" secondAttribute="trailing" id="u9j-3x-Ace"/> <constraint firstAttribute="trailing" secondItem="Qpa-at-ZiX" secondAttribute="trailing" id="u9j-3x-Ace"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(Korean Language Support)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V6u-36-LdC">
<rect key="frame" x="0.0" y="96" width="165" height="17"/>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(Korean Language Support)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V6u-36-LdC">
<rect key="frame" x="0.0" y="113" width="165" height="17"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="17" id="Iix-kc-FU3"/> <constraint firstAttribute="height" constant="17" id="Iix-kc-FU3"/>
</constraints> </constraints>
@ -100,7 +100,7 @@ Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
</subviews> </subviews>
</stackView> </stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TZC-eh-LgA" userLabel="Seperator"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TZC-eh-LgA" userLabel="Seperator">
<rect key="frame" x="10" y="127" width="315" height="1"/>
<rect key="frame" x="10" y="127.5" width="315" height="0.5"/>
<color key="backgroundColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="0.5" id="5Lc-dP-Jp8"/> <constraint firstAttribute="height" constant="0.5" id="5Lc-dP-Jp8"/>
@ -223,7 +223,7 @@ Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
<outlet property="titleLabel" destination="D8Q-EE-Pct" id="aa0-H9-jMq"/> <outlet property="titleLabel" destination="D8Q-EE-Pct" id="aa0-H9-jMq"/>
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EmptyTableViewCell" rowHeight="38" id="nWa-yO-6DP" customClass="EmptyTableViewCell" customModule="GMERemittance" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EmptyTableViewCell" rowHeight="38" id="nWa-yO-6DP" customClass="EmptyTableViewCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="211" width="375" height="38"/> <rect key="frame" x="0.0" y="211" width="375" height="38"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nWa-yO-6DP" id="Lay-cP-VdE"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nWa-yO-6DP" id="Lay-cP-VdE">
@ -285,7 +285,7 @@ Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="ic-agent" width="20" height="20"/>
<image name="ic-agent" width="20.5" height="20.5"/>
<image name="ic_call" width="20" height="20"/> <image name="ic_call" width="20" height="20"/>
<image name="ic_location" width="9" height="15"/> <image name="ic_location" width="9" height="15"/>
</resources> </resources>

2
GMERemittance/Module/GmeContacts/User Interface/View/GmeContactsViewController.swift
View File

@ -55,7 +55,7 @@ class GmeContactsViewController: UIViewController {
headOfficeContacts.title = "Head Office" headOfficeContacts.title = "Head Office"
headOfficeContacts.address = "325, Jong-ro, Jongno-gu, 03104 Seoul" headOfficeContacts.address = "325, Jong-ro, Jongno-gu, 03104 Seoul"
headOfficeContacts.contactNumber = "15886864" headOfficeContacts.contactNumber = "15886864"
headOfficeContacts.language = "Korean Language Support"
// headOfficeContacts.language = "Korean Language Support"
let dongdaemunBranchContacts = GmeContacts() let dongdaemunBranchContacts = GmeContacts()
dongdaemunBranchContacts.title = "Dongdaemun Branch" dongdaemunBranchContacts.title = "Dongdaemun Branch"

18
GMERemittance/Module/Home/User Interface/View/Home.storyboard
View File

@ -265,8 +265,16 @@
<rect key="frame" x="0.0" y="0.0" width="170" height="173"/> <rect key="frame" x="0.0" y="0.0" width="170" height="173"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B7x-OB-ICD">
<rect key="frame" x="72" y="75.5" width="26" height="22"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="SiW-h1-pYT"/>
<constraint firstAttribute="width" constant="26" id="Ymf-0X-IUa"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2AS-0D-YqT"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2AS-0D-YqT">
<rect key="frame" x="45" y="18" width="80" height="80"/>
<rect key="frame" x="45" y="36.5" width="80" height="80"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstAttribute="width" secondItem="2AS-0D-YqT" secondAttribute="height" multiplier="1:1" id="5g2-sa-yq3"/> <constraint firstAttribute="width" secondItem="2AS-0D-YqT" secondAttribute="height" multiplier="1:1" id="5g2-sa-yq3"/>
@ -274,7 +282,7 @@
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Money" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gB-BN-h1P"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Money" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gB-BN-h1P">
<rect key="frame" x="24" y="118" width="122" height="17"/>
<rect key="frame" x="24" y="121.5" width="122" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -292,11 +300,13 @@
<constraints> <constraints>
<constraint firstAttribute="trailingMargin" secondItem="1gB-BN-h1P" secondAttribute="trailing" constant="8" id="6Jo-mq-p5J"/> <constraint firstAttribute="trailingMargin" secondItem="1gB-BN-h1P" secondAttribute="trailing" constant="8" id="6Jo-mq-p5J"/>
<constraint firstItem="1gB-BN-h1P" firstAttribute="leading" secondItem="Etq-JH-rVI" secondAttribute="leadingMargin" constant="8" id="92I-qz-Jrf"/> <constraint firstItem="1gB-BN-h1P" firstAttribute="leading" secondItem="Etq-JH-rVI" secondAttribute="leadingMargin" constant="8" id="92I-qz-Jrf"/>
<constraint firstItem="1gB-BN-h1P" firstAttribute="top" secondItem="2AS-0D-YqT" secondAttribute="bottom" constant="20" id="EES-2m-NVi"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="centerY" secondItem="B7x-OB-ICD" secondAttribute="centerY" constant="-10" id="EIz-R7-J9H"/>
<constraint firstAttribute="trailing" secondItem="Tto-II-gHc" secondAttribute="trailing" constant="6" id="aDQ-XP-G1H"/> <constraint firstAttribute="trailing" secondItem="Tto-II-gHc" secondAttribute="trailing" constant="6" id="aDQ-XP-G1H"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="centerX" secondItem="Etq-JH-rVI" secondAttribute="centerX" id="dcN-Y7-VS9"/> <constraint firstItem="2AS-0D-YqT" firstAttribute="centerX" secondItem="Etq-JH-rVI" secondAttribute="centerX" id="dcN-Y7-VS9"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="top" secondItem="Etq-JH-rVI" secondAttribute="top" constant="18" id="eoD-F8-gs4"/>
<constraint firstItem="B7x-OB-ICD" firstAttribute="centerX" secondItem="Etq-JH-rVI" secondAttribute="centerX" id="e35-zO-9X2"/>
<constraint firstItem="Tto-II-gHc" firstAttribute="top" secondItem="Etq-JH-rVI" secondAttribute="top" constant="6" id="tqF-Pu-NfF"/> <constraint firstItem="Tto-II-gHc" firstAttribute="top" secondItem="Etq-JH-rVI" secondAttribute="top" constant="6" id="tqF-Pu-NfF"/>
<constraint firstItem="1gB-BN-h1P" firstAttribute="top" secondItem="2AS-0D-YqT" secondAttribute="bottom" constant="5" id="xWB-BN-UF3"/>
<constraint firstItem="B7x-OB-ICD" firstAttribute="centerY" secondItem="Etq-JH-rVI" secondAttribute="centerY" id="znS-Pz-eoE"/>
</constraints> </constraints>
<size key="customSize" width="170" height="173"/> <size key="customSize" width="170" height="173"/>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>

2
GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift
View File

@ -32,7 +32,7 @@ class TransactionHistoryTableViewCell: UITableViewCell {
func setup() { func setup() {
self.dateLabel.text = model?.sendDate self.dateLabel.text = model?.sendDate
self.amountLabel.text = model?.pAmt
self.amountLabel.text = (model?.pAmt ?? "") + " " + (model?.pCurrency ?? "")
self.paymentMethodLabel.text = model?.payOutMode self.paymentMethodLabel.text = model?.payOutMode
self.nameLabel.text = model?.user self.nameLabel.text = model?.user
let paystatus = model?.payStatus ?? "" let paystatus = model?.payStatus ?? ""

2
GMERemittance/UrlManager.swift
View File

@ -21,7 +21,7 @@ class UrlManager {
let baseSocialURL = "" let baseSocialURL = ""
let staggingServerUrl = "http://gmeuat.gmeremit.com:5012/api/v1/" let staggingServerUrl = "http://gmeuat.gmeremit.com:5012/api/v1/"
let liveServerUrl = "http://mobileapi.gmeremit.com:8002/api/v1/"
let liveServerUrl = "https://mobileapi.gmeremit.com:8002/api/v1/"
let uatServer = "http://gmeuat.gmeremit.com:5012/api/v1/" let uatServer = "http://gmeuat.gmeremit.com:5012/api/v1/"
init() { init() {

Write Preview
Loading…
Cancel
Save