Merge pull request #15 from onstonboy/develop

1.0.4
onstonboy · Oct 1, 2019 · 8eeddc8 · 8eeddc8
2 parents 86244ad + 76794f5
commit 8eeddc8
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 87 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/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
+            return countries.sortedBy { it.name }
         }
 
         fun getFlagMasterResID(countryCode: Country): Int {