Skip to content
This repository was archived by the owner on Mar 31, 2020. It is now read-only.

Commit b0ad92d

Browse files
committed
Version 1.0
1 parent dfd57f4 commit b0ad92d

File tree

10 files changed

+55
-7
lines changed

10 files changed

+55
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/local.properties
33
/.idea/workspace.xml
44
.DS_Store
5+
*.apk

Readme.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22

33
## To Do
44

5-
* Currency picker
6-
* New icon
75
* Bigger tap targets
86
* Fix giant wrapping

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ android {
55
buildToolsVersion "19.0.3"
66

77
defaultConfig {
8-
minSdkVersion 15
8+
minSdkVersion 10
99
targetSdkVersion 19
1010
versionCode 1
1111
versionName "1.0"
1212
}
1313
buildTypes {
1414
release {
15-
runProguard false
15+
runProguard true
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
1717
}
1818
}

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.nothingmagical.coins" >
44

5+
<uses-sdk
6+
android:minSdkVersion="10"
7+
android:targetSdkVersion="19" />
8+
59
<uses-permission android:name="android.permission.INTERNET" />
610
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
711

812
<application
913
android:allowBackup="true"
1014
android:icon="@drawable/ic_launcher"
1115
android:label="@string/app_name"
12-
android:theme="@style/AppTheme" >
16+
android:theme="@style/AppTheme">
1317
<activity
1418
android:name="com.nothingmagical.coins.MainActivity"
1519
android:label="@string/app_name"

app/src/main/java/com/nothingmagical/coins/CurrencyPickerActivity.java

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import android.app.ListActivity;
44
import android.os.Bundle;
55
import android.util.Log;
6+
import android.view.View;
7+
import android.widget.ArrayAdapter;
68
import android.widget.ListView;
79

10+
import org.json.JSONArray;
811
import org.json.JSONObject;
912

1013
import java.io.BufferedReader;
@@ -34,10 +37,49 @@ protected void onCreate(Bundle savedInstanceState) {
3437
sb.append(line + "\n");
3538
}
3639
br.close();
37-
String jsonString = sb.toString();
38-
mCurrencies = new JSONObject(jsonString);
40+
41+
mCurrencies = new JSONObject(sb.toString());
42+
JSONObject lookup = mCurrencies.getJSONObject("currencies");
43+
44+
JSONArray order = mCurrencies.getJSONArray("order");
45+
String[] names = new String[order.length()];
46+
String selectedKey = Preferences.getCurrencyCode(this);
47+
int selectedIndex = 0;
48+
for (int i = 0; i < order.length(); i++) {
49+
String key = order.getString(i);
50+
if (key.equals(selectedKey)) {
51+
selectedIndex = i;
52+
}
53+
names[i] = lookup.getString(key);
54+
}
55+
56+
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_checked, names);
57+
setListAdapter(adapter);
58+
getListView().setItemChecked(selectedIndex, true);
59+
3960
} catch (Exception e) {
4061
Log.e(TAG, e.getMessage());
4162
}
4263
}
64+
65+
@Override
66+
protected void onListItemClick(ListView l, View v, int position, long id) {
67+
super.onListItemClick(l, v, position, id);
68+
69+
for (int i = 0; i < getListAdapter().getCount(); i++) {
70+
if (i != position) {
71+
l.setItemChecked(i, false);
72+
}
73+
}
74+
75+
try {
76+
JSONArray order = mCurrencies.getJSONArray("order");
77+
String code = order.getString(position);
78+
Preferences.setCurrencyCode(this, code);
79+
} catch (Exception e) {
80+
Log.e(TAG, e.getMessage());
81+
}
82+
83+
finish();
84+
}
4385
}

app/src/main/java/com/nothingmagical/coins/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.net.MalformedURLException;
2626
import java.net.URL;
2727
import java.text.NumberFormat;
28+
import java.util.Currency;
2829
import java.util.Iterator;
2930
import java.util.Timer;
3031
import java.util.TimerTask;
@@ -126,7 +127,9 @@ protected void updateInterface() {
126127
double value = btc * rate;
127128

128129
// Value
130+
String code = Preferences.getCurrencyCode(this);
129131
NumberFormat format = NumberFormat.getCurrencyInstance();
132+
format.setCurrency(Currency.getInstance(code));
130133
mValueLabel.setText(format.format(value));
131134

132135
// BTC
1.3 KB
Loading
554 Bytes
Loading
1.76 KB
Loading
2.21 KB
Loading

0 commit comments

Comments
 (0)