Merge pull request #21 from onstonboy/develop

1.0.7
onstonboy · Oct 1, 2019 · ecfe215 · ecfe215
2 parents 338ba2c + f332617
commit ecfe215
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 53 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/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ccp/src/main/java/com/ccc/ccp/Country.kt b/ccp/src/main/java/com/ccc/ccp/Country.kt
@@ -20,13 +20,18 @@ data class Country(
 
         fun loadCountryDataFromXML(context: Context, languageCode: String): List<Country> {
             val countries = ArrayList<Country>()
+            val defaultLanguage = if (languageCode == "vi" || languageCode == "en") {
+                languageCode
+            } else {
+                "en"
+            }
             try {
                 val xmlFactoryObject = XmlPullParserFactory.newInstance()
                 val xmlPullParser = xmlFactoryObject.newPullParser()
                 val ins = context.resources.openRawResource(
                     context.resources
                         .getIdentifier(
-                            "ccp_$languageCode",
+                            "ccp_$defaultLanguage",
                             "raw", context.packageName
                         )
                 )