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

bug fixes

v0.17
stepie.ub 1 year ago
parent
870461c2c8
commit
5d3644850a
4 changed files with 48 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  2. 10
      GME Remit/Modules/SideMenu/SettingViewController.swift
  3. 11
      GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
  4. 41
      GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard

17
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
View File

@ -139,13 +139,6 @@ notices to get JME Number for this transfer.</string>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Gge-7S-SaJ">
<rect key="frame" x="68" y="261" width="259" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
@ -251,11 +244,17 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YY3-KP-E09" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="313" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="52" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Gge-7S-SaJ">
<rect key="frame" x="54" y="0.0" width="259" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
</subviews>
@ -311,7 +310,7 @@ notices to get JME Number for this transfer.</string>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgd" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="98o-ui-Lmx">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="98o-ui-Lmx">
<rect key="frame" x="87" y="0.0" width="226" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

10
GME Remit/Modules/SideMenu/SettingViewController.swift
View File

@ -313,6 +313,9 @@ class SettingViewController: UIViewController {
let referAndEarn = UITapGestureRecognizer(target: self, action: #selector(self.referAndEarn(_:)))
referAndEarnView.addGestureRecognizer(referAndEarn)
let accountStatementTap = UITapGestureRecognizer(target: self, action: #selector(self.accountStatement(_:)))
accountStatementStackView.addGestureRecognizer(accountStatementTap)
let renewId = UITapGestureRecognizer(target: self, action: #selector(self.renewId(_:)))
renewIdView.addGestureRecognizer(renewId)
@ -344,6 +347,13 @@ class SettingViewController: UIViewController {
}
}
@objc func accountStatement(_ sender: UITapGestureRecognizer) {
if let naviVC = navigationController {
WalletStatementWireframe().pushMainView(in: naviVC)
}
}
@objc func renewId(_ sender: UITapGestureRecognizer) {
RenewIDWireframe().pushMainView(on: self)
}

11
GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
View File

@ -47,17 +47,22 @@ class WalletStatementTableViewCell: UITableViewCell {
let type: WalletInOutType = getType()
self.walletAmountLabel.layer.cornerRadius = 4
self.particularLabel.font = .sanfrancisco(.semibold, size: 16)
self.walletAmountLabel.font = .sanfrancisco(.semibold, size: 16)
self.closingAmountLabel.font = .sanfrancisco(.medium, size: 16)
self.walletAmountLabel.layer.cornerRadius = 8
self.walletAmountLabel.clipsToBounds = true
walletAmountLabel.textColor = .white
switch type {
case .walletIn:
self.walletAmountLabel.backgroundColor = .themeBlue
self.walletAmountLabel.text = "\(StringConstants().in): \(self.model?.walletIn ?? "")"
self.walletAmountLabel.text = " \(StringConstants().in): \(self.model?.walletIn ?? "") "
case .walletOut:
self.walletAmountLabel.backgroundColor = .themeRed
self.walletAmountLabel.text = "\(StringConstants().out): \(model?.walletOut ?? "")"
self.walletAmountLabel.text = " \(StringConstants().out): \(model?.walletOut ?? "") "
case .closingAmount:
self.walletAmountLabel.text = ""
self.walletAmountLabel.backgroundColor = .themeWhite

41
GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard
View File

@ -1,9 +1,9 @@
<?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" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -15,6 +15,9 @@
<array key="SanFranciscoDisplay-Regular.otf">
<string>SanFranciscoDisplay-Regular</string>
</array>
<array key="TimesNewRoman.ttf">
<string>.SFUI-Regular</string>
</array>
</customFonts>
<scenes>
<!--Wallet Statement View Controller-->
@ -37,13 +40,13 @@
<color key="separatorColor" name="ThemeSeparate"/>
<inset key="separatorInset" minX="15" minY="0.0" maxX="15" maxY="0.0"/>
<view key="tableFooterView" contentMode="scaleToFill" id="eBz-A9-Zec">
<rect key="frame" x="0.0" y="180" width="355" height="44"/>
<rect key="frame" x="0.0" y="202" width="355" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletStatementTableViewCell" rowHeight="124" id="lsU-QR-G1g" customClass="WalletStatementTableViewCell" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="355" height="124"/>
<rect key="frame" x="0.0" y="50" width="355" height="124"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lsU-QR-G1g" id="Ngc-ak-pmA">
<rect key="frame" x="0.0" y="0.0" width="355" height="124"/>
@ -56,30 +59,30 @@
<rect key="frame" x="15" y="10" width="315" height="94"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-sK-VqU">
<rect key="frame" x="0.0" y="0.0" width="315" height="49"/>
<rect key="frame" x="0.0" y="0.0" width="315" height="48"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/>
<color key="textColor" name="ThemeText"/>
<color key="textColor" white="0.0" alpha="0.67000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pFg-LK-KPZ">
<rect key="frame" x="0.0" y="54" width="315" height="17.5"/>
<rect key="frame" x="0.0" y="53" width="315" height="18"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M1E-8L-a1t">
<rect key="frame" x="0.0" y="0.0" width="242" height="17.5"/>
<rect key="frame" x="0.0" y="0.0" width="247" height="18"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" text="To: Dhan Singh Saud To: Dhan Singh Saud" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uog-tj-cso">
<rect key="frame" x="0.0" y="0.0" width="242" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
<color key="textColor" name="ThemeText"/>
<rect key="frame" x="0.0" y="0.0" width="247" height="18"/>
<fontDescription key="fontDescription" name=".SFUI-Regular" family=".AppleSystemUIFont" pointSize="13"/>
<color key="textColor" white="0.0" alpha="0.87" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BD2-GC-dic">
<rect key="frame" x="242" y="0.0" width="73" height="17.5"/>
<rect key="frame" x="247" y="0.0" width="68" height="18"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="255" verticalHuggingPriority="251" horizontalCompressionResistancePriority="755" text="-1,000,000" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZlX-mu-6jx">
<rect key="frame" x="0.0" y="0.0" width="73" height="17.5"/>
<rect key="frame" x="0.0" y="0.0" width="68" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -89,16 +92,16 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZWQ-9g-g0t">
<rect key="frame" x="0.0" y="76.5" width="315" height="17.5"/>
<rect key="frame" x="0.0" y="76" width="315" height="18"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Closing Balance" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MKf-Bc-j5A">
<rect key="frame" x="0.0" y="0.0" width="157.5" height="17.5"/>
<rect key="frame" x="0.0" y="0.0" width="157.5" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="255" verticalHuggingPriority="251" horizontalCompressionResistancePriority="755" text="-1,000,000" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6ee-Ey-bqV">
<rect key="frame" x="157.5" y="0.0" width="157.5" height="17.5"/>
<rect key="frame" x="157.5" y="0.0" width="157.5" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -142,7 +145,7 @@
</prototypes>
</tableView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Account Statements Found" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="476-rL-pZJ">
<rect key="frame" x="91" y="110" width="193.5" height="44"/>
<rect key="frame" x="96" y="110" width="183.5" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="8eB-j6-8O8"/>
</constraints>
@ -204,6 +207,7 @@
</constraints>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="JrR-ci-CGa"/>
<color key="backgroundColor" name="ThemeMainBackground"/>
<constraints>
<constraint firstItem="Q4i-L4-Mdw" firstAttribute="leading" secondItem="JrR-ci-CGa" secondAttribute="leading" id="DFO-BG-WjD"/>
@ -211,7 +215,6 @@
<constraint firstItem="Q4i-L4-Mdw" firstAttribute="trailing" secondItem="JrR-ci-CGa" secondAttribute="trailing" id="hKL-vJ-izf"/>
<constraint firstItem="Q4i-L4-Mdw" firstAttribute="bottom" secondItem="JrR-ci-CGa" secondAttribute="bottom" id="vWe-oO-bF9"/>
</constraints>
<viewLayoutGuide key="safeArea" id="JrR-ci-CGa"/>
</view>
<connections>
<outlet property="dateRangeLabelHeightConstraint" destination="Pxd-5h-5QL" id="Z4d-db-hQo"/>
@ -226,6 +229,7 @@
<point key="canvasLocation" x="119" y="126"/>
</scene>
</scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<namedColor name="ThemeMainBackground">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -237,5 +241,4 @@
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</document>
Write Preview
Loading…
Cancel
Save