From a1a659f56d2f5ce428c36467ad214df99b5f7447 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 27 Jun 2023 11:36:30 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/TapApplication.kt | 4 ++-- .../learn2earn/data/DefaultLearn2earnRepository.kt | 2 +- .../feature/learn2earn/data/models/PromoUserData.kt | 2 +- .../learn2earn/domain/DefaultLearn2earnInteractor.kt | 8 ++++---- .../presentation/ui/Learn2earnMainPageScreen.kt | 8 ++++---- .../learn2earn/presentation/ui/state/StateBuilder.kt | 1 - .../learn2earn/presentation/webView/WebViewViewModel.kt | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt index a2868e27e4..70fa67acd8 100644 --- a/app/src/main/java/com/tangem/tap/TapApplication.kt +++ b/app/src/main/java/com/tangem/tap/TapApplication.kt @@ -246,7 +246,7 @@ class TapApplication : Application(), ImageLoaderFactory { shopService = TangemShopService(this, config.shopify!!) initAnalytics(this, config) initFeedbackManager(this, preferencesStorage, foregroundActivityObserver, store) - learn2earnSetupAdditionalDependencies(config) + setupLearn2earnAdditionalDependencies(config) } private fun initAnalytics(application: Application, config: Config) { @@ -309,7 +309,7 @@ class TapApplication : Application(), ImageLoaderFactory { store.dispatch(GlobalAction.SetFeedbackManager(feedbackManager)) } - private fun learn2earnSetupAdditionalDependencies(config: Config) { + private fun setupLearn2earnAdditionalDependencies(config: Config) { learn2ernInteractor.setupDependencies( authCredentials = config.tangemComAuthorization, countryCodeProvider = { store.state.globalState.userCountryCode ?: Locale.current.language }, diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt index 4e82732da2..d1ad091ec5 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt @@ -120,7 +120,7 @@ internal class DefaultLearn2earnRepository( private fun createNewUser(): PromoUserData = PromoUserData( promoCode = null, isRegisteredInPromotion = false, - alreadyReceivedAward = false, + isAlreadyReceivedAward = false, ) private companion object { diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt index a982239d0a..7edf1bc122 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt @@ -6,5 +6,5 @@ package com.tangem.feature.learn2earn.data.models data class PromoUserData( val promoCode: String?, val isRegisteredInPromotion: Boolean, - val alreadyReceivedAward: Boolean, + val isAlreadyReceivedAward: Boolean, ) \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt index 1b58ec245c..2eea7cf470 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt @@ -103,7 +103,7 @@ class DefaultLearn2earnInteractor( val address = getWalletAddressForAward(awardCurrency) val awardResponse = repository.requestAward(walletId, address) if (awardResponse.status == true) { - updateUserData { it.copy(alreadyReceivedAward = true) } + updateUserData { it.copy(isAlreadyReceivedAward = true) } null } else { awardResponse.error @@ -123,7 +123,7 @@ class DefaultLearn2earnInteractor( val address = getWalletAddressForAward(awardCurrency) val awardWithCodeResponse = repository.requestAwardByCode(walletId, address, promoCode) if (awardWithCodeResponse.status == true) { - updateUserData { it.copy(alreadyReceivedAward = true) } + updateUserData { it.copy(isAlreadyReceivedAward = true) } null } else { awardWithCodeResponse.error @@ -159,7 +159,7 @@ class DefaultLearn2earnInteractor( is PromotionError.CardAlreadyHasAward, is PromotionError.WalletAlreadyHasAward, is PromotionError.CodeWasAlreadyUsed, -> { - updateUserData { it.copy(alreadyReceivedAward = true) } + updateUserData { it.copy(isAlreadyReceivedAward = true) } } else -> Unit } @@ -202,7 +202,7 @@ class DefaultLearn2earnInteractor( private fun promotionIsActive(): Boolean { val isActive = when { - repository.getUserData().alreadyReceivedAward -> false + repository.getUserData().isAlreadyReceivedAward -> false promotion.isError() -> false else -> promotion.getPromotionInfo().status == PromotionInfoResponse.Status.ACTIVE } diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt index e7dceb659e..be9b02a7d7 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt @@ -4,18 +4,18 @@ import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.tangem.core.ui.res.TangemTheme -import com.tangem.feature.learn2earn.presentation.Learn2earnViewModel +import com.tangem.feature.learn2earn.presentation.ui.state.Learn2earnState /** [REDACTED_AUTHOR] */ @Composable -fun Learn2earnMainPageScreen(viewModel: Learn2earnViewModel, modifier: Modifier = Modifier) { +fun Learn2earnMainPageScreen(state: Learn2earnState, modifier: Modifier = Modifier) { GetBonusView( - state = viewModel.uiState.mainScreenState, + state = state.mainScreenState, modifier = modifier .padding(horizontal = TangemTheme.dimens.size16) .padding(vertical = TangemTheme.dimens.size8), ) - Learn2earnDialogs(viewModel.uiState.mainScreenState.dialog) + Learn2earnDialogs(state.mainScreenState.dialog) } \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt index 48ffd1a68f..4faefc208d 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt @@ -79,7 +79,6 @@ internal fun Learn2earnState.hideDialog(): Learn2earnState { } } -@Suppress("MagicNumber") internal fun Learn2earnState.updateProgress(showProgress: Boolean): Learn2earnState { return if (mainScreenState.showProgress == showProgress) { this diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt index 3c473657de..37d6f9a5c4 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt @@ -13,7 +13,7 @@ import javax.inject.Inject [REDACTED_AUTHOR] */ @HiltViewModel -class WebViewViewModel @Inject constructor( +internal class WebViewViewModel @Inject constructor( private val handler: WebViewRedirectHandler, ) : ViewModel(), WebViewRedirectHandler {