From 3ec1b5c88e51f6f249417078bfcff4998c0e73dd Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 29 May 2024 18:51:20 +0400 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/MainActivity.kt | 5 ----- .../java/com/tangem/tap/common/extensions/Navigation.kt | 4 +--- .../java/com/tangem/tap/di/RootAppComponentContextModule.kt | 2 ++ .../java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt | 2 -- .../java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt | 1 - .../java/com/tangem/tap/proxy/redux/DaggerGraphState.kt | 2 -- .../com/tangem/core/decompose/di/RootAppComponentContext.kt | 6 ++++++ .../kotlin/com/tangem/features/details/DetailsEntryPoint.kt | 3 +-- .../kotlin/com/tangem/features/details/DetailsFragment.kt | 6 +----- 9 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 core/decompose/src/main/kotlin/com/tangem/core/decompose/di/RootAppComponentContext.kt diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index 7b2ac4c692..78b55f9ecb 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -27,7 +27,6 @@ import by.kirich1409.viewbindingdelegate.viewBinding import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar import com.tangem.core.analytics.api.AnalyticsEventHandler -import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.deeplink.DeepLinksRegistry import com.tangem.core.navigation.AppScreen import com.tangem.core.navigation.NavigationAction @@ -156,9 +155,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac @Inject lateinit var emailSender: EmailSender - @Inject - lateinit var rootComponentContext: AppComponentContext - internal val viewModel: MainViewModel by viewModels() private lateinit var appThemeModeFlow: SharedFlow @@ -243,7 +239,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac sendRouter = sendRouter, qrScanningRouter = qrScanningRouter, emailSender = emailSender, - rootComponentContext = rootComponentContext, ), ) } diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt index 9ee6f6a614..4b0a740760 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt @@ -141,9 +141,7 @@ private fun fragmentFactory(screen: AppScreen): Fragment { val featureToggles = store.inject(getDependency = DaggerGraphState::detailsFeatureToggles) if (featureToggles.isRedesignEnabled) { - store.inject(DaggerGraphState::detailsEntryPoint).entryFragment( - parentContext = store.inject(DaggerGraphState::rootComponentContext), - ) + store.inject(DaggerGraphState::detailsEntryPoint).entryFragment() } else { DetailsFragment() } diff --git a/app/src/main/java/com/tangem/tap/di/RootAppComponentContextModule.kt b/app/src/main/java/com/tangem/tap/di/RootAppComponentContextModule.kt index 038c7d5a86..b23a41b8a8 100644 --- a/app/src/main/java/com/tangem/tap/di/RootAppComponentContextModule.kt +++ b/app/src/main/java/com/tangem/tap/di/RootAppComponentContextModule.kt @@ -6,6 +6,7 @@ import com.arkivanov.decompose.defaultComponentContext import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.DefaultAppComponentContext import com.tangem.core.decompose.di.DecomposeComponent +import com.tangem.core.decompose.di.RootAppComponentContext import com.tangem.core.decompose.ui.UiMessage import com.tangem.core.decompose.ui.UiMessageHandler import com.tangem.utils.coroutines.CoroutineDispatcherProvider @@ -23,6 +24,7 @@ internal object RootAppComponentContextModule { @Provides @ActivityScoped + @RootAppComponentContext fun provideRootAppComponentContext( @ActivityContext context: Context, dispatchers: CoroutineDispatcherProvider, diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt index 3855cdb3f8..f854ba0dae 100644 --- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt +++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt @@ -1,6 +1,5 @@ package com.tangem.tap.proxy.redux -import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.navigation.email.EmailSender import com.tangem.domain.card.ScanCardUseCase import com.tangem.domain.card.repository.CardSdkConfigRepository @@ -26,6 +25,5 @@ sealed interface DaggerGraphAction : Action { val sendRouter: SendRouter, val qrScanningRouter: QrScanningRouter, val emailSender: EmailSender, - val rootComponentContext: AppComponentContext, ) : DaggerGraphAction } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt index d6db12a587..b25fdce12b 100644 --- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt +++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt @@ -23,7 +23,6 @@ object DaggerGraphReducer { sendRouter = action.sendRouter, qrScanningRouter = action.qrScanningRouter, emailSender = action.emailSender, - rootComponentContext = action.rootComponentContext, ) } } diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt index 2905024817..0839a21a08 100644 --- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt +++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt @@ -2,7 +2,6 @@ package com.tangem.tap.proxy.redux import com.tangem.TangemSdkLogger import com.tangem.blockchainsdk.BlockchainSDKFactory -import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.navigation.email.EmailSender import com.tangem.datasource.asset.loader.AssetLoader import com.tangem.datasource.connection.NetworkConnectionManager @@ -42,7 +41,6 @@ import com.tangem.tap.proxy.AppStateHolder import org.rekotlin.StateType data class DaggerGraphState( - val rootComponentContext: AppComponentContext? = null, val testerRouter: TesterRouter? = null, val networkConnectionManager: NetworkConnectionManager? = null, val customTokenFeatureToggles: CustomTokenFeatureToggles? = null, diff --git a/core/decompose/src/main/kotlin/com/tangem/core/decompose/di/RootAppComponentContext.kt b/core/decompose/src/main/kotlin/com/tangem/core/decompose/di/RootAppComponentContext.kt new file mode 100644 index 0000000000..b9e3987632 --- /dev/null +++ b/core/decompose/src/main/kotlin/com/tangem/core/decompose/di/RootAppComponentContext.kt @@ -0,0 +1,6 @@ +package com.tangem.core.decompose.di + +import javax.inject.Qualifier + +@Qualifier +annotation class RootAppComponentContext \ No newline at end of file diff --git a/features/details/api/src/main/kotlin/com/tangem/features/details/DetailsEntryPoint.kt b/features/details/api/src/main/kotlin/com/tangem/features/details/DetailsEntryPoint.kt index 9f8a7d8226..f2cf124e1c 100644 --- a/features/details/api/src/main/kotlin/com/tangem/features/details/DetailsEntryPoint.kt +++ b/features/details/api/src/main/kotlin/com/tangem/features/details/DetailsEntryPoint.kt @@ -1,9 +1,8 @@ package com.tangem.features.details import androidx.fragment.app.Fragment -import com.tangem.core.decompose.context.AppComponentContext interface DetailsEntryPoint { - fun entryFragment(parentContext: AppComponentContext): Fragment + fun entryFragment(): Fragment } \ No newline at end of file diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/DetailsFragment.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/DetailsFragment.kt index 454de7ed1b..6e6b812683 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/DetailsFragment.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/DetailsFragment.kt @@ -3,7 +3,6 @@ package com.tangem.features.details import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.fragment.app.Fragment -import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.UiDependencies import com.tangem.core.ui.screen.ComposeFragment import com.tangem.features.details.component.preview.PreviewDetailsComponent @@ -25,9 +24,6 @@ internal class DetailsFragment : ComposeFragment() { companion object : DetailsEntryPoint { - override fun entryFragment(parentContext: AppComponentContext): Fragment { - // TODO: Update to use the actual component in [REDACTED_TASK_KEY] - return DetailsFragment() - } + override fun entryFragment(): Fragment = DetailsFragment() } } \ No newline at end of file