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

issue fixed

pull/1/head
Amrit Giri 4 years ago
parent
0314601dff
commit
f113a6e92f
2 changed files with 17 additions and 13 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. 27
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreen.storyboard
  2. 3
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift

27
GME Remit/Modules/SplashScreen/User Interface/View/SplashScreen.storyboard
View File

@ -1,9 +1,9 @@
<?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="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_0" orientation="portrait" appearance="dark"/> <device id="retina4_0" orientation="portrait" appearance="dark"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -38,13 +38,13 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="650"/> <rect key="frame" x="0.0" y="0.0" width="320" height="650"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qo1-62-lDK"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qo1-62-lDK">
<rect key="frame" x="0.0" y="0.0" width="320" height="652"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="644"/>
<subviews> <subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="6kh-QB-9Ob"> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="6kh-QB-9Ob">
<rect key="frame" x="20" y="20" width="280" height="120"/>
<rect key="frame" x="20" y="20" width="280" height="116"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_logo_white_large" translatesAutoresizingMaskIntoConstraints="NO" id="BNn-h6-EZr"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_logo_white_large" translatesAutoresizingMaskIntoConstraints="NO" id="BNn-h6-EZr">
<rect key="frame" x="26.5" y="0.0" width="227" height="45"/>
<rect key="frame" x="83.5" y="0.0" width="113.5" height="41"/>
<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="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
@ -53,7 +53,7 @@
</constraints> </constraints>
</imageView> </imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ONN-vO-ntP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ONN-vO-ntP">
<rect key="frame" x="0.0" y="65" width="280" height="55"/>
<rect key="frame" x="0.0" y="61" width="280" height="55"/>
<subviews> <subviews>
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T06-ux-Cea"> <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T06-ux-Cea">
<rect key="frame" x="86.5" y="0.0" width="108.5" height="55"/> <rect key="frame" x="86.5" y="0.0" width="108.5" height="55"/>
@ -126,7 +126,7 @@
</constraints> </constraints>
</stackView> </stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3lv-7J-Tia"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3lv-7J-Tia">
<rect key="frame" x="20" y="164" width="280" height="310"/>
<rect key="frame" x="20" y="160" width="280" height="310"/>
<subviews> <subviews>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tw9-DL-Gef"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tw9-DL-Gef">
<rect key="frame" x="10" y="10" width="260" height="0.0"/> <rect key="frame" x="10" y="10" width="260" height="0.0"/>
@ -565,7 +565,7 @@
</constraints> </constraints>
</view> </view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5R-8A-5Dg"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5R-8A-5Dg">
<rect key="frame" x="20" y="482" width="280" height="16.5"/>
<rect key="frame" x="20" y="478" width="280" height="16.5"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Exchange Rate " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bai-Kn-j3x"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Exchange Rate " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bai-Kn-j3x">
<rect key="frame" x="0.0" y="0.0" width="280" height="16.5"/> <rect key="frame" x="0.0" y="0.0" width="280" height="16.5"/>
@ -584,7 +584,7 @@
</constraints> </constraints>
</view> </view>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="j08-6S-3By"> <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="j08-6S-3By">
<rect key="frame" x="20" y="506.5" width="280" height="54"/>
<rect key="frame" x="20" y="502.5" width="280" height="54"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xXT-1Y-c8Y"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xXT-1Y-c8Y">
<rect key="frame" x="0.0" y="0.0" width="130" height="54"/> <rect key="frame" x="0.0" y="0.0" width="130" height="54"/>
@ -627,7 +627,7 @@
</constraints> </constraints>
</stackView> </stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZWP-4H-GDB"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZWP-4H-GDB">
<rect key="frame" x="31.5" y="576.5" width="257" height="30"/>
<rect key="frame" x="31.5" y="572.5" width="257" height="30"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<state key="normal" title="Existing JME Users without App Login"> <state key="normal" title="Existing JME Users without App Login">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -637,7 +637,7 @@
</connections> </connections>
</button> </button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P8b-PV-4MD"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P8b-PV-4MD">
<rect key="frame" x="255" y="579" width="45" height="45"/>
<rect key="frame" x="255" y="571" width="45" height="45"/>
<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"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="45" id="T0r-Tx-6h7"/> <constraint firstAttribute="height" constant="45" id="T0r-Tx-6h7"/>
@ -649,7 +649,7 @@
</connections> </connections>
</button> </button>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2Nn-5E-IA8"> <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2Nn-5E-IA8">
<rect key="frame" x="89" y="614.5" width="142" height="20"/>
<rect key="frame" x="89" y="610.5" width="142" height="20"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oxi-rn-1LG"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oxi-rn-1LG">
<rect key="frame" x="0.0" y="0.0" width="70.5" height="20"/> <rect key="frame" x="0.0" y="0.0" width="70.5" height="20"/>
@ -720,6 +720,7 @@
<connections> <connections>
<outlet property="appVersion" destination="oxi-rn-1LG" id="z4O-W7-Tu5"/> <outlet property="appVersion" destination="oxi-rn-1LG" id="z4O-W7-Tu5"/>
<outlet property="appVersionLabel" destination="Ng8-um-X90" id="UXi-on-j8X"/> <outlet property="appVersionLabel" destination="Ng8-um-X90" id="UXi-on-j8X"/>
<outlet property="appVersionLabelText" destination="oxi-rn-1LG" id="Nvh-K6-myq"/>
<outlet property="buttonLogin" destination="G73-dq-xvs" id="6ka-MA-eeI"/> <outlet property="buttonLogin" destination="G73-dq-xvs" id="6ka-MA-eeI"/>
<outlet property="buttonSignUp" destination="xXT-1Y-c8Y" id="699-2r-8l6"/> <outlet property="buttonSignUp" destination="xXT-1Y-c8Y" id="699-2r-8l6"/>
<outlet property="calculatedInfoView" destination="O5V-SW-NSx" id="6J0-pA-Ufa"/> <outlet property="calculatedInfoView" destination="O5V-SW-NSx" id="6J0-pA-Ufa"/>
@ -755,6 +756,7 @@
<point key="canvasLocation" x="845.625" y="232.3943661971831"/> <point key="canvasLocation" x="845.625" y="232.3943661971831"/>
</scene> </scene>
</scenes> </scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources> <resources>
<image name="chat11" width="64" height="64"/> <image name="chat11" width="64" height="64"/>
<image name="dropdown_grey" width="15" height="8"/> <image name="dropdown_grey" width="15" height="8"/>
@ -245729,5 +245731,4 @@ PxEA4D8eAOA/IwDgPysA4D8uAOA/MwDgPzsAAAAAAAAEAQAAAAAAAABnAAAAAAAAAAAAAAAAAOA/Pg
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
</resources> </resources>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</document> </document>

3
GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
View File

@ -20,6 +20,7 @@ class SplashScreenViewController: UIViewController {
@IBOutlet private weak var languageBackGroundView: UIView! @IBOutlet private weak var languageBackGroundView: UIView!
@IBOutlet private weak var languageLabel: UILabel! @IBOutlet private weak var languageLabel: UILabel!
@IBOutlet private weak var flagImageView: UIImageView! @IBOutlet private weak var flagImageView: UIImageView!
@IBOutlet weak var appVersionLabelText: UILabel!
@IBOutlet private weak var appVersionLabel: UILabel! @IBOutlet private weak var appVersionLabel: UILabel!
@IBOutlet private weak var exchangeRateForUnitLabel: UILabel! @IBOutlet private weak var exchangeRateForUnitLabel: UILabel!
@ -268,6 +269,8 @@ class SplashScreenViewController: UIViewController {
let attributes: [NSAttributedString.Key: Any] = [.underlineStyle: NSUnderlineStyle.single.rawValue] let attributes: [NSAttributedString.Key: Any] = [.underlineStyle: NSUnderlineStyle.single.rawValue]
let attributeString = NSMutableAttributedString(string: "existing_jme_users_without_app_login".localized(), attributes: attributes) let attributeString = NSMutableAttributedString(string: "existing_jme_users_without_app_login".localized(), attributes: attributes)
existingJMERegister.setAttributedTitle(attributeString, for: .normal) existingJMERegister.setAttributedTitle(attributeString, for: .normal)
self.appVersionLabelText.text = "app_version_text".localized()
} }
private func setExchangeRateUI() { private func setExchangeRateUI() {

Write Preview
Loading…
Cancel
Save