Add localizedName property to Country model.

kizitonwose · Feb 23, 2019 · 74e10a2 · 74e10a2
1 parent 5d994ec
commit 74e10a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/CountryPickerView/CountryPickerView.swift b/CountryPickerView/CountryPickerView.swift
@@ -15,19 +15,16 @@ public enum SearchBarPosition {
 }
 
 public struct Country {
-   public var name: String
-   public var code: String
-   public var phoneCode: String
-   public var flag: UIImage {
+    public var name: String
+    public var code: String
+    public var phoneCode: String
+    public var localizedName: String? {
+        return Locale.current.localizedString(forRegionCode: code)
+    }
+    public var flag: UIImage {
         return UIImage(named: "CountryPickerView.bundle/Images/\(code.uppercased())",
             in: Bundle(for: CountryPickerView.self), compatibleWith: nil)!
     }
-
-   internal init(name: String, code: String, phoneCode: String) {
-        self.name = name
-        self.code = code
-        self.phoneCode = phoneCode
-    }
 }
 
 public func ==(lhs: Country, rhs: Country) -> Bool {

diff --git a/CountryPickerView/CountryPickerViewController.swift b/CountryPickerView/CountryPickerViewController.swift
@@ -52,14 +52,14 @@ extension CountryPickerViewController {
 
             var header = Set<String>()
             countriesArray.forEach{
-                let name = Locale.current.localizedString(forRegionCode: $0.code) ?? $0.name
+                let name = $0.localizedName ?? $0.name
                 header.insert(String(name[name.startIndex]))
             }
 
             var data = [String: [Country]]()
 
             countriesArray.forEach({
-                let name = Locale.current.localizedString(forRegionCode: $0.code) ?? $0.name
+                let name = $0.localizedName ?? $0.name
                 let index = String(name[name.startIndex])
                 var dictValue = data[index] ?? [Country]()
                 dictValue.append($0)
@@ -145,7 +145,7 @@ extension CountryPickerViewController {
         let country = isSearchMode ? searchResults[indexPath.row]
             : countries[sectionsTitles[indexPath.section]]![indexPath.row]
 
-        let countryName = Locale.current.localizedString(forRegionCode: country.code) ?? country.name
+        let countryName = country.localizedName ?? country.name
         let name = dataSource.showPhoneCodeInList ? "\(countryName) (\(country.phoneCode))" : countryName
         cell.imageView?.image = country.flag
 
@@ -234,7 +234,7 @@ extension CountryPickerViewController: UISearchResultsUpdating {
             }
 
             searchResults.append(contentsOf: indexArray.filter({
-                let countryName = Locale.current.localizedString(forRegionCode: $0.code) ?? $0.name
+                let countryName = $0.localizedName ?? $0.name
                 return countryName.lowercased().hasPrefix(text.lowercased())
             }))
         }