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

change ui as dynamic height based on data count

pull/1/head
InKwon James Kim 5 years ago
parent
062852cef0
commit
dbb3d779ad
12 changed files with 138 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      GMERemittance/Library/CountryWithCurrencyPicker/TablePickerViewController.swift
  2. 5
      GMERemittance/Library/CountryWithCurrencyPicker/TableViewPicker.storyboard
  3. 5
      GMERemittance/Library/CountryWithFlagPicker/CountryPicker.storyboard
  4. 25
      GMERemittance/Library/CountryWithFlagPicker/CountryPickerViewController.swift
  5. 5
      GMERemittance/Library/CurrencyPicker/CurrencyPicker.storyboard
  6. 23
      GMERemittance/Library/CurrencyPicker/CurrencyPickerViewController.swift
  7. 5
      GMERemittance/Library/ItemPickerView/ItemsPicker.storyboard
  8. 23
      GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift
  9. 5
      GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard
  10. 19
      GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift
  11. 5
      GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPicker.storyboard
  12. 28
      GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPickerViewController.swift

23
GMERemittance/Library/CountryWithCurrencyPicker/TablePickerViewController.swift
View File

@ -40,8 +40,24 @@ class TablePickerViewController: UIViewController {
@IBOutlet weak var cancelButton: UIButton!
@IBOutlet weak var mainview: UIView!
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
var data: [ExchangeRateModel] = []
var data: [ExchangeRateModel] = [] {
didSet {
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var filteredPlaces: [ExchangeRateModel] = [] {
didSet {
self.tableVIew.reloadData()
@ -66,11 +82,14 @@ class TablePickerViewController: UIViewController {
cancelButton.layer.cornerRadius = 10
self.searchTextField.placeholder = (type?.rawValue ?? "").capitalized
self.configureLanguage()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
height.constant = dynamicHeight
self.configureLanguage()
mainview.bottomToOrigin()
}

5
GMERemittance/Library/CountryWithCurrencyPicker/TableViewPicker.storyboard
View File

@ -106,7 +106,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rXz-TO-Wmd">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -198,6 +198,7 @@
<constraints>
<constraint firstItem="knu-xg-39R" firstAttribute="leading" secondItem="wzp-T6-Ixq" secondAttribute="leading" constant="10" id="0pi-lg-ToY"/>
<constraint firstItem="iN1-I9-rfs" firstAttribute="top" secondItem="wzp-T6-Ixq" secondAttribute="top" constant="10" id="AQE-MY-0xe"/>
<constraint firstAttribute="height" constant="533.5" id="RL1-io-pGc"/>
<constraint firstAttribute="trailing" secondItem="knu-xg-39R" secondAttribute="trailing" constant="10" id="RXt-UL-0kJ"/>
<constraint firstItem="knu-xg-39R" firstAttribute="top" secondItem="iN1-I9-rfs" secondAttribute="bottom" constant="5" id="TqY-sQ-fkh"/>
<constraint firstItem="iN1-I9-rfs" firstAttribute="leading" secondItem="wzp-T6-Ixq" secondAttribute="leading" constant="10" id="Wn7-i6-Wwt"/>
@ -211,7 +212,6 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.404847051056338" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="wzp-T6-Ixq" firstAttribute="height" secondItem="VAY-dF-0Al" secondAttribute="height" multiplier="0.8:1" id="80Q-Gv-PrI"/>
<constraint firstAttribute="trailing" secondItem="wzp-T6-Ixq" secondAttribute="trailing" constant="20" id="NcC-VA-uU9"/>
<constraint firstItem="wzp-T6-Ixq" firstAttribute="leading" secondItem="VAY-dF-0Al" secondAttribute="leading" constant="20" id="WS0-a1-oA3"/>
<constraint firstAttribute="bottom" secondItem="wzp-T6-Ixq" secondAttribute="bottom" constant="20" id="a6D-U2-TIq"/>
@ -229,6 +229,7 @@
</view>
<connections>
<outlet property="cancelButton" destination="Y17-fh-6hn" id="aXS-GJ-Km6"/>
<outlet property="height" destination="RL1-io-pGc" id="cjg-7i-5Uy"/>
<outlet property="mainview" destination="wzp-T6-Ixq" id="sL4-MN-9MD"/>
<outlet property="noResultFoundLabel" destination="rXz-TO-Wmd" id="YU5-cS-kXD"/>
<outlet property="searchTextField" destination="svm-hu-oCl" id="WUY-eW-ceV"/>

5
GMERemittance/Library/CountryWithFlagPicker/CountryPicker.storyboard
View File

@ -105,7 +105,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ufu-mb-X6q">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -206,6 +206,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="UHj-iq-0HO" firstAttribute="top" secondItem="4Wq-I9-YEV" secondAttribute="bottom" constant="10" id="3dK-Mk-UtN"/>
<constraint firstAttribute="height" constant="533.5" id="4PP-zM-DTU"/>
<constraint firstItem="efD-N7-46q" firstAttribute="leading" secondItem="K6k-uh-Q1E" secondAttribute="leading" constant="10" id="6Vb-DO-Bdd"/>
<constraint firstAttribute="trailing" secondItem="4Wq-I9-YEV" secondAttribute="trailing" constant="10" id="9dC-fU-eet"/>
<constraint firstItem="efD-N7-46q" firstAttribute="top" secondItem="K6k-uh-Q1E" secondAttribute="top" constant="5" id="A6l-sn-NOv"/>
@ -222,7 +223,6 @@
<constraints>
<constraint firstItem="K6k-uh-Q1E" firstAttribute="leading" secondItem="gNi-9f-OS2" secondAttribute="leading" constant="20" id="Hf1-YA-zBz"/>
<constraint firstAttribute="trailing" secondItem="K6k-uh-Q1E" secondAttribute="trailing" constant="20" id="URd-xI-UrF"/>
<constraint firstItem="K6k-uh-Q1E" firstAttribute="height" secondItem="gNi-9f-OS2" secondAttribute="height" multiplier="0.8:1" id="ZyV-ff-jBJ"/>
<constraint firstAttribute="bottom" secondItem="K6k-uh-Q1E" secondAttribute="bottom" constant="20" id="oc9-cm-1nM"/>
<constraint firstItem="K6k-uh-Q1E" firstAttribute="top" secondItem="gNi-9f-OS2" secondAttribute="top" constant="60" id="sTX-Ka-ufF"/>
<constraint firstAttribute="bottom" secondItem="K6k-uh-Q1E" secondAttribute="bottom" constant="40" id="vu0-qS-RNM"/>
@ -246,6 +246,7 @@
</view>
<connections>
<outlet property="cancelButton" destination="UHj-iq-0HO" id="JpD-9h-Cvx"/>
<outlet property="height" destination="4PP-zM-DTU" id="OwX-Cd-8N1"/>
<outlet property="mainview" destination="K6k-uh-Q1E" id="7R5-tl-8lG"/>
<outlet property="noResultFoundLabel" destination="Ufu-mb-X6q" id="dFJ-UG-WLH"/>
<outlet property="searchStackView" destination="7Mk-RB-3g6" id="FFN-4T-Q7Y"/>

25
GMERemittance/Library/CountryWithFlagPicker/CountryPickerViewController.swift
View File

@ -46,11 +46,27 @@ class CountryPickerViewController: UIViewController {
@IBOutlet weak var cancelButton: UIButton!
@IBOutlet weak var searchStackView: UIStackView!
@IBOutlet weak var searchStackViewConstraint: NSLayoutConstraint!
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
@IBOutlet weak var mainview: UIView!
var isLanguageSelection = false
var data: [SendMoneyCountryViewModel] = []
var data: [SendMoneyCountryViewModel] = [] {
didSet {
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var filteredPlaces: [SendMoneyCountryViewModel] = [] {
didSet {
self.tableVIew.reloadData()
@ -77,7 +93,7 @@ class CountryPickerViewController: UIViewController {
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
isLanguageSelection ? (self.searchStackViewConstraint.constant = 0) : (self.searchStackViewConstraint.constant = 45)
configureLanguage()
// setupForAnimation()
@ -87,7 +103,8 @@ class CountryPickerViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// self.animate()
height.constant = dynamicHeight
configureLanguage()
mainview.bottomToOrigin()
}

5
GMERemittance/Library/CurrencyPicker/CurrencyPicker.storyboard
View File

@ -93,7 +93,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bAs-K2-xyK">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -189,6 +189,7 @@
<constraint firstItem="f7w-QD-1S6" firstAttribute="centerX" secondItem="IA2-r7-puo" secondAttribute="centerX" id="IRs-zV-DHA"/>
<constraint firstAttribute="trailing" secondItem="H5e-db-8On" secondAttribute="trailing" constant="10" id="Jef-uw-bra"/>
<constraint firstItem="H5e-db-8On" firstAttribute="top" secondItem="obU-jk-2i1" secondAttribute="bottom" constant="10" id="LGv-rB-cqr"/>
<constraint firstAttribute="height" constant="533.5" id="Y3C-k8-olk"/>
<constraint firstItem="lkk-y6-gJJ" firstAttribute="top" secondItem="IA2-r7-puo" secondAttribute="top" constant="5" id="ZEX-3U-QRk"/>
<constraint firstItem="f7w-QD-1S6" firstAttribute="centerY" secondItem="Bm0-Pj-YxX" secondAttribute="centerY" id="ecD-EC-i5P"/>
<constraint firstAttribute="trailing" secondItem="obU-jk-2i1" secondAttribute="trailing" constant="10" id="fcb-KT-6ii"/>
@ -203,7 +204,6 @@
<constraint firstItem="IA2-r7-puo" firstAttribute="leading" secondItem="hQv-gh-5cz" secondAttribute="leading" constant="20" id="DDG-4u-4Ym"/>
<constraint firstAttribute="trailing" secondItem="IA2-r7-puo" secondAttribute="trailing" constant="20" id="FfM-Rd-OpC"/>
<constraint firstAttribute="bottom" secondItem="IA2-r7-puo" secondAttribute="bottom" constant="20" id="Lqm-n6-fpp"/>
<constraint firstItem="IA2-r7-puo" firstAttribute="height" secondItem="hQv-gh-5cz" secondAttribute="height" multiplier="0.8:1" id="QC6-l0-qDF"/>
</constraints>
</view>
</subviews>
@ -218,6 +218,7 @@
</view>
<connections>
<outlet property="cancleButton" destination="H5e-db-8On" id="aCm-Tr-cqi"/>
<outlet property="height" destination="Y3C-k8-olk" id="XrL-CF-w55"/>
<outlet property="mainview" destination="IA2-r7-puo" id="pHW-C8-CNR"/>
<outlet property="noResultFoundLabel" destination="bAs-K2-xyK" id="JiR-4m-mFb"/>
<outlet property="searchTextField" destination="Sm6-Yq-rdj" id="trG-eX-b0i"/>

23
GMERemittance/Library/CurrencyPicker/CurrencyPickerViewController.swift
View File

@ -35,7 +35,24 @@ class CurrencyPickerViewController: UIViewController {
@IBOutlet weak var cancleButton: UIButton!
@IBOutlet weak var titleLabel: UILabel!
var data: [SendMoneyExchangeRateCurrencyViewModel] = []
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
var data: [SendMoneyExchangeRateCurrencyViewModel] = [] {
didSet {
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var selectedData: SendMoneyExchangeRateCurrencyViewModel?
var filteredPlaces: [SendMoneyExchangeRateCurrencyViewModel] = [] {
@ -63,10 +80,12 @@ class CurrencyPickerViewController: UIViewController {
self.setupPlaces()
self.mainview.layer.cornerRadius = 10
cancleButton.layer.cornerRadius = 10
self.configureLanguage()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
height.constant = dynamicHeight
self.configureLanguage()
mainview.bottomToOrigin()
}

5
GMERemittance/Library/ItemPickerView/ItemsPicker.storyboard
View File

@ -105,7 +105,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bAs-K2-xyK">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -201,6 +201,7 @@
<constraint firstItem="lkk-y6-gJJ" firstAttribute="top" secondItem="IA2-r7-puo" secondAttribute="top" id="ZEX-3U-QRk"/>
<constraint firstAttribute="trailing" secondItem="obU-jk-2i1" secondAttribute="trailing" constant="10" id="fcb-KT-6ii"/>
<constraint firstItem="6dk-Yk-ATO" firstAttribute="leading" secondItem="IA2-r7-puo" secondAttribute="leading" constant="10" id="mho-cm-OIV"/>
<constraint firstAttribute="height" constant="533.5" id="n71-vO-2Md"/>
<constraint firstAttribute="trailing" secondItem="lkk-y6-gJJ" secondAttribute="trailing" id="oFQ-bh-wjl"/>
<constraint firstItem="obU-jk-2i1" firstAttribute="top" secondItem="lkk-y6-gJJ" secondAttribute="bottom" constant="5" id="v3x-x4-RF1"/>
<constraint firstItem="obU-jk-2i1" firstAttribute="leading" secondItem="IA2-r7-puo" secondAttribute="leading" constant="10" id="z8z-Va-R7X"/>
@ -212,7 +213,6 @@
<constraint firstItem="IA2-r7-puo" firstAttribute="leading" secondItem="hQv-gh-5cz" secondAttribute="leading" constant="20" id="DDG-4u-4Ym"/>
<constraint firstAttribute="trailing" secondItem="IA2-r7-puo" secondAttribute="trailing" constant="20" id="FfM-Rd-OpC"/>
<constraint firstAttribute="bottom" secondItem="IA2-r7-puo" secondAttribute="bottom" constant="20" id="Lqm-n6-fpp"/>
<constraint firstItem="IA2-r7-puo" firstAttribute="height" secondItem="hQv-gh-5cz" secondAttribute="height" multiplier="0.8:1" id="yeO-qF-33c"/>
</constraints>
</view>
</subviews>
@ -227,6 +227,7 @@
</view>
<connections>
<outlet property="cancelButton" destination="6dk-Yk-ATO" id="wFb-xW-I1c"/>
<outlet property="height" destination="n71-vO-2Md" id="SDF-fq-YNK"/>
<outlet property="mainview" destination="IA2-r7-puo" id="pHW-C8-CNR"/>
<outlet property="noResultFoundLabel" destination="bAs-K2-xyK" id="JiR-4m-mFb"/>
<outlet property="searchTextField" destination="Sm6-Yq-rdj" id="trG-eX-b0i"/>

23
GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift
View File

@ -31,9 +31,24 @@ class ItemsPickerViewController: UIViewController {
@IBOutlet weak var mainview: UIView!
@IBOutlet weak var cancelButton: UIButton!
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
var data: [String] = []
var data: [String] = [] {
didSet {
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var filteredPlaces: [String] = [] {
didSet {
@ -60,11 +75,13 @@ class ItemsPickerViewController: UIViewController {
self.setupPlaces()
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
self.configureLanguage()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
height.constant = dynamicHeight
self.configureLanguage()
mainview.bottomToOrigin()
}

5
GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard
View File

@ -97,7 +97,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bAs-K2-xyK">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -204,6 +204,7 @@
<constraint firstItem="J89-w4-XeB" firstAttribute="top" secondItem="lkk-y6-gJJ" secondAttribute="bottom" constant="100" id="2GC-Mz-yhS"/>
<constraint firstItem="lkk-y6-gJJ" firstAttribute="leading" secondItem="IA2-r7-puo" secondAttribute="leading" constant="10" id="5FA-LB-Q71"/>
<constraint firstAttribute="trailing" secondItem="5jc-tK-oTc" secondAttribute="trailing" constant="10" id="8kC-tx-gzG"/>
<constraint firstAttribute="height" constant="533.5" id="F3N-Vp-MLS"/>
<constraint firstAttribute="bottom" secondItem="5jc-tK-oTc" secondAttribute="bottom" constant="10" id="P0a-g3-eXp"/>
<constraint firstItem="lkk-y6-gJJ" firstAttribute="top" secondItem="IA2-r7-puo" secondAttribute="top" constant="5" id="ZEX-3U-QRk"/>
<constraint firstAttribute="trailing" secondItem="J89-w4-XeB" secondAttribute="trailing" constant="10" id="dix-UA-j0a"/>
@ -220,7 +221,6 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.40484705110000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="IA2-r7-puo" firstAttribute="height" secondItem="hQv-gh-5cz" secondAttribute="height" multiplier="0.8:1" id="6k4-5b-5cv"/>
<constraint firstItem="IA2-r7-puo" firstAttribute="leading" secondItem="hQv-gh-5cz" secondAttribute="leading" constant="20" id="DDG-4u-4Ym"/>
<constraint firstAttribute="trailing" secondItem="IA2-r7-puo" secondAttribute="trailing" constant="20" id="FfM-Rd-OpC"/>
<constraint firstAttribute="bottom" secondItem="IA2-r7-puo" secondAttribute="bottom" constant="20" id="Lqm-n6-fpp"/>
@ -238,6 +238,7 @@
</view>
<connections>
<outlet property="cancelButton" destination="5jc-tK-oTc" id="mg6-k7-5GW"/>
<outlet property="height" destination="F3N-Vp-MLS" id="dtl-d8-6iH"/>
<outlet property="infoLabel" destination="J89-w4-XeB" id="nsf-RO-XfY"/>
<outlet property="mainview" destination="IA2-r7-puo" id="pHW-C8-CNR"/>
<outlet property="noResultFoundLabel" destination="bAs-K2-xyK" id="JiR-4m-mFb"/>

19
GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift
View File

@ -34,10 +34,24 @@ class BankBranchPickerViewController: UIViewController {
@IBOutlet weak var mainview: UIView!
@IBOutlet weak var infoLabel: UILabel!
@IBOutlet weak var cancelButton: UIButton!
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
var data: [SendMoneyBankBranch] = [] {
didSet {
self.tableVIew.reloadData()
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var countryCode: String?
@ -71,13 +85,14 @@ class BankBranchPickerViewController: UIViewController {
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
setTitle()
self.showProgressHud()
self.fetchBranch(searchString: "")
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
setTitle()
height.constant = dynamicHeight
mainview.bottomToOrigin()
}
private func setNoResultText() {

5
GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPicker.storyboard
View File

@ -94,7 +94,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="place not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bAs-K2-xyK">
<rect key="frame" x="-30" y="11.5" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
@ -183,6 +183,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="lkk-y6-gJJ" firstAttribute="leading" secondItem="IA2-r7-puo" secondAttribute="leading" constant="10" id="5FA-LB-Q71"/>
<constraint firstAttribute="height" constant="533.5" id="8nr-YT-Klu"/>
<constraint firstAttribute="trailing" secondItem="f22-JY-IZK" secondAttribute="trailing" constant="10" id="I51-jB-Nr6"/>
<constraint firstItem="f22-JY-IZK" firstAttribute="top" secondItem="obU-jk-2i1" secondAttribute="bottom" constant="10" id="Ux7-sx-oh3"/>
<constraint firstItem="lkk-y6-gJJ" firstAttribute="top" secondItem="IA2-r7-puo" secondAttribute="top" constant="5" id="ZEX-3U-QRk"/>
@ -202,7 +203,6 @@
<constraint firstAttribute="trailing" secondItem="IA2-r7-puo" secondAttribute="trailing" constant="20" id="FfM-Rd-OpC"/>
<constraint firstAttribute="bottom" secondItem="IA2-r7-puo" secondAttribute="bottom" constant="20" id="Lqm-n6-fpp"/>
<constraint firstItem="IA2-r7-puo" firstAttribute="top" secondItem="hQv-gh-5cz" secondAttribute="top" constant="60" id="rMj-w7-4aj"/>
<constraint firstItem="IA2-r7-puo" firstAttribute="height" secondItem="hQv-gh-5cz" secondAttribute="height" multiplier="0.8:1" id="yeC-Y5-EDa"/>
</constraints>
<variation key="default">
<mask key="constraints">
@ -223,6 +223,7 @@
</view>
<connections>
<outlet property="cancelButton" destination="f22-JY-IZK" id="ZTd-dr-hzg"/>
<outlet property="height" destination="8nr-YT-Klu" id="964-oH-Uxf"/>
<outlet property="mainview" destination="IA2-r7-puo" id="pHW-C8-CNR"/>
<outlet property="noResultFoundLabel" destination="bAs-K2-xyK" id="JiR-4m-mFb"/>
<outlet property="searchTextField" destination="Sm6-Yq-rdj" id="trG-eX-b0i"/>

28
GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPickerViewController.swift
View File

@ -30,10 +30,26 @@ class BankPickerViewController: UIViewController {
@IBOutlet weak var cancelButton: UIButton!
@IBOutlet weak var mainview: UIView!
@IBOutlet weak var height: NSLayoutConstraint!
private var dynamicHeight: CGFloat = 0
var data: [SendMoneyBank] = []
var data: [SendMoneyBank] = [] {
didSet {
dynamicHeight = CGFloat(153 + 44 * (data.count + 1))
if dynamicHeight < view.frame.height * 0.5 {
dynamicHeight = view.frame.height * 0.5
} else if dynamicHeight > view.frame.height * 0.8 {
dynamicHeight = view.frame.height * 0.8
}
if height != nil {
height.constant = dynamicHeight
}
}
}
var selectedData: SendMoneyBank?
var filteredPlaces: [SendMoneyBank] = [] {
@ -57,19 +73,15 @@ class BankPickerViewController: UIViewController {
self.setupTableView()
self.setupSearchService()
// self.setupSearchTextFieldUi()
self.setupPlaces()
// self.titleView.layer.cornerRadius = 10
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
setTitle()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
setTitle()
height.constant = dynamicHeight
mainview.bottomToOrigin()
}

Write Preview
Loading…
Cancel
Save