From c27a4b446670b7b6ddadabba69a37c20fd6af3d6 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Wed, 20 Mar 2019 18:01:16 +0900 Subject: [PATCH] place holder changed --- .../User Interface/View/ResendViewController.swift | 10 +++++++--- en.lproj/Localizable.strings | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift index cbd3fdc0..e0ecbf3e 100644 --- a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift +++ b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift @@ -33,7 +33,7 @@ class ResendViewController: UIViewController { } struct StringConstants { - let searchPlaceholderText = "search_with_controlno_text".localized() + let searchPlaceholderText = "resend_search_hint_text".localized() } @@ -174,9 +174,13 @@ class ResendViewController: UIViewController { @objc func search(sender: UITextField) { let searchText = sender.text!.lowercased() -// self.presenter?.search(text: searchText) + + if searchText.isEmpty { + self.filteredTransaction = self.transactions + return + } self.filteredTransaction = self.transactions.filter({ - return searchText.isEmpty || ($0.controlNumber ?? "").lowercased().contains(searchText) || ($0.bankName ?? "").lowercased().contains(searchText) || ($0.recieverName ?? "").lowercased().contains(searchText) + return ($0.controlNumber ?? "").lowercased().contains(searchText) || ($0.bankName ?? "").lowercased().contains(searchText) || ($0.recieverName ?? "").lowercased().contains(searchText) }).sorted(by: { (model, _) in return (model.controlNumber ?? "").lowercased().hasPrefix(searchText) || (model.recieverName ?? "").lowercased().hasPrefix(searchText) || (model.bankName ?? "").lowercased().hasPrefix(searchText) }) diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index a31d1117..b5c69f4b 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -398,3 +398,4 @@ "resend_text" = "Resend"; +"resend_search_hint_text" = "GME No/Receiver Name/Bank Name";