From 907c5577f57d8cc4389a1f454482985c8f0c551c Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 2 Apr 2020 16:15:54 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../ucase/resources/initializers/PersonalizeResources.kt | 1 + .../tangem/tangemtest/ucase/variants/personalize/Ids.kt | 1 + .../personalize/converter/IdToValueAssociations.kt | 1 + .../personalize/converter/PersonalizeConfigConverter.kt | 7 ++++--- .../ucase/variants/personalize/converter/ValueMapper.kt | 1 + .../ucase/variants/personalize/dto/PersonalizeConfig.kt | 1 + .../src/main/res/values/strings_personalization.xml | 2 ++ 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt index d1d91d121f..db2cb35314 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt @@ -43,6 +43,7 @@ class PersonalizeResources() { private fun initCardNumber(holder: TypedHolder) { holder.register(CardNumber.Series, Resources(R.string.pers_item_series, R.string.info_pers_item_series)) holder.register(CardNumber.Number, Resources(R.string.pers_item_number, R.string.info_pers_item_number)) + holder.register(CardNumber.BatchId, Resources(R.string.pers_item_batch_id, R.string.info_pers_item_batch_id)) } private fun initCommon(holder: TypedHolder) { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt index 44860aff33..03a0012900 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt @@ -27,6 +27,7 @@ enum class BlockId : PersonalizeId { enum class CardNumber : BlockItem { Series, Number, + BatchId, } enum class Common : BlockItem { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/IdToValueAssociations.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/IdToValueAssociations.kt index 537f8a2b6f..d9b25637a8 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/IdToValueAssociations.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/IdToValueAssociations.kt @@ -26,6 +26,7 @@ class IdToValueAssociations : BaseTypedHolder() { fun init(from: PersonalizeConfig) { register(CardNumber.Series, Value(from.series)) register(CardNumber.Number, Value(from.startNumber)) + register(CardNumber.BatchId, Value(from.batchId)) register(Common.Curve, Value(from.curveID, Helper.listOfCurves())) register(Common.Blockchain, Value(from.blockchain, Helper.listOfBlockchain())) register(Common.BlockchainCustom, Value("")) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt index e4bee5910d..cfa9636cc5 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt @@ -47,7 +47,8 @@ class PersonalizeConfigConverter { val block = createBlock(BlockId.CardNumber) mutableListOf( CardNumber.Series, - CardNumber.Number + CardNumber.Number, + CardNumber.BatchId ).forEach { createItem(block, it as Id) } return block } @@ -227,7 +228,7 @@ class PersonalizeConfigConverter { val cardData = CardData( blockchainName = applyConfig.blockchain, - batchId = applyConfig.cardData.batch, + batchId = applyConfig.batchId, productMask = productMask, tokenSymbol = tokenSymbol, tokenContractAddress = tokenContractAddress, @@ -316,7 +317,7 @@ class IdItemHelper { ) val editTextList = mutableListOf( - CardNumber.Series, Common.BlockchainCustom, SignHashExProp.CryptoExKey, Token.Symbol, + CardNumber.Series, CardNumber.BatchId, Common.BlockchainCustom, SignHashExProp.CryptoExKey, Token.Symbol, Token.ContractAddress, Pins.Pin, Pins.Pin2, Pins.Pin3, Pins.Cvc, SettingsMaskNdef.AarCustom ) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/ValueMapper.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/ValueMapper.kt index 3c2e36d2bd..1ff32c4012 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/ValueMapper.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/ValueMapper.kt @@ -43,6 +43,7 @@ class ValueMapper { val export = PersonalizeConfig() export.series = getTyped(CardNumber.Series, defaultConfig.series) export.startNumber = getTyped(CardNumber.Number, defaultConfig.startNumber) + export.batchId = getTyped(CardNumber.BatchId, defaultConfig.batchId) export.curveID = getTyped(Common.Curve, defaultConfig.curveID) export.blockchain = getTyped(Common.Blockchain, defaultConfig.blockchain) export.blockchainCustom = getTyped(Common.BlockchainCustom, defaultConfig.blockchainCustom) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt index c3362c4971..6edef02cb7 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt @@ -8,6 +8,7 @@ class PersonalizeConfig { // Card number var series = "BB" var startNumber: Long = 300000000000 + var batchId = "ffff" // Common diff --git a/tangem-demo/src/main/res/values/strings_personalization.xml b/tangem-demo/src/main/res/values/strings_personalization.xml index 365ba71b3b..7ffcc1f7fc 100644 --- a/tangem-demo/src/main/res/values/strings_personalization.xml +++ b/tangem-demo/src/main/res/values/strings_personalization.xml @@ -17,6 +17,7 @@ ​ Series Number + Batch ID Curve Blockchain Custom blockchain @@ -86,6 +87,7 @@ ​ + Elliptic curve used for all wallet key operations. Supported curves: ‘secp256k1’, ‘ed25519’. Name of the blockchain. It\'s just a textfield in the card. It\'s needed for host app to tell what blockchain should it use. You can use this field, to create something special