Updated on 2026-08-14

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')

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.cardandroid.android.data.Firmwares
-import com.tangem.tangemcard.android.data.PINStorage
+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
 

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.

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;
 

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 {

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.cardandroid.data.loadFromBundle
 import com.tangem.cardcommon.data.TangemCard
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R

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.cardandroid.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.asBundle
+import com.tangem.cardandroid.data.asBundle
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.CreateNewWalletTask
 import com.tangem.cardcommon.util.Util

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.asBundle
+import com.tangem.cardandroid.data.asBundle
-import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.cardandroid.data.loadFromBundle
 import com.tangem.cardcommon.data.TangemCard
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.VerifyCardTask

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.cardandroid.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.cardandroid.data.loadFromBundle
-import com.tangem.tangemcard.data.saveToBundle
+import com.tangem.cardandroid.data.saveToBundle
 import com.tangem.cardcommon.data.TangemCard
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.ReadCardInfoTask

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.cardandroid.android.data.PINStorage
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.cardandroid.data.loadFromBundle
-import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
+import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD
-import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
+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

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.*

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.*
+import com.tangem.cardandroid.data.*
 import com.tangem.cardcommon.data.TangemCard
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.SwapPINTask

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+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

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.*

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

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+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.*

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.cardandroid.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.asBundle
+import com.tangem.cardandroid.data.asBundle
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.PurgeTask
 import com.tangem.cardcommon.util.Util

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R
 import org.greenrobot.eventbus.EventBus

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.cardandroid.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.asBundle
+import com.tangem.cardandroid.data.asBundle
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.cardcommon.tasks.SignTask
 import com.tangem.cardcommon.util.Util

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.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.cardandroid.android.reader.NfcReader
-import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
+import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD
-import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.cardandroid.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.tangemcard.data.loadFromBundle
+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.serverandroid.ServerApiTangem
-import com.tangem.tangemserver.model.CardVerifyAndGetInfo
+import com.tangem.serverandroid.model.CardVerifyAndGetInfo
 import com.tangem.util.LOG
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R

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.cardandroid.android.data.PINStorage
-import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
+import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.cardandroid.android.reader.NfcManager
-import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.cardandroid.data.loadFromBundle
 import com.tangem.cardcommon.data.TangemCard
 import com.tangem.cardcommon.reader.CardProtocol
 import com.tangem.util.LOG

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'

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());
     }
 }

card-android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.tangemcard" >
+    package="com.tangem.cardandroid" >
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />

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;
 

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;

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

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

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),

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
 

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
 

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()
+    }
+
+}

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

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;
 

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'

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());
     }
 }

server-android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.tangemserver" >
+    package="com.tangem.serverandroid" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

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 {
     /**

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;

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/";

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;

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.serverandroid.model.CardVerifyAndGetInfo
-import com.tangem.tangemserver.R
+import com.tangem.serverandroid.R
 import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider
 import com.tangem.cardcommon.reader.CardCrypto
 import com.tangem.cardcommon.util.Util

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;

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.*

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;
 

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() {}

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;

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