Merge pull request #19 from onstonboy/develop

1.0.6
onstonboy · Oct 1, 2019 · 338ba2c · 338ba2c
2 parents 5f49197 + 112f134
commit 338ba2c
Show file tree

Hide file tree

Showing 14 changed files with 202 additions and 70 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,6 +14,8 @@ class MainActivity : AppCompatActivity(), OnCountryPickedListener {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        countryCodePicker.setLanguageCode(Locale.getDefault().language)
+        countryCodePicker.refreshDefaultData()
         countryCodePicker.setCountryPicked(countryCodePicker.getCountry(Locale.getDefault().country))
     }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,6 @@
         android:layout_height="50dp"
         app:flagHeight="24dp"
         app:flagWidth="24dp"
-        app:langCode="vi"
         app:showPhoneCode="false"
         android:onClick="onPickerClick"
         />

diff --git a/ccp/src/main/java/com/ccc/ccp/Country.kt b/ccp/src/main/java/com/ccc/ccp/Country.kt
@@ -59,7 +59,7 @@ data class Country(
             } catch (e: Exception) {
                 Log.e(TAG, "error", e)
             }
-            return countries.sortedBy { it.name }
+            return countries.sortedBy { it.name.removeAccent() }
         }
 
         fun getFlagMasterResID(countryCode: Country): Int {

diff --git a/ccp/src/main/java/com/ccc/ccp/StringExtension.kt b/ccp/src/main/java/com/ccc/ccp/StringExtension.kt
@@ -0,0 +1,11 @@
+package com.ccc.ccp
+
+import java.text.Normalizer
+import java.util.regex.Pattern
+
+fun String.removeAccent(): String {
+    val temp = Normalizer.normalize(this, Normalizer.Form.NFD)
+    val pattern = Pattern.compile("\\p{InCombiningDiacriticalMarks}+")
+    return pattern.matcher(temp).replaceAll("").replace('đ', 'd')
+        .replace('Đ', 'D')
+}