Merge remote-tracking branch 'origin/dev' into duke

app/src/main/java/org/myhush/silentdragon/ConnectionManager.kt

@@ -116,11 +116,18 @@ object ConnectionManager {
             DataModel.currencySymbols["USD"] = "$"
             DataModel.currencySymbols["EUR"] = "€"
             DataModel.currencySymbols["JPY"] = "¥"
+            DataModel.currencySymbols["CNY"] = "¥"
+            DataModel.currencySymbols["RUB"] = "\u20BD"
+            DataModel.currencySymbols["SGD"] = "$"
+            DataModel.currencySymbols["GBP"] = "£"
+            DataModel.currencySymbols["AUD"] = "$"
+            DataModel.currencySymbols["CAD"] = "$"
 
             Thread {
                 val client = OkHttpClient()
+                val currencies = "usd,eur,jpy,btc,cny,rub,cad,sgd,chf,inr,gbp,aud"
                 val request: Request = Request.Builder()
-                    .url("https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=usd,eur,jpy,btc")
+                    .url("https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=${currencies}")
                     .build()
                 val response: Response = client.newCall(request).execute()
                 val json: JSONObject = JSONObject(response.body()?.string())["hush"] as JSONObject

app/src/main/java/org/myhush/silentdragon/DataModel.kt

@@ -24,9 +24,9 @@ object DataModel {
     var transactions : List<TransactionItem>? = null
 
     val fee: Double = 0.0001
-    var currencyValues: HashMap<String, Double?> = HashMap()
-    var currencySymbols: HashMap<String, String> = HashMap()
-    var selectedCurrency: String = ""
+    val currencyValues: HashMap<String, Double?> = HashMap()
+    val currencySymbols: HashMap<String, String> = HashMap()
+    var selectedCurrency = ""
 
     fun isTestnet(): Boolean {
         return mainResponseData?.tokenName != "HUSH"

app/src/main/java/org/myhush/silentdragon/SettingsActivity.kt

@@ -60,11 +60,21 @@ class SettingsActivity : AppCompatActivity() {
 
     private fun fillSpinner(){
         val items = DataModel.currencyValues.keys.toMutableList()
+        var selectedIndex = 0
+        items.sort()
+
+        for (i in items){
+            if(i == DataModel.selectedCurrency)
+                break
+            selectedIndex++
+        }
+
 
         var adapter: ArrayAdapter<String> = ArrayAdapter(this, android.R.layout.simple_spinner_item, items)
 
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_item)
         spinnerCurrency.adapter = adapter
+        spinnerCurrency.setSelection(selectedIndex)
     }
 
     fun updateUI() {