Updated on 2026-08-14
This commit is contained in:
commit
78d2c9da95
6 changed files with 29 additions and 16 deletions
|
|
@ -62,7 +62,6 @@ public class ServerApiBinance {
|
|||
BinanceAssetData binanceAssetData = (BinanceAssetData) binanceData;
|
||||
for (Balance balance : account.getBalances()) {
|
||||
if (balance.getSymbol().equals(ctx.getCard().getContractAddress())) {
|
||||
binanceAssetData.setBalanceReceived(true);
|
||||
binanceAssetData.setAssetBalance(balance.getFree());
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ internal class JsonToConfig : Converter<PersonalizationJson, PersonalizationConf
|
|||
val jsonCardData = jsonDto.cardData
|
||||
|
||||
// copy whole object and then checking tricky places
|
||||
config.cardData = jsonCardData
|
||||
config.cardData.copyFrom(jsonCardData)
|
||||
|
||||
config.itsToken = jsonCardData.token_contract_address?.isNotEmpty() ?: false
|
||||
|| jsonCardData.token_symbol?.isNotEmpty() ?: false
|
||||
|
|
|
|||
|
|
@ -200,6 +200,19 @@ class CardData {
|
|||
var product_id_card = false
|
||||
var product_id_issuer = false
|
||||
|
||||
fun copyFrom(applyData: CardData) {
|
||||
date = applyData.date
|
||||
batch = applyData.batch
|
||||
blockchain = applyData.blockchain
|
||||
token_symbol = applyData.token_symbol
|
||||
token_contract_address = applyData.token_contract_address
|
||||
token_decimal = applyData.token_decimal
|
||||
product_note = applyData.product_note
|
||||
product_tag = applyData.product_tag
|
||||
product_id_card = applyData.product_id_card
|
||||
product_id_issuer = applyData.product_id_issuer
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun default(): CardData {
|
||||
return CardData().apply {
|
||||
|
|
|
|||
|
|
@ -8,18 +8,6 @@
|
|||
android:id="@+id/action_reset"
|
||||
android:title="@string/menu_personalization_preset_reset" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_import_preset"
|
||||
android:icon="@drawable/ic_import"
|
||||
android:title="@string/menu_import"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_share_preset"
|
||||
android:icon="@drawable/ic_share_white_18dp"
|
||||
android:title="@string/menu_share"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_save"
|
||||
android:title="@string/menu_personalization_preset_save" />
|
||||
|
|
@ -27,6 +15,18 @@
|
|||
android:id="@+id/action_load"
|
||||
android:title="@string/menu_personalization_preset_load" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_import_preset"
|
||||
android:icon="@drawable/ic_import"
|
||||
android:title="@string/menu_import"
|
||||
app:showAsAction="never" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_share_preset"
|
||||
android:icon="@drawable/ic_share_white_18dp"
|
||||
android:title="@string/menu_export"
|
||||
app:showAsAction="never" />
|
||||
|
||||
</group>
|
||||
|
||||
</menu>
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
<string name="menu_main_description">Description</string>
|
||||
<string name="menu_share">Share</string>
|
||||
<string name="menu_import">Import</string>
|
||||
<string name="menu_export">Export</string>
|
||||
|
||||
<string name="copy_to_clipboard">Copy to clipboard</string>
|
||||
<string name="btn_delete">Delete</string>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<resources>
|
||||
|
||||
<string name="menu_personalization_preset_reset">Reset to default</string>
|
||||
<string name="menu_personalization_preset_save">Save configuration</string>
|
||||
<string name="menu_personalization_preset_load">Load configuration</string>
|
||||
<string name="menu_personalization_preset_save">Save preset</string>
|
||||
<string name="menu_personalization_preset_load">Load preset</string>
|
||||
<string name="menu_personalization_preset_import">Import configuration</string>
|
||||
|
||||
<string name="hint_enter_preset_name">Enter a preset name</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue