Removed Bluetrade and TheRock exchanges.

Updated several exchange APIs.

Author: hwki

bitcoin/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.android'
 }
 
 android {
@@ -12,8 +13,8 @@ android {
         applicationId "com.brentpanther.bitcoinwidget"
         minSdk 23
         targetSdk 33
-        versionCode 317
-        versionName "8.3.7"
+        versionCode 318
+        versionName "8.3.8"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -71,26 +72,29 @@ android {
 }
 
 dependencies {
+    implementation platform('androidx.compose:compose-bom:2023.04.00')
+
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
-    implementation 'androidx.activity:activity-compose:1.6.1'
-    implementation "androidx.compose.ui:ui:$compose_ui_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
-    implementation 'androidx.compose.material:material:1.3.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+    implementation 'androidx.work:work-runtime-ktx:2.8.1'
+    implementation 'androidx.activity:activity-compose:1.7.0'
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+    implementation 'androidx.compose.material:material'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
     implementation 'androidx.navigation:navigation-compose:2.5.3'
-    implementation "io.coil-kt:coil-compose:2.2.2"
+    implementation "io.coil-kt:coil-compose:2.3.0"
+    implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.jayway.jsonpath:json-path:2.7.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
+    testImplementation 'com.jayway.jsonpath:json-path:2.8.0'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:"
+    debugImplementation "androidx.compose.ui:ui-tooling:"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:"
 
-    def room_version = "2.4.3"
+    def room_version = "2.5.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"

bitcoin/src/main/java/com/brentpanther/bitcoinwidget/WidgetProvider.kt

@@ -70,7 +70,7 @@ open class WidgetProvider : AppWidgetProvider() {
             val immediateWork = OneTimeWorkRequestBuilder<WidgetUpdateWorker>().setInitialDelay(3650L, TimeUnit.DAYS).build()
             workManager.enqueueUniqueWork(ONETIMEWORKNAME, ExistingWorkPolicy.KEEP, immediateWork)
 
-            val workPolicy = if (restart) ExistingPeriodicWorkPolicy.REPLACE else ExistingPeriodicWorkPolicy.KEEP
+            val workPolicy = if (restart) ExistingPeriodicWorkPolicy.UPDATE else ExistingPeriodicWorkPolicy.KEEP
             when (refresh) {
                 5 -> (0..10 step 5).forEachIndexed { i, it -> scheduleWork(workManager, 15, it, i, workPolicy) }
                 10 -> (0..10 step 10).forEachIndexed { i, it -> scheduleWork(workManager, 20, it, i, workPolicy) }

bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt

@@ -131,7 +131,7 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
     BITPAY("BitPay") {
 
         override fun getValue(coin: String, currency: String): String {
-            val url = "https://bitpay.com/api/rates/BTC/USD"
+            val url = "https://bitpay.com/api/rates/$coin/$currency"
             return getJsonObject(url).get("rate").asString
         }
     },
@@ -180,15 +180,6 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
         }
 
     },
-    BLEUTRADE("Bleutrade") {
-
-        override fun getValue(coin: String, currency: String): String {
-            val pair = "${coin}_$currency"
-            val url = "https://bleutrade.com/api/v3/public/getticker?market=$pair"
-            val result = getJsonObject(url).getAsJsonArray("result").get(0).asJsonObject
-            return result.get("Last").asString
-        }
-    },
     BTCBOX("BTC Box") {
 
         override fun getValue(coin: String, currency: String): String {
@@ -277,8 +268,8 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
     COINONE("Coinone") {
 
         override fun getValue(coin: String, currency: String): String {
-            val url = "https://api.coinone.co.kr/ticker/?currency=$coin"
-            return getJsonObject(url).get("last").asString
+            val url = "https://api.coinone.co.kr/public/v2/ticker_new/$currency/$coin"
+            return getJsonObject(url).getAsJsonArray("tickers")[0].asJsonObject.get("last").asString
         }
     },
     COINSBIT("Coinsbit") {
@@ -560,13 +551,6 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
             return getJsonObject(url).getAsJsonArray("data")[0].asJsonObject.get("last").asString
         }
     },
-    THEROCK("TheRock") {
-
-        override fun getValue(coin: String, currency: String): String {
-            val url = "https://api.therocktrading.com/v1/funds/$coin$currency/ticker"
-            return getJsonObject(url).get("last").asString
-        }
-    },
     TRADEOGRE("TradeOgre") {
         override fun getValue(coin: String, currency: String): String {
             val url = "https://tradeogre.com/api/v1/ticker/$currency-$coin"
@@ -606,8 +590,8 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
     },
     XT("XT.com") {
         override fun getValue(coin: String, currency: String): String? {
-            val url = "https://api.xt.com/data/api/v1/getTicker?market=${coin.lowercase()}_${currency.lowercase()}"
-            return getJsonObject(url).get("price").asString
+            val url = "https://sapi.xt.com/v4/public/ticker/price?symbol=${coin.lowercase()}_${currency.lowercase()}"
+            return getJsonObject(url).get("result").asJsonArray[0].asJsonObject.get("p").asString
         }
 
     },

bitcoin/src/main/res/raw/cryptowidgetcoins_v2.json

@@ -94,7 +94,7 @@
         <item>ISO</item>
         <item>NONE</item>
     </string-array>
-    <string name="json_last_modified" translatable="false">Thu, 03 Nov 2022 11:11:24 GMT</string>
+    <string name="json_last_modified" translatable="false">Thu, 06 Apr 2023 01:02:58 GMT</string>
     <string name="json_url" translatable="false">https://www.brentpanther.com/cryptowidgetcoins_v2.json</string>
 
     <string name="error_restricted_battery_saver">Unable to refresh, Battery Saver is on</string>

bitcoin/src/main/res/values/strings.xml

@@ -33,15 +33,15 @@ class GenerateSupportedCoinsJson {
                 listOf(this::ascendex, this::bibox, this::bigone, this::binance, this::binance_us, this::bit2c,
                         this::bitbank, this::bitcambio, this::bitclude,
                         this::bitcoinde, this::bitfinex, this::bitflyer, this::bithumb, this::bitglobal, this::bitmart,
-                        this::bitpanda, this::bitpay, this::bitso, this::bitstamp, this::bittrex, this::bitrue, this::bitvavo, this::bleutrade,
+                        this::bitpanda, this::bitpay, this::bitso, this::bitstamp, this::bittrex, this::bitrue, this::bitvavo,
                         this::btcbox, this::btcmarkets, this::btcturk, this::bybit, this::cexio,
                         this::chilebit, this::coinbase, this::coinbasepro, this::coindesk, this::coingecko,
                         this::coinjar, this::coinmate, this::coinone, this::coinsbit, this::coinsph, this::cointree,
                         this::cryptocom, this::deversifi, this::digifinex, this::exmo, this::foxbit, this::gateio, this::gemini,
                         this::hitbtc, this::huobi, this::independent_reserve, this::indodax, this::itbit, this::korbit, this::kraken, this::kucoin,
                         this::kuna, this::lbank, this::liquid, this::luno, this::mercado, this::mexc, this::ndax,
                         this::nexchange, this::okcoin, this::okx, this::p2pb2b, this::paribu, this::paymium, this::phemex,
-                        this::pocketbits, this::poloniex, this::probit, this::therock, this::tradeogre, this::uphold,
+                        this::pocketbits, this::poloniex, this::probit, this::tradeogre, this::uphold,
                         this::vbtc, this::whitebit, this::wyre, this::xt, this::yadio, this::yobit, this::zbg, this::zonda
                 ).zip(Exchange.values())
 
@@ -320,8 +320,10 @@ class GenerateSupportedCoinsJson {
     }
 
     private fun bitpay(): List<String> {
-        return parse("https://bitpay.com/currencies", "$.data[*].code").flatMap {
-            listOf("BTC_$it", "BCH_$it")
+        val coins = parse("https://bitpay.com/currencies", "$.data[?(@.chain)].code").filterNot { it == "PAX" }
+        val currencies = parse("https://bitpay.com/currencies", "$.data[*].code")
+        return coins.flatMap { coin ->
+            currencies.map { currency -> "${coin}_$currency"}
         }
     }
 
@@ -346,10 +348,6 @@ class GenerateSupportedCoinsJson {
         return parse("https://api.bitvavo.com/v2/markets", "$[*].market")
     }
 
-    private fun bleutrade(): List<String> {
-        return parse("https://bleutrade.com/api/v3/public/getmarkets", "$.result[*].MarketName")
-    }
-
     private fun btcbox(): List<String> {
         return parseKeys("https://www.btcbox.co.jp/api/v1/tickers", "$")
     }
@@ -411,8 +409,10 @@ class GenerateSupportedCoinsJson {
     }
 
     private fun coinone(): List<String> {
-        return parse("https://tb.coinone.co.kr/api/v1/tradepair/", "$.tradepairs[*].target_coin_symbol").map {
-            it + "_KRW"
+        val currencies = listOf("KRW")
+        return currencies.flatMap { currency ->
+            val list = parse("https://api.coinone.co.kr/public/v2/markets/$currency", "$.markets[*].target_currency")
+            list.map { "${it}_$currency" }
         }
     }
 
@@ -572,10 +572,6 @@ class GenerateSupportedCoinsJson {
         return parse("https://api.probit.com/api/exchange/v1/market", "$.data[*].id")
     }
 
-    private fun therock(): List<String> {
-        return parse("https://api.therocktrading.com/v1/funds/tickers", "$.tickers[*].fund_id")
-    }
-
     private fun tradeogre(): List<String> {
         val list = JsonPath.read(get("https://tradeogre.com/api/v1/markets"), "$[*]") as List<Map<String, *>>
         return list.map { it.keys.first().split("-").reversed().joinToString("_") }
@@ -604,7 +600,7 @@ class GenerateSupportedCoinsJson {
     }
 
     private fun xt(): List<String> {
-        return parseKeys("https://api.xt.com/data/api/v1/getTickers", "$")
+        return parse("https://sapi.xt.com/v4/public/symbol", "$.result.symbols[*].symbol")
     }
 
     private fun yadio(): List<String> {

bitcoin/src/test/java/com/brentpanther/bitcoinwidget/GenerateSupportedCoinsJson.kt

@@ -2,17 +2,16 @@
 
 buildscript {
     ext {
-        compose_ui_version = '1.3.2'
-        compose_compiler_version = '1.3.1'
+        compose_compiler_version = '1.4.3'
     }
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build.gradle

@@ -0,0 +1 @@
+Removed Bluetrade and TheRock exchanges.

fastlane/metadata/android/en-US/changelogs/318.txt

@@ -14,3 +14,4 @@
 org.gradle.jvmargs=-Xmx2048M -XX:+UseParallelGC
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.unsafe.configuration-cache=true

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists