diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index 100da06a42..7ad61d6a45 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -12,8 +12,8 @@ import com.google.android.material.snackbar.Snackbar import com.tangem.TangemSdk import com.tangem.features.tester.api.TesterRouter import com.tangem.operations.backup.BackupService -import com.tangem.tangem_sdk_new.extensions.init -import com.tangem.tangem_sdk_new.extensions.initWithBiometrics +import com.tangem.sdk.extensions.init +import com.tangem.sdk.extensions.initWithBiometrics import com.tangem.tap.common.ActivityResultCallbackHolder import com.tangem.tap.common.DialogManager import com.tangem.tap.common.OnActivityResultCallback diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt index fa91934a30..32c3110ba5 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt @@ -5,8 +5,8 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp -import com.tangem.tangem_sdk_new.extensions.dpToPx -import com.tangem.tangem_sdk_new.extensions.pxToDp +import com.tangem.sdk.extensions.dpToPx +import com.tangem.sdk.extensions.pxToDp /** [REDACTED_AUTHOR] diff --git a/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt b/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt index 98a06327bb..8253e64b37 100644 --- a/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt +++ b/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt @@ -6,8 +6,8 @@ import android.widget.FrameLayout import androidx.fragment.app.Fragment import androidx.transition.TransitionInflater import by.kirich1409.viewbindingdelegate.viewBinding -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidgetState +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidgetState import com.tangem.tap.domain.twins.TwinsCardWidget import com.tangem.wallet.R import com.tangem.wallet.databinding.TestLeapfrogFragmentBinding diff --git a/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt b/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt index b1d16fc3f6..cb8ea5186f 100644 --- a/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt +++ b/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt @@ -3,7 +3,7 @@ package com.tangem.tap.common.recyclerView import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.tangem.tangem_sdk_new.extensions.dpToPx +import com.tangem.sdk.extensions.dpToPx class SpaceItemDecoration( private val horizontalSpaceDp: Float, diff --git a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt index 95d1d76fdd..ca1f95a650 100644 --- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt +++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt @@ -7,9 +7,9 @@ import android.view.View import androidx.core.animation.doOnEnd import com.tangem.common.extensions.VoidCallback import com.tangem.domain.common.TwinCardNumber -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapView -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapViewState -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapView +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapViewState +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget /** [REDACTED_AUTHOR] diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt index 108547e8b2..76f11e8ae0 100644 --- a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt +++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt @@ -5,8 +5,8 @@ import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import com.tangem.common.json.TangemSdkAdapter import com.tangem.common.services.secure.SecureStorage -import com.tangem.tangem_sdk_new.storage.AndroidSecureStorage -import com.tangem.tangem_sdk_new.storage.createEncryptedSharedPreferences +import com.tangem.sdk.storage.AndroidSecureStorage +import com.tangem.sdk.storage.createEncryptedSharedPreferences import com.tangem.tap.domain.TangemSdkManager import com.tangem.tap.domain.userWalletList.UserWalletsListManager import com.tangem.tap.domain.userWalletList.implementation.BiometricUserWalletsListManager diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt index 416dbb70e3..4c8d89c813 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt @@ -18,7 +18,7 @@ import com.tangem.core.ui.fragments.setStatusBarColor import com.tangem.datasource.asset.AssetReader import com.tangem.domain.common.ScanResponse import com.tangem.domain.common.TwinCardNumber -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget import com.tangem.tap.common.analytics.events.Onboarding import com.tangem.tap.common.extensions.beginDelayedTransition import com.tangem.tap.common.extensions.getDrawableCompat diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt index d2202cc249..44a4ea0a35 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt @@ -19,8 +19,8 @@ import com.google.android.material.tabs.TabLayoutMediator import com.tangem.common.CardIdFormatter import com.tangem.common.core.CardIdDisplayFormat import com.tangem.core.analytics.Analytics -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.PropertyCalculator +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget +import com.tangem.sdk.ui.widget.leapfrogWidget.PropertyCalculator import com.tangem.tap.common.analytics.events.Onboarding import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.inflate diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt index 7385c4d025..64479ca66d 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt @@ -6,9 +6,9 @@ import android.animation.PropertyValuesHolder import android.view.View import android.widget.ImageView import androidx.core.animation.doOnEnd -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapView -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapViewState -import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapView +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapViewState +import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget class WalletCardsWidget( val leapfrogWidget: LeapfrogWidget, diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt index 55b1211cfb..ecc6d5d00e 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt @@ -17,7 +17,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding import com.google.android.material.textfield.TextInputEditText import com.tangem.Message import com.tangem.core.analytics.Analytics -import com.tangem.tangem_sdk_new.extensions.hideSoftKeyboard +import com.tangem.sdk.extensions.hideSoftKeyboard import com.tangem.tap.common.KeyboardObserver import com.tangem.tap.common.analytics.events.Token import com.tangem.tap.common.entities.FiatCurrency diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt index 600e7a99d7..8d1fe0182f 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt @@ -5,7 +5,7 @@ import androidx.appcompat.app.AlertDialog import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.BlockchainSdkError import com.tangem.common.module.ModuleMessageConverter -import com.tangem.tangem_sdk_new.extensions.localizedDescription +import com.tangem.sdk.extensions.localizedDescription import com.tangem.tap.common.extensions.stripZeroPlainString import com.tangem.tap.common.feedback.SendTransactionFailedEmail import com.tangem.tap.common.redux.global.GlobalAction diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index af465cf7b2..1eebe4d266 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -25,7 +25,7 @@ import com.tangem.core.analytics.Analytics import com.tangem.domain.common.TapWorkarounds.derivationStyle import com.tangem.domain.common.extensions.withMainContext import com.tangem.feature.swap.domain.SwapInteractor -import com.tangem.tangem_sdk_new.extensions.dpToPx +import com.tangem.sdk.extensions.dpToPx import com.tangem.tap.common.SnackbarHandler import com.tangem.tap.common.TestActions import com.tangem.tap.common.analytics.events.DetailsScreen diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt index d05ac08cc9..4019726797 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt @@ -8,7 +8,7 @@ import androidx.constraintlayout.utils.widget.ImageFilterView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible import com.tangem.blockchain.common.DerivationStyle -import com.tangem.tangem_sdk_new.extensions.dpToPx +import com.tangem.sdk.extensions.dpToPx import com.tangem.tap.features.wallet.models.Currency import com.tangem.wallet.databinding.ViewCurrencyIconBinding import kotlin.math.roundToInt diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 3fbf32f7d0..d6186e0348 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -68,11 +68,10 @@ kotlinSerialization = "1.4.1" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-174" -#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds - -tangemCardSdk = "develop-200" -#tangemCardSdk = "0.0.1" # Keep it! - used for local builds +tangemBlockchainSdk = "develop-176" +# tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds +tangemCardSdk = "develop-204" +# tangemCardSdk = "0.0.1" # Keep it! - used for local builds # endregion Tangem # region Tools