Localized country names from Java's built-in Locale object.

.gitignore

@@ -12,9 +12,17 @@
 bin/
 gen/
 
-# Local configuration file (sdk path, etc)
-local.properties
-
 # Eclipse project files
 .classpath
 .project
+.settings
+
+# Android Studio
+.gradle/
+.idea/
+build/
+*.iml
+local.properties
+
+# MacOS
+.DS_Store

CountryPicker/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 27
+        versionCode 3
+        versionName '1.2.0'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    api 'com.android.support:support-fragment:27.1.1'
+}

CountryPicker/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.countrypicker" >
+
+    <application
+        android:allowBackup="true"
+        android:theme="@style/AppTheme" >
+    </application>
+
+</manifest>

CountryPicker/src/com/countrypicker/CountryListAdapter.java → CountryPicker/src/main/java/com/countrypicker/CountryListAdapter.java

@@ -27,7 +27,7 @@ public class CountryListAdapter extends BaseAdapter {
 	 * http://stackoverflow.com/
 	 * questions/3042961/how-can-i-get-the-resource-id-of
 	 * -an-image-if-i-know-its-name
-	 * 
+	 *
 	 * @param drawableName
 	 * @return
 	 */
@@ -46,7 +46,7 @@ private int getResId(String drawableName) {
 
 	/**
 	 * Constructor
-	 * 
+	 *
 	 * @param context
 	 * @param countries
 	 */
@@ -60,19 +60,16 @@ public CountryListAdapter(Context context, List<Country> countries) {
 
 	@Override
 	public int getCount() {
-		// TODO Auto-generated method stub
 		return countries.size();
 	}
 
 	@Override
-	public Object getItem(int arg0) {
-		// TODO Auto-generated method stub
+	public Object getItem(int position) {
 		return null;
 	}
 
 	@Override
-	public long getItemId(int arg0) {
-		// TODO Auto-generated method stub
+	public long getItemId(int position) {
 		return 0;
 	}
 
@@ -87,7 +84,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 		if (convertView == null) {
 			cell = new Cell();
-			cellView = inflater.inflate(R.layout.row, null);
+			cellView = inflater.inflate(R.layout.row, parent, false);
 			cell.textView = (TextView) cellView.findViewById(R.id.row_title);
 			cell.imageView = (ImageView) cellView.findViewById(R.id.row_icon);
 			cellView.setTag(cell);
@@ -106,7 +103,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 	/**
 	 * Holder for the cell
-	 * 
+	 *
 	 */
 	static class Cell {
 		public TextView textView;

CountryPicker/src/com/countrypicker/CountryPicker.java → CountryPicker/src/main/java/com/countrypicker/CountryPicker.java

@@ -1,23 +1,18 @@
 package com.countrypicker;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Currency;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.json.JSONObject;
-
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Base64;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -54,9 +49,15 @@ public class CountryPicker extends DialogFragment implements
 	 */
 	private CountryPickerListener listener;
 
+	/**
+	 * Use collator to sort locale-aware.
+	 */
+	private static final Collator sCollator = Collator.getInstance();
+
+
 	/**
 	 * Set listener
-	 * 
+	 *
 	 * @param listener
 	 */
 	public void setListener(CountryPickerListener listener) {
@@ -74,7 +75,7 @@ public ListView getCountryListView() {
 	/**
 	 * Convenient function to get currency code from country code currency code
 	 * is in English locale
-	 * 
+	 *
 	 * @param countryCode
 	 * @return
 	 */
@@ -89,26 +90,18 @@ public static Currency getCurrencyCode(String countryCode) {
 
 	/**
 	 * Get all countries with code and name from res/raw/countries.json
-	 * 
+	 *
 	 * @return
 	 */
 	private List<Country> getAllCountries() {
 		if (allCountriesList == null) {
 			try {
 				allCountriesList = new ArrayList<Country>();
 
-				// Read from local file
-				String allCountriesString = readFileAsString(getActivity());
-				Log.d("countrypicker", "country: " + allCountriesString);
-				JSONObject jsonObject = new JSONObject(allCountriesString);
-				Iterator<?> keys = jsonObject.keys();
-
-				// Add the data to all countries list
-				while (keys.hasNext()) {
-					String key = (String) keys.next();
+				for (String cc : Locale.getISOCountries()) {
 					Country country = new Country();
-					country.setCode(key);
-					country.setName(jsonObject.getString(key));
+					country.setCode(cc);
+					country.setName(new Locale("", cc).getDisplayCountry());
 					allCountriesList.add(country);
 				}
 
@@ -129,24 +122,9 @@ private List<Country> getAllCountries() {
 		return null;
 	}
 
-	/**
-	 * R.string.countries is a json string which is Base64 encoded to avoid
-	 * special characters in XML. It's Base64 decoded here to get original json.
-	 * 
-	 * @param context
-	 * @return
-	 * @throws java.io.IOException
-	 */
-	private static String readFileAsString(Context context)
-			throws java.io.IOException {
-		String base64 = context.getResources().getString(R.string.countries);
-		byte[] data = Base64.decode(base64, Base64.DEFAULT);
-		return new String(data, "UTF-8");
-	}
-
 	/**
 	 * To support show as dialog
-	 * 
+	 *
 	 * @param dialogTitle
 	 * @return
 	 */
@@ -165,7 +143,7 @@ public static CountryPicker newInstance(String dialogTitle) {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		// Inflate view
-		View view = inflater.inflate(R.layout.country_picker, null);
+		View view = inflater.inflate(R.layout.country_picker, container, false);
 
 		// Get countries from the json
 		getAllCountries();
@@ -232,7 +210,7 @@ public void afterTextChanged(Editable s) {
 	/**
 	 * Search allCountriesList contains text and put result into
 	 * selectedCountriesList
-	 * 
+	 *
 	 * @param text
 	 */
 	@SuppressLint("DefaultLocale")
@@ -254,7 +232,7 @@ private void search(String text) {
 	 */
 	@Override
 	public int compare(Country lhs, Country rhs) {
-		return lhs.getName().compareTo(rhs.getName());
+		return sCollator.compare(lhs.getName(), rhs.getName());
 	}
 
 }

CountryPicker/res/layout/country_picker.xml → CountryPicker/src/main/res/layout/country_picker.xml

@@ -10,7 +10,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:hint="@string/search"
-        android:drawableLeft="@drawable/search_icon" />
+        android:drawableLeft="@drawable/search_icon"
+        android:drawableStart="@drawable/search_icon" />
 
     <ListView
         android:id="@+id/country_picker_listview"

CountryPicker/res/layout/row.xml → CountryPicker/src/main/res/layout/row.xml

@@ -9,6 +9,8 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:contentDescription="@string/Flag"
         android:padding="10dp" />
 
     <TextView

CountryPicker/res/values/strings.xml → CountryPicker/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">CountryPicker</string>
     <string name="search">Search&#8230;</string>
+    <string name="Flag">Flag</string>
 
 </resources>