From 0eab4907a27cbe10de2eb64ef6e7beaadcac25b9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 17 Sep 2024 19:17:55 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/datasource/di/DevTangemApi.kt | 8 ---- .../com/tangem/datasource/di/NetworkModule.kt | 40 +++++-------------- .../data/markets/di/MarketsDataModule.kt | 5 +-- .../presentation/wallet/ui/WalletScreen.kt | 5 +-- 4 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 core/datasource/src/main/java/com/tangem/datasource/di/DevTangemApi.kt diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/DevTangemApi.kt b/core/datasource/src/main/java/com/tangem/datasource/di/DevTangemApi.kt deleted file mode 100644 index 4bfacf89db..0000000000 --- a/core/datasource/src/main/java/com/tangem/datasource/di/DevTangemApi.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.tangem.datasource.di - -import javax.inject.Qualifier - -@Qualifier -@MustBeDocumented -@Retention(AnnotationRetention.RUNTIME) -annotation class DevTangemApi \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt index c692a451c2..667e63d05e 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt @@ -35,7 +35,6 @@ import javax.inject.Singleton @InstallIn(SingletonComponent::class) internal object NetworkModule { - private const val DEV_V1_TANGEM_TECH_BASE_URL = "https://devapi.tangem-tech.com/v1/" private const val PROD_V2_TANGEM_TECH_BASE_URL = "https://api.tangem-tech.com/v2/" private const val TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS = 60L @@ -128,44 +127,27 @@ internal object NetworkModule { } @Provides - @DevTangemApi - @Singleton - fun provideTangemTechDevApi( - @NetworkMoshi moshi: Moshi, - @ApplicationContext context: Context, - appVersionProvider: AppVersionProvider, - ): TangemTechApi { - return provideTangemTechApiInternal( - moshi = moshi, - context = context, - appVersionProvider = appVersionProvider, - baseUrl = DEV_V1_TANGEM_TECH_BASE_URL, - ) - } - - // TODO: [REDACTED_JIRA] - @Provides - @DevTangemApi @Singleton fun provideTangemTechMarketsApi( @NetworkMoshi moshi: Moshi, @ApplicationContext context: Context, - appVersionProvider: AppVersionProvider, + apiConfigsManager: ApiConfigsManager, ): TangemTechMarketsApi { - return provideTangemTechApiInternal( + return createApi( + id = ApiConfig.ID.TangemTech, moshi = moshi, context = context, - appVersionProvider = appVersionProvider, - baseUrl = DEV_V1_TANGEM_TECH_BASE_URL, - timeouts = Timeouts( - callTimeoutSeconds = TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, - connectTimeoutSeconds = TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, - readTimeoutSeconds = TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, - ), - requestHeaders = listOf(AppVersionPlatformHeaders(appVersionProvider)), + apiConfigsManager = apiConfigsManager, + clientBuilder = { + this.callTimeout(TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .connectTimeout(TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .readTimeout(TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .applyTimeoutAnnotations() + }, ) } + @Deprecated("use createApi instead") private inline fun provideTangemTechApiInternal( moshi: Moshi, context: Context, diff --git a/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt b/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt index 4ef2f1e094..fa4e3d492f 100644 --- a/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt +++ b/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt @@ -4,7 +4,6 @@ import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.data.markets.DefaultMarketsTokenRepository import com.tangem.datasource.api.markets.TangemTechMarketsApi import com.tangem.datasource.api.tangemTech.TangemTechApi -import com.tangem.datasource.di.DevTangemApi import com.tangem.datasource.local.userwallet.UserWalletsStore import com.tangem.domain.markets.repositories.MarketsTokenRepository import com.tangem.utils.coroutines.CoroutineDispatcherProvider @@ -21,8 +20,8 @@ internal object MarketsDataModule { @Provides @Singleton fun provideMarketsRepository( - @DevTangemApi marketsApi: TangemTechMarketsApi, - @DevTangemApi tangemTechApi: TangemTechApi, + marketsApi: TangemTechMarketsApi, + tangemTechApi: TangemTechApi, userWalletsStore: UserWalletsStore, dispatchers: CoroutineDispatcherProvider, analyticsEventHandler: AnalyticsEventHandler, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt index 7243dbb143..a42d33d598 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt @@ -407,7 +407,6 @@ private inline fun BaseScaffoldWithMarkets( sheetContainerColor = backgroundColor.value, scaffoldState = scaffoldState, sheetPeekHeight = peekHeight, - sheetTonalElevation = 8.dp, sheetShadowElevation = 8.dp, sheetShape = TangemTheme.shapes.bottomSheetLarge, sheetContent = { @@ -645,7 +644,7 @@ private fun BottomSheetStateEffects( val systemUiController = rememberSystemUiController() val navigationBarColor = TangemTheme.colors.background.primary - LaunchedEffect(Unit) { + LaunchedEffect(navigationBarColor) { delay(timeMillis = 100) when (bottomSheetState.currentValue) { TangemSheetValue.Hidden, @@ -660,7 +659,7 @@ private fun BottomSheetStateEffects( } } - LaunchedEffect(key1 = bottomSheetState.targetValue, navigationBarColor) { + LaunchedEffect(bottomSheetState.targetValue, navigationBarColor) { when (bottomSheetState.targetValue) { TangemSheetValue.Hidden, TangemSheetValue.Expanded,