Browse Source

change swipe left menu logic

pull/1/head
InKwon James Kim 5 years ago
parent
commit
415271a0d1
  1. 3
      GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
  2. 6
      GME Remit/Modules/Home/User Interface/View/Home.storyboard
  3. 3
      GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
  4. 2
      GME Remit/Modules/RegisterModules/KYC/Kyc/Application Logic/Service/KycServiceType.swift
  5. 1
      GME Remit/Modules/RegisterModules/PennyTest/Application Logic/Service/PennyTestServiceType.swift

3
GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift

@ -131,12 +131,11 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
let device = Utility.getDeviceModel()
if device == .iphone5 {
let itemsPerRow: CGFloat = 2
let paddingSpace: CGFloat = CGFloat(20 * (itemsPerRow + 1))
let availableWidth = frame.width - paddingSpace
let widthPerItem = availableWidth / itemsPerRow
return CGSize(width: widthPerItem, height: widthPerItem * 1.2)
return CGSize(width: widthPerItem, height: widthPerItem)
} else {
let itemsPerRow: CGFloat = 2
let paddingSpace: CGFloat = CGFloat(25 * (itemsPerRow + 1))

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

@ -298,8 +298,8 @@
<constraint firstAttribute="width" constant="80" id="Ddx-6M-Xsk"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Money" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gB-BN-h1P">
<rect key="frame" x="24" y="121.66666666666667" width="122" height="15.666666666666671"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Money" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="1gB-BN-h1P">
<rect key="frame" x="24" y="121.66666666666667" width="122" height="15.333333333333329"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="13"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@ -318,9 +318,11 @@
<constraint firstAttribute="trailingMargin" secondItem="1gB-BN-h1P" secondAttribute="trailing" constant="8" id="6Jo-mq-p5J"/>
<constraint firstItem="1gB-BN-h1P" firstAttribute="leading" secondItem="Etq-JH-rVI" secondAttribute="leadingMargin" constant="8" id="92I-qz-Jrf"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="centerY" secondItem="B7x-OB-ICD" secondAttribute="centerY" constant="-10" id="EIz-R7-J9H"/>
<constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="1gB-BN-h1P" secondAttribute="bottom" constant="5" id="Og8-kB-g6C"/>
<constraint firstAttribute="trailing" secondItem="Tto-II-gHc" secondAttribute="trailing" constant="6" id="aDQ-XP-G1H"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="centerX" secondItem="Etq-JH-rVI" secondAttribute="centerX" id="dcN-Y7-VS9"/>
<constraint firstItem="B7x-OB-ICD" firstAttribute="centerX" secondItem="Etq-JH-rVI" secondAttribute="centerX" id="e35-zO-9X2"/>
<constraint firstItem="2AS-0D-YqT" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Etq-JH-rVI" secondAttribute="topMargin" constant="10" id="j4o-Xh-Xdd"/>
<constraint firstItem="Tto-II-gHc" firstAttribute="top" secondItem="Etq-JH-rVI" secondAttribute="top" constant="6" id="tqF-Pu-NfF"/>
<constraint firstItem="1gB-BN-h1P" firstAttribute="top" secondItem="2AS-0D-YqT" secondAttribute="bottom" constant="5" id="xWB-BN-UF3"/>
<constraint firstItem="B7x-OB-ICD" firstAttribute="centerY" secondItem="Etq-JH-rVI" secondAttribute="centerY" id="znS-Pz-eoE"/>

3
GME Remit/Modules/Home/User Interface/View/HomeViewController.swift

@ -580,6 +580,9 @@ extension HomeViewController {
private func showAutoDebitMessage() {
showMessageView(isHidden: false)
(MainWireframe.shared?.window?.rootViewController as? LGSideMenuController)?
.isLeftViewSwipeGestureEnabled = false
messageTitleLabel.text = "add_auto_debit_account_text".localized()
messageLabel.text = "autodebit_account_required_message".localized()
messageLeftImageview.image = #imageLiteral(resourceName: "ic_home_verified")

2
GME Remit/Modules/RegisterModules/KYC/Kyc/Application Logic/Service/KycServiceType.swift

@ -29,7 +29,7 @@ extension KYCSubmitApiService {
success: @escaping (KYCResponseContainer?) -> Void,
failure: @escaping (Error) -> Void
) {
let url = "https://mobileapi.gmeremit.com:8002/api/v3/mobile/RegisterKyc"
let url = baseUrlWithoutVersion + "/v3/mobile/RegisterKyc"
auth.requestMultipart(
method: .post,
url, parameters: param,

1
GME Remit/Modules/RegisterModules/PennyTest/Application Logic/Service/PennyTestServiceType.swift

@ -64,7 +64,6 @@ extension InitiatePennyTestService {
}
}
protocol SubmitPennyTestService: ApiServiceType {
func submit(
params: [String: String],

Loading…
Cancel
Save