From 2c00b9b5e706ba95cd56b87bb8d90b4e357d318b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 6 Dec 2022 20:45:53 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tap/features/details/redux/DetailsAction.kt | 12 ++++++++---- .../saveWallet/ui/SaveWalletBottomSheetFragment.kt | 4 ++-- .../features/saveWallet/ui/SaveWalletScreenState.kt | 2 +- .../features/saveWallet/ui/SaveWalletViewModel.kt | 2 +- .../ui/components}/EnrollBiometricsDialogConent.kt | 4 ++-- .../saveWallet}/ui/models/EnrollBiometricsDialog.kt | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) rename {core/ui/src/main/java/com/tangem/core/ui/components/dialogs => app/src/main/java/com/tangem/tap/features/saveWallet/ui/components}/EnrollBiometricsDialogConent.kt (96%) rename {core/ui/src/main/java/com/tangem/core => app/src/main/java/com/tangem/tap/features/saveWallet}/ui/models/EnrollBiometricsDialog.kt (74%) diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt index bf8afa7f53..d08fd627f5 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt @@ -55,10 +55,14 @@ sealed class DetailsAction : Action { ) : AppSettings() } - object EnrollBiometrics : AppSettings() { - object Enroll : AppSettings() - object Cancel : AppSettings() - } + data class CheckBiometricsStatus( + val awaitStatusChange: Boolean, + ) : AppSettings() + + object EnrollBiometrics : AppSettings() + data class BiometricsStatusChanged( + val needEnrollBiometrics: Boolean, + ) : AppSettings() } data class ChangeAppCurrency(val fiatCurrency: FiatCurrency) : DetailsAction() diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt index 6050723fbd..f4663eda6e 100644 --- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt @@ -16,12 +16,12 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.fragment.app.viewModels -import com.tangem.core.ui.components.dialogs.EnrollBiometricsDialogContent import com.tangem.core.ui.fragments.ComposeBottomSheetFragment -import com.tangem.core.ui.models.EnrollBiometricsDialog import com.tangem.core.ui.res.TangemTheme import com.tangem.tap.features.details.ui.cardsettings.resolveReference +import com.tangem.tap.features.saveWallet.ui.components.EnrollBiometricsDialogContent import com.tangem.tap.features.saveWallet.ui.components.SaveWalletScreenContent +import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog internal class SaveWalletBottomSheetFragment : ComposeBottomSheetFragment() { override val expandedHeightFraction: Float = .98f diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt index a9ca74fa12..51dbdcadc0 100644 --- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt @@ -1,8 +1,8 @@ package com.tangem.tap.features.saveWallet.ui import androidx.compose.runtime.Immutable -import com.tangem.core.ui.models.EnrollBiometricsDialog import com.tangem.tap.features.details.ui.cardsettings.TextReference +import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog @Immutable internal data class SaveWalletScreenState( diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt index b0807fbf19..14cae87732 100644 --- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt @@ -1,11 +1,11 @@ package com.tangem.tap.features.saveWallet.ui import androidx.lifecycle.ViewModel -import com.tangem.core.ui.models.EnrollBiometricsDialog import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.features.details.ui.cardsettings.TextReference import com.tangem.tap.features.saveWallet.redux.SaveWalletAction import com.tangem.tap.features.saveWallet.redux.SaveWalletState +import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog import com.tangem.tap.store import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/dialogs/EnrollBiometricsDialogConent.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt similarity index 96% rename from core/ui/src/main/java/com/tangem/core/ui/components/dialogs/EnrollBiometricsDialogConent.kt rename to app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt index a75943cc04..d79531b7ee 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/dialogs/EnrollBiometricsDialogConent.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt @@ -1,4 +1,4 @@ -package com.tangem.core.ui.components.dialogs +package com.tangem.tap.features.saveWallet.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,8 +17,8 @@ import com.tangem.core.ui.components.SpacerH16 import com.tangem.core.ui.components.SpacerH24 import com.tangem.core.ui.components.SpacerW8 import com.tangem.core.ui.components.TextButton -import com.tangem.core.ui.models.EnrollBiometricsDialog import com.tangem.core.ui.res.TangemTheme +import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog @Composable fun EnrollBiometricsDialogContent( diff --git a/core/ui/src/main/java/com/tangem/core/ui/models/EnrollBiometricsDialog.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt similarity index 74% rename from core/ui/src/main/java/com/tangem/core/ui/models/EnrollBiometricsDialog.kt rename to app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt index a48550d1c1..7f785a95cf 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/models/EnrollBiometricsDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt @@ -1,4 +1,4 @@ -package com.tangem.core.ui.models +package com.tangem.tap.features.saveWallet.ui.models import androidx.compose.runtime.Immutable