Merge pull request #6 from 4ndrey/master

optimize images loading
xtrinch · Jan 18, 2017 · 1d33e04 · 1d33e04
2 parents 2ce9fff + c8ae148
commit 1d33e04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/MRCountryPicker/Assets/SwiftCountryPicker.bundle/Data/countryCodes.json b/MRCountryPicker/Assets/SwiftCountryPicker.bundle/Data/countryCodes.json
@@ -546,7 +546,7 @@
 },
 {
 "name": "Kazakhstan",
-"dial_code": "+77",
+"dial_code": "+7",
 "code": "KZ"
 },
 {

diff --git a/MRCountryPicker/Classes/SwiftCountryPicker.swift b/MRCountryPicker/Classes/SwiftCountryPicker.swift
@@ -9,13 +9,15 @@ struct Country {
     var code: String?
     var name: String?
     var phoneCode: String?
-    var flag: UIImage?
-
-    init(code: String?, name: String?, phoneCode: String?, flag: UIImage?) {
+    var flag: UIImage? {
+        guard let code = self.code else { return nil }
+        return UIImage(named: "SwiftCountryPicker.bundle/Images/\(code.uppercased())", in: Bundle(for: MRCountryPicker.self), compatibleWith: nil)
+    }
+
+    init(code: String?, name: String?, phoneCode: String?) {
         self.code = code
         self.name = name
         self.phoneCode = phoneCode
-        self.flag = flag
     }
 }
 
@@ -97,10 +99,8 @@ open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewData
                         guard let code = countryObj["code"] as? String, let phoneCode = countryObj["dial_code"] as? String, let name = countryObj["name"] as? String else {
                             return countries
                         }
-
-                        let flag = UIImage(named: "SwiftCountryPicker.bundle/Images/\(code.uppercased())", in: Bundle(for: type(of: self)), compatibleWith: nil)
-
-                        let country = Country(code: code, name: name, phoneCode: phoneCode, flag: flag)
+
+                        let country = Country(code: code, name: name, phoneCode: phoneCode)
                         countries.append(country)
                     }