Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZdenoIT - patch 1 #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ZdenoIT - patch 1 #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ace1226
Add files via upload
ZdenoIT Apr 24, 2018
b0d674a
Add files via upload
ZdenoIT Apr 24, 2018
b54a259
Delete SwiftCountryPicker.swift
ZdenoIT Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions MRCountryPicker/Classes/SwiftCountryPicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import CoreTelephony
func countryPhoneCodePicker(_ picker: MRCountryPicker, didSelectCountryWithName name: String, countryCode: String, phoneCode: String, flag: UIImage)
}

struct Country {
var code: String?
var name: String?
var phoneCode: String?
var flag: UIImage? {
public struct Country { // TODO takac added by me !!
public var code: String?
public var name: String?
public var phoneCode: String?
public 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)
}
Expand All @@ -22,13 +22,18 @@ struct Country {
}

open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewDataSource {


// TODO takac added by me !!
var countriesCodesEU = ["BE", "BG", "CY", "CZ", "DK", "EE", "FI", "FR", "GR", "NL", "HR", "IE", "LT", "LV", "LU", "HU", "MT", "DE", "PL", "PT", "AT", "RO", "SK", "SI", "GB", "ES", "SE", "IT"]
var onlyEU = false

var countries: [Country]!
open var selectedLocale: Locale?
open weak var countryPickerDelegate: MRCountryPickerDelegate?
open var showPhoneNumbers: Bool = true
open var selectedCountry: Country? // TODO takac added by me !!

override init(frame: CGRect) {
override public init(frame: CGRect) { // TODO takac added by me !!
super.init(frame: frame)
setup()
}
Expand All @@ -38,6 +43,12 @@ open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewData
setup()
}

public init (frame: CGRect, onlyEU: Bool = false){ // TODO takac added by me !!
super.init(frame: frame)
self.onlyEU = onlyEU
setup()
}

func setup() {
countries = countryNamesByCode()

Expand Down Expand Up @@ -84,6 +95,7 @@ open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewData
func setCountryByRow(row: Int) {
self.selectRow(row, inComponent: 0, animated: true)
let country = countries[row]
self.selectedCountry = country // TODO takac added by me !!
if let countryPickerDelegate = countryPickerDelegate {
countryPickerDelegate.countryPhoneCodePicker(self, didSelectCountryWithName: country.name!, countryCode: country.code!, phoneCode: country.phoneCode!, flag: country.flag!)
}
Expand Down Expand Up @@ -112,7 +124,13 @@ open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewData
}

let country = Country(code: code, name: name, phoneCode: phoneCode)
countries.append(country)
if self.onlyEU { // filter EU TODO takac added by me !!
if self.countriesCodesEU.contains(code) {
countries.append(country)
}
} else {
countries.append(country)
}
}

}
Expand Down Expand Up @@ -150,6 +168,7 @@ open class MRCountryPicker: UIPickerView, UIPickerViewDelegate, UIPickerViewData

open func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
let country = countries[row]
self.selectedCountry = country // TODO takac added by me !!
if let countryPickerDelegate = countryPickerDelegate {
countryPickerDelegate.countryPhoneCodePicker(self, didSelectCountryWithName: country.name!, countryCode: country.code!, phoneCode: country.phoneCode!, flag: country.flag!)
}
Expand Down