Browse Source

Merge remote-tracking branch 'origin/navigation' into dev-swift-d

v0.17
Dibya 1 year ago
parent
commit
6cd8af2c6d
  1. 28
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
  2. 18
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib
  3. 8
      GME Remit/Modules/Home/User Interface/View/Home.storyboard
  4. 9
      GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift
  5. 1
      GME Remit/Modules/Profile/ProfileViewController.swift
  6. 14
      GME Remit/Modules/SideMenu/Setting.storyboard
  7. 6
      GME Remit/Modules/SideMenu/SettingViewController.swift

28
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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" useSafeAreas="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="21678"/>
<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="System colors in document resources" minToolsVersion="11.0"/>
@ -24,7 +24,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Msg-ak-twI">
<rect key="frame" x="0.0" y="20" width="375" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="SgC-Zr-M2U">
<rect key="frame" x="16" y="16" width="343" height="18"/>
@ -59,7 +59,7 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="nhb-o1-ekZ">
<rect key="frame" x="20" y="70" width="335" height="486"/>
<rect key="frame" x="20" y="50" width="335" height="506"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="BeneficiaryTableViewCell" rowHeight="203" id="Zvf-x1-Wi5" customClass="BeneficiaryTableViewCell" customModule="JME_Remit" customModuleProvider="target">
@ -96,7 +96,7 @@
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cnn-41-XDg">
<rect key="frame" x="56" y="0.0" width="193" height="82"/>
<rect key="frame" x="56" y="0.0" width="193" height="92"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
<rect key="frame" x="0.0" y="0.0" width="193" height="14"/>
@ -105,29 +105,29 @@
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Lh7-U6-fWO">
<rect key="frame" x="0.0" y="22" width="193" height="60"/>
<rect key="frame" x="0.0" y="22" width="193" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doi-P7-z1R">
<rect key="frame" x="0.0" y="0.0" width="193" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="0.0" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O58-Ke-fq6">
<rect key="frame" x="0.0" y="16" width="193" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="18.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
<rect key="frame" x="0.0" y="32" width="193" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="37" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
<rect key="frame" x="0.0" y="48" width="193" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="55.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

18
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -52,7 +52,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cqd-2Y-S86">
<rect key="frame" x="128" y="0.0" width="455" height="136"/>
<rect key="frame" x="128" y="0.0" width="455" height="137"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CCk-EB-IRl">
<rect key="frame" x="0.0" y="0.0" width="455" height="28"/>
@ -86,7 +86,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="nLI-6r-icB">
<rect key="frame" x="0.0" y="36" width="455" height="28"/>
<rect key="frame" x="0.0" y="36" width="455" height="29"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-smartphone-94" translatesAutoresizingMaskIntoConstraints="NO" id="dgU-AV-hy1">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@ -97,7 +97,7 @@
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="W5h-nA-8vi">
<rect key="frame" x="32" y="0.0" width="423" height="28"/>
<rect key="frame" x="32" y="0.0" width="423" height="29"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile Number" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fsd-2X-Yg1">
<rect key="frame" x="0.0" y="0.0" width="423" height="12"/>
@ -106,8 +106,8 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9860636112" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eC0-je-pC7">
<rect key="frame" x="0.0" y="12" width="423" height="16"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="16"/>
<rect key="frame" x="0.0" y="12" width="423" height="17"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
@ -116,7 +116,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="WAL-nn-fmB">
<rect key="frame" x="0.0" y="72" width="455" height="28"/>
<rect key="frame" x="0.0" y="73" width="455" height="28"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-people-94" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-j0-Rkg">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@ -146,7 +146,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="NUo-GK-jR6">
<rect key="frame" x="0.0" y="108" width="455" height="28"/>
<rect key="frame" x="0.0" y="109" width="455" height="28"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-location-94" translatesAutoresizingMaskIntoConstraints="NO" id="sMg-xb-OHS">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>

8
GME Remit/Modules/Home/User Interface/View/Home.storyboard

@ -154,14 +154,14 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
<rect key="frame" x="16" y="36" width="109" height="32.5"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB447110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
<rect key="frame" x="16" y="36" width="92.5" height="32.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0B9-0a-Jlt">
<rect key="frame" x="133" y="44" width="13" height="17"/>
<rect key="frame" x="116.5" y="44" width="13" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="13" id="PY1-YE-0vx"/>
<constraint firstAttribute="height" constant="17" id="a2I-Sr-5OW"/>

9
GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift

@ -11,6 +11,7 @@ import UIKit
class LoyalityPointsWireframe {
weak var view: UIViewController!
private lazy var recipientsWireframe: RecipientsWireframe = { RecipientsWireframe() }()
private lazy var allRecipientsWireframe: AllRecipientsWireframe = { AllRecipientsWireframe() }()
}
extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
@ -34,8 +35,12 @@ extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
}
func openSendMoneyView() {
if let navVC = view.navigationController {
navVC.push(recipientsWireframe.getMainView(), animated: true)
// if let navVC = view.navigationController {
// navVC.push(allRecipientsWireframe.getMainView(), animated: true)
// }
if let navigation = view.navigationController {
AllRecipientsWireframe().openAllRecipients(source: navigation)
}
}
}

1
GME Remit/Modules/Profile/ProfileViewController.swift

@ -94,6 +94,7 @@ class ProfileViewController: UIViewController {
func show() {
let name = GMEDB.shared.user.string(.firstName)
let isVerified = GMEDB.shared.user.string(.verified)
self.labelUserName?.text = name?.uppercased()
self.labelMobileNumber.text = GMEDB.shared.user.string(.mobileNumber)
self.labelEmail.text = GMEDB.shared.user.string(.email)

14
GME Remit/Modules/SideMenu/Setting.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" 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="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<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="System colors in document resources" minToolsVersion="11.0"/>
@ -19,7 +19,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CeA-3t-iCj">
<rect key="frame" x="0.0" y="20" width="375" height="1080"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="1100"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u7J-jx-kQ1">
<rect key="frame" x="0.0" y="0.0" width="375" height="1350"/>
@ -63,7 +63,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="r5D-EE-JVM">
<rect key="frame" x="80" y="232" width="215" height="16"/>
<rect key="frame" x="90.5" y="232" width="194" height="16"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Hd-kg-Yh4">
<rect key="frame" x="0.0" y="0.0" width="83" height="16"/>
@ -87,8 +87,8 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
<rect key="frame" x="199" y="0.0" width="16" height="16"/>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
<rect key="frame" x="194" y="0.0" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="vmk-nY-QKg"/>
</constraints>
@ -310,7 +310,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MSU-xb-tWA">
<rect key="frame" x="327" y="0.0" width="16" height="55"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
<rect key="frame" x="0.0" y="19.5" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="GLb-In-rxs"/>

6
GME Remit/Modules/SideMenu/SettingViewController.swift

@ -156,6 +156,12 @@ class SettingViewController: UIViewController {
}
override func viewDidLoad() {
super.viewDidLoad()
let isVerified = GMEDB.shared.user.string(.verified) ?? ""
print("isver", isVerified)
if (isVerified != "1") {
verificationStatusButton.isHidden = true
}
NotificationCenter.default.addObserver(
self,
selector: #selector(setText),

Loading…
Cancel
Save