🐛 Fix list controller

Author: Aurélien Grifasi

ExampleCocoapods/Example/ScrollViewController.swift

@@ -22,13 +22,15 @@ class ScrollViewController: UIViewController {
 		contentView.backgroundColor = UIColor.groupTableViewBackground
 		scrollView.delaysContentTouches = false
 
-		phoneNumberTextField.countryListDisplayMode = .picker
+		phoneNumberTextField.displayMode = .picker
 		phoneNumberTextField.delegate = self
 	}
 }
 
 extension ScrollViewController: FPNTextFieldDelegate {
 
+	func fpnDisplayCountryList() {}
+
 	func fpnDidValidatePhoneNumber(textField: FPNTextField, isValid: Bool) {
 		textField.rightViewMode = .always
 		textField.rightView = UIImageView(image: isValid ? #imageLiteral(resourceName: "success") : #imageLiteral(resourceName: "error"))

ExampleCocoapods/Example/SimpleViewController.swift

@@ -13,6 +13,8 @@ class SimpleViewController: UIViewController {
 
 	@IBOutlet weak var phoneNumberTextField: FPNTextField!
 
+	var listController: FPNCountryListViewController = FPNCountryListViewController(style: .grouped)
+
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
@@ -21,34 +23,39 @@ class SimpleViewController: UIViewController {
 		view.backgroundColor = UIColor.groupTableViewBackground
 
 		// To use your own flag icons, uncommment the line :
-		//		Bundle.FlagIcons = Bundle(for: ViewController.self)
+		//		Bundle.FlagIcons = Bundle(for: SimpleViewController.self)
 
 		phoneNumberTextField.borderStyle = .roundedRect
+//		phoneNumberTextField.pickerView.showPhoneNumbers = false
+		phoneNumberTextField.displayMode = .list // .picker by default
 
-		// Comment this line to not have access to the country list
-		phoneNumberTextField.countryListDisplayMode = .presented(on: self)
-		phoneNumberTextField.delegate = self
+		listController.setup(repository: phoneNumberTextField.countryRepository)
+
+		listController.didSelect = { [weak self] country in
+			self?.phoneNumberTextField.setFlag(countryCode: country.code)
+		}
 
+		phoneNumberTextField.delegate = self
 		phoneNumberTextField.font = UIFont.systemFont(ofSize: 14)
 
 		// Custom the size/edgeInsets of the flag button
 		phoneNumberTextField.flagButtonSize = CGSize(width: 35, height: 35)
 		phoneNumberTextField.flagButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
 
 		// Example of customizing the textField input accessory view
-		//		let items = [
-		//			UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.save, target: self, action: nil),
-		//			UIBarButtonItem(title: "Item 1", style: .plain, target: self, action: nil),
-		//			UIBarButtonItem(title: "Item 2", style: .plain, target: self, action: nil)
-		//		]
-		//		phoneNumberTextField.textFieldInputAccessoryView = getCustomTextFieldInputAccessoryView(with: items)
+		let items = [
+			UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.save, target: self, action: nil),
+			UIBarButtonItem(title: "Item 1", style: .plain, target: self, action: nil),
+			UIBarButtonItem(title: "Item 2", style: .plain, target: self, action: nil)
+		]
+		phoneNumberTextField.textFieldInputAccessoryView = getCustomTextFieldInputAccessoryView(with: items)
 
 		// The placeholder is an example phone number of the selected country by default. You can add your own placeholder :
 		phoneNumberTextField.hasPhoneNumberExample = true
-		//		phoneNumberTextField.placeholder = "Phone Number"
+		phoneNumberTextField.placeholder = "Phone Number"
 
 		// Set the country list
-		phoneNumberTextField.setCountries(including: [.ES, .IT, .BE, .LU, .DE])
+		//		phoneNumberTextField.setCountries(including: [.ES, .IT, .BE, .LU, .DE])
 
 		// Exclude countries from the list
 		//		phoneNumberTextField.setCountries(excluding: [.AM, .BW, .BA])
@@ -73,6 +80,10 @@ class SimpleViewController: UIViewController {
 
 		return toolbar
 	}
+
+	@objc func dismissCountries() {
+		listController.dismiss(animated: true, completion: nil)
+	}
 }
 
 extension SimpleViewController: FPNTextFieldDelegate {
@@ -94,4 +105,14 @@ extension SimpleViewController: FPNTextFieldDelegate {
 	func fpnDidSelectCountry(name: String, dialCode: String, code: String) {
 		print(name, dialCode, code)
 	}
+
+
+	func fpnDisplayCountryList() {
+		let navigationViewController = UINavigationController(rootViewController: listController)
+
+		listController.title = "Countries"
+		listController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(dismissCountries))
+
+		self.present(navigationViewController, animated: true, completion: nil)
+	}
 }

ExampleCocoapods/Example/StackViewController.swift

@@ -19,14 +19,16 @@ class StackViewController: UIViewController {
 		title = "In Stack View"
 		view.backgroundColor = UIColor.groupTableViewBackground
 
-		phoneNumberTextField.countryListDisplayMode = .picker
+		phoneNumberTextField.displayMode = .picker
 		phoneNumberTextField.delegate = self
 	}
 
 }
 
 extension StackViewController: FPNTextFieldDelegate {
 
+	func fpnDisplayCountryList() {}
+
 	func fpnDidValidatePhoneNumber(textField: FPNTextField, isValid: Bool) {
 		textField.rightViewMode = .always
 		textField.rightView = UIImageView(image: isValid ? #imageLiteral(resourceName: "success") : #imageLiteral(resourceName: "error"))

ExampleCocoapods/Example/TableViewController.swift

@@ -14,22 +14,43 @@ class TableViewController: UITableViewController {
 	@IBOutlet weak var firstPhoneNumberTextField: FPNTextField!
 	@IBOutlet weak var secondPhoneNumberTextField: FPNTextField!
 
+	var listController: FPNCountryListViewController = FPNCountryListViewController(style: .grouped)
+	var repository: FPNCountryRepository = FPNCountryRepository()
+
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
 		title = "In Table View"
 		tableView.delaysContentTouches = false
 
-		firstPhoneNumberTextField.countryListDisplayMode = .picker
+		firstPhoneNumberTextField.displayMode = .picker
 		firstPhoneNumberTextField.delegate = self
 
-		secondPhoneNumberTextField.countryListDisplayMode = .presented(on: self)
+		secondPhoneNumberTextField.displayMode = .list
 		secondPhoneNumberTextField.delegate = self
+
+		listController.setup(repository: secondPhoneNumberTextField.countryRepository)
+
+		listController.didSelect = { [weak self] country in
+			self?.secondPhoneNumberTextField.setFlag(countryCode: country.code)
+		}
+	}
+
+	@objc func dismissCountries() {
+		listController.dismiss(animated: true, completion: nil)
 	}
 }
 
 extension TableViewController: FPNTextFieldDelegate {
 
+	func fpnDisplayCountryList() {
+		let navigationViewController = UINavigationController(rootViewController: listController)
+
+		listController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(dismissCountries))
+
+		self.present(navigationViewController, animated: true, completion: nil)
+	}
+
 	func fpnDidValidatePhoneNumber(textField: FPNTextField, isValid: Bool) {
 		textField.rightViewMode = .always
 		textField.rightView = UIImageView(image: isValid ? #imageLiteral(resourceName: "success") : #imageLiteral(resourceName: "error"))

README.md

@@ -70,15 +70,24 @@ FPNTextFieldDelegate inherites from UITextFieldDelegate so nothing change:
 phoneNumberTextField.delegate = self
 ```
 
-It provides two methods that lets you know when a country is selected and when the phone number is valid or not. Once a phone number is valid, you can get it in severals formats (E164, International, National, RFC3966):
+It provides you three methods:
 
 ```swift
 extension YourViewController: FPNTextFieldDelegate {
 
+   /// The place to present/push the listController if you choosen displayMode = .list
+   func fpnDisplayCountryList() {
+      let navigationViewController = UINavigationController(rootViewController: listController)
+      
+      present(navigationViewController, animated: true, completion: nil)
+   }
+
+   /// Lets you know when a country is selected 
    func fpnDidSelectCountry(name: String, dialCode: String, code: String) {
       print(name, dialCode, code) // Output "France", "+33", "FR"
    }
 
+   /// Lets you know when the phone number is valid or not. Once a phone number is valid, you can get it in severals formats (E164, International, National, RFC3966)
    func fpnDidValidatePhoneNumber(textField: FPNTextField, isValid: Bool) {
       if isValid {
          // Do something...         
@@ -96,6 +105,31 @@ extension YourViewController: FPNTextFieldDelegate {
 
 ## 🎨 Customization
 
+By default, the picker view is showed but you can display the countries with a list view controller:
+
+```swift
+var listController: FPNCountryListViewController = FPNCountryListViewController(style: .grouped)
+
+phoneNumberTextField.displayMode = .list // .picker by default
+
+listController.setup(repository: textField.countryRepository)
+listController.didSelect = { [weak self] country in
+self?.textField.setFlag(countryCode: country.code)
+}
+```
+
+Don't forget to implement the `fpnDisplayCountryList`:
+
+```swift
+func fpnDisplayCountryList() {
+let navigationViewController = UINavigationController(rootViewController: listController)
+
+listController.title = "Countries"
+
+self.present(navigationViewController, animated: true, completion: nil)
+}
+```
+
 FlagKit is used by default but you can customize the list with your own flag icons assets:
 ```swift
 // Be sure to set it before initializing a FlagPhoneNumber instance.
@@ -136,15 +170,10 @@ Or exclude countries from the list:
 phoneNumberTextField.setCountries(excluding: [.AM, .BW, .BA])
 ```
 
-You can choose to display the country list by picker or by a presented view controller:
-```swift
-phoneNumberTextField.countryListDisplayMode = .picker // by default
-phoneNumberTextField.countryListDisplayMode = .presented(on: self)
-```
-
-You can choose to display the country phone code in the picker or in the presented view controller:
+You can choose to display the country phone code in the picker or in the list view controller:
 ```swift
-phoneNumberTextField.showCountryPhoneCode = false // true by default
+phoneNumberTextField.pickerView.showCountryPhoneCode = false // true by default
+listController.showCountryPhoneCode = false // true by default
 ```
 
 You can reuses `FPN` classes as you see fit !

Sources/FPNCountryListViewController.swift

@@ -10,45 +10,31 @@ import UIKit
 
 open class FPNCountryListViewController: UITableViewController, UISearchResultsUpdating, UISearchControllerDelegate {
 
-	var countries: [FPNCountry]
-	var showCountryPhoneCode: Bool
+	open var repository: FPNCountryRepository?
+	open var showCountryPhoneCode: Bool = true
+	open var searchController: UISearchController = UISearchController(searchResultsController: nil)
+	open var didSelect: ((FPNCountry) -> Void)?
 
-	var searchController: UISearchController?
 	var results: [FPNCountry]?
 
-	public var didSelect: ((FPNCountry) -> Void)?
-
-	public init(countries: [FPNCountry], showCountryPhoneCode: Bool = true) {
-		self.countries = countries
-		self.showCountryPhoneCode = showCountryPhoneCode
-
-		super.init(nibName: nil, bundle: nil)
-	}
-
-	required public init?(coder aDecoder: NSCoder) {
-		fatalError("init(coder:) has not been implemented")
-	}
-
 	override open func viewDidLoad() {
 		super.viewDidLoad()
 
 		tableView.tableFooterView = UIView()
-		navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(dismissController))
 
 		initSearchBarController()
 	}
 
-	@objc private func dismissController() {
-		dismiss(animated: true, completion: nil)
+	open func setup(repository: FPNCountryRepository) {
+		self.repository = repository
 	}
 
 	private func initSearchBarController() {
-		searchController = UISearchController(searchResultsController: nil)
-		searchController?.searchResultsUpdater = self
-		searchController?.delegate = self
+		searchController.searchResultsUpdater = self
+		searchController.delegate = self
 
 		if #available(iOS 9.1, *) {
-			searchController?.obscuresBackgroundDuringPresentation = false
+			searchController.obscuresBackgroundDuringPresentation = false
 		} else {
 			// Fallback on earlier versions
 		}
@@ -57,39 +43,35 @@ open class FPNCountryListViewController: UITableViewController, UISearchResultsU
 			navigationItem.searchController = searchController
 			navigationItem.hidesSearchBarWhenScrolling = false
 		} else {
-			searchController?.dimsBackgroundDuringPresentation = false
-			searchController?.hidesNavigationBarDuringPresentation = true
-			searchController?.definesPresentationContext = true
+			searchController.dimsBackgroundDuringPresentation = false
+			searchController.hidesNavigationBarDuringPresentation = true
+			searchController.definesPresentationContext = true
 
-			//				searchController?.searchBar.sizeToFit()
-			tableView.tableHeaderView = searchController?.searchBar
+			//				searchController.searchBar.sizeToFit()
+			tableView.tableHeaderView = searchController.searchBar
 		}
 		definesPresentationContext = true
 	}
 
 	private func getItem(at indexPath: IndexPath) -> FPNCountry {
-		var array: [FPNCountry]!
-
-		if let searchController = searchController, searchController.isActive && results != nil && results!.count > 0 {
-			array = results
+		if searchController.isActive && results != nil && results!.count > 0 {
+			return results![indexPath.row]
 		} else {
-			array = countries
+			return repository!.countries[indexPath.row]
 		}
-
-		return array[indexPath.row]
 	}
 
 	override open func numberOfSections(in tableView: UITableView) -> Int {
 		return 1
 	}
 
 	override open func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		if let searchController = searchController, searchController.isActive {
+		if searchController.isActive {
 			if let count = searchController.searchBar.text?.count, count > 0 {
 				return results?.count ?? 0
 			}
 		}
-		return countries.count
+		return repository?.countries.count ?? 0
 	}
 
 	override open func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -113,14 +95,16 @@ open class FPNCountryListViewController: UITableViewController, UISearchResultsU
 
 		didSelect?(country)
 
-		searchController?.isActive = false
-		searchController?.searchBar.resignFirstResponder()
-		dismissController()
+		searchController.isActive = false
+		searchController.searchBar.resignFirstResponder()
+		dismiss(animated: true, completion: nil)
 	}
 
 	// UISearchResultsUpdating
 
-	public func updateSearchResults(for searchController: UISearchController) {
+	open func updateSearchResults(for searchController: UISearchController) {
+		guard let countries = repository?.countries else { return }
+
 		if countries.isEmpty {
 			results?.removeAll()
 			return
@@ -147,7 +131,7 @@ open class FPNCountryListViewController: UITableViewController, UISearchResultsU
 
 	// UISearchControllerDelegate
 
-	public func willDismissSearchController(_ searchController: UISearchController) {
+	open func willDismissSearchController(_ searchController: UISearchController) {
 		results?.removeAll()
 	}
 }