Browse Source

bank branch show hide condition adjusted and blue logo added

dev
puranpanthi 8 months ago
parent
commit
f41ac10516
  1. 24
      GME Remit/Modules/AppUpdate/User Interface/View/AppUpdate.storyboard
  2. 3
      GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift
  3. 4
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
  4. 8
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  5. 21
      GME Remit/Supported Files/Assets.xcassets/ime_blue_logo.imageset/Contents.json
  6. BIN
      GME Remit/Supported Files/Assets.xcassets/ime_blue_logo.imageset/logo-white-01.jpg

24
GME Remit/Modules/AppUpdate/User Interface/View/AppUpdate.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" 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="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -22,7 +22,7 @@
<!--AppUpdate-->
<scene sceneID="R60-Pu-Hpy">
<objects>
<viewController storyboardIdentifier="AppUpdateViewController" title="AppUpdate" id="HSb-ou-7T5" customClass="AppUpdateViewController" customModule="JME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="AppUpdateViewController" title="AppUpdate" id="HSb-ou-7T5" customClass="AppUpdateViewController" customModule="IME_London" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y1H-iV-BwG"/>
<viewControllerLayoutGuide type="bottom" id="PYB-Kq-ghm"/>
@ -34,10 +34,10 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BRv-FW-HNA">
<rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_logo_white_large" translatesAutoresizingMaskIntoConstraints="NO" id="lak-SO-oCz">
<rect key="frame" x="126.5" y="123" width="122" height="35"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ime_blue_logo" translatesAutoresizingMaskIntoConstraints="NO" id="lak-SO-oCz">
<rect key="frame" x="119" y="123" width="137" height="35"/>
<constraints>
<constraint firstAttribute="width" secondItem="lak-SO-oCz" secondAttribute="height" multiplier="80:23" id="Efp-xM-wQO"/>
<constraint firstAttribute="width" secondItem="lak-SO-oCz" secondAttribute="height" multiplier="90:23" id="Efp-xM-wQO"/>
<constraint firstAttribute="height" constant="35" id="vIX-bY-Q9o"/>
</constraints>
</imageView>
@ -64,7 +64,7 @@
<nil key="highlightedColor"/>
</label>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tom-j5-Wgp">
<rect key="frame" x="87.5" y="449" width="200" height="30"/>
<rect key="frame" x="87.5" y="449.5" width="200" height="30"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>
<state key="normal">
<color key="titleColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -79,7 +79,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vBA-a9-hIn">
<rect key="frame" x="87.5" y="395" width="200" height="50"/>
<rect key="frame" x="87.5" y="395.5" width="200" height="50"/>
<color key="backgroundColor" red="0.1211191192" green="0.1492218971" blue="0.40953290460000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="AN0-11-hbq"/>
@ -98,8 +98,8 @@
<action selector="update:" destination="HSb-ou-7T5" eventType="touchUpInside" id="h8h-6c-ldf"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This version of the app is out of date. To keep using JME." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cmV-cC-wUM">
<rect key="frame" x="32" y="322" width="311" height="33"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This version of the app is out of date. To keep using IME." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cmV-cC-wUM">
<rect key="frame" x="32" y="322" width="311" height="33.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -154,9 +154,9 @@
</scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="ic_back_button" width="23" height="17"/>
<image name="ic_back_button" width="24" height="24"/>
<image name="ic_cloud_banner" width="2000" height="51"/>
<image name="ic_logo_white_large" width="113.5" height="41"/>
<image name="ime_blue_logo" width="926" height="152"/>
<namedColor name="ThemeText">
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>

3
GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift

@ -80,7 +80,8 @@ class AppUpdateViewController: UIViewController {
}
func update() {
let urlStr = "itms-apps://itunes.apple.com/gh/app/jme-remittance/id1561903311"
// let urlStr = "itms-apps://itunes.apple.com/gh/app/jme-remittance/id1561903311"
let urlStr = "itms-apps://itunes.apple.com/gh/app/ime-london/id1464134705"
UIApplication.tryURL(url: urlStr)
}
}

4
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard

@ -404,8 +404,8 @@
<color key="textColor" red="0.14901960784313725" green="0.13333333333333333" blue="0.38431372549019605" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jtc-R8-9Oq">
<rect key="frame" x="319" y="8" width="49" height="27"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jtc-R8-9Oq">
<rect key="frame" x="302" y="8" width="65" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="65" id="6om-qQ-ouQ"/>
<constraint firstAttribute="height" constant="27" id="LV9-jM-zg2"/>

8
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift

@ -491,7 +491,7 @@ extension SetupRecipientViewController {
self.payoutPartner = $0?.payoutPartner ?? ""
self.validationRequired = $0?.accountValidationRequired ?? "False"
self.bankTextField.sendActions(for: .editingChanged)
if !self.branchTextField.isHidden {
// if !self.branchTextField.isHidden {
if $0?.branchRequired?.lowercased() == "false" {
self.branchTextField.isHidden = true
self.branchDropdown.isHidden = true
@ -502,9 +502,9 @@ extension SetupRecipientViewController {
self.branchDropdown.isHidden = $0?.branches?.count == 0
self.branchTextField.valid.onNext($0?.branches?.count == 0)
}
} else {
self.branchDropdown.isHidden = true
}
// } else {
// self.branchDropdown.isHidden = true
// }
if $0?.accountRequired?.lowercased() == "false" {
self.accountTextField.isHidden = true

21
GME Remit/Supported Files/Assets.xcassets/ime_blue_logo.imageset/Contents.json

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "logo-white-01.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
GME Remit/Supported Files/Assets.xcassets/ime_blue_logo.imageset/logo-white-01.jpg

After

Width: 926  |  Height: 152  |  Size: 26 KiB

Loading…
Cancel
Save