Merge pull request #106 from kizitonwose/dev

Release 3.0.9
kizitonwose · Feb 22, 2020 · 544786e · 544786e
2 parents 71a427a + 1ea8009
commit 544786e
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 42 deletions.
diff --git a/CountryPickerView.podspec b/CountryPickerView.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "CountryPickerView"
-  spec.version      = "3.0.8"
+  spec.version      = "3.0.9"
   spec.summary      = "A simple, customizable view for selecting countries in iOS apps."
   spec.homepage     = "https://github.com/kizitonwose/CountryPickerView"
   spec.license      = "MIT"

diff --git a/CountryPickerView/CountryPickerView.swift b/CountryPickerView/CountryPickerView.swift
@@ -46,16 +46,33 @@ public class CountryPickerView: NibView {
     }
     @IBOutlet public weak var countryDetailsLabel: UILabel!
 
-    // Show/Hide the country code on the view.
+    /// Show/Hide the country code on the view.
     public var showCountryCodeInView = true {
-        didSet { setup() }
+        didSet {
+            if showCountryNameInView && showCountryCodeInView {
+                showCountryNameInView = false
+            } else {
+                setup()
+            }
+        }
     }
 
-    // Show/Hide the phone code on the view.
+    /// Show/Hide the phone code on the view.
     public var showPhoneCodeInView = true {
         didSet { setup() }
     }
 
+    /// Show/Hide the country name on the view.
+    public var showCountryNameInView = false {
+        didSet {
+            if showCountryCodeInView && showCountryNameInView {
+                showCountryCodeInView = false
+            } else {
+                setup()
+            }
+        }
+    }
+
     /// Change the font of phone code
     public var font = UIFont.systemFont(ofSize: 17.0) {
         didSet { setup() }
@@ -106,13 +123,14 @@ public class CountryPickerView: NibView {
         flagImageView.image = selectedCountry.flag
         countryDetailsLabel.font = font
         countryDetailsLabel.textColor = textColor
-        if showPhoneCodeInView && showCountryCodeInView {
+        if showCountryCodeInView && showPhoneCodeInView {
             countryDetailsLabel.text = "(\(selectedCountry.code)) \(selectedCountry.phoneCode)"
-            return
-        }
-
-        if showCountryCodeInView || showPhoneCodeInView {
-            countryDetailsLabel.text = showCountryCodeInView ? selectedCountry.code : selectedCountry.phoneCode
+        } else if showCountryNameInView && showPhoneCodeInView {
+            countryDetailsLabel.text = "(\(selectedCountry.localizedName() ?? selectedCountry.name)) \(selectedCountry.phoneCode)"
+        } else if showCountryCodeInView || showPhoneCodeInView || showCountryNameInView {
+            countryDetailsLabel.text = showCountryCodeInView ? selectedCountry.code
+                : showPhoneCodeInView ? selectedCountry.phoneCode
+                : selectedCountry.localizedName() ?? selectedCountry.name
         } else {
             countryDetailsLabel.text = nil
         }