diff --git a/GMERemittance/Info.plist b/GMERemittance/Info.plist index 987b7f85..6dd51e77 100644 --- a/GMERemittance/Info.plist +++ b/GMERemittance/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 2 + 3 Fabric APIKey diff --git a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard index 63c1e649..e2da09c8 100644 --- a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard +++ b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPicker.storyboard @@ -13,9 +13,6 @@ Roboto-MediumItalic - - Roboto-Regular - SanFranciscoDisplay-Regular @@ -39,7 +36,7 @@ - + @@ -60,21 +57,11 @@ - + - - - - - - - - - + - + @@ -116,9 +103,9 @@ @@ -151,23 +138,13 @@ - - - - - - - - - - @@ -180,7 +157,7 @@ @@ -238,7 +216,6 @@ - @@ -255,7 +232,6 @@ - diff --git a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift index 4ec1d3e7..fae67a32 100644 --- a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift +++ b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift @@ -46,39 +46,23 @@ class BankBranchPickerViewController: UIViewController { @IBOutlet weak var mainview: UIView! @IBOutlet weak var infoLabel: UILabel! @IBOutlet weak var cancelButton: UIButton! - @IBOutlet weak var height: NSLayoutConstraint! @IBOutlet weak var transparentView: UIView! 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 data: [SendMoneyBankBranch]? = [] var countryCode: String? var bankId: String? var selectedData : SendMoneyBankBranch? - var filteredPlaces: [SendMoneyBankBranch] = [] { + var filteredPlaces: [SendMoneyBankBranch]? = [] { didSet { self.tableVIew.reloadData() self.setNoResultText() - self.filteredPlaces.isEmpty ? (self.noResultFoundLabel.isHidden = false) : (self.noResultFoundLabel.isHidden = true) + self.filteredPlaces?.isEmpty ?? true ? (self.noResultFoundLabel.isHidden = false) : (self.noResultFoundLabel.isHidden = true) } } @@ -119,7 +103,6 @@ class BankBranchPickerViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) setTitle() - height.constant = dynamicHeight mainview.bottomToOrigin() } private func setNoResultText() { @@ -245,7 +228,7 @@ extension BankBranchPickerViewController: UITableViewDelegate { } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - self.selectedData = filteredPlaces.elementAt(index: indexPath.row) + self.selectedData = filteredPlaces?.elementAt(index: indexPath.row) if !self.allowMultipleSelection { self.close(nil) } @@ -264,12 +247,12 @@ extension BankBranchPickerViewController: UITableViewDataSource { } func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return filteredPlaces.count + return filteredPlaces?.count ?? 0 } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableVIew.dequeueReusableCell(withIdentifier: "BankBranchPickerCell", for: indexPath) as! BankBranchPickerCell - cell.place = self.filteredPlaces.elementAt(index: indexPath.row)?.name + cell.place = self.filteredPlaces?.elementAt(index: indexPath.row)?.name cell.setup() return cell } diff --git a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index 539e42b5..7bacfbbd 100644 --- a/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -311,11 +311,13 @@ class SendMoneyPaymentModeViewController: UIViewController { private func showBranchPickerView() { let viewcontroller = self.getBankBranchPickerViewController() + viewcontroller.data = selectedBank?.branches viewcontroller.type = PickerTitle.branch viewcontroller.countryCode = self.recipient?.countryCode ?? "" viewcontroller.bankId = self.selectedBank?.id ?? "" viewcontroller.doneAction = self.branchSelected viewcontroller.defaultSelectedData = [self.selectedBranch] + self.present(viewcontroller, animated: true, completion: nil) }