From a69baf630af09db76838f19bea2915bba92bb4b5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 16 Apr 2019 12:45:51 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- .../com/tangem/data/network/BinanceApi.java | 23 +++++++++++ .../java/com/tangem/data/network/Server.java | 11 +++++ .../tangem/data/network/ServerApiBinance.java | 4 ++ .../com/tangem/data/network/ServerURL.java | 1 + .../data/network/model/BinanceResponse.kt | 41 +++++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 app/src/main/java/com/tangem/data/network/BinanceApi.java create mode 100644 app/src/main/java/com/tangem/data/network/ServerApiBinance.java create mode 100644 app/src/main/java/com/tangem/data/network/model/BinanceResponse.kt diff --git a/app/src/main/java/com/tangem/data/network/BinanceApi.java b/app/src/main/java/com/tangem/data/network/BinanceApi.java new file mode 100644 index 0000000000..532aaae7c9 --- /dev/null +++ b/app/src/main/java/com/tangem/data/network/BinanceApi.java @@ -0,0 +1,23 @@ +package com.tangem.data.network; + +import com.tangem.data.network.model.BinanceAccount; +import com.tangem.data.network.model.BinanceError; +import com.tangem.data.network.model.BinanceFees; + +import retrofit2.Call; +import retrofit2.http.Body; +import retrofit2.http.GET; +import retrofit2.http.Headers; +import retrofit2.http.POST; + +public interface BinanceApi { + @GET(Server.ApiBinance.Method.ACCOUNT) + Call binanceAccount(); + + @GET(Server.ApiBinance.Method.FEES) + Call binanceFees(); + + @Headers("Content-Type: text/plain") + @POST(Server.ApiBinance.Method.BROADCAST) + Call binanceBroadcast(@Body String txForSend); +} diff --git a/app/src/main/java/com/tangem/data/network/Server.java b/app/src/main/java/com/tangem/data/network/Server.java index 832e0495c2..4af90598d1 100644 --- a/app/src/main/java/com/tangem/data/network/Server.java +++ b/app/src/main/java/com/tangem/data/network/Server.java @@ -55,4 +55,15 @@ public class Server { static final String N_6 = URL_ESTIMATEFEE + "n/6"; } } + + public static class ApiBinance { + public static final String URL_BINANCE = ServerURL.API_BINANCE; + static final String API_V1 = "api/v1/"; + + public static class Method { + static final String ACCOUNT = URL_BINANCE + API_V1 + "account"; + static final String FEES = URL_BINANCE + API_V1 + "fees"; + static final String BROADCAST = URL_BINANCE + API_V1 + "broadcast"; + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/data/network/ServerApiBinance.java b/app/src/main/java/com/tangem/data/network/ServerApiBinance.java new file mode 100644 index 0000000000..e361fe64e2 --- /dev/null +++ b/app/src/main/java/com/tangem/data/network/ServerApiBinance.java @@ -0,0 +1,4 @@ +package com.tangem.data.network; + +public class ServerApiBinance { +} diff --git a/app/src/main/java/com/tangem/data/network/ServerURL.java b/app/src/main/java/com/tangem/data/network/ServerURL.java index b33d4c4ba4..bf472694c7 100644 --- a/app/src/main/java/com/tangem/data/network/ServerURL.java +++ b/app/src/main/java/com/tangem/data/network/ServerURL.java @@ -7,4 +7,5 @@ class ServerURL { static final String API_ESTIMATEFEE = "https://estimatefee.com/"; static final String API_UPDATE_VERSION = "https://raw.githubusercontent.com/"; static final String API_ROOTSTOCK = "https://public-node.rsk.co/"; + static final String API_BINANCE = "https://testnet-dex.binance.org/"; } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/data/network/model/BinanceResponse.kt b/app/src/main/java/com/tangem/data/network/model/BinanceResponse.kt new file mode 100644 index 0000000000..0e11bd307d --- /dev/null +++ b/app/src/main/java/com/tangem/data/network/model/BinanceResponse.kt @@ -0,0 +1,41 @@ +package com.tangem.data.network.model + +import com.google.gson.annotations.SerializedName +import java.security.MessageDigest + +data class BinanceAccount( + @SerializedName("address") + var address: String? = null, + + @SerializedName("sequence") + var sequence: Long? = null, + + @SerializedName("balances") + var balances: List? = null +) + +data class BinanceBalance( + @SerializedName("symbol") + var symbol: String? = null, + + @SerializedName("free") + var free: String? = null +) + +data class BinanceFees( + @SerializedName("fixed_fee_params") + var fixed_fee_params: BinanceFixedFee? = null +) + +data class BinanceFixedFee( + @SerializedName("msg_type") + var msg_type: String? = null, + + @SerializedName("fee") + var fee: Long? = null +) + +data class BinanceError( + @SerializedName("message") + var message: String? = null +) \ No newline at end of file From 29f73887433790a80851319eaffd02bd03c75e48 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 17 Apr 2019 11:24:47 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- app/src/main/res/values/dimens.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 8464ee95a5..1612a3d2a4 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,13 +17,13 @@ 140dp 16dp - 11sp - 13sp - 15sp - 19sp - 23sp - 26sp - 34sp + 11dp + 13dp + 15dp + 19dp + 23dp + 26dp + 34dp 180dp 30dp