Merge pull request #11 from onstonboy/develop

1.0.2
onstonboy · Sep 30, 2019 · 7c3c691 · 7c3c691
2 parents ec5b991 + b79148c
commit 7c3c691
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 55 deletions.
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/com/ccc/countrycodepicker/MainActivity.kt b/app/src/main/java/com/ccc/countrycodepicker/MainActivity.kt
@@ -14,7 +14,7 @@ class MainActivity : AppCompatActivity(), OnCountryPickedListener {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        countryCodePicker.setCountryPicked(countryCodePicker.getDefaultCountryPicked())
+        countryCodePicker.setCountryPicked(countryCodePicker.getCountry(Locale.getDefault().country))
     }
 
     override fun onCountryPicked(country: Country) {

diff --git a/ccp/src/main/java/com/ccc/ccp/CountryCodePicker.kt b/ccp/src/main/java/com/ccc/ccp/CountryCodePicker.kt
@@ -84,8 +84,10 @@ class CountryCodePicker : LinearLayout {
 
     // Default country is Viet Nam
     fun getDefaultCountryPicked(): Country {
-        val countries = Country.loadCountryDataFromXML(context, mLanguageCode)
-        countries.find { it.nameCode == "vn" }?.let {
+        if (mCountries.isEmpty()) {
+            mCountries.addAll(Country.loadCountryDataFromXML(context, mLanguageCode))
+        }
+        mCountries.find { it.nameCode == "vn" }?.let {
             return it
         }
         if (mLanguageCode == "vi") {
@@ -94,6 +96,13 @@ class CountryCodePicker : LinearLayout {
         return Country("vn", "+84", "VietNam")
     }
 
+    fun getCountry(nameCode: String): Country {
+        if (mCountries.isEmpty()) {
+            mCountries.addAll(Country.loadCountryDataFromXML(context, mLanguageCode))
+        }
+        return mCountries.find { it.nameCode == nameCode.toLowerCase(Locale.getDefault()) } ?: getDefaultCountryPicked()
+    }
+
     fun getCountryPicked(): Country? {
         return mCountryPicked
     }