From aac8562e5625c3b1671479cf40471441d0e09cba Mon Sep 17 00:00:00 2001 From: lashlyn Date: Mon, 22 Jul 2024 13:44:34 +0700 Subject: [PATCH] feat: change countries list order --- .../FlagAndCountryCode/CountryFlagInfo.swift | 10 +- .../Resources/country-codes.json | 114 +++++++++--------- 2 files changed, 66 insertions(+), 58 deletions(-) diff --git a/Sources/FlagAndCountryCode/CountryFlagInfo.swift b/Sources/FlagAndCountryCode/CountryFlagInfo.swift index f076cb3..e75928c 100644 --- a/Sources/FlagAndCountryCode/CountryFlagInfo.swift +++ b/Sources/FlagAndCountryCode/CountryFlagInfo.swift @@ -48,7 +48,7 @@ extension CountryFlagInfo { } } -public struct CountryFlagInfo: Decodable, Hashable { +public struct CountryFlagInfo: Codable, Hashable { /** Country 2 letter code */ @@ -87,6 +87,14 @@ public struct CountryFlagInfo: Decodable, Hashable { self.languageEnglish = languageEnglish } + public init(languageEnglish: String, code: String) { + self.languageEnglish = languageEnglish + self.code = code + self.name = "" + self.dialCode = "" + self.languageNative = "" + } + enum CodingKeys: String, CodingKey { case code = "code" case name = "name" diff --git a/Sources/FlagAndCountryCode/Resources/country-codes.json b/Sources/FlagAndCountryCode/Resources/country-codes.json index 06b5955..b916628 100644 --- a/Sources/FlagAndCountryCode/Resources/country-codes.json +++ b/Sources/FlagAndCountryCode/Resources/country-codes.json @@ -6,6 +6,63 @@ "language_native": "افغان", "language_english": "Afghan" }, + { + "name": "United Arab Emirates", + "dial_code": "+971", + "code": "AE", + "language_native": "العربية", + "language_english": "Arabic" + }, + { + "name": "Spain", + "dial_code": "+34", + "code": "ES", + "language_native": "Español", + "language_english": "Spanish" + }, + { + "name": "Germany", + "dial_code": "+49", + "code": "DE", + "language_native": "Deutsch", + "language_english": "German" + }, + { + "name": "United States", + "dial_code": "+1", + "code": "US", + "language_native": "English", + "language_english": "English" + }, + { + "name": "Sweden", + "dial_code": "+46", + "code": "SE", + "language_native": "Svenska", + "language_english": "Swedish" + }, + { + "name": "Portugal", + "dial_code": "+351", + "code": "PT", + "language_native": "Português", + "language_english": "Portuguese" + + }, + { + "name": "Belgium", + "dial_code": "+32", + "code": "BE", + "language_native": "Nederlands", + "language_english": "Dutch" + }, + { + "name": "France", + "dial_code": "+33", + "code": "FR", + "language_native": "Français", + "language_english": "French" + }, { "name": "Aland Islands", "dial_code": "+358", @@ -139,13 +196,6 @@ "language_native": "беларускі", "language_english": "Belarusian" }, - { - "name": "Belgium", - "dial_code": "+32", - "code": "BE", - "language_native": "Nederlands", - "language_english": "Dutch" - }, { "name": "Belize", "dial_code": "+501", @@ -496,13 +546,6 @@ "language_native": "Suomi", "language_english": "Finnish" }, - { - "name": "France", - "dial_code": "+33", - "code": "FR", - "language_native": "Français", - "language_english": "French" - }, { "name": "French Guiana", "dial_code": "+594", @@ -538,13 +581,6 @@ "language_native": "ქართული", "language_english": "Georgian" }, - { - "name": "Germany", - "dial_code": "+49", - "code": "DE", - "language_native": "Deutsch", - "language_english": "German" - }, { "name": "Ghana", "dial_code": "+233", @@ -1206,14 +1242,6 @@ "language_native": "Polski", "language_english": "Polish" - }, - { - "name": "Portugal", - "dial_code": "+351", - "code": "PT", - "language_native": "Português", - "language_english": "Portuguese" - }, { "name": "Puerto Rico", @@ -1435,13 +1463,6 @@ "language_english": "English" }, - { - "name": "Spain", - "dial_code": "+34", - "code": "ES", - "language_native": "Español", - "language_english": "Spanish" - }, { "name": "Sri Lanka", "dial_code": "+94", @@ -1477,13 +1498,6 @@ "language_native": "English", "language_english": "English" }, - { - "name": "Sweden", - "dial_code": "+46", - "code": "SE", - "language_native": "Svenska", - "language_english": "Swedish" - }, { "name": "Switzerland", "dial_code": "+41", @@ -1610,13 +1624,6 @@ "language_native": "Українська", "language_english": "Ukrainian" }, - { - "name": "United Arab Emirates", - "dial_code": "+971", - "code": "AE", - "language_native": "العربية", - "language_english": "Arabic" - }, { "name": "United Kingdom", "dial_code": "+44", @@ -1624,13 +1631,6 @@ "language_native": "English", "language_english": "English" }, - { - "name": "United States", - "dial_code": "+1", - "code": "US", - "language_native": "English", - "language_english": "English" - }, { "name": "Uruguay", "dial_code": "+598",