Browse Source

add recharge history

pull/1/head
InKwon James Kim 5 years ago
parent
commit
a234eead49
  1. 108
      GME Remit.xcodeproj/project.pbxproj
  2. 11
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
  3. 30
      GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Interactor/RechargeHistoryInteractor.swift
  4. 15
      GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Interactor/RechargeHistoryInteractorIO.swift
  5. 13
      GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Service/RechargeHistoryService.swift
  6. 11
      GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Service/RechargeHistoryServiceType.swift
  7. 39
      GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Presenter/RechargeHistoryPresenter.swift
  8. 212
      GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard
  9. 72
      GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistoryViewController.swift
  10. 33
      GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Wireframe/RechargeHistoryWireframe.swift
  11. 13
      GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Wireframe/RechargeHistoryWireframeInput.swift
  12. 24
      GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard
  13. 2
      GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistoryGroup/User Interface/View/TransactionHistoryGroupViewController.swift
  14. 10
      GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistory.storyboard

108
GME Remit.xcodeproj/project.pbxproj

@ -292,6 +292,15 @@
734DD31A2366881600BFA7EE /* VerificationAndBuy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 734DD3192366881600BFA7EE /* VerificationAndBuy.swift */; };
734DD31C2366DA2700BFA7EE /* CheckMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 734DD31B2366DA2700BFA7EE /* CheckMark.swift */; };
73538B2222EFC5FA00188CDD /* CommonServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73538B2122EFC5FA00188CDD /* CommonServiceType.swift */; };
73549BB2236FDD5600AD75D2 /* RechargeHistoryServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BA4236FDD5600AD75D2 /* RechargeHistoryServiceType.swift */; };
73549BB3236FDD5600AD75D2 /* RechargeHistoryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BA5236FDD5600AD75D2 /* RechargeHistoryService.swift */; };
73549BB4236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BA7236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift */; };
73549BB5236FDD5600AD75D2 /* RechargeHistoryInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BA8236FDD5600AD75D2 /* RechargeHistoryInteractor.swift */; };
73549BB6236FDD5600AD75D2 /* RechargeHistoryPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BAB236FDD5600AD75D2 /* RechargeHistoryPresenter.swift */; };
73549BB7236FDD5600AD75D2 /* RechargeHistoryWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BAD236FDD5600AD75D2 /* RechargeHistoryWireframeInput.swift */; };
73549BB8236FDD5600AD75D2 /* RechargeHistoryWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BAE236FDD5600AD75D2 /* RechargeHistoryWireframe.swift */; };
73549BB9236FDD5600AD75D2 /* RechargeHistory.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73549BB0236FDD5600AD75D2 /* RechargeHistory.storyboard */; };
73549BBA236FDD5600AD75D2 /* RechargeHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73549BB1236FDD5600AD75D2 /* RechargeHistoryViewController.swift */; };
7366BECC235D326C00A8AE7C /* CardList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7366BECB235D326C00A8AE7C /* CardList.swift */; };
7366BECE235D331B00A8AE7C /* PriceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7366BECD235D331B00A8AE7C /* PriceModel.swift */; };
7366BED0235D33A600A8AE7C /* CountryPriceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7366BECF235D33A600A8AE7C /* CountryPriceModel.swift */; };
@ -2570,6 +2579,15 @@
734DD3192366881600BFA7EE /* VerificationAndBuy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerificationAndBuy.swift; sourceTree = "<group>"; };
734DD31B2366DA2700BFA7EE /* CheckMark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckMark.swift; sourceTree = "<group>"; };
73538B2122EFC5FA00188CDD /* CommonServiceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonServiceType.swift; sourceTree = "<group>"; };
73549BA4236FDD5600AD75D2 /* RechargeHistoryServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryServiceType.swift; sourceTree = "<group>"; };
73549BA5236FDD5600AD75D2 /* RechargeHistoryService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryService.swift; sourceTree = "<group>"; };
73549BA7236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryInteractorIO.swift; sourceTree = "<group>"; };
73549BA8236FDD5600AD75D2 /* RechargeHistoryInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryInteractor.swift; sourceTree = "<group>"; };
73549BAB236FDD5600AD75D2 /* RechargeHistoryPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryPresenter.swift; sourceTree = "<group>"; };
73549BAD236FDD5600AD75D2 /* RechargeHistoryWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryWireframeInput.swift; sourceTree = "<group>"; };
73549BAE236FDD5600AD75D2 /* RechargeHistoryWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryWireframe.swift; sourceTree = "<group>"; };
73549BB0236FDD5600AD75D2 /* RechargeHistory.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = RechargeHistory.storyboard; sourceTree = "<group>"; };
73549BB1236FDD5600AD75D2 /* RechargeHistoryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RechargeHistoryViewController.swift; sourceTree = "<group>"; };
7366BECB235D326C00A8AE7C /* CardList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardList.swift; sourceTree = "<group>"; };
7366BECD235D331B00A8AE7C /* PriceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceModel.swift; sourceTree = "<group>"; };
7366BECF235D33A600A8AE7C /* CountryPriceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryPriceModel.swift; sourceTree = "<group>"; };
@ -6498,6 +6516,86 @@
path = View;
sourceTree = "<group>";
};
73549BA0236FDD5600AD75D2 /* RechargeHistory */ = {
isa = PBXGroup;
children = (
73549BA1236FDD5600AD75D2 /* Application Logic */,
73549BA9236FDD5600AD75D2 /* User Interface */,
);
path = RechargeHistory;
sourceTree = "<group>";
};
73549BA1236FDD5600AD75D2 /* Application Logic */ = {
isa = PBXGroup;
children = (
73549BA2236FDD5600AD75D2 /* Model */,
73549BA3236FDD5600AD75D2 /* Service */,
73549BA6236FDD5600AD75D2 /* Interactor */,
);
path = "Application Logic";
sourceTree = "<group>";
};
73549BA2236FDD5600AD75D2 /* Model */ = {
isa = PBXGroup;
children = (
);
path = Model;
sourceTree = "<group>";
};
73549BA3236FDD5600AD75D2 /* Service */ = {
isa = PBXGroup;
children = (
73549BA4236FDD5600AD75D2 /* RechargeHistoryServiceType.swift */,
73549BA5236FDD5600AD75D2 /* RechargeHistoryService.swift */,
);
path = Service;
sourceTree = "<group>";
};
73549BA6236FDD5600AD75D2 /* Interactor */ = {
isa = PBXGroup;
children = (
73549BA7236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift */,
73549BA8236FDD5600AD75D2 /* RechargeHistoryInteractor.swift */,
);
path = Interactor;
sourceTree = "<group>";
};
73549BA9236FDD5600AD75D2 /* User Interface */ = {
isa = PBXGroup;
children = (
73549BAA236FDD5600AD75D2 /* Presenter */,
73549BAC236FDD5600AD75D2 /* Wireframe */,
73549BAF236FDD5600AD75D2 /* View */,
);
path = "User Interface";
sourceTree = "<group>";
};
73549BAA236FDD5600AD75D2 /* Presenter */ = {
isa = PBXGroup;
children = (
73549BAB236FDD5600AD75D2 /* RechargeHistoryPresenter.swift */,
);
path = Presenter;
sourceTree = "<group>";
};
73549BAC236FDD5600AD75D2 /* Wireframe */ = {
isa = PBXGroup;
children = (
73549BAD236FDD5600AD75D2 /* RechargeHistoryWireframeInput.swift */,
73549BAE236FDD5600AD75D2 /* RechargeHistoryWireframe.swift */,
);
path = Wireframe;
sourceTree = "<group>";
};
73549BAF236FDD5600AD75D2 /* View */ = {
isa = PBXGroup;
children = (
73549BB0236FDD5600AD75D2 /* RechargeHistory.storyboard */,
73549BB1236FDD5600AD75D2 /* RechargeHistoryViewController.swift */,
);
path = View;
sourceTree = "<group>";
};
736A8C262277EAC100337A50 /* BiometricAuthModules */ = {
isa = PBXGroup;
children = (
@ -7487,6 +7585,7 @@
73F7C592234C4FCB00176856 /* PowerCallModules */ = {
isa = PBXGroup;
children = (
73549BA0236FDD5600AD75D2 /* RechargeHistory */,
733E8F7A23580BDF0050E499 /* RechargeReceipt */,
733A3B8523554DAE00E6B87E /* RechargePayment */,
73EC6C1B236984BB00060448 /* LocalTopup */,
@ -13633,6 +13732,7 @@
D93C2A9A22000D650079BF03 /* iPad_transkey_number_cmd_1_mongolian.png in Resources */,
D93C2BFB22000D660079BF03 /* pt-icon17.png in Resources */,
D93C2B2522000D650079BF03 /* iPad_transkey_landscape_number_cmd_10_indonesian.png in Resources */,
73549BB9236FDD5600AD75D2 /* RechargeHistory.storyboard in Resources */,
D93C278922000D630079BF03 /* iPhone_transkey_alnum_key_15.png in Resources */,
D93C26CA22000D630079BF03 /* iPhone_transkey_land_popup_left.png in Resources */,
D93C292722000D640079BF03 /* iPhone_transkey_landscape_alnum_cmd_8_2_vietnamese.png in Resources */,
@ -14416,6 +14516,7 @@
9FD260F81FD00458007A511D /* AppDelegate.swift in Sources */,
D903113E214786EA00AD5BA9 /* ForgotPasswordService.swift in Sources */,
7301979222535135001954AB /* KycWireframeInput.swift in Sources */,
73549BB7236FDD5600AD75D2 /* RechargeHistoryWireframeInput.swift in Sources */,
73B4C8C522A5F2440078D495 /* CouponCell.swift in Sources */,
730D78BC227A94F2007E517E /* SearchAddressWireframeInput.swift in Sources */,
73210DA222FBE73100715D6C /* RecipientsService.swift in Sources */,
@ -14501,6 +14602,7 @@
D923EBB9215C7421008A3026 /* HomeCollectionCollectionViewCell.swift in Sources */,
04E36E1C21AE585200783685 /* PennyTestSubmitInteractorIO.swift in Sources */,
D96A4FFE2146625C00CFD507 /* RegisterViewInterface.swift in Sources */,
73549BBA236FDD5600AD75D2 /* RechargeHistoryViewController.swift in Sources */,
BE74AFC6227C8FF200F05CE7 /* AutoDebitModuleInterface.swift in Sources */,
7301979A22535135001954AB /* kycForm1Interactor.swift in Sources */,
D922D98621351AAE00D43053 /* SendMoneyExchangeRateService.swift in Sources */,
@ -14539,6 +14641,7 @@
73168A1F22F3CC4C00878038 /* NativeCountry.swift in Sources */,
73185351230EACA400BA9AE3 /* SendMoneyDistrictViewModel.swift in Sources */,
73B4C8BE22A5F2440078D495 /* SelectCouponService.swift in Sources */,
73549BB3236FDD5600AD75D2 /* RechargeHistoryService.swift in Sources */,
739A7781228BB2B40018A1A9 /* DetailOrderModuleInterface.swift in Sources */,
733E8F9023580BE00050E499 /* RechargeReceiptPresenter.swift in Sources */,
73AEFF732334A13100A967FB /* TransactionHistoryGroupInteractor.swift in Sources */,
@ -14667,6 +14770,7 @@
730D78B5227A94F2007E517E /* JusoContainer.swift in Sources */,
D9B7ADF12130048E009B0564 /* ExchangeRatesService.swift in Sources */,
730197A322535135001954AB /* kycForm3Service.swift in Sources */,
73549BB4236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift in Sources */,
D922D96C2135145F00D43053 /* SendMoneyParentViewController.swift in Sources */,
D922D98C21351AAE00D43053 /* SendMoneyExchangeRateViewController.swift in Sources */,
731627A52301009800BA48A8 /* ExchangeRateRequestModel.swift in Sources */,
@ -14766,12 +14870,14 @@
730D78C0227A94F2007E517E /* SearchAddressViewController.swift in Sources */,
738FD48C2303E157008B144D /* FieldModel.swift in Sources */,
732D17972297899400ACEBF1 /* HotLineCell.swift in Sources */,
73549BB2236FDD5600AD75D2 /* RechargeHistoryServiceType.swift in Sources */,
73AEFF762334A13100A967FB /* TransactionHistoryGroupWireframeInputOutput.swift in Sources */,
734BF6882353F7D8004E8D60 /* PhoneCardRechargeWireframeInputOutput.swift in Sources */,
73A621642330AD20000FFB5B /* RecentHistoriesPresenter.swift in Sources */,
73210DA722FBE73100715D6C /* RecipientsWireframe.swift in Sources */,
BE74AFD1227C8FF200F05CE7 /* AutoDebitViewInterface.swift in Sources */,
734DD31C2366DA2700BFA7EE /* CheckMark.swift in Sources */,
73549BB8236FDD5600AD75D2 /* RechargeHistoryWireframe.swift in Sources */,
D922D9652135145F00D43053 /* SendMoneyParentInteractor.swift in Sources */,
73157BA222DC1EEC009B836F /* PopupNotificationWireframeInput.swift in Sources */,
73071ACB2296CF9B008840FD /* HotLineWireframe.swift in Sources */,
@ -14945,6 +15051,7 @@
73EC6C16236984B200060448 /* InternationalTopupPresenter.swift in Sources */,
730D78B7227A94F2007E517E /* SearchAddressService.swift in Sources */,
D92B80272140C3CB00A25B26 /* MainServiceType.swift in Sources */,
73549BB6236FDD5600AD75D2 /* RechargeHistoryPresenter.swift in Sources */,
739A7782228BB2B40018A1A9 /* DetailOrderService.swift in Sources */,
043770ED21AD04240005B22D /* PennyTestWireframeInput.swift in Sources */,
7318534F230EACA400BA9AE3 /* SendMoneyRelationViewModel.swift in Sources */,
@ -15004,6 +15111,7 @@
73149F6522E5AF8000D66B26 /* LauncherScreenService.swift in Sources */,
D95B5E3B21311057000C0B33 /* GmeContactsServiceType.swift in Sources */,
730D7888227A94E1007E517E /* RewardModuleInterface.swift in Sources */,
73549BB5236FDD5600AD75D2 /* RechargeHistoryInteractor.swift in Sources */,
730D788C227A94E1007E517E /* RewardService.swift in Sources */,
D922D9672135145F00D43053 /* SendMoneyParentPresenter.swift in Sources */,
D9B39678214F7DDC0072A9B8 /* MultiMediaManager.swift in Sources */,

11
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift

@ -343,18 +343,15 @@ extension PhoneCardRechargeViewController {
.disposed(by: disposeBag)
mobileTextField.rx.controlEvent(.editingDidEnd)
.withLatestFrom(mobileTextField.valid) {$1}
.withLatestFrom(mobileTextField.valid) {!$1}
.asDriverOnErrorJustComplete()
.drive(onNext: { [weak self] in
self?.menuContainerView.animateHidden(isHidden: !$0)
})
.drive(menuContainerView.rx.isAnimateHidden)
.disposed(by: disposeBag)
mobileTextField.rx.controlEvent(.editingDidBegin)
.asDriver()
.drive(onNext: { [weak self] in
self?.menuContainerView.animateHidden(isHidden: true)
})
.map { true }
.drive(menuContainerView.rx.isAnimateHidden)
.disposed(by: disposeBag)
}
}

30
GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Interactor/RechargeHistoryInteractor.swift

@ -0,0 +1,30 @@
//
// RechargeHistoryInteractor.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import Foundation
class RechargeHistoryInteractor {
// MARK: Properties
weak var output: RechargeHistoryInteractorOutput?
private let service: RechargeHistoryServiceType
// MARK: Initialization
init(service: RechargeHistoryServiceType) {
self.service = service
}
}
// MARK: RechargeHistory interactor input interface
extension RechargeHistoryInteractor: RechargeHistoryInteractorInput {
}

15
GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Interactor/RechargeHistoryInteractorIO.swift

@ -0,0 +1,15 @@
//
// RechargeHistoryInteractorIO.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
protocol RechargeHistoryInteractorInput: class {
}
protocol RechargeHistoryInteractorOutput: class {
}

13
GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Service/RechargeHistoryService.swift

@ -0,0 +1,13 @@
//
// RechargeHistoryService.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import Foundation
class RechargeHistoryService: RechargeHistoryServiceType {
}

11
GME Remit/Modules/PowerCallModules/RechargeHistory/Application Logic/Service/RechargeHistoryServiceType.swift

@ -0,0 +1,11 @@
//
// RechargeHistoryServiceType.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
protocol RechargeHistoryServiceType: class {
}

39
GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Presenter/RechargeHistoryPresenter.swift

@ -0,0 +1,39 @@
//
// RechargeHistoryPresenter.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import RxSwift
import RxCocoa
class RechargeHistoryPresenter: ViewModelType {
var interactor: RechargeHistoryInteractorInput?
var wireframe: RechargeHistoryWireframeInput?
struct Input {}
struct Output {
let isError: Driver<Error>
let isProgress: Driver<Bool>
}
private let disposeBag = DisposeBag()
private let progressLinker = PublishSubject<Bool>()
private let errorLinker = PublishSubject<Error>()
func transform(input: Input) -> Output {
return Output(
isError: errorLinker.asDriverOnErrorJustComplete(),
isProgress: progressLinker.asDriverOnErrorJustComplete()
)
}
}
// MARK: RechargeHistory interactor output interface
extension RechargeHistoryPresenter: RechargeHistoryInteractorOutput {
}

212
GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard

@ -0,0 +1,212 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" 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="15509"/>
<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"/>
</dependencies>
<customFonts key="customFonts">
<array key="SanFranciscoDisplay-Medium.otf">
<string>SanFranciscoDisplay-Medium</string>
</array>
<array key="SanFranciscoDisplay-Regular.otf">
<string>SanFranciscoDisplay-Regular</string>
</array>
</customFonts>
<scenes>
<!--RechargeHistory-->
<scene sceneID="R60-Pu-Hpy">
<objects>
<viewController storyboardIdentifier="RechargeHistoryViewController" title="RechargeHistory" id="HSb-ou-7T5" customClass="RechargeHistoryViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="9Uc-9s-KgO">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GyV-RQ-S76">
<rect key="frame" x="0.0" y="10" width="375" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FbO-fp-5M1">
<rect key="frame" x="0.0" y="0.0" width="312" height="50"/>
<subviews>
<searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="viD-UT-958">
<rect key="frame" x="10" y="0.0" width="302" height="50"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="viD-UT-958" firstAttribute="leading" secondItem="FbO-fp-5M1" secondAttribute="leading" constant="10" id="1Vb-9h-Orz"/>
<constraint firstItem="viD-UT-958" firstAttribute="top" secondItem="FbO-fp-5M1" secondAttribute="top" id="P51-tN-Ld7"/>
<constraint firstAttribute="trailing" secondItem="viD-UT-958" secondAttribute="trailing" id="eN6-DY-Qn3"/>
<constraint firstAttribute="bottom" secondItem="viD-UT-958" secondAttribute="bottom" id="pXz-kP-70e"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aJz-Qa-aaJ">
<rect key="frame" x="312" y="0.0" width="63" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IRp-JR-dKF">
<rect key="frame" x="5" y="5" width="53" height="40"/>
<state key="normal" image="ic_calender"/>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="IRp-JR-dKF" firstAttribute="top" secondItem="aJz-Qa-aaJ" secondAttribute="top" constant="5" id="410-i0-VaZ"/>
<constraint firstItem="IRp-JR-dKF" firstAttribute="leading" secondItem="aJz-Qa-aaJ" secondAttribute="leading" constant="5" id="5Pw-uv-LJ2"/>
<constraint firstAttribute="bottom" secondItem="IRp-JR-dKF" secondAttribute="bottom" constant="5" id="UXA-XL-Tcd"/>
<constraint firstAttribute="trailing" secondItem="IRp-JR-dKF" secondAttribute="trailing" constant="5" id="iZs-Ay-yW9"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="50" id="t4d-cK-az8"/>
</constraints>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yw9-cK-pIF">
<rect key="frame" x="5" y="70" width="365" height="35"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EHz-NG-QNu">
<rect key="frame" x="10" y="1" width="345" height="33"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="VZm-PZ-6xT">
<rect key="frame" x="110" y="-8.5" width="125" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kXj-V1-9fF">
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="~" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vc7-6n-qg3">
<rect key="frame" x="58" y="0.0" width="9" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwn-HQ-Zqv">
<rect key="frame" x="75" y="0.0" width="50" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mtc-x2-p8u">
<rect key="frame" x="320" y="9" width="15" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="81h-kW-v0l"/>
<constraint firstAttribute="width" constant="15" id="nfu-bk-LLl"/>
</constraints>
<state key="normal" title="Button" image="ic_error"/>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="VZm-PZ-6xT" firstAttribute="centerY" secondItem="EHz-NG-QNu" secondAttribute="centerY" id="B5E-ez-zv1"/>
<constraint firstItem="mtc-x2-p8u" firstAttribute="centerY" secondItem="EHz-NG-QNu" secondAttribute="centerY" id="D6V-Kd-ukQ"/>
<constraint firstAttribute="trailing" secondItem="mtc-x2-p8u" secondAttribute="trailing" constant="10" id="La3-8L-UlL"/>
<constraint firstItem="VZm-PZ-6xT" firstAttribute="centerX" secondItem="EHz-NG-QNu" secondAttribute="centerX" id="e1l-BN-EBp"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="EHz-NG-QNu" secondAttribute="trailing" constant="10" id="UKh-3x-Ao0"/>
<constraint firstItem="EHz-NG-QNu" firstAttribute="top" secondItem="Yw9-cK-pIF" secondAttribute="top" constant="1" id="cdB-bO-Exa"/>
<constraint firstAttribute="height" constant="35" id="hZ6-aq-01h"/>
<constraint firstItem="EHz-NG-QNu" firstAttribute="leading" secondItem="Yw9-cK-pIF" secondAttribute="leading" constant="10" id="iYg-GQ-yFf"/>
<constraint firstAttribute="bottom" secondItem="EHz-NG-QNu" secondAttribute="bottom" constant="1" id="jMn-uV-Ch2"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="kkE-JE-vKh">
<rect key="frame" x="10" y="115" width="355" height="542"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<view key="tableFooterView" contentMode="scaleToFill" id="sUn-Qd-aYI">
<rect key="frame" x="0.0" y="141" width="355" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="There are no histories" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Om4-pB-2Ja">
<rect key="frame" x="112.5" y="13.5" width="130" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="Om4-pB-2Ja" firstAttribute="centerX" secondItem="sUn-Qd-aYI" secondAttribute="centerX" id="E9L-yi-QJ5"/>
<constraint firstItem="Om4-pB-2Ja" firstAttribute="centerY" secondItem="sUn-Qd-aYI" secondAttribute="centerY" id="P4Z-MJ-Swd"/>
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="85" id="swM-we-WxX">
<rect key="frame" x="0.0" y="28" width="355" height="85"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="swM-we-WxX" id="SyI-Yh-F6t">
<rect key="frame" x="0.0" y="0.0" width="355" height="85"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bXu-3Y-Pkq">
<rect key="frame" x="320" y="0.0" width="30" height="85"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="I8b-az-9YA">
<rect key="frame" x="5" y="0.0" width="20" height="85"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="gKw-Jm-b0N"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="I8b-az-9YA" secondAttribute="bottom" id="5vh-yj-Q7i"/>
<constraint firstAttribute="height" constant="90" id="FkP-B6-HWD"/>
<constraint firstAttribute="trailing" secondItem="I8b-az-9YA" secondAttribute="trailing" constant="5" id="bcz-Ow-Hna"/>
<constraint firstItem="I8b-az-9YA" firstAttribute="leading" secondItem="bXu-3Y-Pkq" secondAttribute="leading" constant="5" id="qr3-Xp-mXX"/>
<constraint firstItem="I8b-az-9YA" firstAttribute="top" secondItem="bXu-3Y-Pkq" secondAttribute="top" id="ucA-0e-Suc"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="bXu-3Y-Pkq" secondAttribute="trailing" constant="5" id="LHb-na-xEa"/>
<constraint firstItem="bXu-3Y-Pkq" firstAttribute="top" secondItem="SyI-Yh-F6t" secondAttribute="top" id="Zgv-rl-CQp"/>
<constraint firstAttribute="bottom" secondItem="bXu-3Y-Pkq" secondAttribute="bottom" id="dzT-5N-agg"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Yw9-cK-pIF" firstAttribute="top" secondItem="GyV-RQ-S76" secondAttribute="bottom" constant="10" id="34F-eG-Fho"/>
<constraint firstAttribute="trailing" secondItem="Yw9-cK-pIF" secondAttribute="trailing" constant="5" id="3ct-1I-TS1"/>
<constraint firstItem="O1T-1R-Sun" firstAttribute="bottom" secondItem="kkE-JE-vKh" secondAttribute="bottom" constant="10" id="6TR-9d-XZL"/>
<constraint firstItem="kkE-JE-vKh" firstAttribute="top" secondItem="Yw9-cK-pIF" secondAttribute="bottom" constant="10" id="Std-hM-zhA"/>
<constraint firstItem="kkE-JE-vKh" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" constant="10" id="US6-mo-06Z"/>
<constraint firstItem="GyV-RQ-S76" firstAttribute="top" secondItem="O1T-1R-Sun" secondAttribute="top" constant="10" id="WhH-tY-cXg"/>
<constraint firstItem="O1T-1R-Sun" firstAttribute="trailing" secondItem="kkE-JE-vKh" secondAttribute="trailing" constant="10" id="blY-bE-ogR"/>
<constraint firstItem="Yw9-cK-pIF" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" constant="5" id="lMv-ka-EXR"/>
<constraint firstAttribute="trailing" secondItem="GyV-RQ-S76" secondAttribute="trailing" id="xfw-Fh-wAQ"/>
<constraint firstItem="GyV-RQ-S76" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" id="zeS-je-2DG"/>
</constraints>
<viewLayoutGuide key="safeArea" id="O1T-1R-Sun"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-92" y="232.53373313343329"/>
</scene>
</scenes>
<resources>
<image name="ic_calender" width="25" height="25"/>
<image name="ic_error" width="55" height="55"/>
<image name="right_arrow" width="128" height="128"/>
<namedColor name="ThemeText">
<color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" 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>

72
GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistoryViewController.swift

@ -0,0 +1,72 @@
//
// RechargeHistoryViewController.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import UIKit
import RxSwift
import RxCocoa
class RechargeHistoryViewController: UIViewController {
// MARK: Properties
var presenter: RechargeHistoryPresenter!
private let disposeBag = DisposeBag()
// MARK: Computed Properties
// MARK: IBOutlets
// MARK: VC's Life cycle
override func viewDidLoad() {
super.viewDidLoad()
setup()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
}
// MARK: IBActions
}
// MARK: Other Functions
extension RechargeHistoryViewController {
private func setup() {
setUI()
setBinding()
setUIBinding()
}
private func setUI() {
}
private func setUIBinding() {
}
private func setBinding() {
let input = RechargeHistoryPresenter.Input()
let output = presenter.transform(input: input)
output.isError
.drive(
onNext: { self.alert(type: .error, message: $0.localizedDescription) }
).disposed(by: disposeBag)
output.isProgress
.drive(
onNext: { $0 ? self.showProgressHud() : self.hideProgressHud() }
).disposed(by: disposeBag)
}
}

33
GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Wireframe/RechargeHistoryWireframe.swift

@ -0,0 +1,33 @@
//
// RechargeHistoryWireframe.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import UIKit
class RechargeHistoryWireframe {
weak var view: UIViewController!
}
extension RechargeHistoryWireframe: RechargeHistoryWireframeInput {
var storyboardName: String {return "RechargeHistory"}
func getMainView() -> UIViewController {
let service = RechargeHistoryService()
let interactor = RechargeHistoryInteractor(service: service)
let presenter = RechargeHistoryPresenter()
let viewController = viewControllerFromStoryboard(of: RechargeHistoryViewController.self)
viewController.presenter = presenter
interactor.output = presenter
presenter.interactor = interactor
presenter.wireframe = self
view = viewController
return viewController
}
}

13
GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/Wireframe/RechargeHistoryWireframeInput.swift

@ -0,0 +1,13 @@
//
// RechargeHistoryWireframeInput.swift
// GME Remit
//
// Created by InKwon James Kim on 2019/11/04.
//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import Foundation
protocol RechargeHistoryWireframeInput: WireframeInput {
}

24
GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
<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"/>
@ -81,7 +81,7 @@
</connections>
</segmentedControl>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Transaction Found" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jdu-hl-JUc">
<rect key="frame" x="118.5" y="258" width="138" height="44"/>
<rect key="frame" x="122" y="258" width="131" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="WU9-zv-79l"/>
</constraints>
@ -118,16 +118,16 @@
<rect key="frame" x="15" y="10" width="300" height="60"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Xg-58-Lhd">
<rect key="frame" x="0.0" y="0.0" width="300" height="14"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="14.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Tue, 19/12/2017" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lTb-Co-nsv">
<rect key="frame" x="0.0" y="0.0" width="150" height="14"/>
<rect key="frame" x="0.0" y="0.0" width="150" height="14.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ouw-tA-MfC">
<rect key="frame" x="150" y="0.0" width="150" height="14"/>
<rect key="frame" x="150" y="0.0" width="150" height="14.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -135,10 +135,10 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eGL-X3-yur">
<rect key="frame" x="0.0" y="14" width="300" height="30.5"/>
<rect key="frame" x="0.0" y="14.5" width="300" height="30"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" text="To: Dhan Singh Saud" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="p2g-GW-5Xg">
<rect key="frame" x="0.0" y="0.0" width="150" height="30.5"/>
<rect key="frame" x="0.0" y="0.0" width="150" height="30"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="wNs-Py-y0m"/>
</constraints>
@ -147,7 +147,7 @@
<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="Dow-0z-Sq7">
<rect key="frame" x="150" y="0.0" width="150" height="30.5"/>
<rect key="frame" x="150" y="0.0" width="150" height="30"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/>
<color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/>
@ -323,13 +323,13 @@
<image name="ic_calender" width="25" height="25"/>
<image name="right_arrow" width="128" height="128"/>
<namedColor name="ThemeMainBackground">
<color red="0.097999997437000275" green="0.097999997437000275" blue="0.097999997437000275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="ThemeRed">
<color red="1" green="0.15299999713897705" blue="0.15299999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.92900002002716064" green="0.10599999874830246" blue="0.14100000262260437" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="ThemeText">
<color white="0.80299997329711914" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" 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"/>

2
GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistoryGroup/User Interface/View/TransactionHistoryGroupViewController.swift

@ -43,7 +43,7 @@ class TransactionHistoryGroupViewController: ButtonBarPagerTabStripViewControlle
let domesticVC = TransactionHistoryWireframe().getMainView(type: .domestic)
let overseasVC = TransactionHistoryWireframe().getMainView(type: .overseas)
return [domesticVC, overseasVC]
return [overseasVC, domesticVC]
}
// MARK: IBActions

10
GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistory.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" 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="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
<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"/>
@ -354,13 +354,13 @@
<image name="ic_calender" width="25" height="25"/>
<image name="ic_error" width="55" height="55"/>
<namedColor name="ThemeMainBackground">
<color red="0.14901960784313725" green="0.14901960784313725" blue="0.14901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="ThemeSeparate">
<color white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color red="0.82400000095367432" green="0.82400000095367432" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="ThemeText">
<color white="0.80256043313300773" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" 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"/>

Loading…
Cancel
Save