diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ada7acbd0c..e8ad7e999f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,7 +10,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index cd2f3a654d..703e5d4b89 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,41 +5,6 @@ - - - - diff --git a/app/build.gradle b/app/build.gradle index 69451846c1..5facfb67ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,9 +44,12 @@ android { } dependencies { - implementation project(':tangemcard-common') + implementation project(':tangemcommon') +// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' + implementation project(':tangemcard-android') implementation project(':tangemserver-android') + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' @@ -74,6 +77,6 @@ dependencies { implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation 'info.hoang8f:android-segmented:1.0.6' implementation 'io.reactivex.rxjava2:rxjava:2.2.0' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' + implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index d226c4afb7..dc02b999b5 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -10,9 +10,7 @@ import com.tangem.di.NavigatorComponent import com.tangem.di.NetworkComponent import com.tangem.tangemcard.android.data.Firmwares import com.tangem.tangemcard.android.data.PINStorage -import com.tangem.tangemcard.data.Issuer -import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider -import com.tangem.tangemcard.data.external.PINsProvider +import com.tangem.tangemcommon.data.Issuer import com.tangem.tangemserver.android.data.LocalStorage import java.io.InputStreamReader import java.nio.charset.StandardCharsets @@ -32,9 +30,9 @@ class App : Application() { var navigatorComponent: NavigatorComponent? = null private set - lateinit var firmwaresStorage: FirmwaresDigestsProvider + lateinit var firmwaresStorage: Firmwares lateinit var localStorage: LocalStorage - lateinit var pinStorage: PINsProvider + lateinit var pinStorage: PINStorage } override fun onCreate() { diff --git a/app/src/main/java/com/tangem/data/Logger.java b/app/src/main/java/com/tangem/data/Logger.java index 9196d9987c..01c7bd46ae 100644 --- a/app/src/main/java/com/tangem/data/Logger.java +++ b/app/src/main/java/com/tangem/data/Logger.java @@ -3,7 +3,7 @@ package com.tangem.data; import android.content.Context; import android.util.Log; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java index 7e933b1951..7097530d85 100644 --- a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java +++ b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java @@ -11,7 +11,7 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.internal.LinkedTreeMap; import com.jakewharton.retrofit2.adapter.rxjava2.HttpException; import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import com.tangem.wallet.R; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/data/network/Kraken.java b/app/src/main/java/com/tangem/data/network/Kraken.java index 3eefe0a9d9..f0ca344987 100644 --- a/app/src/main/java/com/tangem/data/network/Kraken.java +++ b/app/src/main/java/com/tangem/data/network/Kraken.java @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import com.tangem.wallet.R; import org.spongycastle.util.encoders.Base64; diff --git a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java b/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java index 91da8e43cf..3a059da2f2 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java +++ b/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java @@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java b/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java index 973d4ed231..f196a0ac9f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java +++ b/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java @@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java index a40ef82c03..5fa7fd1f60 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java @@ -1,6 +1,6 @@ package com.tangem.domain.wallet; -import com.tangem.tangemcard.data.TangemCard; +import com.tangem.tangemcommon.data.TangemCard; import com.tangem.wallet.R; public class BalanceValidator { diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java index 285b9e06fd..5bfb7b9b4e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java @@ -3,8 +3,8 @@ package com.tangem.domain.wallet; import android.net.Uri; import android.text.InputFilter; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.tangemcommon.tasks.SignTask; import java.io.IOException; import java.math.BigDecimal; diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java index 1537c56082..9b2177da0b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -6,9 +6,8 @@ import android.os.Bundle; import com.tangem.Constant; import com.tangem.data.Blockchain; -import com.tangem.tangemcard.data.TangemCard; import com.tangem.tangemcard.data.TangemCardExtensionsKt; - +import com.tangem.tangemcommon.data.TangemCard; public class TangemContext { // public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"; diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java index 689c25219b..5ccbb927ac 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java @@ -8,20 +8,20 @@ import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; import com.tangem.domain.wallet.BCHUtils; import com.tangem.domain.wallet.BTCUtils; -import com.tangem.tangemcard.reader.CardProtocol; +import com.tangem.tangemcommon.reader.CardProtocol; import com.tangem.domain.wallet.BalanceValidator; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.domain.wallet.CoinData; import com.tangem.domain.wallet.CoinEngine; -import com.tangem.tangemcard.data.TangemCard; +import com.tangem.tangemcommon.data.TangemCard; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import com.tangem.wallet.R; import org.json.JSONArray; diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java index 664b1623fa..8c63bb608d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java @@ -5,22 +5,22 @@ import android.text.InputFilter; import android.util.Log; import com.tangem.data.network.ServerApiCommon; -import com.tangem.tangemcard.reader.CardProtocol; +import com.tangem.tangemcommon.reader.CardProtocol; import com.tangem.domain.wallet.BalanceValidator; import com.tangem.domain.wallet.Base58; import com.tangem.data.Blockchain; import com.tangem.domain.wallet.CoinData; import com.tangem.domain.wallet.CoinEngine; -import com.tangem.tangemcard.data.TangemCard; +import com.tangem.tangemcommon.data.TangemCard; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; import com.tangem.domain.wallet.BTCUtils; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import com.tangem.wallet.R; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; diff --git a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java index 94b4276189..438643f7db 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java @@ -15,10 +15,10 @@ import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.domain.wallet.btc.BtcEngine; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.tasks.SignTask; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.tangemcommon.util.Util; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java index f347e75893..0f0086f8d1 100644 --- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java @@ -15,8 +15,8 @@ import com.tangem.domain.wallet.ECDSASignatureETH; import com.tangem.domain.wallet.EthTransaction; import com.tangem.domain.wallet.Keccak256; import com.tangem.domain.wallet.TangemContext; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java index 56f6bcc379..0bf1b2839a 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java @@ -16,10 +16,10 @@ import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.domain.wallet.btc.BtcEngine; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.tasks.SignTask; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.tangemcommon.util.Util; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; diff --git a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java index 2e9e73e016..a89d916c95 100644 --- a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java @@ -16,13 +16,12 @@ import com.tangem.domain.wallet.Keccak256; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.eth.EthData; import com.tangem.domain.wallet.token.TokenData; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.wallet.R; import java.math.BigInteger; - public class NftTokenEngine extends CoinEngine { private static final String TAG = NftTokenEngine.class.getSimpleName(); diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java index 45fd76eba1..96d178234f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java @@ -18,8 +18,8 @@ import com.tangem.domain.wallet.EthTransaction; import com.tangem.domain.wallet.Keccak256; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.eth.EthData; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt index 46fbfa8537..92815f8889 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt @@ -14,14 +14,15 @@ import android.view.KeyEvent import android.view.View import android.widget.Toast import com.tangem.Constant +import com.tangem.data.Blockchain import com.tangem.domain.wallet.CoinEngine import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.event.TransactionFinishWithError import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle +import com.tangem.tangemcommon.data.TangemCard import com.tangem.util.UtilHelper import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_confirm_transaction.* @@ -71,10 +72,17 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac else tvIncFee.visibility = View.INVISIBLE - etAmount.setText(amount.toValueString()) + if (ctx.card.blockchainID == Blockchain.Token.id) { + // for Blockchain.Token limit decimals + etAmount.setText(amount.toValueString(ctx.card.tokensDecimal)) + } else { + // for others + etAmount.setText(amount.toValueString()) + } + tvCurrency.text = engine.balanceCurrency tvCurrency2.text = engine.feeCurrency - tvCardID.text = ctx.card!!.cidDescription + tvCardID.text = ctx.card.cidDescription etWallet.setText(intent.getStringExtra(Constant.EXTRA_TARGET_ADDRESS)) btnSend.visibility = View.INVISIBLE @@ -93,8 +101,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { try { - val engine = CoinEngineFactory.create(ctx) - val eqFee = engine?.evaluateFeeEquivalent(etFee!!.text.toString()) + val eqFee = engine.evaluateFeeEquivalent(etFee!!.text.toString()) tvFeeEquivalent.text = eqFee if (!ctx.coinData!!.amountEquivalentDescriptionAvailable) { diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt index d20ddac09e..6ed08bc66b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -22,9 +22,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.CreateNewWalletTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.CreateNewWalletTask +import com.tangem.tangemcommon.util.Util import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_create_new_wallet.* import kotlinx.android.synthetic.main.layout_progress_horizontal.* diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt index 2a87fbdf71..591df62fad 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -23,12 +23,12 @@ import com.tangem.presentation.dialog.WaitSecurityDelayDialog import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.asBundle import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.VerifyCardTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.VerifyCardTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.util.UtilHelper import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt index 11ab269e93..cb3227e1d2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -34,11 +34,11 @@ import com.tangem.tangemcard.android.nfc.NfcDeviceAntennaLocation import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle import com.tangem.tangemcard.data.saveToBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.ReadCardInfoTask +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.ReadCardInfoTask import com.tangem.util.CommonUtil import com.tangem.util.LOG import com.tangem.util.PhoneUtility @@ -112,7 +112,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) if (tag != null && onNfcReaderCallback != null) { - onNfcReaderCallback!!.onTagDiscovered(tag) + onNfcReaderCallback?.onTagDiscovered(tag) } } @@ -231,7 +231,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco lastTag = tag readCardInfoTask = ReadCardInfoTask(NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this) - readCardInfoTask!!.start() + readCardInfoTask?.start() LOG.i(TAG, "onTagDiscovered " + Arrays.toString(tag.id)) diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt index 23ab30cf58..1ae1e72cae 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -26,10 +26,10 @@ import com.tangem.data.fingerprint.FingerprintHelper import com.tangem.domain.wallet.TangemContext import com.tangem.tangemcard.android.data.PINStorage import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID +import com.tangem.tangemcommon.data.TangemCard import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_request.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt index 7700515491..c0de9bdfd6 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -21,9 +21,10 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.* -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.SwapPINTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.SwapPINTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_swap.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt index 4649032c20..8e5e68c1ff 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -92,7 +92,6 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade val strAmount: String = etAmount.text.toString().replace(",", ".") val strFee: String = etFee.text.toString().replace(",", ".") val dblAmount: Double = strAmount.toDouble() - var dblFee: Double = strFee.toDouble() cryptonit!!.fee = strFee rlProgressBar.visibility = View.VISIBLE diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt index dc8bbb7665..e44c8a0ece 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -24,9 +24,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.PurgeTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.PurgeTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_purge.* diff --git a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt index 8a88b1c0b3..6d19aa4b8c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.content.res.ColorStateList import android.graphics.Color +import android.media.MediaPlayer import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep @@ -24,9 +25,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.SignTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.SignTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_sign_transaction.* @@ -41,6 +42,7 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, private lateinit var nfcManager: NfcManager private lateinit var ctx: TangemContext + private lateinit var mpFinishSignSound: MediaPlayer private lateinit var nfcDeviceAntenna: NfcDeviceAntennaLocation @@ -61,6 +63,8 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, ctx = TangemContext.loadFromBundle(this, intent.extras) + mpFinishSignSound = MediaPlayer.create(this, R.raw.scan_card_sound) + // init NFC Antenna nfcDeviceAntenna = NfcDeviceAntennaLocation(this, ivHandCardHorizontal, ivHandCardVertical, llHand, llNfc) nfcDeviceAntenna.init() @@ -173,22 +177,24 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, if (cardProtocol.error == null) { rlProgressBar.post { rlProgressBar.visibility = View.GONE } - progressBar!!.post { - progressBar!!.progress = 100 - progressBar!!.progressTintList = ColorStateList.valueOf(Color.GREEN) + progressBar?.post { + progressBar?.progress = 100 + progressBar?.progressTintList = ColorStateList.valueOf(Color.GREEN) } + + mpFinishSignSound.start() } else { lastReadSuccess = false if (cardProtocol.error.javaClass == CardProtocol.TangemException_InvalidPIN::class.java) { - progressBar!!.post { - progressBar!!.progress = 100 - progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED) + progressBar?.post { + progressBar?.progress = 100 + progressBar?.progressTintList = ColorStateList.valueOf(Color.RED) } - progressBar!!.postDelayed({ + progressBar?.postDelayed({ try { - progressBar!!.progress = 0 - progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY) - progressBar!!.visibility = View.INVISIBLE + progressBar?.progress = 0 + progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY) + progressBar?.visibility = View.INVISIBLE val intent = Intent() intent.putExtra("message", getString(R.string.cannot_sign_transaction_make_sure_you_enter_correct_pin_2)) intent.putExtra("UID", cardProtocol.card.uid) diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index cc1184277b..6e3b09fbb1 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -6,6 +6,7 @@ import android.content.* import android.content.Context.CLIPBOARD_SERVICE import android.content.pm.PackageManager import android.content.res.ColorStateList +import android.media.MediaPlayer import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep @@ -43,11 +44,11 @@ import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.VerifyCardTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.VerifyCardTask +import com.tangem.tangemcommon.util.Util import com.tangem.tangemserver.android.ServerApiTangem import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo import com.tangem.util.LOG @@ -69,6 +70,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback private lateinit var ctx: TangemContext private lateinit var nfcManager: NfcManager + private lateinit var mpSecondScanSound: MediaPlayer private var serverApiCommon: ServerApiCommon = ServerApiCommon() private var serverApiTangem: ServerApiTangem = ServerApiTangem() private var lastTag: Tag? = null @@ -105,6 +107,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback srl.isRefreshing = true } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) ctx = TangemContext.loadFromBundle(activity, activity?.intent?.extras) @@ -113,6 +116,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback lifecycle.addObserver(NfcLifecycleObserver(nfcManager)) lastTag = activity?.intent?.getParcelableExtra(Constant.EXTRA_LAST_DISCOVERED_TAG) + + mpSecondScanSound = MediaPlayer.create(activity, R.raw.scan_card_sound) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { @@ -138,10 +143,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback tvWallet.setOnClickListener { doShareWallet(false) } - btnExplore.setOnClickListener { - val engine = CoinEngineFactory.create(ctx) - startActivity(Intent(Intent.ACTION_VIEW, engine?.walletExplorerUri)) - } + btnExplore.setOnClickListener { startActivity(Intent(Intent.ACTION_VIEW, engine?.walletExplorerUri)) } + btnCopy.setOnClickListener { doShareWallet(false) } btnLoad.setOnClickListener { @@ -152,8 +155,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback when (items[which]) { getString(R.string.in_app) -> { try { - val engine = CoinEngineFactory.create(ctx) - val intent = Intent(Intent.ACTION_VIEW, engine?.shareWalletUri) + val intent = Intent(Intent.ACTION_VIEW, engine.shareWalletUri) intent.addCategory(Intent.CATEGORY_DEFAULT) startActivity(intent) } catch (e: ActivityNotFoundException) { @@ -166,8 +168,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback } getString(R.string.load_via_qr) -> { - val engine = CoinEngineFactory.create(ctx) - ShowQRCodeDialog.show(activity as AppCompatActivity?, engine!!.shareWalletUri.toString()) + ShowQRCodeDialog.show(activity as AppCompatActivity?, engine.shareWalletUri.toString()) } getString(R.string.via_cryptonit) -> { @@ -192,9 +193,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback } btnExtract.setOnClickListener { - val engine = CoinEngineFactory.create(ctx) if (UtilHelper.isOnline(context as Activity)) - if (!engine!!.isExtractPossible) + if (!engine.isExtractPossible) UtilHelper.showSingleToast(context, ctx.message) else if (ctx.card!!.remainingSignatures == 0) UtilHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature)) @@ -441,14 +441,6 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD)) ctx.card = updatedCard } -// if (data.extras!!.containsKey("message")) { -// if (resultCode == Activity.RESULT_OK) { -// ctx.message = data.getStringExtra("message") -// } else { -// ctx.error = data.getStringExtra("message") -// } -// } -// updateViews() } } } @@ -470,12 +462,15 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback verifyCardTask = null if (cardProtocol != null) { if (cardProtocol.error == null) { - rlProgressBar?.post { rlProgressBar?.visibility = View.GONE this.cardProtocol = cardProtocol - if (!cardProtocol.card.isWalletPublicKeyValid) refresh() - else updateViews() + if (!cardProtocol.card.isWalletPublicKeyValid) + refresh() + else + updateViews() + + mpSecondScanSound.start() } } else { // remove last UIDs because of error and no card read diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index 4afa6e42ab..e9a2f0b4bf 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -25,9 +25,9 @@ import com.tangem.presentation.event.DeletingWalletFinish import com.tangem.tangemcard.android.data.PINStorage import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol import com.tangem.util.LOG import com.tangem.wallet.BuildConfig import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/util/CryptoUtil.java b/app/src/main/java/com/tangem/util/CryptoUtil.java index 9e5c5d08d1..d3e90a7ff7 100644 --- a/app/src/main/java/com/tangem/util/CryptoUtil.java +++ b/app/src/main/java/com/tangem/util/CryptoUtil.java @@ -3,7 +3,7 @@ package com.tangem.util; import android.util.Log; import com.tangem.domain.wallet.ECDSASignatureETH; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import org.spongycastle.asn1.ASN1EncodableVector; import org.spongycastle.asn1.ASN1Integer; diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml index 50a52dd393..acb261225c 100644 --- a/app/src/main/res/layout/activity_confirm_transaction.xml +++ b/app/src/main/res/layout/activity_confirm_transaction.xml @@ -106,7 +106,7 @@ android:enabled="false" android:fontFamily="@font/maax" android:hint="@string/target_wallet_address" - android:inputType="text" + android:inputType="textMultiLine" android:maxLines="2" android:padding="12dp" android:singleLine="false" @@ -156,7 +156,7 @@ android:layout_height="wrap_content" android:enabled="false" android:fontFamily="@font/maax" - android:hint="@string/transaction_amount" + android:hint="@string/payment_amount" android:inputType="numberDecimal" android:padding="12dp" android:textColor="@color/black" @@ -268,7 +268,9 @@ android:layout_marginBottom="4dp" android:enabled="false" android:fontFamily="@font/maax" + android:hint="@string/fee_amount" android:inputType="numberDecimal" + android:padding="12dp" android:textColor="@color/black" android:textColorLink="@android:color/holo_blue_dark" android:textSize="@dimen/text_size_medium" diff --git a/app/src/main/res/raw/scan_card_sound.mp3 b/app/src/main/res/raw/scan_card_sound.mp3 new file mode 100644 index 0000000000..704f2441df Binary files /dev/null and b/app/src/main/res/raw/scan_card_sound.mp3 differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5864598db5..b424f87e0d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -168,7 +168,8 @@ target wallet address - payment amount + payment amount + fee amount Fee Send Minimal diff --git a/build.gradle b/build.gradle index 2bfb6ce8b6..8788f43922 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -14,6 +15,7 @@ allprojects { repositories { google() jcenter() +// maven { url 'https://jitpack.io' } } } diff --git a/settings.gradle b/settings.gradle index 38ca2a86f1..ad0149e0f6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':tangemcard-android', ':tangemserver-android', ':tangemcard-common' +include ':app', ':tangemcard-android', ':tangemserver-android', ':tangemcommon' diff --git a/tangemcard-android/.idea/caches/build_file_checksums.ser b/tangemcard-android/.idea/caches/build_file_checksums.ser index d50a885154..d339c19f39 100644 Binary files a/tangemcard-android/.idea/caches/build_file_checksums.ser and b/tangemcard-android/.idea/caches/build_file_checksums.ser differ diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml deleted file mode 100644 index bf16fff60d..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml deleted file mode 100644 index 3672191097..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml deleted file mode 100644 index 27b1867567..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml deleted file mode 100644 index e5c527903a..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml deleted file mode 100644 index 3c68888267..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml deleted file mode 100644 index ba470532d5..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml b/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml deleted file mode 100644 index 91aae22d5a..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml deleted file mode 100644 index d7b54e8e49..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml deleted file mode 100644 index d661b92d7d..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml deleted file mode 100644 index 3adbd26dbe..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0.xml deleted file mode 100644 index bb09bc80ce..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml deleted file mode 100644 index 80e4d731eb..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml deleted file mode 100644 index bcb4ff48a7..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml deleted file mode 100644 index c0adf88fae..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml deleted file mode 100644 index 97836ea7b8..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml deleted file mode 100644 index 830cd238b4..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml deleted file mode 100644 index 9fec3518d8..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_design_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_design_28_0_0.xml deleted file mode 100644 index 97fe427240..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_design_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml deleted file mode 100644 index 524d01ecbc..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml deleted file mode 100644 index 38b44b30aa..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml deleted file mode 100644 index 9aab62b216..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml deleted file mode 100644 index 9dd42c1961..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml deleted file mode 100644 index ecfc3b503b..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml deleted file mode 100644 index 628832daaa..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml deleted file mode 100644 index 26e2936c1f..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml deleted file mode 100644 index 437f7fac8d..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml deleted file mode 100644 index 0fdecce0d6..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml deleted file mode 100644 index 129fc06474..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml deleted file mode 100644 index 5ca9644a03..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml deleted file mode 100644 index c6570f7435..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml deleted file mode 100644 index 398f8ec322..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml deleted file mode 100644 index 1f47f18005..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml deleted file mode 100644 index 0fb0ac4602..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml deleted file mode 100644 index 78bf0d8291..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml deleted file mode 100644 index 5749719e9d..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml deleted file mode 100644 index 4912074536..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml deleted file mode 100644 index 041cbb2726..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml deleted file mode 100644 index 03a762f327..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml deleted file mode 100644 index 8408d30c6f..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_transition_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_transition_28_0_0.xml deleted file mode 100644 index 84a20b7c0b..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_transition_28_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml deleted file mode 100644 index d2745eedab..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml b/tangemcard-android/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml deleted file mode 100644 index 8704d75527..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_google_dagger_dagger_2_16_jar.xml b/tangemcard-android/.idea/libraries/Gradle__com_google_dagger_dagger_2_16_jar.xml deleted file mode 100644 index 284170c712..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_google_dagger_dagger_2_16_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7.xml b/tangemcard-android/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7.xml deleted file mode 100644 index 32b901fcad..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1.xml b/tangemcard-android/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1.xml deleted file mode 100644 index 7f33fc2e11..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml b/tangemcard-android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml deleted file mode 100644 index 70c9278186..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6.xml b/tangemcard-android/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6.xml deleted file mode 100644 index 31d200c58b..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml b/tangemcard-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml deleted file mode 100644 index 5789daef55..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8.xml b/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8.xml deleted file mode 100644 index 1d3db747c4..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8.xml b/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8.xml deleted file mode 100644 index bbe3bbb46c..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_11_jar.xml b/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_11_jar.xml deleted file mode 100644 index 3668e68cce..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_11_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11_jar.xml b/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11_jar.xml deleted file mode 100644 index 8762d3d930..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11_jar.xml b/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11_jar.xml deleted file mode 100644 index 7eba057aeb..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_11_jar.xml b/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_11_jar.xml deleted file mode 100644 index ad4fd5145d..0000000000 --- a/tangemcard-android/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_11_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tangemcard-android/.idea/misc.xml b/tangemcard-android/.idea/misc.xml index b0c7b20c87..703e5d4b89 100644 --- a/tangemcard-android/.idea/misc.xml +++ b/tangemcard-android/.idea/misc.xml @@ -1,33 +1,9 @@ - - - + + + + diff --git a/tangemcard-android/.idea/workspace.xml b/tangemcard-android/.idea/workspace.xml index 46a99e117c..4c82d585e9 100644 --- a/tangemcard-android/.idea/workspace.xml +++ b/tangemcard-android/.idea/workspace.xml @@ -1,50 +1,157 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + - -