From 64ddaa4541fd9029956c80824710f288eba9f80c Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 27 Feb 2019 22:54:37 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/AndroidManifest.xml | 36 +++++++++---------- .../ConfirmWithFingerprintTask.java | 2 +- .../StartFingerprintReaderTask.java | 2 +- app/src/main/java/com/tangem/di/Navigator.kt | 2 +- .../java/com/tangem/di/NavigatorComponent.kt | 18 +++++----- .../java/com/tangem/di/NavigatorModule.kt | 2 +- .../event/DeletingWalletFinish.kt | 3 -- .../presentation/event/ReadAfterRequest.kt | 3 -- .../activity/ConfirmTransactionActivity.kt | 4 +-- .../activity/CreateNewWalletActivity.kt | 6 ++-- .../activity/EmptyWalletActivity.kt | 6 ++-- .../activity/LoadedWalletActivity.kt | 4 +-- .../activity/LogoActivity.kt | 2 +- .../activity/MainActivity.kt | 8 ++--- .../activity/PinRequestActivity.kt | 2 +- .../activity/PinSaveActivity.kt | 2 +- .../activity/PinSwapActivity.kt | 6 ++-- ...pareCryptonitOtherApiWithdrawalActivity.kt | 2 +- .../PrepareCryptonitWithdrawalActivity.kt | 2 +- .../PrepareKrakenWithdrawalActivity.kt | 2 +- .../activity/PrepareTransactionActivity.kt | 2 +- .../activity/PurgeActivity.kt | 10 +++--- .../activity/QrScanActivity.kt | 2 +- .../activity/SendTransactionActivity.kt | 6 ++-- .../activity/SignTransactionActivity.kt | 6 ++-- .../activity/VerifyCardActivity.kt | 4 +-- .../dialog/NoExtendedLengthSupportDialog.kt | 2 +- .../dialog/PINSwapWarningDialog.java | 2 +- .../dialog/RootFoundDialog.kt | 2 +- .../dialog/ShowQRCodeDialog.java | 2 +- .../dialog/WaitSecurityDelayDialog.java | 2 +- .../dialog/WaitSecurityDelayDialogNew.kt | 8 ++--- .../tangem/ui/event/DeletingWalletFinish.kt | 3 ++ .../com/tangem/ui/event/ReadAfterRequest.kt | 3 ++ .../event/ReadBeforeRequest.kt | 2 +- .../{presentation => ui}/event/ReadWait.kt | 2 +- .../event/TransactionFinishWithError.kt | 2 +- .../event/TransactionFinishWithSuccess.kt | 2 +- .../fragment/LoadedWallet.kt | 24 ++++++------- .../fragment/VerifyCard.kt | 8 ++--- .../viewmodel/BaseViewModel.kt | 2 +- .../viewmodel/LoadedWalletViewModel.kt | 2 +- .../layout/activity_confirm_transaction.xml | 2 +- .../res/layout/activity_create_new_wallet.xml | 2 +- .../main/res/layout/activity_empty_wallet.xml | 2 +- .../res/layout/activity_loaded_wallet.xml | 4 +-- app/src/main/res/layout/activity_logo.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_pin_request.xml | 2 +- app/src/main/res/layout/activity_pin_save.xml | 2 +- app/src/main/res/layout/activity_pin_swap.xml | 2 +- ...prepare_cryptonit_other_api_withdrawal.xml | 2 +- .../activity_prepare_cryptonit_withdrawal.xml | 2 +- .../activity_prepare_kraken_withdrawal.xml | 2 +- .../layout/activity_prepare_transaction.xml | 2 +- app/src/main/res/layout/activity_purge.xml | 2 +- .../res/layout/activity_send_transaction.xml | 2 +- .../res/layout/activity_sign_transaction.xml | 2 +- .../main/res/layout/activity_verify_card.xml | 4 +-- app/src/main/res/layout/fr_loaded_wallet.xml | 2 +- app/src/main/res/layout/fr_verify_card.xml | 2 +- app/src/main/res/menu/menu_loaded_wallet.xml | 2 +- .../presentation/dialog/NfcEnableDialog.kt | 36 ------------------- 63 files changed, 128 insertions(+), 164 deletions(-) delete mode 100644 app/src/main/java/com/tangem/presentation/event/DeletingWalletFinish.kt delete mode 100644 app/src/main/java/com/tangem/presentation/event/ReadAfterRequest.kt rename app/src/main/java/com/tangem/{presentation => ui}/activity/ConfirmTransactionActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/CreateNewWalletActivity.kt (97%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/EmptyWalletActivity.kt (98%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/LoadedWalletActivity.kt (93%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/LogoActivity.kt (97%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/MainActivity.kt (98%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PinRequestActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PinSaveActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PinSwapActivity.kt (97%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PrepareCryptonitWithdrawalActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PrepareKrakenWithdrawalActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PrepareTransactionActivity.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/PurgeActivity.kt (96%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/QrScanActivity.kt (98%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/SendTransactionActivity.kt (95%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/SignTransactionActivity.kt (98%) rename app/src/main/java/com/tangem/{presentation => ui}/activity/VerifyCardActivity.kt (92%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/NoExtendedLengthSupportDialog.kt (95%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/PINSwapWarningDialog.java (97%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/RootFoundDialog.kt (94%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/ShowQRCodeDialog.java (98%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/WaitSecurityDelayDialog.java (99%) rename app/src/main/java/com/tangem/{presentation => ui}/dialog/WaitSecurityDelayDialogNew.kt (95%) create mode 100644 app/src/main/java/com/tangem/ui/event/DeletingWalletFinish.kt create mode 100644 app/src/main/java/com/tangem/ui/event/ReadAfterRequest.kt rename app/src/main/java/com/tangem/{presentation => ui}/event/ReadBeforeRequest.kt (60%) rename app/src/main/java/com/tangem/{presentation => ui}/event/ReadWait.kt (54%) rename app/src/main/java/com/tangem/{presentation => ui}/event/TransactionFinishWithError.kt (64%) rename app/src/main/java/com/tangem/{presentation => ui}/event/TransactionFinishWithSuccess.kt (65%) rename app/src/main/java/com/tangem/{presentation => ui}/fragment/LoadedWallet.kt (97%) rename app/src/main/java/com/tangem/{presentation => ui}/fragment/VerifyCard.kt (99%) rename app/src/main/java/com/tangem/{presentation => ui}/viewmodel/BaseViewModel.kt (95%) rename app/src/main/java/com/tangem/{presentation => ui}/viewmodel/LoadedWalletViewModel.kt (94%) delete mode 100644 card-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21ee9f11d2..0758bd9d3e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ android:grantUriPermissions="true" /> @@ -48,7 +48,7 @@ @@ -69,82 +69,82 @@ diff --git a/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java b/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java index 9e1e6d5788..e9d02d158a 100644 --- a/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java +++ b/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java @@ -3,7 +3,7 @@ package com.tangem.data.fingerprint; import android.os.AsyncTask; import android.widget.Toast; -import com.tangem.presentation.activity.PinSaveActivity; +import com.tangem.ui.activity.PinSaveActivity; import com.tangem.wallet.R; import java.lang.ref.WeakReference; 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 6a7c78aa1d..ee991f228d 100644 --- a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java +++ b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java @@ -10,7 +10,7 @@ import android.security.keystore.KeyProperties; import com.tangem.Constant; import com.tangem.cardandroid.android.data.PINStorage; -import com.tangem.presentation.activity.PinRequestActivity; +import com.tangem.ui.activity.PinRequestActivity; import com.tangem.util.LOG; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index bc486fbfb5..07ba69f100 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.nfc.Tag import com.tangem.Constant import com.tangem.domain.wallet.TangemContext -import com.tangem.presentation.activity.* +import com.tangem.ui.activity.* class Navigator { diff --git a/app/src/main/java/com/tangem/di/NavigatorComponent.kt b/app/src/main/java/com/tangem/di/NavigatorComponent.kt index d4eff92dfe..f3cef57221 100644 --- a/app/src/main/java/com/tangem/di/NavigatorComponent.kt +++ b/app/src/main/java/com/tangem/di/NavigatorComponent.kt @@ -1,14 +1,14 @@ package com.tangem.di -import com.tangem.presentation.activity.EmptyWalletActivity -import com.tangem.presentation.activity.LoadedWalletActivity -import com.tangem.presentation.activity.LogoActivity -import com.tangem.presentation.activity.MainActivity -import com.tangem.presentation.activity.PrepareCryptonitOtherApiWithdrawalActivity -import com.tangem.presentation.activity.PrepareKrakenWithdrawalActivity -import com.tangem.presentation.activity.PrepareTransactionActivity -import com.tangem.presentation.activity.PurgeActivity -import com.tangem.presentation.activity.VerifyCardActivity +import com.tangem.ui.activity.EmptyWalletActivity +import com.tangem.ui.activity.LoadedWalletActivity +import com.tangem.ui.activity.LogoActivity +import com.tangem.ui.activity.MainActivity +import com.tangem.ui.activity.PrepareCryptonitOtherApiWithdrawalActivity +import com.tangem.ui.activity.PrepareKrakenWithdrawalActivity +import com.tangem.ui.activity.PrepareTransactionActivity +import com.tangem.ui.activity.PurgeActivity +import com.tangem.ui.activity.VerifyCardActivity import javax.inject.Singleton diff --git a/app/src/main/java/com/tangem/di/NavigatorModule.kt b/app/src/main/java/com/tangem/di/NavigatorModule.kt index 1eb397c3c6..7e4ee23826 100644 --- a/app/src/main/java/com/tangem/di/NavigatorModule.kt +++ b/app/src/main/java/com/tangem/di/NavigatorModule.kt @@ -1,6 +1,6 @@ package com.tangem.di -import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew +import com.tangem.ui.dialog.WaitSecurityDelayDialogNew import javax.inject.Singleton diff --git a/app/src/main/java/com/tangem/presentation/event/DeletingWalletFinish.kt b/app/src/main/java/com/tangem/presentation/event/DeletingWalletFinish.kt deleted file mode 100644 index edf47d0737..0000000000 --- a/app/src/main/java/com/tangem/presentation/event/DeletingWalletFinish.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.tangem.presentation.event - -class DeletingWalletFinish \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/event/ReadAfterRequest.kt b/app/src/main/java/com/tangem/presentation/event/ReadAfterRequest.kt deleted file mode 100644 index b283fc13a5..0000000000 --- a/app/src/main/java/com/tangem/presentation/event/ReadAfterRequest.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.tangem.presentation.event - -class ReadAfterRequest \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt rename to app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt index 28244cc6ce..09487806a4 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Intent @@ -18,7 +18,7 @@ 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.ui.event.TransactionFinishWithError import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.cardandroid.data.loadFromBundle diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt similarity index 97% rename from app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt rename to app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt index 1114e4bd00..7b0f2af875 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Context @@ -15,8 +15,8 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App 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.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt similarity index 98% rename from app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt rename to app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt index a704e4078d..7375c2e7fe 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Context @@ -18,8 +18,8 @@ import com.tangem.App import com.tangem.Constant 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.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.cardandroid.android.reader.NfcReader diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt similarity index 93% rename from app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt rename to app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt index 44fffccc9a..8026d17341 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.content.Context import android.content.Intent @@ -10,7 +10,7 @@ import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator import com.tangem.domain.wallet.TangemContext -import com.tangem.presentation.fragment.LoadedWallet +import com.tangem.ui.fragment.LoadedWallet import com.tangem.wallet.R import javax.inject.Inject diff --git a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt similarity index 97% rename from app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt rename to app/src/main/java/com/tangem/ui/activity/LogoActivity.kt index acb03e8626..9b1baa5087 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt similarity index 98% rename from app/src/main/java/com/tangem/presentation/activity/MainActivity.kt rename to app/src/main/java/com/tangem/ui/activity/MainActivity.kt index 894b26ae9d..2c116e90a1 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.Manifest import android.app.Activity @@ -27,9 +27,9 @@ import com.tangem.data.network.ServerApiCommon import com.tangem.di.Navigator import com.tangem.domain.wallet.CoinEngineFactory 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.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.RootFoundDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt index 8f0fb1411b..b3ab7fbfee 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.Manifest import android.annotation.SuppressLint diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt index dfc3870313..97002dfb43 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.Manifest import android.annotation.SuppressLint diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt similarity index 97% rename from app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt index 0cfe9fa926..1b043a33af 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Context @@ -15,8 +15,8 @@ import android.widget.ProgressBar import android.widget.Toast import com.tangem.App import com.tangem.Constant -import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog -import com.tangem.presentation.dialog.WaitSecurityDelayDialog +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.cardandroid.android.reader.NfcReader diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index d94914355d..f851cf5358 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt index f464698978..694be791e0 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt index 9e286accf5..3e73309ccf 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareTransactionActivity.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PrepareTransactionActivity.kt index ba484c9165..6d7da5c7b0 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareTransactionActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Context diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt similarity index 96% rename from app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt rename to app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt index 2f532cba4e..62d606ae4e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Context @@ -15,10 +15,10 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.domain.wallet.TangemContext -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.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialogNew +import com.tangem.ui.event.DeletingWalletFinish import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager diff --git a/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt b/app/src/main/java/com/tangem/ui/activity/QrScanActivity.kt similarity index 98% rename from app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt rename to app/src/main/java/com/tangem/ui/activity/QrScanActivity.kt index b765cd6c42..82e542ed4c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/QrScanActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.Manifest import android.app.Activity diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt similarity index 95% rename from app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt rename to app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt index ddeec95b24..ae3d17b25b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.content.Intent import android.nfc.NfcAdapter @@ -11,8 +11,8 @@ import com.tangem.Constant 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.presentation.event.TransactionFinishWithSuccess +import com.tangem.ui.event.TransactionFinishWithError +import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.util.UtilHelper diff --git a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt similarity index 98% rename from app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt rename to app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt index 9f4573fd2f..e7d61198e7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.app.Activity import android.content.Intent @@ -18,8 +18,8 @@ import com.tangem.Constant import com.tangem.domain.wallet.CoinEngine 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.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.cardandroid.android.nfc.NfcDeviceAntennaLocation import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt similarity index 92% rename from app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt rename to app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt index 976b1bb083..c9942b0195 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.activity +package com.tangem.ui.activity import android.content.Context import android.content.Intent @@ -8,7 +8,7 @@ import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator import com.tangem.domain.wallet.TangemContext -import com.tangem.presentation.fragment.VerifyCard +import com.tangem.ui.fragment.VerifyCard import com.tangem.wallet.R import javax.inject.Inject diff --git a/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt b/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt similarity index 95% rename from app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt rename to app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt index 102aa06044..d931e86360 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt +++ b/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog +package com.tangem.ui.dialog import android.app.AlertDialog import android.app.Dialog diff --git a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java similarity index 97% rename from app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java rename to app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java index 2f4d2ba00d..50b24b101e 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog; +package com.tangem.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt b/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt similarity index 94% rename from app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt rename to app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt index 7560cfbf43..3882cf74dc 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt +++ b/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog +package com.tangem.ui.dialog import android.app.AlertDialog import android.app.Dialog diff --git a/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java similarity index 98% rename from app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java rename to app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java index 475986f0b9..49646c489f 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog; +package com.tangem.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java similarity index 99% rename from app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java rename to app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java index 232666d59e..5a07459eb3 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog; +package com.tangem.ui.dialog; import android.app.Activity; import android.app.AlertDialog; diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt similarity index 95% rename from app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt rename to app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt index ed2aa9575c..b9421af27d 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt +++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.dialog +package com.tangem.ui.dialog import android.annotation.SuppressLint import android.app.AlertDialog @@ -6,9 +6,9 @@ import android.app.Dialog import android.os.Bundle import androidx.appcompat.app.AppCompatDialogFragment import android.widget.ProgressBar -import com.tangem.presentation.event.ReadAfterRequest -import com.tangem.presentation.event.ReadBeforeRequest -import com.tangem.presentation.event.ReadWait +import com.tangem.ui.event.ReadAfterRequest +import com.tangem.ui.event.ReadBeforeRequest +import com.tangem.ui.event.ReadWait import com.tangem.util.LOG import com.tangem.wallet.R import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/tangem/ui/event/DeletingWalletFinish.kt b/app/src/main/java/com/tangem/ui/event/DeletingWalletFinish.kt new file mode 100644 index 0000000000..c9683549d5 --- /dev/null +++ b/app/src/main/java/com/tangem/ui/event/DeletingWalletFinish.kt @@ -0,0 +1,3 @@ +package com.tangem.ui.event + +class DeletingWalletFinish \ No newline at end of file diff --git a/app/src/main/java/com/tangem/ui/event/ReadAfterRequest.kt b/app/src/main/java/com/tangem/ui/event/ReadAfterRequest.kt new file mode 100644 index 0000000000..8c61063c75 --- /dev/null +++ b/app/src/main/java/com/tangem/ui/event/ReadAfterRequest.kt @@ -0,0 +1,3 @@ +package com.tangem.ui.event + +class ReadAfterRequest \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/event/ReadBeforeRequest.kt b/app/src/main/java/com/tangem/ui/event/ReadBeforeRequest.kt similarity index 60% rename from app/src/main/java/com/tangem/presentation/event/ReadBeforeRequest.kt rename to app/src/main/java/com/tangem/ui/event/ReadBeforeRequest.kt index e9d1690bd5..203b0e1edb 100644 --- a/app/src/main/java/com/tangem/presentation/event/ReadBeforeRequest.kt +++ b/app/src/main/java/com/tangem/ui/event/ReadBeforeRequest.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.event +package com.tangem.ui.event class ReadBeforeRequest { var timeout: Int? = null diff --git a/app/src/main/java/com/tangem/presentation/event/ReadWait.kt b/app/src/main/java/com/tangem/ui/event/ReadWait.kt similarity index 54% rename from app/src/main/java/com/tangem/presentation/event/ReadWait.kt rename to app/src/main/java/com/tangem/ui/event/ReadWait.kt index 3b35bf479b..cd4e013295 100644 --- a/app/src/main/java/com/tangem/presentation/event/ReadWait.kt +++ b/app/src/main/java/com/tangem/ui/event/ReadWait.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.event +package com.tangem.ui.event class ReadWait { var msec: Int? = null diff --git a/app/src/main/java/com/tangem/presentation/event/TransactionFinishWithError.kt b/app/src/main/java/com/tangem/ui/event/TransactionFinishWithError.kt similarity index 64% rename from app/src/main/java/com/tangem/presentation/event/TransactionFinishWithError.kt rename to app/src/main/java/com/tangem/ui/event/TransactionFinishWithError.kt index bc5c5cb58c..fd21ee0083 100644 --- a/app/src/main/java/com/tangem/presentation/event/TransactionFinishWithError.kt +++ b/app/src/main/java/com/tangem/ui/event/TransactionFinishWithError.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.event +package com.tangem.ui.event class TransactionFinishWithError { var message: String? = null diff --git a/app/src/main/java/com/tangem/presentation/event/TransactionFinishWithSuccess.kt b/app/src/main/java/com/tangem/ui/event/TransactionFinishWithSuccess.kt similarity index 65% rename from app/src/main/java/com/tangem/presentation/event/TransactionFinishWithSuccess.kt rename to app/src/main/java/com/tangem/ui/event/TransactionFinishWithSuccess.kt index 689c418d27..00d24a8b33 100644 --- a/app/src/main/java/com/tangem/presentation/event/TransactionFinishWithSuccess.kt +++ b/app/src/main/java/com/tangem/ui/event/TransactionFinishWithSuccess.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.event +package com.tangem.ui.event class TransactionFinishWithSuccess { var message: String? = null diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt similarity index 97% rename from app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt rename to app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt index 47618c02ea..a07f0d66dc 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.fragment +package com.tangem.ui.fragment import android.app.Activity import android.app.AlertDialog @@ -28,17 +28,17 @@ import com.tangem.domain.wallet.BalanceValidator import com.tangem.domain.wallet.CoinEngine import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext -import com.tangem.presentation.activity.LoadedWalletActivity -import com.tangem.presentation.activity.PinRequestActivity -import com.tangem.presentation.activity.PrepareCryptonitWithdrawalActivity -import com.tangem.presentation.activity.PrepareKrakenWithdrawalActivity -import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog -import com.tangem.presentation.dialog.PINSwapWarningDialog -import com.tangem.presentation.dialog.ShowQRCodeDialog -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.ui.activity.LoadedWalletActivity +import com.tangem.ui.activity.PinRequestActivity +import com.tangem.ui.activity.PrepareCryptonitWithdrawalActivity +import com.tangem.ui.activity.PrepareKrakenWithdrawalActivity +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.PINSwapWarningDialog +import com.tangem.ui.dialog.ShowQRCodeDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog +import com.tangem.ui.event.DeletingWalletFinish +import com.tangem.ui.event.TransactionFinishWithError +import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager import com.tangem.cardandroid.android.reader.NfcReader diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt similarity index 99% rename from app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt rename to app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt index c11f19d723..1838a430f2 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.fragment +package com.tangem.ui.fragment import android.app.Activity import android.content.Intent @@ -19,9 +19,9 @@ import com.tangem.Constant import com.tangem.data.Blockchain import com.tangem.domain.wallet.CoinEngineFactory 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.ui.activity.* +import com.tangem.ui.dialog.PINSwapWarningDialog +import com.tangem.ui.event.DeletingWalletFinish import com.tangem.cardandroid.android.data.PINStorage import com.tangem.cardandroid.android.nfc.NfcLifecycleObserver import com.tangem.cardandroid.android.reader.NfcManager diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt b/app/src/main/java/com/tangem/ui/viewmodel/BaseViewModel.kt similarity index 95% rename from app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt rename to app/src/main/java/com/tangem/ui/viewmodel/BaseViewModel.kt index 9ea24cec16..c91a8c80e2 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/com/tangem/ui/viewmodel/BaseViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.tangem.presentation.viewmodel +package com.tangem.ui.viewmodel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt b/app/src/main/java/com/tangem/ui/viewmodel/LoadedWalletViewModel.kt similarity index 94% rename from app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt rename to app/src/main/java/com/tangem/ui/viewmodel/LoadedWalletViewModel.kt index c96f4c6d64..f43d40c632 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt +++ b/app/src/main/java/com/tangem/ui/viewmodel/LoadedWalletViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.presentation.viewmodel +package com.tangem.ui.viewmodel import androidx.lifecycle.MutableLiveData import com.tangem.data.network.exception.Failure diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml index decf945d60..c0d8ab2048 100644 --- a/app/src/main/res/layout/activity_confirm_transaction.xml +++ b/app/src/main/res/layout/activity_confirm_transaction.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.tangem.presentation.activity.ConfirmTransactionActivity" + tools:context="com.tangem.ui.activity.ConfirmTransactionActivity" tools:ignore="Autofill"> + tools:context="com.tangem.ui.activity.CreateNewWalletActivity"> + tools:context="com.tangem.ui.activity.LoadedWalletActivity"> + tools:context="com.tangem.ui.activity.PinRequestActivity"> + tools:context="com.tangem.ui.activity.PinSaveActivity"> + tools:context="com.tangem.ui.activity.PurgeActivity"> + tools:context="com.tangem.ui.activity.PrepareCryptonitOtherApiWithdrawalActivity"> + tools:context="com.tangem.ui.activity.PrepareCryptonitWithdrawalActivity"> + tools:context="com.tangem.ui.activity.PrepareKrakenWithdrawalActivity"> + tools:context="com.tangem.ui.activity.PurgeActivity"> + tools:context="com.tangem.ui.activity.SendTransactionActivity"> + tools:context="com.tangem.ui.activity.SignTransactionActivity"> + tools:context="com.tangem.ui.activity.VerifyCardActivity"> diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index 34163673be..d7a6e84a44 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context="com.tangem.presentation.fragment.VerifyCard" + tools:context="com.tangem.ui.fragment.VerifyCard" tools:ignore="contentDescription" tools:showIn="@layout/activity_verify_card"> diff --git a/app/src/main/res/menu/menu_loaded_wallet.xml b/app/src/main/res/menu/menu_loaded_wallet.xml index 9b93dd09a3..b43f6e76db 100644 --- a/app/src/main/res/menu/menu_loaded_wallet.xml +++ b/app/src/main/res/menu/menu_loaded_wallet.xml @@ -2,7 +2,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - tools:context="com.tangem.presentation.activity.LoadedWalletActivity"> + tools:context="com.tangem.ui.activity.LoadedWalletActivity"> - 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