GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2024-06-11 15:24:34 +04:00
parent 821be73571
commit ba4ceb2e8b
8 changed files with 101 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/decompose/src/main/kotlin/com/tangem/core/decompose/factory/ComponentFactory.kt Normal file
View file

@ -0,0 +1,8 @@
package com.tangem.core.decompose.factory
import com.tangem.core.decompose.context.AppComponentContext
interface ComponentFactory<Component : Any, Params : Any> {
fun create(context: AppComponentContext, params: Params): Component
}

19
core/decompose/src/main/kotlin/com/tangem/core/decompose/navigation/DefaultRouter.kt
View file

@ -6,6 +6,7 @@ import com.arkivanov.decompose.router.stack.pop
import com.arkivanov.decompose.router.stack.popWhile
import com.arkivanov.decompose.router.stack.pushNew
import com.arkivanov.essenty.instancekeeper.InstanceKeeper
import kotlin.reflect.KClass
internal class DefaultRouter(
private val navigationProvider: AppNavigationProvider,
@ -23,9 +24,23 @@ internal class DefaultRouter(
navigation.pop(onComplete)
}
override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
navigation.popWhile(
predicate = { it != route },
predicate = { it::class != routeClass },
onComplete = onComplete,
)
}
override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
navigation.popWhile(
predicate = { it::class != routeClass },
onComplete = onComplete,
)
}
override fun clear(onComplete: (isSuccess: Boolean) -> Unit) {
navigation.popWhile(
predicate = { true },
onComplete = onComplete,
)
}

26
core/decompose/src/main/kotlin/com/tangem/core/decompose/navigation/DummyRouter.kt Normal file
View file

@ -0,0 +1,26 @@
package com.tangem.core.decompose.navigation
import kotlin.reflect.KClass
class DummyRouter : Router {
override fun push(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
onComplete(true)
}
override fun pop(onComplete: (isSuccess: Boolean) -> Unit) {
onComplete(true)
}
override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
onComplete(true)
}
override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
onComplete(true)
}
override fun clear(onComplete: (isSuccess: Boolean) -> Unit) {
onComplete(true)
}
}

19
core/decompose/src/main/kotlin/com/tangem/core/decompose/navigation/Router.kt
View file

@ -1,5 +1,7 @@
package com.tangem.core.decompose.navigation
import kotlin.reflect.KClass
/**
* Interface for a router in the application.
* It provides methods for navigating through the application.
@ -22,10 +24,25 @@ interface Router {
fun pop(onComplete: (isSuccess: Boolean) -> Unit = {})
/**
* Pops routes from the navigation stack until the specified route is found.
* Pops routes from the navigation stack until the specified [route] is found.
*
* @param route The route to pop to.
* @param onComplete The callback to be invoked when the operation is complete.
*/
fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit = {})
/**
* Pops routes from the navigation stack until the ***first*** specified [routeClass] is found.
*
* @param routeClass The route class to pop to.
* @param onComplete The callback to be invoked when the operation is complete.
*/
fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit = {})
/**
* Pops all routes from the navigation stack.
*
* @param onComplete The callback to be invoked when the operation is complete.
*/
fun clear(onComplete: (isSuccess: Boolean) -> Unit = {})
}

11
core/decompose/src/main/kotlin/com/tangem/core/decompose/navigation/RouterExt.kt Normal file
View file

@ -0,0 +1,11 @@
package com.tangem.core.decompose.navigation
/**
* Pops routes from the navigation stack until the specified route [R] is found.
*
* @param R The route to pop to.
* @param onComplete The callback to be invoked when the operation is complete.
*/
inline fun <reified R : Route> Router.popTo(noinline onComplete: (isSuccess: Boolean) -> Unit = {}) {
popTo(R::class, onComplete)
}

17
features/details/impl/src/main/kotlin/com/tangem/features/details/DetailsRouter.kt
View file

@ -10,6 +10,7 @@ import com.tangem.core.navigation.url.UrlOpener
import com.tangem.features.details.routing.DetailsRoute
import com.tangem.features.tester.api.TesterRouter
import javax.inject.Inject
import kotlin.reflect.KClass
// TODO: Remove after [REDACTED_JIRA]
internal class DetailsRouter @Inject constructor(
@ -46,13 +47,15 @@ internal class DetailsRouter @Inject constructor(
onComplete(true)
}
override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
TODO("This class will be removed in future")
}
override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
if (route is DetailsRoute.Screen) {
reduxNavController.popBackStack(route.screen)
onComplete(true)
} else {
reduxNavController.getBackStack()
onComplete(false)
}
TODO("This class will be removed in future")
}
override fun clear(onComplete: (isSuccess: Boolean) -> Unit) {
TODO("This class will be removed in future")
}
}

9
features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewRouter.kt
View file

@ -2,6 +2,7 @@ package com.tangem.features.details.component.preview
import com.tangem.core.decompose.navigation.Route
import com.tangem.core.decompose.navigation.Router
import kotlin.reflect.KClass
internal class PreviewRouter : Router {
override fun push(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
@ -12,7 +13,15 @@ internal class PreviewRouter : Router {
/* no-op */
}
override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
/* no-op */
}
override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
/* no-op */
}
override fun clear(onComplete: (isSuccess: Boolean) -> Unit) {
/* no-op */
}
}

6
features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
View file

@ -6,7 +6,6 @@ import com.tangem.core.analytics.models.AnalyticsParam
import com.tangem.core.decompose.di.ComponentScoped
import com.tangem.core.decompose.navigation.Router
import com.tangem.core.decompose.ui.UiMessageSender
import com.tangem.core.navigation.AppScreen
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.isNullOrEmpty
import com.tangem.core.ui.extensions.resourceReference
@ -22,7 +21,6 @@ import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
import com.tangem.domain.wallets.usecase.SaveWalletUseCase
import com.tangem.domain.wallets.usecase.SelectWalletUseCase
import com.tangem.features.details.impl.R
import com.tangem.features.details.routing.DetailsRoute
import javax.inject.Inject
@ComponentScoped
@ -44,7 +42,7 @@ internal class UserWalletSaver @Inject constructor(
saveWallet(userWallet)
router.popTo(DetailsRoute.Screen(AppScreen.Wallet))
// router.popTo(DetailsRoute.Screen(AppScreen.Wallet))
},
recover = { error ->
val message = error.message
@ -77,7 +75,7 @@ internal class UserWalletSaver @Inject constructor(
selectWalletUseCase(userWallet.walletId).bind()
}
router.popTo(DetailsRoute.Screen(AppScreen.Wallet))
// router.popTo(DetailsRoute.Screen(AppScreen.Wallet))
}
private suspend fun Raise<Error>.createUserWallet(response: ScanResponse): UserWallet {