Merge remote-tracking branch 'origin/master'

# Conflicts: # bitcoin/src/main/res/raw/cryptowidgetcoins.json
hwki · Oct 4, 2021 · 8b2ea85 · 8b2ea85
2 parents 9ed6e80 + 3047572
commit 8b2ea85
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt
@@ -30,6 +30,7 @@ enum class Coin(val coinName: String, vararg val themes: IconTheme) : Parcelable
         }
     },
     BNB("Binance Coin", IconTheme(SOLID, ic_bnb)),
+    BEST("Bitpanda Ecosystem Token", IconTheme(SOLID, ic_best)),
     BNT("Bancor Network Token", IconTheme(SOLID, ic_bnt)),
     BSV("Bitcoin SV", IconTheme(SOLID, ic_bsv, ic_bsv_dark)),
     BTC("Bitcoin", IconTheme(SOLID, ic_btc, ic_btc_dark)) {

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt
@@ -134,6 +134,13 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
             return getJsonArray(url).get(0).asJsonObject.get("lastPrice").asString
         }
     },
+    BITPANDA("Bitpanda") {
+
+        override fun getValue(coin: String, currency: String): String {
+            val url = "https://api.bitpanda.com/v1/ticker"
+            return getJsonObject(url).get(coin).asJsonObject.get(currency).asString
+        }
+    },
     BITPAY("BitPay") {
 
         override fun getValue(coin: String, currency: String): String? {
@@ -286,6 +293,7 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
                 "BAND" to "band-protocol",
                 "BAT" to "basic-attention-token",
                 "BCD" to "bitcoin-diamond",
+                "BEST" to "bitpanda-ecosystem-token",
                 "BCH" to "bitcoin-cash",
                 "BNB" to "binancecoin",
                 "BNT" to "bancor",

diff --git a/bitcoin/src/main/res/drawable-nodpi/ic_best.png b/bitcoin/src/main/res/drawable-nodpi/ic_best.png
diff --git a/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/GenerateSupportedCoinsJson.kt b/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/GenerateSupportedCoinsJson.kt
@@ -2,6 +2,7 @@ package com.brentpanther.bitcoinwidget
 
 import com.brentpanther.bitcoinwidget.exchange.Exchange
 import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.jayway.jsonpath.JsonPath
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -26,7 +27,7 @@ class GenerateSupportedCoinsJson {
                 listOf(this::abucoins, this::ascendex, this::bibox, this::bigone, this::binance, this::binance_us, this::bit2c,
                         this::bitbank, this::bitbay, this::bitcambio, this::bitclude,
                         this::bitcoinde, this::bitfinex, this::bitflyer, this::bithumb, this::bithumbpro, this::bitmex,
-                        this::bitpay, this::bitso, this::bitstamp, this::bittrex, this::bitvavo, this::bleutrade,
+                        this::bitpanda, this::bitpay, this::bitso, this::bitstamp, this::bittrex, this::bitvavo, this::bleutrade,
                         this::btcbox, this::btcmarkets, this::btcturk, this::bybit, this::cexio,
                         this::chilebit, this::coinbase, this::coinbasepro, this::coinbene, this::coindesk, this::coingecko,
                         this::coinjar, this::coinmate, this::coinone, this::coinsbit, this::coinsph, this::cointree,
@@ -266,6 +267,16 @@ class GenerateSupportedCoinsJson {
         return parse("https://www.bitmex.com/api/v1/instrument/active", "$.[*].symbol")
     }
 
+    private fun bitpanda(): List<String> {
+        val pairs = mutableListOf<String>()
+        Gson().fromJson(get("https://api.bitpanda.com/v1/ticker"), JsonObject::class.java).entrySet().forEach { (coin, currencies) ->
+            currencies.asJsonObject.keySet().forEach{
+                pairs.add("${coin}_${it}")
+            }
+        }
+        return pairs
+    }
+
     private fun bitpay(): List<String> {
         return parse("https://bitpay.com/currencies", "$.data[*].code").map {
             "BTC_$it"