From 449840473ae28c36fb438370f8ffaa87985f8bf9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 27 Feb 2019 22:36:18 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 2 +- app/src/main/java/com/tangem/App.kt | 6 ++-- .../main/java/com/tangem/data/Blockchain.java | 2 +- .../StartFingerprintReaderTask.java | 2 +- .../tangem/domain/wallet/TangemContext.java | 2 +- .../activity/ConfirmTransactionActivity.kt | 6 ++-- .../activity/CreateNewWalletActivity.kt | 10 +++--- .../activity/EmptyWalletActivity.kt | 10 +++--- .../presentation/activity/MainActivity.kt | 12 +++---- .../activity/PinRequestActivity.kt | 12 +++---- .../presentation/activity/PinSaveActivity.kt | 2 +- .../presentation/activity/PinSwapActivity.kt | 8 ++--- ...pareCryptonitOtherApiWithdrawalActivity.kt | 4 +-- .../PrepareCryptonitWithdrawalActivity.kt | 4 +-- .../PrepareKrakenWithdrawalActivity.kt | 4 +-- .../activity/PrepareTransactionActivity.kt | 4 +-- .../presentation/activity/PurgeActivity.kt | 10 +++--- .../activity/SendTransactionActivity.kt | 4 +-- .../activity/SignTransactionActivity.kt | 10 +++--- .../presentation/fragment/LoadedWallet.kt | 16 ++++----- .../presentation/fragment/VerifyCard.kt | 8 ++--- card-android/build.gradle | 2 +- .../ExampleInstrumentedTest.java | 4 +-- card-android/src/main/AndroidManifest.xml | 2 +- .../android/data/Firmwares.java | 2 +- .../android/data/PINStorage.java | 2 +- .../android/nfc/NfcDeviceAntennaLocation.kt | 2 +- .../android/nfc/NfcLifecycleObserver.kt | 4 +-- .../android/nfc/NfcLocation.kt | 2 +- .../android/reader/NfcManager.kt | 4 +-- .../android/reader/NfcReader.kt | 2 +- .../cardandroid/android/ui/NfcEnableDialog.kt | 36 +++++++++++++++++++ .../data/TangemCardExtensions.kt | 2 +- .../ExampleUnitTest.java | 2 +- server-android/build.gradle | 2 +- .../ExampleInstrumentedTest.java | 4 +-- server-android/src/main/AndroidManifest.xml | 2 +- .../Server.java | 2 +- .../ServerApiTangem.java | 4 +-- .../ServerURL.java | 2 +- .../TangemApi.java | 4 +-- .../data/LocalStorage.kt | 6 ++-- .../model/CardVerify.java | 2 +- .../model/CardVerifyAndGetInfo.kt | 2 +- .../ExampleUnitTest.java | 2 +- .../out/com/tangem/tangemcard/R.java | 2 +- .../com/tangem/tangemcard/BuildConfig.java | 4 +-- .../debug/package-aware-r.txt | 2 +- 48 files changed, 140 insertions(+), 104 deletions(-) rename card-android/src/androidTest/java/com/tangem/{tangemcard => cardandroid}/ExampleInstrumentedTest.java (84%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/data/Firmwares.java (98%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/data/PINStorage.java (99%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/nfc/NfcDeviceAntennaLocation.kt (98%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/nfc/NfcLifecycleObserver.kt (86%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/nfc/NfcLocation.kt (99%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/reader/NfcManager.kt (97%) rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/android/reader/NfcReader.kt (94%) create mode 100644 card-android/src/main/java/com/tangem/cardandroid/android/ui/NfcEnableDialog.kt rename card-android/src/main/java/com/tangem/{tangemcard => cardandroid}/data/TangemCardExtensions.kt (99%) rename card-android/src/test/java/com/tangem/{tangemcard => cardandroid}/ExampleUnitTest.java (91%) rename server-android/src/androidTest/java/com/tangem/{tangemserver => serverandroid}/ExampleInstrumentedTest.java (83%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/Server.java (93%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/ServerApiTangem.java (98%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/ServerURL.java (71%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/TangemApi.java (86%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/data/LocalStorage.kt (99%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/model/CardVerify.java (83%) rename server-android/src/main/java/com/tangem/{tangemserver => serverandroid}/model/CardVerifyAndGetInfo.kt (97%) rename server-android/src/test/java/com/tangem/{tangemserver => serverandroid}/ExampleUnitTest.java (91%) diff --git a/app/build.gradle b/app/build.gradle index 97f6b65d67..0373e0e10a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ android { dependencies { implementation project(':card-common') -// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' +// implementation 'com.github.TangemCash.cardandroid-common:cardandroid-android:0.1.0' implementation project(':card-android') implementation project(':server-android') diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index b229f5eb05..985efe39b9 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -8,10 +8,10 @@ import com.tangem.di.DaggerNavigatorComponent import com.tangem.di.DaggerNetworkComponent 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.cardandroid.android.data.Firmwares +import com.tangem.cardandroid.android.data.PINStorage import com.tangem.cardcommon.data.Issuer -import com.tangem.tangemserver.data.LocalStorage +import com.tangem.serverandroid.data.LocalStorage import java.io.InputStreamReader import java.nio.charset.StandardCharsets diff --git a/app/src/main/java/com/tangem/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java index 11a9ec45dd..caae9259f6 100644 --- a/app/src/main/java/com/tangem/data/Blockchain.java +++ b/app/src/main/java/com/tangem/data/Blockchain.java @@ -1,6 +1,6 @@ package com.tangem.data; -import com.tangem.tangemcard.R; +import com.tangem.cardandroid.R; /** * Created by dvol on 06.08.2017. diff --git a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java index 91b13b925c..6a7c78aa1d 100644 --- a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java +++ b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java @@ -9,7 +9,7 @@ import android.security.keystore.KeyPermanentlyInvalidatedException; import android.security.keystore.KeyProperties; import com.tangem.Constant; -import com.tangem.tangemcard.android.data.PINStorage; +import com.tangem.cardandroid.android.data.PINStorage; import com.tangem.presentation.activity.PinRequestActivity; import com.tangem.util.LOG; 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 4022a29dea..42ae18e0d6 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -6,7 +6,7 @@ import android.os.Bundle; import com.tangem.Constant; import com.tangem.data.Blockchain; -import com.tangem.tangemcard.data.TangemCardExtensionsKt; +import com.tangem.cardandroid.data.TangemCardExtensionsKt; import com.tangem.cardcommon.data.TangemCard; public class TangemContext { 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 3040c238df..28244cc6ce 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt @@ -19,9 +19,9 @@ 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.loadFromBundle +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.data.loadFromBundle import com.tangem.cardcommon.data.TangemCard import com.tangem.util.UtilHelper import com.tangem.wallet.R 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 278cb84a15..1114e4bd00 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -17,11 +17,11 @@ import com.tangem.Constant import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog -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.asBundle +import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.asBundle import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.CreateNewWalletTask import com.tangem.cardcommon.util.Util 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 81f5497a83..a704e4078d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -20,11 +20,11 @@ import com.tangem.di.Navigator import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog 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.asBundle -import com.tangem.tangemcard.data.loadFromBundle +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.asBundle +import com.tangem.cardandroid.data.loadFromBundle import com.tangem.cardcommon.data.TangemCard import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.VerifyCardTask 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 861c554829..894b26ae9d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -30,12 +30,12 @@ import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.RootFoundDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog -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.loadFromBundle -import com.tangem.tangemcard.data.saveToBundle +import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.loadFromBundle +import com.tangem.cardandroid.data.saveToBundle import com.tangem.cardcommon.data.TangemCard import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.ReadCardInfoTask 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 54a2fb1e75..8f0fb1411b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -21,14 +21,14 @@ import android.view.View import android.widget.Button import com.tangem.Constant import com.tangem.data.fingerprint.StartFingerprintReaderTask -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcManager 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.loadFromBundle -import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD -import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID +import com.tangem.cardandroid.android.data.PINStorage +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.data.loadFromBundle +import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD +import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD_UID import com.tangem.cardcommon.data.TangemCard import com.tangem.util.LOG import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt index a7ef5dacb9..dfc3870313 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -23,7 +23,7 @@ import android.widget.Toast import com.tangem.Constant import com.tangem.data.fingerprint.ConfirmWithFingerprintTask import com.tangem.data.fingerprint.FingerprintHelper -import com.tangem.tangemcard.android.data.PINStorage +import com.tangem.cardandroid.android.data.PINStorage import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_save.* import kotlinx.android.synthetic.main.layout_pin_buttons.* 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 4f68fc4d4a..0cfe9fa926 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -17,10 +17,10 @@ import com.tangem.App import com.tangem.Constant import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog 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.* +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.* import com.tangem.cardcommon.data.TangemCard import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.SwapPINTask diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index 820a1715cf..d94914355d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -16,8 +16,8 @@ import com.tangem.data.network.CryptonitOtherApi import com.tangem.di.Navigator import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext -import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_cryptonit_other_api_withdrawal.* import java.io.IOException 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 8e5e68c1ff..f464698978 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -13,11 +13,11 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast import com.tangem.data.network.Cryptonit -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.data.Blockchain import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext -import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.util.DecimalDigitsInputFilter import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_cryptonit_withdrawal.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt index 73f365c799..9e286accf5 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt @@ -18,12 +18,12 @@ import android.widget.Toast import com.tangem.App import com.tangem.Constant import com.tangem.data.network.Kraken -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.data.Blockchain import com.tangem.di.Navigator import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext -import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_kraken_withdrawal.* import java.io.IOException diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt index 758ea7ae85..ba484c9165 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt @@ -19,8 +19,8 @@ import com.tangem.data.Blockchain import com.tangem.di.Navigator import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext -import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.util.UtilHelper import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_transaction.* 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 1357fcf845..2f532cba4e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -19,11 +19,11 @@ import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew import com.tangem.presentation.event.DeletingWalletFinish -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.asBundle +import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.asBundle import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.PurgeTask import com.tangem.cardcommon.util.Util diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt index f29eb48e4e..ddeec95b24 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -13,8 +13,8 @@ import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.event.TransactionFinishWithError import com.tangem.presentation.event.TransactionFinishWithSuccess -import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.util.UtilHelper import com.tangem.wallet.R import org.greenrobot.eventbus.EventBus 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 fdef24c5b4..9f4573fd2f 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt @@ -20,11 +20,11 @@ import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog -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.asBundle +import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.asBundle import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.SignTask import com.tangem.cardcommon.util.Util 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 c9a6c88221..47618c02ea 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -39,18 +39,18 @@ import com.tangem.presentation.dialog.WaitSecurityDelayDialog import com.tangem.presentation.event.DeletingWalletFinish import com.tangem.presentation.event.TransactionFinishWithError import com.tangem.presentation.event.TransactionFinishWithSuccess -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.EXTRA_TANGEM_CARD -import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID -import com.tangem.tangemcard.data.loadFromBundle +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcReader +import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD +import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD_UID +import com.tangem.cardandroid.data.loadFromBundle import com.tangem.cardcommon.data.TangemCard import com.tangem.cardcommon.reader.CardProtocol import com.tangem.cardcommon.tasks.VerifyCardTask import com.tangem.cardcommon.util.Util -import com.tangem.tangemserver.ServerApiTangem -import com.tangem.tangemserver.model.CardVerifyAndGetInfo +import com.tangem.serverandroid.ServerApiTangem +import com.tangem.serverandroid.model.CardVerifyAndGetInfo 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/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index e2bf93f3e2..c11f19d723 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -22,10 +22,10 @@ import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.activity.* import com.tangem.presentation.dialog.PINSwapWarningDialog 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.loadFromBundle +import com.tangem.cardandroid.android.data.PINStorage +import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver +import com.tangem.cardandroid.android.reader.NfcManager +import com.tangem.cardandroid.data.loadFromBundle import com.tangem.cardcommon.data.TangemCard import com.tangem.cardcommon.reader.CardProtocol import com.tangem.util.LOG diff --git a/card-android/build.gradle b/card-android/build.gradle index ade6e69fba..d787149d49 100644 --- a/card-android/build.gradle +++ b/card-android/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation project(':card-common') -// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' +// implementation 'com.github.TangemCash.cardandroid-common:cardandroid-android:0.1.0' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'com.google.code.gson:gson:2.8.5' diff --git a/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java b/card-android/src/androidTest/java/com/tangem/cardandroid/ExampleInstrumentedTest.java similarity index 84% rename from card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java rename to card-android/src/androidTest/java/com/tangem/cardandroid/ExampleInstrumentedTest.java index 369ceda261..d7f16092fb 100644 --- a/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java +++ b/card-android/src/androidTest/java/com/tangem/cardandroid/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard; +package com.tangem.cardandroid; import android.content.Context; import androidx.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.tangem.tangemcard.test", appContext.getPackageName()); + assertEquals("com.tangem.cardandroid.test", appContext.getPackageName()); } } diff --git a/card-android/src/main/AndroidManifest.xml b/card-android/src/main/AndroidManifest.xml index 9df3c4db3d..ada8a4acbb 100644 --- a/card-android/src/main/AndroidManifest.xml +++ b/card-android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.tangem.cardandroid" > diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java b/card-android/src/main/java/com/tangem/cardandroid/android/data/Firmwares.java similarity index 98% rename from card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java rename to card-android/src/main/java/com/tangem/cardandroid/android/data/Firmwares.java index dcce291126..f9a587916e 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java +++ b/card-android/src/main/java/com/tangem/cardandroid/android/data/Firmwares.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.data; +package com.tangem.cardandroid.android.data; import android.content.Context; diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java b/card-android/src/main/java/com/tangem/cardandroid/android/data/PINStorage.java similarity index 99% rename from card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java rename to card-android/src/main/java/com/tangem/cardandroid/android/data/PINStorage.java index 491e008d0e..6406168331 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java +++ b/card-android/src/main/java/com/tangem/cardandroid/android/data/PINStorage.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.data; +package com.tangem.cardandroid.android.data; import android.content.Context; import android.content.SharedPreferences; diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcDeviceAntennaLocation.kt b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcDeviceAntennaLocation.kt similarity index 98% rename from card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcDeviceAntennaLocation.kt rename to card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcDeviceAntennaLocation.kt index f237869987..8d5f991d55 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcDeviceAntennaLocation.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcDeviceAntennaLocation.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.nfc +package com.tangem.cardandroid.android.nfc import android.content.Context import android.os.Build diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLifecycleObserver.kt b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLifecycleObserver.kt similarity index 86% rename from card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLifecycleObserver.kt rename to card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLifecycleObserver.kt index 559adbfdfa..57dd5c9d38 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLifecycleObserver.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLifecycleObserver.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemcard.android.nfc +package com.tangem.cardandroid.android.nfc import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.OnLifecycleEvent -import com.tangem.tangemcard.android.reader.NfcManager +import com.tangem.cardandroid.android.reader.NfcManager /** * Lifecycle observer for all activities and fragments with nfc diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLocation.kt b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLocation.kt similarity index 99% rename from card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLocation.kt rename to card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLocation.kt index f63234fd0f..10a937a82d 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/nfc/NfcLocation.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/android/nfc/NfcLocation.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.nfc +package com.tangem.cardandroid.android.nfc enum class NfcLocation(val codename: String, val fullName: String, val orientation: Int, val x: Int, val y: Int, val z: Int) { model1("sailfish", "Google Pixel", 0, 65, 25, 0), diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt b/card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcManager.kt similarity index 97% rename from card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt rename to card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcManager.kt index daa4f45e8f..3ac1d480d7 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcManager.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.reader +package com.tangem.cardandroid.android.reader import android.Manifest import android.annotation.TargetApi @@ -15,7 +15,7 @@ import android.os.Build import android.os.Bundle import androidx.core.app.ActivityCompat import androidx.fragment.app.FragmentActivity -import com.tangem.tangemcard.android.presentation.dialog.NfcEnableDialog +import com.tangem.cardandroid.android.ui.NfcEnableDialog import com.tangem.cardcommon.util.Log import java.io.IOException diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt b/card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcReader.kt similarity index 94% rename from card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt rename to card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcReader.kt index 4185a365da..7aae3cd68b 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/android/reader/NfcReader.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android.reader +package com.tangem.cardandroid.android.reader import android.nfc.tech.IsoDep diff --git a/card-android/src/main/java/com/tangem/cardandroid/android/ui/NfcEnableDialog.kt b/card-android/src/main/java/com/tangem/cardandroid/android/ui/NfcEnableDialog.kt new file mode 100644 index 0000000000..ad9eff9e32 --- /dev/null +++ b/card-android/src/main/java/com/tangem/cardandroid/android/ui/NfcEnableDialog.kt @@ -0,0 +1,36 @@ +package com.tangem.cardandroid.android.ui + +import android.app.Dialog +import android.content.Intent +import android.os.Bundle +import android.provider.Settings + +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment + +import com.tangem.cardandroid.R + +class NfcEnableDialog : DialogFragment() { + companion object { + val TAG: String = NfcEnableDialog::class.java.simpleName + } + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + val builder = context?.let { AlertDialog.Builder(it) } + builder?.setCancelable(false) + ?.setIcon(R.drawable.ic_action_nfc_gray) + ?.setTitle(R.string.nfc_disabled) + ?.setMessage(R.string.enable_nfc) + ?.setPositiveButton(R.string.dialog_ok + ) { _, _ -> + activity?.startActivity(Intent(Settings.ACTION_NFC_SETTINGS)) + } + ?.setNegativeButton(R.string.dialog_quit + ) { dialog, _ -> + dialog.cancel() + activity?.finish() + } + return builder!!.create() + } + +} \ No newline at end of file diff --git a/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt b/card-android/src/main/java/com/tangem/cardandroid/data/TangemCardExtensions.kt similarity index 99% rename from card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt rename to card-android/src/main/java/com/tangem/cardandroid/data/TangemCardExtensions.kt index facb34176b..d304e242c8 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt +++ b/card-android/src/main/java/com/tangem/cardandroid/data/TangemCardExtensions.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.data +package com.tangem.cardandroid.data import android.os.Bundle import com.tangem.cardcommon.data.Manufacturer diff --git a/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java b/card-android/src/test/java/com/tangem/cardandroid/ExampleUnitTest.java similarity index 91% rename from card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java rename to card-android/src/test/java/com/tangem/cardandroid/ExampleUnitTest.java index 053a2eef4f..653cb7d112 100644 --- a/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java +++ b/card-android/src/test/java/com/tangem/cardandroid/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard; +package com.tangem.cardandroid; import org.junit.Test; diff --git a/server-android/build.gradle b/server-android/build.gradle index 0c0ad4e3d9..ec325ead78 100644 --- a/server-android/build.gradle +++ b/server-android/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation project(':card-common') -// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' +// implementation 'com.github.TangemCash.cardandroid-common:cardandroid-android:0.1.0' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'com.google.code.gson:gson:2.8.5' diff --git a/server-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java b/server-android/src/androidTest/java/com/tangem/serverandroid/ExampleInstrumentedTest.java similarity index 83% rename from server-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java rename to server-android/src/androidTest/java/com/tangem/serverandroid/ExampleInstrumentedTest.java index d6e313ca5d..9898160511 100644 --- a/server-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java +++ b/server-android/src/androidTest/java/com/tangem/serverandroid/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; import android.content.Context; import androidx.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.tangem.tangemserver.test", appContext.getPackageName()); + assertEquals("com.tangem.serverandroid.test", appContext.getPackageName()); } } diff --git a/server-android/src/main/AndroidManifest.xml b/server-android/src/main/AndroidManifest.xml index 25d98a0dca..4be88ecd02 100644 --- a/server-android/src/main/AndroidManifest.xml +++ b/server-android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.tangem.serverandroid" > diff --git a/server-android/src/main/java/com/tangem/tangemserver/Server.java b/server-android/src/main/java/com/tangem/serverandroid/Server.java similarity index 93% rename from server-android/src/main/java/com/tangem/tangemserver/Server.java rename to server-android/src/main/java/com/tangem/serverandroid/Server.java index 0a74c2da6a..06d2c9a23a 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/Server.java +++ b/server-android/src/main/java/com/tangem/serverandroid/Server.java @@ -1,4 +1,4 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; public class Server { /** diff --git a/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java b/server-android/src/main/java/com/tangem/serverandroid/ServerApiTangem.java similarity index 98% rename from server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java rename to server-android/src/main/java/com/tangem/serverandroid/ServerApiTangem.java index 23a6317fdd..8d7f7cd011 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java +++ b/server-android/src/main/java/com/tangem/serverandroid/ServerApiTangem.java @@ -1,10 +1,10 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; import androidx.annotation.NonNull; import android.util.Log; import com.tangem.cardcommon.data.TangemCard; -import com.tangem.tangemserver.model.CardVerifyAndGetInfo; +import com.tangem.serverandroid.model.CardVerifyAndGetInfo; import com.tangem.cardcommon.util.Util; import java.io.InputStream; diff --git a/server-android/src/main/java/com/tangem/tangemserver/ServerURL.java b/server-android/src/main/java/com/tangem/serverandroid/ServerURL.java similarity index 71% rename from server-android/src/main/java/com/tangem/tangemserver/ServerURL.java rename to server-android/src/main/java/com/tangem/serverandroid/ServerURL.java index 3c2952f9a8..cf7f667169 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/ServerURL.java +++ b/server-android/src/main/java/com/tangem/serverandroid/ServerURL.java @@ -1,4 +1,4 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; class ServerURL { static final String API_TANGEM = "https://verify.tangem.com/"; diff --git a/server-android/src/main/java/com/tangem/tangemserver/TangemApi.java b/server-android/src/main/java/com/tangem/serverandroid/TangemApi.java similarity index 86% rename from server-android/src/main/java/com/tangem/tangemserver/TangemApi.java rename to server-android/src/main/java/com/tangem/serverandroid/TangemApi.java index e16469787e..39775e45f5 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/TangemApi.java +++ b/server-android/src/main/java/com/tangem/serverandroid/TangemApi.java @@ -1,6 +1,6 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; -import com.tangem.tangemserver.model.CardVerifyAndGetInfo; +import com.tangem.serverandroid.model.CardVerifyAndGetInfo; import okhttp3.ResponseBody; import retrofit2.Call; diff --git a/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt b/server-android/src/main/java/com/tangem/serverandroid/data/LocalStorage.kt similarity index 99% rename from server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt rename to server-android/src/main/java/com/tangem/serverandroid/data/LocalStorage.kt index efabf80480..e9d7c56d10 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt +++ b/server-android/src/main/java/com/tangem/serverandroid/data/LocalStorage.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemserver.data +package com.tangem.serverandroid.data import android.content.Context import com.tangem.cardcommon.data.TangemCard @@ -12,8 +12,8 @@ import android.util.Log import com.google.gson.Gson import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken -import com.tangem.tangemserver.model.CardVerifyAndGetInfo -import com.tangem.tangemserver.R +import com.tangem.serverandroid.model.CardVerifyAndGetInfo +import com.tangem.serverandroid.R import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider import com.tangem.cardcommon.reader.CardCrypto import com.tangem.cardcommon.util.Util diff --git a/server-android/src/main/java/com/tangem/tangemserver/model/CardVerify.java b/server-android/src/main/java/com/tangem/serverandroid/model/CardVerify.java similarity index 83% rename from server-android/src/main/java/com/tangem/tangemserver/model/CardVerify.java rename to server-android/src/main/java/com/tangem/serverandroid/model/CardVerify.java index 15555216f6..260186bfa1 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/model/CardVerify.java +++ b/server-android/src/main/java/com/tangem/serverandroid/model/CardVerify.java @@ -1,4 +1,4 @@ -package com.tangem.tangemserver.model; +package com.tangem.serverandroid.model; public class CardVerify { private String CID; diff --git a/server-android/src/main/java/com/tangem/tangemserver/model/CardVerifyAndGetInfo.kt b/server-android/src/main/java/com/tangem/serverandroid/model/CardVerifyAndGetInfo.kt similarity index 97% rename from server-android/src/main/java/com/tangem/tangemserver/model/CardVerifyAndGetInfo.kt rename to server-android/src/main/java/com/tangem/serverandroid/model/CardVerifyAndGetInfo.kt index 149b866949..1b8d030a61 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/model/CardVerifyAndGetInfo.kt +++ b/server-android/src/main/java/com/tangem/serverandroid/model/CardVerifyAndGetInfo.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemserver.model +package com.tangem.serverandroid.model import java.text.SimpleDateFormat import java.util.* diff --git a/server-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java b/server-android/src/test/java/com/tangem/serverandroid/ExampleUnitTest.java similarity index 91% rename from server-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java rename to server-android/src/test/java/com/tangem/serverandroid/ExampleUnitTest.java index 6fd65d8f9b..085f7bd8f2 100644 --- a/server-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java +++ b/server-android/src/test/java/com/tangem/serverandroid/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemserver; +package com.tangem.serverandroid; import org.junit.Test; diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/tangem/tangemcard/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/tangem/tangemcard/R.java index 860c548c87..43f1e1f3b3 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/tangem/tangemcard/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/tangem/tangemcard/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package com.tangem.tangemcard; +package com.tangem.cardandroid; public final class R { private R() {} diff --git a/tangemcard/build/generated/source/buildConfig/debug/com/tangem/tangemcard/BuildConfig.java b/tangemcard/build/generated/source/buildConfig/debug/com/tangem/tangemcard/BuildConfig.java index 05b60a0e2f..fdf813f511 100644 --- a/tangemcard/build/generated/source/buildConfig/debug/com/tangem/tangemcard/BuildConfig.java +++ b/tangemcard/build/generated/source/buildConfig/debug/com/tangem/tangemcard/BuildConfig.java @@ -1,11 +1,11 @@ /** * Automatically generated file. DO NOT MODIFY */ -package com.tangem.tangemcard; +package com.tangem.cardandroid; public final class BuildConfig { public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "com.tangem.tangemcard"; + public static final String APPLICATION_ID = "com.tangem.cardandroid"; public static final String BUILD_TYPE = "debug"; public static final String FLAVOR = ""; public static final int VERSION_CODE = 1; diff --git a/tangemcard/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/tangemcard/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt index adb8e5e2ac..84a63e10c7 100644 --- a/tangemcard/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt +++ b/tangemcard/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt @@ -1,4 +1,4 @@ -com.tangem.tangemcard +cardandroid anim abc_fade_in anim abc_fade_out anim abc_grow_fade_in_from_bottom