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

done button fixes

v0.17
yare 2 years ago
parent
e03fa83a4f
commit
d14b9bbc50
3 changed files with 14 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. 8
      GME Remit.xcodeproj/project.pbxproj
  2. 3
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  3. 16
      GME Remit/Modules/SlipUpload/SlipUpload.storyboard

8
GME Remit.xcodeproj/project.pbxproj
View File

@ -7585,7 +7585,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV; DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -7601,7 +7601,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
); );
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)", "$(OTHER_LDFLAGS)",
@ -7626,7 +7626,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV; DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -7642,7 +7642,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
); );
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)", "$(OTHER_LDFLAGS)",
"-ObjC", "-ObjC",

3
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -267,7 +267,8 @@ class SendMoneyReceiptViewController: UIViewController {
self.requestToCancelButton.isHidden = true self.requestToCancelButton.isHidden = true
self.requestToCancelButton.setTitle("Cancel Transaction", for: .normal) self.requestToCancelButton.setTitle("Cancel Transaction", for: .normal)
case .none: case .none:
print("No Dispaly Action Found")
self.transactionReportButtonStackView.isHidden = true
self.doneButton.isHidden = false
} }
if shouldShowCancelAmmendButton { if shouldShowCancelAmmendButton {
self.navigationController?.navigationItem.hidesBackButton = false self.navigationController?.navigationItem.hidesBackButton = false

16
GME Remit/Modules/SlipUpload/SlipUpload.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="20037" 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="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<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="System colors in document resources" minToolsVersion="11.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -66,13 +66,13 @@
<rect key="frame" x="110" y="8" width="262" height="116"/> <rect key="frame" x="110" y="8" width="262" height="116"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload Deposit Slip" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="30V-tZ-sKM"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload Deposit Slip" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="30V-tZ-sKM">
<rect key="frame" x="50.5" y="5" width="111.5" height="16"/>
<rect key="frame" x="48" y="5" width="116.5" height="15.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HPn-oR-fwN"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HPn-oR-fwN">
<rect key="frame" x="197" y="86" width="55" height="24"/>
<rect key="frame" x="194" y="86" width="58" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample"> <state key="normal" title="View Sample">
<color key="titleColor" name="ThemeBlue"/> <color key="titleColor" name="ThemeBlue"/>
@ -154,16 +154,16 @@
<rect key="frame" x="110" y="8" width="262" height="92"/> <rect key="frame" x="110" y="8" width="262" height="92"/>
<subviews> <subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="M3F-L2-4xc"> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="M3F-L2-4xc">
<rect key="frame" x="0.0" y="19.5" width="262" height="53"/>
<rect key="frame" x="0.0" y="20" width="262" height="52.5"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Side ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3pe-jb-ec2"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Side ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3pe-jb-ec2">
<rect key="frame" x="0.0" y="0.0" width="45.5" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="49" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AE2-x0-tVK"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AE2-x0-tVK">
<rect key="frame" x="0.0" y="29" width="55" height="24"/>
<rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample"> <state key="normal" title="View Sample">
<color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@ -283,7 +283,7 @@
</scenes> </scenes>
<designables> <designables>
<designable name="mty-ff-7Mb"> <designable name="mty-ff-7Mb">
<size key="intrinsicContentSize" width="168.5" height="34"/>
<size key="intrinsicContentSize" width="171" height="34"/>
</designable> </designable>
</designables> </designables>
<resources> <resources>

Write Preview
Loading…
Cancel
Save