From 5d8461a4f273b622e2c0fc846679870553f9b8b1 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 25 Sep 2024 16:15:46 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/tap/common/extensions/Specific.kt | 6 +--- .../tap/common/log/TangemLogCollector.kt | 31 ------------------- .../common/redux/legacy/LegacyMiddleware.kt | 2 +- .../tap/domain/walletconnect/BnbHelper.kt | 2 +- .../features/onboarding/OnboardingManager.kt | 2 +- .../products/note/OnboardingNoteFragment.kt | 2 +- .../twins/ui/OnboardingTwinsFragment.kt | 6 +++- .../tangem/utils/extensions/BigDecimalExt.kt | 15 +++++---- 8 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/common/log/TangemLogCollector.kt diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt index 773bca1bd5..0dfce4b8c7 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt @@ -20,8 +20,4 @@ fun BigDecimal.toFormattedString( df.isGroupingUsed = true df.roundingMode = roundingMode return df.format(this) -} - -fun BigDecimal.stripZeroPlainString(): String = this.stripTrailingZeros().toPlainString() - -fun BigDecimal.isPositive(): Boolean = this.signum() == 1 \ No newline at end of file +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/log/TangemLogCollector.kt b/app/src/main/java/com/tangem/tap/common/log/TangemLogCollector.kt deleted file mode 100644 index 54a56e17c3..0000000000 --- a/app/src/main/java/com/tangem/tap/common/log/TangemLogCollector.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.tangem.tap.common.log - -import com.tangem.Log -import com.tangem.LogFormat -import com.tangem.TangemSdkLogger -import java.text.SimpleDateFormat -import java.util.* - -class TangemLogCollector( - private val levels: List, - private val messageFormatter: LogFormat, -) : TangemSdkLogger { - - private val dateFormatter = SimpleDateFormat("HH:mm:ss.SSS") - private val logs = mutableListOf() - private val mutex = Object() - - override fun log(message: () -> String, level: Log.Level) { - if (!levels.contains(level)) return - - synchronized(mutex) { - val formattedMessage = messageFormatter.format(message, level) - val logMessage = "${dateFormatter.format(Date())}: $formattedMessage" - logs.add("$logMessage\n") - } - } - - fun getLogs(): List = synchronized(mutex) { logs.toList() } - - fun clearLogs() = synchronized(mutex) { logs.clear() } -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt index 0a08d6080d..03c2b409a0 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt @@ -9,7 +9,6 @@ import com.tangem.domain.redux.LegacyAction import com.tangem.domain.utils.convertToSdkAmount import com.tangem.tap.common.extensions.dispatchWithMain import com.tangem.tap.common.extensions.inject -import com.tangem.tap.common.extensions.stripZeroPlainString import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.features.details.redux.DetailsAction @@ -18,6 +17,7 @@ import com.tangem.tap.scope import com.tangem.tap.store import com.tangem.utils.coroutines.JobHolder import com.tangem.utils.coroutines.saveIn +import com.tangem.utils.extensions.stripZeroPlainString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt index 2b3094d9f6..0e6ccce36b 100644 --- a/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt +++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt @@ -4,12 +4,12 @@ import com.github.salomonbrys.kotson.registerTypeAdapter import com.google.gson.GsonBuilder import com.tangem.blockchain.common.Blockchain import com.tangem.common.extensions.calculateSha256 -import com.tangem.tap.common.extensions.stripZeroPlainString import com.tangem.tap.domain.walletconnect2.domain.models.binance.WcBinanceTradeOrder import com.tangem.tap.domain.walletconnect2.domain.models.binance.WcBinanceTransferOrder import com.tangem.tap.domain.walletconnect2.domain.models.binance.tradeOrderSerializer import com.tangem.tap.features.details.redux.walletconnect.BinanceMessageData import com.tangem.tap.features.details.redux.walletconnect.TradeData +import com.tangem.utils.extensions.stripZeroPlainString import timber.log.Timber internal object BnbHelper { diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt index d37b7153d1..a0db9b19f8 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt @@ -11,7 +11,6 @@ import com.tangem.operations.attestation.CardVerifyAndGetInfo import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.entities.ProgressState import com.tangem.tap.common.extensions.inject -import com.tangem.tap.common.extensions.isPositive import com.tangem.tap.common.extensions.safeUpdate import com.tangem.tap.domain.TapError import com.tangem.tap.domain.extensions.getOrLoadCardArtworkUrl @@ -20,6 +19,7 @@ import com.tangem.tap.domain.model.hasPendingTransactions import com.tangem.tap.features.demo.isDemoCard import com.tangem.tap.proxy.redux.DaggerGraphState import com.tangem.tap.store +import com.tangem.utils.extensions.isPositive import timber.log.Timber import java.math.BigDecimal diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt index 757ec91454..97746d2d70 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt @@ -14,7 +14,6 @@ import com.tangem.core.navigation.ShareElement import com.tangem.domain.models.scan.ScanResponse import com.tangem.tap.common.analytics.events.Onboarding import com.tangem.tap.common.extensions.getDrawableCompat -import com.tangem.tap.common.extensions.stripZeroPlainString import com.tangem.tap.common.toggleWidget.RefreshBalanceWidget import com.tangem.tap.common.transitions.InternalNoteLayoutTransition import com.tangem.tap.features.addBackPressHandler @@ -24,6 +23,7 @@ import com.tangem.tap.features.onboarding.products.note.redux.OnboardingNoteActi import com.tangem.tap.features.onboarding.products.note.redux.OnboardingNoteState import com.tangem.tap.features.onboarding.products.note.redux.OnboardingNoteStep import com.tangem.tap.store +import com.tangem.utils.extensions.stripZeroPlainString import com.tangem.wallet.R /** diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt index 76880fb5e1..f058c94f3b 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt @@ -21,7 +21,10 @@ import com.tangem.domain.models.scan.ScanResponse import com.tangem.domain.wallets.models.Artwork import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget import com.tangem.tap.common.analytics.events.Onboarding -import com.tangem.tap.common.extensions.* +import com.tangem.tap.common.extensions.beginDelayedTransition +import com.tangem.tap.common.extensions.getDrawableCompat +import com.tangem.tap.common.extensions.hide +import com.tangem.tap.common.extensions.show import com.tangem.tap.common.toggleWidget.RefreshBalanceWidget import com.tangem.tap.common.transitions.InternalNoteLayoutTransition import com.tangem.tap.domain.twins.TwinsCardWidget @@ -35,6 +38,7 @@ import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep import com.tangem.tap.store import com.tangem.utils.Provider +import com.tangem.utils.extensions.stripZeroPlainString import com.tangem.wallet.R import com.tangem.wallet.databinding.LayoutOnboardingContainerTopBinding import dagger.hilt.android.AndroidEntryPoint diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/BigDecimalExt.kt b/core/utils/src/main/java/com/tangem/utils/extensions/BigDecimalExt.kt index 30820e1536..31a31d6704 100644 --- a/core/utils/src/main/java/com/tangem/utils/extensions/BigDecimalExt.kt +++ b/core/utils/src/main/java/com/tangem/utils/extensions/BigDecimalExt.kt @@ -2,11 +2,14 @@ package com.tangem.utils.extensions import java.math.BigDecimal -/** - * Converts `BigDecimal?` to `BigDecimal` - * - * If `BigDecimal?` is `null`, returns `BigDecimal.ZERO` - */ +/** Returns [BigDecimal] or [BigDecimal.ZERO] if [this] is null */ fun BigDecimal?.orZero(): BigDecimal = this ?: BigDecimal.ZERO -fun BigDecimal.isZero(): Boolean = this.compareTo(BigDecimal.ZERO) == 0 \ No newline at end of file +/** Checks if [this] is [BigDecimal] */ +fun BigDecimal.isZero(): Boolean = this.compareTo(BigDecimal.ZERO) == 0 + +/** Checks if [this] is positive */ +fun BigDecimal.isPositive(): Boolean = this.signum() == 1 + +/** Removes trailing zeros and returns plain [String] */ +fun BigDecimal.stripZeroPlainString(): String = this.stripTrailingZeros().toPlainString() \ No newline at end of file